N°1318 - multiple choice in a template - WIP

N°1318 - multiple choice in a template - first step
2026-02-28 14:44:17 +01:00 · 2023-06-23 08:51:51 +02:00 · 2023-06-05 23:26:58 +02:00 · 2023-06-02 09:45:31 +02:00
769 changed files with 23658 additions and 27751 deletions
--- a/.make/license/updateLicenses.php
+++ b/.make/license/updateLicenses.php
@@ -19,24 +19,17 @@
 * The target license file path is in `$xmlFilePath`
 */

-$iTopFolder = __DIR__."/../../";
-$xmlFilePath = $iTopFolder."setup/licenses/community-licenses.xml";
+$iTopFolder = __DIR__ . "/../../" ;
+$xmlFilePath = $iTopFolder . "setup/licenses/community-licenses.xml";

-$jqExec = shell_exec("jq -V"); // a param is mandatory otherwise the script will freeze
-if ((null === $jqExec) || (false === $jqExec)) {
-	echo "/!\ JQ is required but cannot be launched :( \n";
-	echo "Check this script PHPDoc block for instructions\n";
-	die(-1);
-}
-
-
-function get_scope($product_node) {
+function get_scope($product_node)
+{
 	$scope = $product_node->getAttribute("scope");

-	if ($scope === "") {   //put iTop first
+	if ($scope === "")
+	{   //put iTop first
 		return "aaaaaaaaa";
 	}
-
 	return $scope;
 }

--- a/application/audit.category.class.inc.php
+++ b/application/audit.category.class.inc.php
@@ -74,23 +74,15 @@ class AuditCategory extends cmdbAbstractObject
 	public function GetReportColor($iTotal, $iErrors)
 	{
 		$sResult = 'red';
-		if ( ($iTotal == 0) || ($iErrors / $iTotal) <= ($this->Get('ok_error_tolerance') / 100) ) {
+		if ( ($iTotal == 0) || ($iErrors / $iTotal) <= ($this->Get('ok_error_tolerance') / 100) )
+		{
 			$sResult = 'green';
-		} else if (($iErrors / $iTotal) <= ($this->Get('warning_error_tolerance') / 100)) {
+		}
+		else if ( ($iErrors / $iTotal) <= ($this->Get('warning_error_tolerance') / 100) )
+		{
 			$sResult = 'orange';
 		}
-
 		return $sResult;
 	}
-
-	public static function GetShortcutActions($sFinalClass)
-	{
-		$aShortcutActions = parent::GetShortcutActions($sFinalClass);
-		if (!in_array('UI:Menu:RunAudit', $aShortcutActions)) {
-			$aShortcutActions[] = 'UI:Menu:RunAudit';
-		}
-
-		return $aShortcutActions;
-	}
 }
 ?>
--- a/application/audit.domain.class.inc.php
+++ b/application/audit.domain.class.inc.php
@@ -47,30 +47,19 @@ class AuditDomain extends cmdbAbstractObject
 			'style'                      => new ormStyle(null, null, null, null, null, '../images/icons/icons8-audit-album.svg'),
 		);
 		MetaModel::Init_Params($aParams);
-		MetaModel::Init_AddAttribute(new AttributeString("name", array("description" => "Short name for this category", "allowed_values" => null, "sql" => "name", "default_value" => "", "is_null_allowed" => false, "depends_on" => array())));
-		MetaModel::Init_AddAttribute(new AttributeString("description", array("allowed_values" => null, "sql" => "description", "default_value" => "", "is_null_allowed" => true, "depends_on" => array())));
-		MetaModel::Init_AddAttribute(new AttributeImage("icon", array("is_null_allowed" => true, "depends_on" => array(), "display_max_width" => 96, "display_max_height" => 96, "storage_max_width" => 256, "storage_max_height" => 256, "default_image" => null, "always_load_in_tables" => false)));
-		MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("categories_list",
-			array("linked_class" => "lnkAuditCategoryToAuditDomain", "ext_key_to_me" => "domain_id", "ext_key_to_remote" => "category_id", "allowed_values" => null, "count_min" => 0, "count_max" => 0, "depends_on" => array())));
+		MetaModel::Init_AddAttribute(new AttributeString("name", array("description"=>"Short name for this category", "allowed_values"=>null, "sql"=>"name", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("description", array("allowed_values"=>null, "sql"=>"description", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeImage("icon", array("is_null_allowed"=>true, "depends_on"=>array(), "display_max_width"=>96, "display_max_height"=>96, "storage_max_width"=>256, "storage_max_height"=>256, "default_image"=>null, "always_load_in_tables"=>false)));
+		MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("categories_list", array("linked_class" => "lnkAuditCategoryToAuditDomain", "ext_key_to_me" => "domain_id", "ext_key_to_remote" => "category_id", "allowed_values" => null, "count_min" => 0, "count_max" => 0, "depends_on" => array())));

 		// Display lists
 		MetaModel::Init_SetZListItems('details', array('name', 'description', 'icon', 'categories_list')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('description',)); // Attributes to be displayed for a list
+		MetaModel::Init_SetZListItems('list', array('description', )); // Attributes to be displayed for a list
 		// Search criteria
 		MetaModel::Init_SetZListItems('standard_search', array('description')); // Criteria of the std search form
 		MetaModel::Init_SetZListItems('default_search', array('name', 'description')); // Criteria of the default search form
 	}

-	public static function GetShortcutActions($sFinalClass)
-	{
-		$aShortcutActions = parent::GetShortcutActions($sFinalClass);
-		if (!in_array('UI:Menu:RunAudit', $aShortcutActions)) {
-			$aShortcutActions[] = 'UI:Menu:RunAudit';
-		}
-
-		return $aShortcutActions;
-	}
-
 }

 /**
--- a/application/audit.rule.class.inc.php
+++ b/application/audit.rule.class.inc.php
@@ -35,23 +35,23 @@ class AuditRule extends cmdbAbstractObject
 	{
 		$aParams = array
 		(
-			"category"            => "application, grant_by_profile",
-			"key_type"            => "autoincrement",
-			"name_attcode"        => "name",
-			"state_attcode"       => "",
-			"reconc_keys"         => array('name'),
-			"db_table"            => "priv_auditrule",
-			"db_key_field"        => "id",
+			"category" => "application, grant_by_profile",
+			"key_type" => "autoincrement",
+			"name_attcode" => "name",
+			"state_attcode" => "",
+			"reconc_keys" => array('name'),
+			"db_table" => "priv_auditrule",
+			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			'style'               => new ormStyle(null, null, null, null, null, '../images/icons/icons8-audit.svg'),
+			'style' => new ormStyle(null, null, null, null, null, '../images/icons/icons8-audit.svg'),
 		);
 		MetaModel::Init_Params($aParams);
-		MetaModel::Init_AddAttribute(new AttributeString("name", array("allowed_values" => null, "sql" => "name", "default_value" => "", "is_null_allowed" => false, "depends_on" => array())));
-		MetaModel::Init_AddAttribute(new AttributeString("description", array("allowed_values" => null, "sql" => "description", "default_value" => "", "is_null_allowed" => true, "depends_on" => array())));
-		MetaModel::Init_AddAttribute(new AttributeOQL("query", array("allowed_values" => null, "sql" => "query", "default_value" => "", "is_null_allowed" => false, "depends_on" => array())));
-		MetaModel::Init_AddAttribute(new AttributeEnum("valid_flag", array("allowed_values" => new ValueSetEnum('true,false'), "sql" => "valid_flag", "default_value" => "true", "is_null_allowed" => false, "depends_on" => array())));
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("category_id", array("allowed_values" => null, "sql" => "category_id", "targetclass" => "AuditCategory", "is_null_allowed" => false, "on_target_delete" => DEL_MANUAL, "depends_on" => array())));
-		MetaModel::Init_AddAttribute(new AttributeExternalField("category_name", array("allowed_values" => null, "extkey_attcode" => 'category_id', "target_attcode" => "name")));
+		MetaModel::Init_AddAttribute(new AttributeString("name", array("allowed_values"=>null, "sql"=>"name", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("description", array("allowed_values"=>null, "sql"=>"description", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeOQL("query", array("allowed_values"=>null, "sql"=>"query", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("valid_flag", array("allowed_values"=>new ValueSetEnum('true,false'), "sql"=>"valid_flag", "default_value"=>"true", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("category_id", array("allowed_values"=>null, "sql"=>"category_id", "targetclass"=>"AuditCategory", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("category_name", array("allowed_values"=>null, "extkey_attcode"=> 'category_id', "target_attcode"=>"name")));

 		// Display lists
 		MetaModel::Init_SetZListItems('details', array('category_id', 'name', 'description', 'query', 'valid_flag')); // Attributes to be displayed for the complete details
@@ -60,16 +60,5 @@ class AuditRule extends cmdbAbstractObject
 		MetaModel::Init_SetZListItems('standard_search', array('category_id', 'name', 'description', 'valid_flag', 'query')); // Criteria of the std search form
 		MetaModel::Init_SetZListItems('default_search', array('name', 'description', 'category_id')); // Criteria of the advanced search form
 	}
-
-
-	public static function GetShortcutActions($sFinalClass)
-	{
-		$aShortcutActions = parent::GetShortcutActions($sFinalClass);
-		if (!in_array('UI:Menu:RunAudit', $aShortcutActions)) {
-			$aShortcutActions[] = 'UI:Menu:RunAudit';
-		}
-
-		return $aShortcutActions;
-	}
 }
 ?>
--- a/application/cmdbabstract.class.inc.php
+++ b/application/cmdbabstract.class.inc.php
@@ -3085,10 +3085,7 @@ JS

 		$iFieldsCount = count($aFieldsMap);
 		$sJsonFieldsMap = json_encode($aFieldsMap);
-		$sLifecycleStateForWizardHelper = '';
-		if (MetaModel::HasLifecycle($sClass)) {
-			$sLifecycleStateForWizardHelper = $this->GetState();
-		}
+		$sState = $this->GetState();
 		$sSessionStorageKey = $sClass.'_'.$iKey;
 		$sTempId = utils::GetUploadTempId($iTransactionId);
 		$oPage->add_ready_script(InlineImage::EnableCKEditorImageUpload($this, $sTempId));
@@ -3098,7 +3095,7 @@ JS
 		sessionStorage.removeItem('$sSessionStorageKey');
 		
 		// Create the object once at the beginning of the page...
-		var oWizardHelper$sPrefix = new WizardHelper('$sClass', '$sPrefix', '$sLifecycleStateForWizardHelper');
+		var oWizardHelper$sPrefix = new WizardHelper('$sClass', '$sPrefix', '$sState');
 		oWizardHelper$sPrefix.SetFieldsMap($sJsonFieldsMap);
 		oWizardHelper$sPrefix.SetFieldsCount($iFieldsCount);
 EOF
@@ -3392,15 +3389,22 @@ EOF
 		];

 		// The list of candidate fields is made of the ordered list of "details" attributes + other attributes
-		// First attributes from the "details" zlist as they were sorted...
-		$aList = $this->FlattenZList(MetaModel::GetZListItems($sClass, 'details'));
-
-		// ... then append forgotten attributes
+		$aAttributes = array();
+		foreach ($this->FlattenZList(MetaModel::GetZListItems($sClass, 'details')) as $sAttCode) {
+			$aAttributes[$sAttCode] = true;
+		}
 		foreach (MetaModel::GetAttributesList($sClass) as $sAttCode) {
-			if (!in_array($sAttCode, $aList)) {
-				$aList[] = $sAttCode;
+			if (!array_key_exists($sAttCode, $aAttributes)) {
+				$aAttributes[$sAttCode] = true;
 			}
 		}
+		// Order the fields based on their dependencies, set the fields for which there is only one possible value
+		// and perform this in the order of dependencies to avoid dead-ends
+		$aDeps = array();
+		foreach ($aAttributes as $sAttCode => $trash) {
+			$aDeps[$sAttCode] = MetaModel::GetPrerequisiteAttributes($sClass, $sAttCode);
+		}
+		$aList = $this->OrderDependentFields($aDeps);

 		$bExistFieldToDisplay = false;
 		foreach ($aList as $sAttCode) {
--- a/application/dashlet.class.inc.php
+++ b/application/dashlet.class.inc.php
@@ -869,7 +869,7 @@ class DashletPlainText extends Dashlet
 	public function Render($oPage, $bEditMode = false, $aExtraParams = array())
 	{
 		$sText = $this->aProperties['text'];
-		$sText = utils::EscapeHtml(Dict::S($sText));
+		$sText = utils::EscapeHtml($sText);
 		$sText = str_replace(array("\r\n", "\n", "\r"), "<br/>", $sText);

 		$sId = 'plaintext_'.($bEditMode ? 'edit_' : '').$this->sId;
--- a/application/datamodel.application.xml
+++ b/application/datamodel.application.xml
@@ -100,20 +100,11 @@
      <enable_class>URP_Profiles</enable_class>
      <enable_action>UR_ACTION_MODIFY</enable_action>
    </menu>
-    <menu id="AuditCategories" xsi:type="DashboardMenuNode" _delta="define">
+    <menu id="AuditCategories" xsi:type="OQLMenuNode" _delta="define">
      <rank>20</rank>
      <parent>AdminTools</parent>
-      <definition>
-        <layout>DashboardLayoutOneCol</layout>
-        <title>Menu:WelcomeMenuPage</title>
-        <cells>
-          <cell id="0">
-            <rank>0</rank>
-            <dashlets>
-            </dashlets>
-          </cell>
-        </cells>
-      </definition>
+      <oql><![CDATA[SELECT AuditCategory]]></oql>
+      <do_search>1</do_search>
      <enable_class>AuditCategory</enable_class>
      <enable_action>UR_ACTION_MODIFY</enable_action>
    </menu>
--- a/application/displayblock.class.inc.php
+++ b/application/displayblock.class.inc.php
@@ -1083,7 +1083,6 @@ JS
 			$this->m_oSet = new CMDBObjectSet($this->m_oFilter, array(), $aQueryParams);
 			$this->m_oSet->SetShowObsoleteData($this->m_bShowObsoleteData);
 		}
-
 		// Summary details
 		$aCounts = array();
 		$aStateLabels = array();
@@ -1130,18 +1129,6 @@ JS
 		}

 		$oBlock = new UIContentBlockWithJSRefreshCallback(null, ["ibo-dashlet-header-dynamic--container"]);
-
-		// N°6394 Make sure to sort elements as defined in the datamodel
-		if (utils::IsNotNullOrEmptyString($sStateAttrCode)) {
-			$oAttDef = MetaModel::GetAttributeDef($sClass, $sStateAttrCode);
-			$aAllowedValues = $oAttDef->GetAllowedValues() ?? [];
-			$AllowedValuesKeys = array_keys($aAllowedValues);
-
-			uksort($aStateLabels, function ($sKey1, $sKey2) use ($AllowedValuesKeys) {
-				return array_search($sKey1, $AllowedValuesKeys) > array_search($sKey2, $AllowedValuesKeys) ? 1 : -1;
-			});
-		}
-
 		foreach ($aStateLabels as $sStateValue => $sStateLabel) {
 			$aCount = $aCounts[$sStateValue];
 			$sHyperlink = $aCount['link'];
--- a/application/loginbasic.class.inc.php
+++ b/application/loginbasic.class.inc.php
@@ -80,11 +80,6 @@ class LoginBasic extends AbstractLoginFSMExtension
 	{
 		if (Session::Get('login_mode') == 'basic')
 		{
-            $iOnExit = LoginWebPage::getIOnExit();
-            if ($iOnExit === LoginWebPage::EXIT_RETURN)
-            {
-                return LoginWebPage::LOGIN_FSM_RETURN; // Error, exit FSM
-            }
 			LoginWebPage::HTTP401Error();
 		}
 		return LoginWebPage::LOGIN_FSM_CONTINUE;
--- a/application/logindefault.class.inc.php
+++ b/application/logindefault.class.inc.php
@@ -79,7 +79,7 @@ class LoginDefaultAfter extends AbstractLoginFSMExtension implements iLogoutExte
 	{
 		self::ResetLoginSession();
 		$iOnExit = LoginWebPage::getIOnExit();
-		if ($iOnExit === LoginWebPage::EXIT_RETURN)
+		if ($iOnExit == LoginWebPage::EXIT_RETURN)
 		{
 			return LoginWebPage::LOGIN_FSM_RETURN; // Error, exit FSM
 		}
@@ -95,12 +95,6 @@ class LoginDefaultAfter extends AbstractLoginFSMExtension implements iLogoutExte
 	{
 		if (!Session::IsSet('login_mode'))
 		{
-            // N°6358 - if EXIT_RETURN was asked, send an error
-            if (LoginWebPage::getIOnExit() === LoginWebPage::EXIT_RETURN) {
-                $iErrorCode = LoginWebPage::EXIT_CODE_WRONGCREDENTIALS;
-                return LoginWebPage::LOGIN_FSM_ERROR;
-            }
-
 			// If no plugin validated the user, exit
 			self::ResetLoginSession();
 			exit();
--- a/application/loginexternal.class.inc.php
+++ b/application/loginexternal.class.inc.php
@@ -73,11 +73,6 @@ class LoginExternal extends AbstractLoginFSMExtension
 	{
 		if (Session::Get('login_mode') == 'external')
 		{
-            $iOnExit = LoginWebPage::getIOnExit();
-            if ($iOnExit === LoginWebPage::EXIT_RETURN)
-            {
-                return LoginWebPage::LOGIN_FSM_RETURN; // Error, exit FSM
-            }
 			LoginWebPage::HTTP401Error();
 		}
 		return LoginWebPage::LOGIN_FSM_CONTINUE;
--- a/application/loginform.class.inc.php
+++ b/application/loginform.class.inc.php
@@ -44,10 +44,6 @@ class LoginForm extends AbstractLoginFSMExtension implements iLoginUIExtension
 					exit;
 				}

-                if (LoginWebPage::getIOnExit() === LoginWebPage::EXIT_RETURN) {
-                    return LoginWebPage::LOGIN_FSM_CONTINUE;
-                }
-
 				// No credentials yet, display the form
 				$oPage = LoginWebPage::NewLoginWebPage();
 				$oPage->DisplayLoginForm($this->bForceFormOnError);
--- a/application/utils.inc.php
+++ b/application/utils.inc.php
@@ -2904,8 +2904,7 @@ HTML;
 				if ($sClassNameFilter !== '' && strpos($sPHPClass, $sClassNameFilter) === false) {
 					$bSkipped = true;
 				}
-				// For some PHP classes we don't have their file path as they are already in memory, so we never filter on their paths
-				elseif (utils::IsNotNullOrEmptyString($sPHPFile)) {
+				else {
 					$sPHPFile = self::LocalPath($sPHPFile);
 					if ($sPHPFile !== false) {
 						$sPHPFile = '/'.$sPHPFile; // for regex
--- a/composer.json
+++ b/composer.json
@@ -12,10 +12,10 @@
    "ext-json": "*",
    "ext-mysqli": "*",
    "ext-soap": "*",
-    "apereo/phpcas": "~1.6.0",
+    "apereo/phpcas" : "~1.6.0",
    "combodo/tcpdf": "~6.4.4",
    "firebase/php-jwt": "~6.4.0",
-    "guzzlehttp/guzzle": "^7.5.1",
+    "guzzlehttp/guzzle": "^7.4.5",
    "laminas/laminas-mail": "^2.11",
    "laminas/laminas-servicemanager": "^3.5",
    "league/oauth2-google": "^3.0",
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
-    "content-hash": "cb3883f141f50e1bfbc957880ab93be1",
+    "content-hash": "69db9dbdea61a588fa2058724d91a579",
    "packages": [
        {
            "name": "apereo/phpcas",
@@ -217,22 +217,22 @@
        },
        {
            "name": "guzzlehttp/guzzle",
-            "version": "7.7.0",
+            "version": "7.4.5",
            "source": {
                "type": "git",
                "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "fb7566caccf22d74d1ab270de3551f72a58399f5"
+                "reference": "1dd98b0564cb3f6bd16ce683cb755f94c10fbd82"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/fb7566caccf22d74d1ab270de3551f72a58399f5",
-                "reference": "fb7566caccf22d74d1ab270de3551f72a58399f5",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/1dd98b0564cb3f6bd16ce683cb755f94c10fbd82",
+                "reference": "1dd98b0564cb3f6bd16ce683cb755f94c10fbd82",
                "shasum": ""
            },
            "require": {
                "ext-json": "*",
-                "guzzlehttp/promises": "^1.5.3 || ^2.0",
-                "guzzlehttp/psr7": "^1.9.1 || ^2.4.5",
+                "guzzlehttp/promises": "^1.5",
+                "guzzlehttp/psr7": "^1.9 || ^2.4",
                "php": "^7.2.5 || ^8.0",
                "psr/http-client": "^1.0",
                "symfony/deprecation-contracts": "^2.2 || ^3.0"
@@ -241,11 +241,10 @@
                "psr/http-client-implementation": "1.0"
            },
            "require-dev": {
-                "bamarni/composer-bin-plugin": "^1.8.1",
+                "bamarni/composer-bin-plugin": "^1.4.1",
                "ext-curl": "*",
-                "php-http/client-integration-tests": "dev-master#2c025848417c1135031fdf9c728ee53d0a7ceaee as 3.0.999",
-                "php-http/message-factory": "^1.1",
-                "phpunit/phpunit": "^8.5.29 || ^9.5.23",
+                "php-http/client-integration-tests": "^3.0",
+                "phpunit/phpunit": "^8.5.5 || ^9.3.5",
                "psr/log": "^1.1 || ^2.0 || ^3.0"
            },
            "suggest": {
@@ -255,9 +254,8 @@
            },
            "type": "library",
            "extra": {
-                "bamarni-bin": {
-                    "bin-links": true,
-                    "forward-command": false
+                "branch-alias": {
+                    "dev-master": "7.4-dev"
                }
            },
            "autoload": {
@@ -323,7 +321,7 @@
            ],
            "support": {
                "issues": "https://github.com/guzzle/guzzle/issues",
-                "source": "https://github.com/guzzle/guzzle/tree/7.7.0"
+                "source": "https://github.com/guzzle/guzzle/tree/7.4.5"
            },
            "funding": [
                {
@@ -339,37 +337,38 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-05-21T14:04:53+00:00"
+            "time": "2022-06-20T22:16:13+00:00"
        },
        {
            "name": "guzzlehttp/promises",
-            "version": "2.0.0",
+            "version": "1.5.1",
            "source": {
                "type": "git",
                "url": "https://github.com/guzzle/promises.git",
-                "reference": "3a494dc7dc1d7d12e511890177ae2d0e6c107da6"
+                "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/promises/zipball/3a494dc7dc1d7d12e511890177ae2d0e6c107da6",
-                "reference": "3a494dc7dc1d7d12e511890177ae2d0e6c107da6",
+                "url": "https://api.github.com/repos/guzzle/promises/zipball/fe752aedc9fd8fcca3fe7ad05d419d32998a06da",
+                "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da",
                "shasum": ""
            },
            "require": {
-                "php": "^7.2.5 || ^8.0"
+                "php": ">=5.5"
            },
            "require-dev": {
-                "bamarni/composer-bin-plugin": "^1.8.1",
-                "phpunit/phpunit": "^8.5.29 || ^9.5.23"
+                "symfony/phpunit-bridge": "^4.4 || ^5.1"
            },
            "type": "library",
            "extra": {
-                "bamarni-bin": {
-                    "bin-links": true,
-                    "forward-command": false
+                "branch-alias": {
+                    "dev-master": "1.5-dev"
                }
            },
            "autoload": {
+                "files": [
+                    "src/functions_include.php"
+                ],
                "psr-4": {
                    "GuzzleHttp\\Promise\\": "src/"
                }
@@ -406,7 +405,7 @@
            ],
            "support": {
                "issues": "https://github.com/guzzle/promises/issues",
-                "source": "https://github.com/guzzle/promises/tree/2.0.0"
+                "source": "https://github.com/guzzle/promises/tree/1.5.1"
            },
            "funding": [
                {
@@ -422,26 +421,26 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-05-21T13:50:22+00:00"
+            "time": "2021-10-22T20:56:57+00:00"
        },
        {
            "name": "guzzlehttp/psr7",
-            "version": "2.5.0",
+            "version": "2.4.0",
            "source": {
                "type": "git",
                "url": "https://github.com/guzzle/psr7.git",
-                "reference": "b635f279edd83fc275f822a1188157ffea568ff6"
+                "reference": "13388f00956b1503577598873fffb5ae994b5737"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/b635f279edd83fc275f822a1188157ffea568ff6",
-                "reference": "b635f279edd83fc275f822a1188157ffea568ff6",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/13388f00956b1503577598873fffb5ae994b5737",
+                "reference": "13388f00956b1503577598873fffb5ae994b5737",
                "shasum": ""
            },
            "require": {
                "php": "^7.2.5 || ^8.0",
                "psr/http-factory": "^1.0",
-                "psr/http-message": "^1.1 || ^2.0",
+                "psr/http-message": "^1.0",
                "ralouphie/getallheaders": "^3.0"
            },
            "provide": {
@@ -449,18 +448,17 @@
                "psr/http-message-implementation": "1.0"
            },
            "require-dev": {
-                "bamarni/composer-bin-plugin": "^1.8.1",
+                "bamarni/composer-bin-plugin": "^1.4.1",
                "http-interop/http-factory-tests": "^0.9",
-                "phpunit/phpunit": "^8.5.29 || ^9.5.23"
+                "phpunit/phpunit": "^8.5.8 || ^9.3.10"
            },
            "suggest": {
                "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
            },
            "type": "library",
            "extra": {
-                "bamarni-bin": {
-                    "bin-links": true,
-                    "forward-command": false
+                "branch-alias": {
+                    "dev-master": "2.4-dev"
                }
            },
            "autoload": {
@@ -522,7 +520,7 @@
            ],
            "support": {
                "issues": "https://github.com/guzzle/psr7/issues",
-                "source": "https://github.com/guzzle/psr7/tree/2.5.0"
+                "source": "https://github.com/guzzle/psr7/tree/2.4.0"
            },
            "funding": [
                {
@@ -538,7 +536,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-04-17T16:11:26+00:00"
+            "time": "2022-06-20T21:43:11+00:00"
        },
        {
            "name": "laminas/laminas-loader",
@@ -1670,21 +1668,21 @@
        },
        {
            "name": "psr/http-client",
-            "version": "1.0.2",
+            "version": "1.0.1",
            "source": {
                "type": "git",
                "url": "https://github.com/php-fig/http-client.git",
-                "reference": "0955afe48220520692d2d09f7ab7e0f93ffd6a31"
+                "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-client/zipball/0955afe48220520692d2d09f7ab7e0f93ffd6a31",
-                "reference": "0955afe48220520692d2d09f7ab7e0f93ffd6a31",
+                "url": "https://api.github.com/repos/php-fig/http-client/zipball/2dfb5f6c5eff0e91e20e913f8c5452ed95b86621",
+                "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621",
                "shasum": ""
            },
            "require": {
                "php": "^7.0 || ^8.0",
-                "psr/http-message": "^1.0 || ^2.0"
+                "psr/http-message": "^1.0"
            },
            "type": "library",
            "extra": {
@@ -1704,7 +1702,7 @@
            "authors": [
                {
                    "name": "PHP-FIG",
-                    "homepage": "https://www.php-fig.org/"
+                    "homepage": "http://www.php-fig.org/"
                }
            ],
            "description": "Common interface for HTTP clients",
@@ -1716,27 +1714,27 @@
                "psr-18"
            ],
            "support": {
-                "source": "https://github.com/php-fig/http-client/tree/1.0.2"
+                "source": "https://github.com/php-fig/http-client/tree/master"
            },
-            "time": "2023-04-10T20:12:12+00:00"
+            "time": "2020-06-29T06:28:15+00:00"
        },
        {
            "name": "psr/http-factory",
-            "version": "1.0.2",
+            "version": "1.0.1",
            "source": {
                "type": "git",
                "url": "https://github.com/php-fig/http-factory.git",
-                "reference": "e616d01114759c4c489f93b099585439f795fe35"
+                "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-factory/zipball/e616d01114759c4c489f93b099585439f795fe35",
-                "reference": "e616d01114759c4c489f93b099585439f795fe35",
+                "url": "https://api.github.com/repos/php-fig/http-factory/zipball/12ac7fcd07e5b077433f5f2bee95b3a771bf61be",
+                "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be",
                "shasum": ""
            },
            "require": {
                "php": ">=7.0.0",
-                "psr/http-message": "^1.0 || ^2.0"
+                "psr/http-message": "^1.0"
            },
            "type": "library",
            "extra": {
@@ -1756,7 +1754,7 @@
            "authors": [
                {
                    "name": "PHP-FIG",
-                    "homepage": "https://www.php-fig.org/"
+                    "homepage": "http://www.php-fig.org/"
                }
            ],
            "description": "Common interfaces for PSR-7 HTTP message factories",
@@ -1771,31 +1769,31 @@
                "response"
            ],
            "support": {
-                "source": "https://github.com/php-fig/http-factory/tree/1.0.2"
+                "source": "https://github.com/php-fig/http-factory/tree/master"
            },
-            "time": "2023-04-10T20:10:41+00:00"
+            "time": "2019-04-30T12:38:16+00:00"
        },
        {
            "name": "psr/http-message",
-            "version": "2.0",
+            "version": "1.0.1",
            "source": {
                "type": "git",
                "url": "https://github.com/php-fig/http-message.git",
-                "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71"
+                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-message/zipball/402d35bcb92c70c026d1a6a9883f06b2ead23d71",
-                "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71",
+                "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363",
+                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363",
                "shasum": ""
            },
            "require": {
-                "php": "^7.2 || ^8.0"
+                "php": ">=5.3.0"
            },
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "2.0.x-dev"
+                    "dev-master": "1.0.x-dev"
                }
            },
            "autoload": {
@@ -1810,7 +1808,7 @@
            "authors": [
                {
                    "name": "PHP-FIG",
-                    "homepage": "https://www.php-fig.org/"
+                    "homepage": "http://www.php-fig.org/"
                }
            ],
            "description": "Common interface for HTTP messages",
@@ -1824,9 +1822,9 @@
                "response"
            ],
            "support": {
-                "source": "https://github.com/php-fig/http-message/tree/2.0"
+                "source": "https://github.com/php-fig/http-message/tree/master"
            },
-            "time": "2023-04-04T09:54:51+00:00"
+            "time": "2016-08-06T14:39:51+00:00"
        },
        {
            "name": "psr/log",
@@ -5276,5 +5274,5 @@
    "platform-overrides": {
        "php": "7.4.0"
    },
-    "plugin-api-version": "2.3.0"
+    "plugin-api-version": "2.1.0"
 }
--- a/core/action.class.inc.php
+++ b/core/action.class.inc.php
@@ -16,7 +16,6 @@
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>

-use Combodo\iTop\Application\TwigBase\Twig\TwigHelper;

 /**
 * Persistent classes (internal): user defined actions
@@ -226,22 +225,7 @@ class ActionEmail extends ActionNotification
 	 * @since 3.0.1
 	 */
 	const ENUM_HEADER_NAME_REFERENCES = 'References';
-	/**
-	 * @var string
-	 * @since 3.1.0
-	 */
-	const TEMPLATE_BODY_CONTENT = '$content$';
-	/**
-	 * Wraps the 'body' of the message for previewing inside an IFRAME -- i.e. without any of the iTop stylesheets being applied
-	 * @var string
-	 * @since 3.1.0
-	 */
-	const CONTENT_HIGHLIGHT = '<div style="border:2px dashed #6800ff;position:relative;padding:2px;margin-top:14px;"><div style="background-color:#6800ff;color:#fff;font-family:Courier New, sans-serif;font-size:14px;line-height:16px;padding:3px;display:block;position:absolute;top:-22px;right:0;">$content$</div>%s</div>';
-	/**
-	 * Wraps a placeholder of the email's body for previewing inside an IFRAME -- i.e. without any of the iTop stylesheets being applied
-	 * @var string
-	 */
-	const FIELD_HIGHLIGHT = '<span style="background-color:#6800ff;color:#fff;font-size:smaller;font-family:Courier New, sans-serif;padding:2px;">\\$$1\\$</span>';
+
 	/**
 	 * @inheritDoc
 	 */
@@ -273,10 +257,6 @@ class ActionEmail extends ActionNotification
 		MetaModel::Init_AddAttribute(new AttributeTemplateString("subject", array("allowed_values" => null, "sql" => "subject", "default_value" => null, "is_null_allowed" => false, "depends_on" => array())));
 		MetaModel::Init_AddAttribute(new AttributeTemplateHTML("body", array("allowed_values" => null, "sql" => "body", "default_value" => null, "is_null_allowed" => false, "depends_on" => array())));
 		MetaModel::Init_AddAttribute(new AttributeEnum("importance", array("allowed_values" => new ValueSetEnum('low,normal,high'), "sql" => "importance", "default_value" => 'normal', "is_null_allowed" => false, "depends_on" => array())));
-		MetaModel::Init_AddAttribute(new AttributeApplicationLanguage("language", array("sql"=>"language", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeBlob("html_template", array("is_null_allowed"=>true, "depends_on"=>array(), "always_load_in_tables"=>false)));
-		MetaModel::Init_AddAttribute(new AttributeEnum("ignore_notify", array("allowed_values" => new ValueSetEnum('yes,no'), "sql" => "ignore_notify", "default_value" => 'yes', "is_null_allowed" => false, "depends_on" => array())));
-		

 		// Display lists
 		// - Attributes to be displayed for the complete details
@@ -286,10 +266,8 @@ class ActionEmail extends ActionNotification
 					0 => 'name',
 					1 => 'description',
 					2 => 'status',
-					3 => 'language',
-					4 => 'html_template',
-					5 => 'subject',
-					6 => 'body',
+					3 => 'subject',
+					4 => 'body',
 					// 5 => 'importance', not handled when sending the mail, better hide it then
 				),
 				'fieldset:ActionEmail:trigger' => array(
@@ -303,21 +281,20 @@ class ActionEmail extends ActionNotification
 					2 => 'reply_to',
 					3 => 'reply_to_label',
 					4 => 'test_recipient',
-					5 => 'ignore_notify',
-					6 => 'to',
-					7 => 'cc',
-					8 => 'bcc',
+					5 => 'to',
+					6 => 'cc',
+					7 => 'bcc',
 				),
 			),
 		));

 		// - Attributes to be displayed for a list
-		MetaModel::Init_SetZListItems('list', array('status', 'to', 'subject', 'language'));
+		MetaModel::Init_SetZListItems('list', array('status', 'to', 'subject'));
 		// Search criteria
 		// - Standard criteria of the search
-		MetaModel::Init_SetZListItems('standard_search', array('name', 'description', 'status', 'subject', 'language'));
+		MetaModel::Init_SetZListItems('standard_search', array('name', 'description', 'status', 'subject'));
 		// - Default criteria for the search
-		MetaModel::Init_SetZListItems('default_search', array('name', 'description', 'status', 'subject', 'language'));
+		MetaModel::Init_SetZListItems('default_search', array('name', 'description', 'status', 'subject'));
 	}

 	// count the recipients found
@@ -347,15 +324,6 @@ class ActionEmail extends ActionNotification
 		try
 		{
 			$oSearch = DBObjectSearch::FromOQL($sOQL);
-			if ($this->Get('ignore_notify') === 'no') {
-				// In theory it is possible to notify *any* kind of object, 
-				// as long as there is an email attribute in the class
-				// So let's not assume that the selected class is a Person
-				$sFirstSelectedClass = $oSearch->GetClass();
-				if (MetaModel::IsValidAttCode($sFirstSelectedClass, 'notify')) {
-					$oSearch->AddCondition('notify', 'yes');
-				}
-			}
 			$oSearch->AllowAllData();
 		}
 		catch (OQLException $e)
@@ -480,27 +448,114 @@ class ActionEmail extends ActionNotification
 	 */
 	protected function _DoExecute($oTrigger, $aContextArgs, &$oLog)
 	{
+		$sPreviousUrlMaker = ApplicationContext::SetUrlMakerClass();
+		try
+		{
+			$this->m_iRecipients = 0;
+			$this->m_aMailErrors = array();
+
+			// Determine recipients
+			//
+			$sTo = $this->FindRecipients('to', $aContextArgs);
+			$sCC = $this->FindRecipients('cc', $aContextArgs);
+			$sBCC = $this->FindRecipients('bcc', $aContextArgs);
+
+			$sFrom = MetaModel::ApplyParams($this->Get('from'), $aContextArgs);
+			$sFromLabel = MetaModel::ApplyParams($this->Get('from_label'), $aContextArgs);
+			$sReplyTo = MetaModel::ApplyParams($this->Get('reply_to'), $aContextArgs);
+			$sReplyToLabel = MetaModel::ApplyParams($this->Get('reply_to_label'), $aContextArgs);
+
+			$sSubject = MetaModel::ApplyParams($this->Get('subject'), $aContextArgs);
+			$sBody = MetaModel::ApplyParams($this->Get('body'), $aContextArgs);
+
+			$oObj = $aContextArgs['this->object()'];
+			$sMessageId = $this->GenerateIdentifierForHeaders($oObj, static::ENUM_HEADER_NAME_MESSAGE_ID);
+			$sReference = $this->GenerateIdentifierForHeaders($oObj, static::ENUM_HEADER_NAME_REFERENCES);
+		}
+		catch (Exception $e) {
+			/** @noinspection PhpUnhandledExceptionInspection */
+			throw $e;
+		}
+		finally {
+			ApplicationContext::SetUrlMakerClass($sPreviousUrlMaker);
+		}
+
+		if (!is_null($oLog)) {
+			// Note: we have to secure this because those values are calculated
+			// inside the try statement, and we would like to keep track of as
+			// many data as we could while some variables may still be undefined
+			if (isset($sTo)) {
+				$oLog->Set('to', $sTo);
+			}
+			if (isset($sCC)) {
+				$oLog->Set('cc', $sCC);
+			}
+			if (isset($sBCC)) {
+				$oLog->Set('bcc', $sBCC);
+			}
+			if (isset($sFrom)) {
+				$oLog->Set('from', $sFrom);
+			}
+			if (isset($sSubject)) {
+				$oLog->Set('subject', $sSubject);
+			}
+			if (isset($sBody)) {
+				$oLog->Set('body', $sBody);
+			}
+		}
 		$sStyles = file_get_contents(APPROOT.'css/email.css');
 		$sStyles .= MetaModel::GetConfig()->Get('email_css');
-		
+
 		$oEmail = new EMail();
-		
-		$aEmailContent = $this->PrepareMessageContent($aContextArgs, $oLog);
-		$oEmail->SetSubject($aEmailContent['subject']);
-		$oEmail->SetBody($aEmailContent['body'], 'text/html', $sStyles);
-		$oEmail->SetRecipientTO($aEmailContent['to']);
-		$oEmail->SetRecipientCC($aEmailContent['cc']);
-		$oEmail->SetRecipientBCC($aEmailContent['bcc']);
-		$oEmail->SetRecipientFrom($aEmailContent['from'], $aEmailContent['from_label']);
-		$oEmail->SetRecipientReplyTo($aEmailContent['reply_to'], $aEmailContent['reply_to_label']);
-		$oEmail->SetReferences($aEmailContent['references']);
-		$oEmail->SetMessageId($aEmailContent['message_id']);
-		$oEmail->SetInReplyTo($aEmailContent['in_reply_to']);
-		
-		foreach($aEmailContent['attachments'] as $aAttachment) {
-			$oEmail->AddAttachment($aAttachment['data'], $aAttachment['filename'], $aAttachment['mime_type']);
+
+		if ($this->IsBeingTested()) {
+			$oEmail->SetSubject('TEST['.$sSubject.']');
+			$sTestBody = $sBody;
+			$sTestBody .= "<div style=\"border: dashed;\">\n";
+			$sTestBody .= "<h1>Testing email notification ".$this->GetHyperlink()."</h1>\n";
+			$sTestBody .= "<p>The email should be sent with the following properties\n";
+			$sTestBody .= "<ul>\n";
+			$sTestBody .= "<li>TO: $sTo</li>\n";
+			$sTestBody .= "<li>CC: $sCC</li>\n";
+			$sTestBody .= "<li>BCC: $sBCC</li>\n";
+			$sTestBody .= empty($sFromLabel) ? "<li>From: $sFrom</li>\n" : "<li>From: $sFromLabel &lt;$sFrom&gt;</li>\n";
+			$sTestBody .= empty($sReplyToLabel) ? "<li>Reply-To: $sReplyTo</li>\n" : "<li>Reply-To: $sReplyToLabel &lt;$sReplyTo&gt;</li>\n";
+			$sTestBody .= "<li>References: $sReference</li>\n";
+			$sTestBody .= "</ul>\n";
+			$sTestBody .= "</p>\n";
+			$sTestBody .= "</div>\n";
+			$oEmail->SetBody($sTestBody, 'text/html', $sStyles);
+			$oEmail->SetRecipientTO($this->Get('test_recipient'));
+			$oEmail->SetRecipientFrom($sFrom, $sFromLabel);
+			$oEmail->SetReferences($sReference);
+			$oEmail->SetMessageId($sMessageId);
+			// Note: N°4849 We pass the "References" identifier instead of the "Message-ID" on purpose as we want notifications emails to group around the triggering iTop object, not just the users' replies to the notification
+			$oEmail->SetInReplyTo($sReference);
+		} else {
+			$oEmail->SetSubject($sSubject);
+			$oEmail->SetBody($sBody, 'text/html', $sStyles);
+			$oEmail->SetRecipientTO($sTo);
+			$oEmail->SetRecipientCC($sCC);
+			$oEmail->SetRecipientBCC($sBCC);
+			$oEmail->SetRecipientFrom($sFrom, $sFromLabel);
+			$oEmail->SetRecipientReplyTo($sReplyTo, $sReplyToLabel);
+			$oEmail->SetReferences($sReference);
+			$oEmail->SetMessageId($sMessageId);
+			// Note: N°4849 We pass the "References" identifier instead of the "Message-ID" on purpose as we want notifications emails to group around the triggering iTop object, not just the users' replies to the notification
+			$oEmail->SetInReplyTo($sReference);
 		}
-		
+
+		if (isset($aContextArgs['attachments']))
+		{
+			$aAttachmentReport = array();
+			foreach($aContextArgs['attachments'] as $oDocument)
+			{
+				$oEmail->AddAttachment($oDocument->GetData(), $oDocument->GetFileName(), $oDocument->GetMimeType());
+				$aAttachmentReport[] = array($oDocument->GetFileName(), $oDocument->GetMimeType(), strlen($oDocument->GetData()));
+			}
+			$oLog->Set('attachments', $aAttachmentReport);
+		}
+
 		if (empty($this->m_aMailErrors))
 		{
 			if ($this->m_iRecipients == 0)
@@ -509,7 +564,6 @@ class ActionEmail extends ActionNotification
 			}
 			else
 			{
-				$aErrors = [];
 				$iRes = $oEmail->Send($aErrors, false, $oLog); // allow asynchronous mode
 				switch ($iRes)
 				{
@@ -534,147 +588,13 @@ class ActionEmail extends ActionNotification
 		}
 	}

-	/**
-	 * @param array $aContextArgs
-	 * @param \EventNotification $oLog
-	 *
-	 * @return array
-	 * @throws \CoreException
-	 * @throws \Exception
-	 * @since 3.1.0 N°918
-	 */
-	protected function PrepareMessageContent($aContextArgs, &$oLog): array
-	{
-		$aMessageContent = [
-			'to' => '',
-			'cc' => '',
-			'bcc' => '',
-			'from' => '',
-			'from_label' => '',
-			'reply_to' => '',
-			'reply_to_label' => '',
-			'subject' => '',
-			'body' => '',
-			'references' => '',
-			'message_id' => '',
-			'in_reply_to' => '',
-			'attachments' => [],
-		];
-		$sPreviousUrlMaker = ApplicationContext::SetUrlMakerClass();
-		$sPreviousLanguage = Dict::GetUserLanguage();
-		$aPreviousPluginProperties = ApplicationContext::GetPluginProperties('QueryLocalizerPlugin');
-		if ($this->Get('language') !== '') {
-			// If a language is specified for this action, force this language
-			// when rendering all placeholders inside this message
-			Dict::SetUserLanguage($this->Get('language'));
-			AttributeDateTime::LoadFormatFromConfig();
-			ApplicationContext::SetPluginProperty('QueryLocalizerPlugin', 'language_code', $this->Get('language'));
-		}
-
-		try
-		{
-			$this->m_iRecipients = 0;
-			$this->m_aMailErrors = array();
-			
-			// Determine recipients
-			//
-			$aMessageContent['to'] = $this->FindRecipients('to', $aContextArgs);
-			$aMessageContent['cc'] = $this->FindRecipients('cc', $aContextArgs);
-			$aMessageContent['bcc'] = $this->FindRecipients('bcc', $aContextArgs);
-			
-			$aMessageContent['from'] = MetaModel::ApplyParams($this->Get('from'), $aContextArgs);
-			$aMessageContent['from_label'] = MetaModel::ApplyParams($this->Get('from_label'), $aContextArgs);
-			$aMessageContent['reply_to'] = MetaModel::ApplyParams($this->Get('reply_to'), $aContextArgs);
-			$aMessageContent['reply_to_label'] = MetaModel::ApplyParams($this->Get('reply_to_label'), $aContextArgs);
-			
-			$aMessageContent['subject'] = MetaModel::ApplyParams($this->Get('subject'), $aContextArgs);
-			$sBody = $this->BuildMessageBody(false);
-			$aMessageContent['body'] = MetaModel::ApplyParams($sBody, $aContextArgs);
-			
-			$oObj = $aContextArgs['this->object()'];
-			$aMessageContent['message_id'] = $this->GenerateIdentifierForHeaders($oObj, static::ENUM_HEADER_NAME_MESSAGE_ID);
-			$aMessageContent['references'] = $this->GenerateIdentifierForHeaders($oObj, static::ENUM_HEADER_NAME_REFERENCES);
-		}
-		catch (Exception $e) {
-			/** @noinspection PhpUnhandledExceptionInspection */
-			throw $e;
-		}
-		finally {
-			ApplicationContext::SetUrlMakerClass($sPreviousUrlMaker);
-			Dict::SetUserLanguage($sPreviousLanguage);
-			AttributeDateTime::LoadFormatFromConfig();
-			ApplicationContext::SetPluginProperty('QueryLocalizerPlugin', 'language_code', $aPreviousPluginProperties['language_code'] ?? null);
-		}
-		
-		if (!is_null($oLog)) {
-			// Note: we have to secure this because those values are calculated
-			// inside the try statement, and we would like to keep track of as
-			// many data as we could while some variables may still be undefined
-			if (isset($aMessageContent['to'])) {
-				$oLog->Set('to', $aMessageContent['to']);
-			}
-			if (isset($aMessageContent['cc'])) {
-				$oLog->Set('cc', $aMessageContent['cc']);
-			}
-			if (isset($aMessageContent['bcc'])) {
-				$oLog->Set('bcc', $aMessageContent['bcc']);
-			}
-			if (isset($aMessageContent['from'])) {
-				$oLog->Set('from', $aMessageContent['from']);
-			}
-			if (isset($aMessageContent['subject'])) {
-				$oLog->Set('subject', $aMessageContent['subject']);
-			}
-			if (isset($aMessageContent['body'])) {
-				$oLog->Set('body', HTMLSanitizer::Sanitize($aMessageContent['body']));
-			}
-		}
-		$sStyles = file_get_contents(APPROOT.'css/email.css');
-		$sStyles .= MetaModel::GetConfig()->Get('email_css');
-		
-		if ($this->IsBeingTested()) {
-			$sTestBody = $aMessageContent['body'];
-			$sTestBody .= "<div style=\"border: dashed;\">\n";
-			$sTestBody .= "<h1>Testing email notification ".$this->GetHyperlink()."</h1>\n";
-			$sTestBody .= "<p>The email should be sent with the following properties\n";
-			$sTestBody .= "<ul>\n";
-			$sTestBody .= "<li>TO: {$aMessageContent['to']}</li>\n";
-			$sTestBody .= "<li>CC: {$aMessageContent['cc']}</li>\n";
-			$sTestBody .= "<li>BCC: {$aMessageContent['bcc']}</li>\n";
-			$sTestBody .= empty($aMessageContent['from_label']) ? "<li>From: {$aMessageContent['from']}</li>\n" : "<li>From: {$aMessageContent['from_label']} &lt;{$aMessageContent['from']}&gt;</li>\n";
-			$sTestBody .= empty($aMessageContent['reply_to_label']) ? "<li>Reply-To: {$aMessageContent['reply_to']}</li>\n" : "<li>Reply-To: {$aMessageContent['reply_to_label']} &lt;{$aMessageContent['reply_to']}&gt;</li>\n";
-			$sTestBody .= "<li>References: {$aMessageContent['references']}</li>\n";
-			$sTestBody .= "</ul>\n";
-			$sTestBody .= "</p>\n";
-			$sTestBody .= "</div>\n";
-			$aMessageContent['subject'] = 'TEST['.$aMessageContent['subject'].']';
-			$aMessageContent['body'] = $sTestBody;
-			$aMessageContent['to'] = $this->Get('test_recipient');
-		}
-		// Note: N°4849 We pass the "References" identifier instead of the "Message-ID" on purpose as we want notifications emails to group around the triggering iTop object, not just the users' replies to the notification
-		$aMessageContent['in_reply_to'] = $aMessageContent['references'];
-		
-		if (isset($aContextArgs['attachments']))
-		{
-			$aAttachmentReport = array();
-			foreach($aContextArgs['attachments'] as $oDocument)
-			{
-				$aMessageContent['attachments'][] = ['data' => $oDocument->GetData(), 'filename' => $oDocument->GetFileName(), 'mime_type' => $oDocument->GetMimeType()];
-				$aAttachmentReport[] = array($oDocument->GetFileName(), $oDocument->GetMimeType(), strlen($oDocument->GetData()));
-			}
-			$oLog->Set('attachments', $aAttachmentReport);
-		}
-		
-		return $aMessageContent;
-	}
-
 	/**
 	 * @param \DBObject $oObject
 	 * @param string $sHeaderName {@see \ActionEmail::ENUM_HEADER_NAME_REFERENCES}, {@see \ActionEmail::ENUM_HEADER_NAME_MESSAGE_ID}
 	 *
 	 * @return string The formatted identifier for $sHeaderName based on $oObject
 	 * @throws \Exception
-	 * @since 3.1.0 N°4849
+	 * @since 3.0.1 N°4849
 	 */
 	protected function GenerateIdentifierForHeaders(DBObject $oObject, string $sHeaderName): string
 	{
@@ -709,65 +629,4 @@ class ActionEmail extends ActionNotification
 		]);
 		throw new Exception($sErrorMessage);
 	}
-	
-	/**
-	 * Compose the body of the message from the 'body' attribute and the HTML template (if any)
-	 * @since 3.1.0 N°4849
-	 * @param bool $bHighlightPlaceholders If true add some extra HTML around placeholders to highlight them 
-	 * @return string
-	 */
-	protected function BuildMessageBody(bool $bHighlightPlaceholders = false): string
-	{
-		$sBody = $this->Get('body');
-		/**  @var ormDocument $oHtmlTemplate */
-		$oHtmlTemplate = $this->Get('html_template');
-		if ($oHtmlTemplate && !$oHtmlTemplate->IsEmpty()) {
-			$sHtmlTemplate = $oHtmlTemplate->GetData();
-			if (false !== mb_strpos($sHtmlTemplate, static::TEMPLATE_BODY_CONTENT)) {
-				if ($bHighlightPlaceholders) {
-					// Highlight the $content$ block
-					$sBody = sprintf(static::CONTENT_HIGHLIGHT, $sBody);
-				}
-				$sBody = str_replace(static::TEMPLATE_BODY_CONTENT, $sBody, $oHtmlTemplate->GetData()); // str_replace is ok as long as both strings are well-formed UTF-8
-			} else {
-				$sBody = $oHtmlTemplate->GetData();
-			}
-		}
-		if($bHighlightPlaceholders) {
-			// Highlight all placeholders
-			$sBody = preg_replace('/\\$([^$]+)\\$/', static::FIELD_HIGHLIGHT, $sBody);
-		}
-		return $sBody;
-	}
-	
-	/**
-	 * @since 3.1.0 N°4849
-	 * @inheritDoc
-	 * @see cmdbAbstractObject::DisplayBareRelations()
-	 */
-	public function DisplayBareRelations(WebPage $oPage, $bEditMode = false)
-	{
-		parent::DisplayBareRelations($oPage, false);
-		if (!$bEditMode) {
-			$oPage->SetCurrentTab('action_email__preview', Dict::S('ActionEmail:preview_tab'), Dict::S('ActionEmail:preview_tab+'));
-			$sBody = $this->BuildMessageBody(true);
-			TwigHelper::RenderIntoPage($oPage, APPROOT.'/', 'templates/datamodel/ActionEmail/email-notification-preview', ['iframe_content' => $sBody]);
-		}
-	}
-
-	/**
-	 * @since 3.1.0
-	 * @inheritDoc
-	 * @see cmdbAbstractObject::DoCheckToWrite()
-	 */
-	public function DoCheckToWrite()
-	{
-		parent::DoCheckToWrite();
-		$oHtmlTemplate = $this->Get('html_template');
-		if ($oHtmlTemplate && !$oHtmlTemplate->IsEmpty()) {
-			if (false === mb_strpos($oHtmlTemplate->GetData(), static::TEMPLATE_BODY_CONTENT)) {
-				$this->m_aCheckWarnings[] = Dict::Format('ActionEmail:content_placeholder_missing', static::TEMPLATE_BODY_CONTENT, Dict::S('Class:ActionEmail/Attribute:body'));
-			}
-		}
-	}
 }
--- a/core/attributedef.class.inc.php
+++ b/core/attributedef.class.inc.php
@@ -9,7 +9,6 @@ use Combodo\iTop\Application\UI\Links\Set\BlockLinkSetDisplayAsProperty;
 use Combodo\iTop\Form\Field\LabelField;
 use Combodo\iTop\Form\Field\TextAreaField;
 use Combodo\iTop\Form\Form;
-use Combodo\iTop\Form\Validator\LinkedSetValidator;
 use Combodo\iTop\Form\Validator\NotEmptyExtKeyValidator;
 use Combodo\iTop\Form\Validator\Validator;
 use Combodo\iTop\Renderer\BlockRenderer;
@@ -1727,16 +1726,6 @@ class AttributeLinkedSet extends AttributeDefinition
 		return $sDisplayStyle;
 	}

-	/**
-	 * Indicates if the current Attribute has constraints (php constraints or datamodel constraints)
-	 * @return bool true if Attribute has constraints
-	 * @since 3.1.0 N°6228
-	 */
-	public function GetHasConstraint()
-	{
-		return $this->GetOptional('with_php_constraint', false);
-	}
-
 	/**
 	 * @return boolean
 	 * @since 3.1.0 N°5563
@@ -1777,7 +1766,7 @@ class AttributeLinkedSet extends AttributeDefinition
 		try {

 			/** @var ormLinkSet $sValue */
-			if (is_null($sValue) || $sValue->Count() === 0) {
+			if ($sValue->Count() === 0) {
 				return '';
 			}

@@ -2396,63 +2385,43 @@ class AttributeLinkedSet extends AttributeDefinition
 	{
 		if ($oFormField === null)
 		{
-			$sFormFieldClass = static::GetFormFieldClass();
-			$oFormField = new $sFormFieldClass($this->GetCode());
-		}
+            $sFormFieldClass = static::GetFormFieldClass();
+            $oFormField = new $sFormFieldClass($this->GetCode());
+        }

-		// Setting target class
+        // Setting target class
 		if (!$this->IsIndirect()) {
-			$sTargetClass = $this->GetLinkedClass();
-		} else {
-			/** @var \AttributeExternalKey $oRemoteAttDef */
-			/** @var \AttributeLinkedSetIndirect $this */
-			$oRemoteAttDef = MetaModel::GetAttributeDef($this->GetLinkedClass(), $this->GetExtKeyToRemote());
-			$sTargetClass = $oRemoteAttDef->GetTargetClass();
+            $sTargetClass = $this->GetLinkedClass();
+        } else {
+            /** @var \AttributeExternalKey $oRemoteAttDef */
+            /** @var \AttributeLinkedSetIndirect $this */
+            $oRemoteAttDef = MetaModel::GetAttributeDef($this->GetLinkedClass(), $this->GetExtKeyToRemote());
+            $sTargetClass = $oRemoteAttDef->GetTargetClass();

-			/** @var \AttributeLinkedSetIndirect $this */
-			$oFormField->SetExtKeyToRemote($this->GetExtKeyToRemote());
-		}
-		$oFormField->SetTargetClass($sTargetClass);
-		$oFormField->SetLinkedClass($this->GetLinkedClass());
-		$oFormField->SetIndirect($this->IsIndirect());
-		// Setting attcodes to display
-		$aAttCodesToDisplay = MetaModel::FlattenZList(MetaModel::GetZListItems($sTargetClass, 'list'));
-		// - Adding friendlyname attribute to the list is not already in it
-		$sTitleAttCode = MetaModel::GetFriendlyNameAttributeCode($sTargetClass);
-		if (($sTitleAttCode !== null) && !in_array($sTitleAttCode, $aAttCodesToDisplay)) {
-			$aAttCodesToDisplay = array_merge(array($sTitleAttCode), $aAttCodesToDisplay);
-		}
-		// - Adding attribute properties
-		$aAttributesToDisplay = array();
-		foreach ($aAttCodesToDisplay as $sAttCodeToDisplay) {
-			$oAttDefToDisplay = MetaModel::GetAttributeDef($sTargetClass, $sAttCodeToDisplay);
-			$aAttributesToDisplay[$sAttCodeToDisplay] = [
-				'att_code' => $sAttCodeToDisplay,
-				'label'    => $oAttDefToDisplay->GetLabel(),
-			];
-		}
-		$oFormField->SetAttributesToDisplay($aAttributesToDisplay);
+            /** @var \AttributeLinkedSetIndirect $this */
+            $oFormField->SetExtKeyToRemote($this->GetExtKeyToRemote());
+        }
+        $oFormField->SetTargetClass($sTargetClass);
+        $oFormField->SetIndirect($this->IsIndirect());
+        // Setting attcodes to display
+        $aAttCodesToDisplay = MetaModel::FlattenZList(MetaModel::GetZListItems($sTargetClass, 'list'));
+        // - Adding friendlyname attribute to the list is not already in it
+        $sTitleAttCode = MetaModel::GetFriendlyNameAttributeCode($sTargetClass);
+        if (($sTitleAttCode !== null) && !in_array($sTitleAttCode, $aAttCodesToDisplay)) {
+            $aAttCodesToDisplay = array_merge(array($sTitleAttCode), $aAttCodesToDisplay);
+        }
+        // - Adding attribute labels
+        $aAttributesToDisplay = array();
+        foreach ($aAttCodesToDisplay as $sAttCodeToDisplay) {
+            $oAttDefToDisplay = MetaModel::GetAttributeDef($sTargetClass, $sAttCodeToDisplay);
+            $aAttributesToDisplay[$sAttCodeToDisplay] = $oAttDefToDisplay->GetLabel();
+        }
+        $oFormField->SetAttributesToDisplay($aAttributesToDisplay);

-		// Append lnk attributes (filtered from zlist)
-		if ($this->IsIndirect()) {
-			$aLnkAttDefToDisplay = MetaModel::GetZListAttDefsFilteredForIndirectLinkClass($this->m_sHostClass, $this->m_sCode);
-			$aLnkAttributesToDisplay = array();
-			foreach ($aLnkAttDefToDisplay as $oLnkAttDefToDisplay) {
-				$aLnkAttributesToDisplay[$oLnkAttDefToDisplay->GetCode()] = [
-					'att_code'  => $oLnkAttDefToDisplay->GetCode(),
-					'label'     => $oLnkAttDefToDisplay->GetLabel(),
-					'mandatory' => !$oLnkAttDefToDisplay->IsNullAllowed(),
-				];
-			}
-			$oFormField->SetLnkAttributesToDisplay($aLnkAttributesToDisplay);
-		}
+        parent::MakeFormField($oObject, $oFormField);

-		$oFormField->AddValidator(new LinkedSetValidator());
-
-		parent::MakeFormField($oObject, $oFormField);
-
-		return $oFormField;
-	}
+        return $oFormField;
+    }

    public function IsPartOfFingerprint()
    {
@@ -3151,7 +3120,7 @@ class AttributeDecimal extends AttributeDBField
 		$iPrecision = $this->Get('decimals');
 		$iNbIntegerDigits = $iNbDigits - $iPrecision - 1; // -1 because the first digit is treated separately in the pattern below

-		return "^[\-\+]?[0-9]\d{0,$iNbIntegerDigits}(\.\d{0,$iPrecision})?$";
+		return "^[-+]?[0-9]\d{0,$iNbIntegerDigits}(\.\d{0,$iPrecision})?$";
 	}

 	public function GetBasicFilterOperators()
@@ -5931,14 +5900,6 @@ class AttributeEnum extends AttributeString
 			$aLocalizedValues[$sKey] = $this->GetValueLabel($sKey);
 		}

-		// Sort by label only if necessary
-		// See N°1646 and {@see \MFCompiler::CompileAttributeEnumValues()} for complete information as for why sort on labels is done at runtime while other sorting are done at compile time
-		/** @var \ValueSetEnum $oValueSetDef */
-		$oValueSetDef = $this->GetValuesDef();
-		if ($oValueSetDef->IsSortedByValues()) {
-			asort($aLocalizedValues);
-		}
-
 		return $aLocalizedValues;
 	}

@@ -6214,7 +6175,7 @@ class AttributeDateTime extends AttributeDBField
 	/**
 	 * Load the 3 settings: date format, time format and data_time format from the configuration
 	 */
-	public static function LoadFormatFromConfig()
+	protected static function LoadFormatFromConfig()
 	{
 		$aFormats = MetaModel::GetConfig()->Get('date_and_time_format');
 		$sLang = Dict::GetUserLanguage();
@@ -8343,7 +8304,7 @@ class AttributeBlob extends AttributeDefinition
 			$aValues[$this->GetCode().'_data'] = '';
 			$aValues[$this->GetCode().'_mimetype'] = '';
 			$aValues[$this->GetCode().'_filename'] = '';
-			$aValues[$this->GetCode().'_downloads_count'] = \ormDocument::DEFAULT_DOWNLOADS_COUNT;
+			$aValues[$this->GetCode().'_downloads_count'] = ''; // Note: Should this be set to \ormDocument::DEFAULT_DOWNLOADS_COUNT ?
 		}

 		return $aValues;
@@ -8719,11 +8680,8 @@ class AttributeImage extends AttributeBlob
 		}
 		else
 		{
-			$oDefaultImage = $this->Get('default_image');
-			if (is_object($oDefaultImage) && !$oDefaultImage->IsEmpty()) {
-				$oFormField->SetDownloadUrl($oDefaultImage);
-				$oFormField->SetDisplayUrl($oDefaultImage);
-			}
+			$oFormField->SetDownloadUrl($this->Get('default_image'));
+			$oFormField->SetDisplayUrl($this->Get('default_image'));
 		}

 		return $oFormField;
--- a/core/cmdbchange.class.inc.php
+++ b/core/cmdbchange.class.inc.php
@@ -19,17 +19,17 @@ class CMDBChange extends DBObject
 	{
 		$aParams = array
 		(
-			"category"            => "core/cmdb, grant_by_profile",
-			"key_type"            => "autoincrement",
-			"name_attcode"        => "date",
-			"state_attcode"       => "",
-			"reconc_keys"         => array(),
-			"db_table"            => "priv_change",
-			"db_key_field"        => "id",
+			"category" => "core/cmdb",
+			"key_type" => "autoincrement",
+			"name_attcode" => "date",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_change",
+			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			'indexes'             => array(
+			'indexes' => array(
 				array('origin'),
-			),
+			)
 		);
 		MetaModel::Init_Params($aParams);
 		//MetaModel::Init_InheritAttributes();
--- a/core/cmdbchangeop.class.inc.php
+++ b/core/cmdbchangeop.class.inc.php
@@ -52,17 +52,17 @@ class CMDBChangeOp extends DBObject implements iCMDBChangeOp
 	{
 		$aParams = array
 		(
-			"category"            => "core/cmdb, grant_by_profile",
-			"key_type"            => "autoincrement",
-			"name_attcode"        => "change",
-			"state_attcode"       => "",
-			"reconc_keys"         => array(),
-			"db_table"            => "priv_changeop",
-			"db_key_field"        => "id",
+			"category" => "core/cmdb",
+			"key_type" => "autoincrement",
+			"name_attcode" => "change",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_changeop",
+			"db_key_field" => "id",
 			"db_finalclass_field" => "optype",
-			'indexes'             => array(
+			'indexes' => array(
 				array('objclass', 'objkey'),
-			),
+			)
 		);
 		MetaModel::Init_Params($aParams);
 		//MetaModel::Init_InheritAttributes();
@@ -121,13 +121,13 @@ class CMDBChangeOpCreate extends CMDBChangeOp
 	{
 		$aParams = array
 		(
-			"category"            => "core/cmdb, grant_by_profile",
-			"key_type"            => "",
-			"name_attcode"        => "change",
-			"state_attcode"       => "",
-			"reconc_keys"         => array(),
-			"db_table"            => "priv_changeop_create",
-			"db_key_field"        => "id",
+			"category" => "core/cmdb",
+			"key_type" => "",
+			"name_attcode" => "change",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_changeop_create",
+			"db_key_field" => "id",
 			"db_finalclass_field" => "",
 		);
 		MetaModel::Init_Params($aParams);
@@ -157,13 +157,13 @@ class CMDBChangeOpDelete extends CMDBChangeOp
 	{
 		$aParams = array
 		(
-			"category"            => "core/cmdb, grant_by_profile",
-			"key_type"            => "",
-			"name_attcode"        => "change",
-			"state_attcode"       => "",
-			"reconc_keys"         => array(),
-			"db_table"            => "priv_changeop_delete",
-			"db_key_field"        => "id",
+			"category" => "core/cmdb",
+			"key_type" => "",
+			"name_attcode" => "change",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_changeop_delete",
+			"db_key_field" => "id",
 			"db_finalclass_field" => "",
 		);
 		MetaModel::Init_Params($aParams);
@@ -198,13 +198,13 @@ class CMDBChangeOpSetAttribute extends CMDBChangeOp
 	{
 		$aParams = array
 		(
-			"category"            => "core/cmdb, grant_by_profile",
-			"key_type"            => "",
-			"name_attcode"        => "change",
-			"state_attcode"       => "",
-			"reconc_keys"         => array(),
-			"db_table"            => "priv_changeop_setatt",
-			"db_key_field"        => "id",
+			"category" => "core/cmdb",
+			"key_type" => "",
+			"name_attcode" => "change",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_changeop_setatt",
+			"db_key_field" => "id",
 			"db_finalclass_field" => "",
 		);
 		MetaModel::Init_Params($aParams);
@@ -231,13 +231,13 @@ class CMDBChangeOpSetAttributeScalar extends CMDBChangeOpSetAttribute
 	{
 		$aParams = array
 		(
-			"category"            => "core/cmdb, grant_by_profile",
-			"key_type"            => "",
-			"name_attcode"        => "change",
-			"state_attcode"       => "",
-			"reconc_keys"         => array(),
-			"db_table"            => "priv_changeop_setatt_scalar",
-			"db_key_field"        => "id",
+			"category" => "core/cmdb",
+			"key_type" => "",
+			"name_attcode" => "change",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_changeop_setatt_scalar",
+			"db_key_field" => "id",
 			"db_finalclass_field" => "",
 		);
 		MetaModel::Init_Params($aParams);
@@ -290,14 +290,14 @@ class CMDBChangeOpSetAttributeTagSet extends CMDBChangeOpSetAttribute
    {
        $aParams = array
        (
-	        "category"            => "core/cmdb, grant_by_profile",
-	        "key_type"            => "",
-	        "name_attcode"        => "change",
-	        "state_attcode"       => "",
-	        "reconc_keys"         => array(),
-	        "db_table"            => "priv_changeop_setatt_tagset",
-	        "db_key_field"        => "id",
-	        "db_finalclass_field" => "",
+            "category" => "core/cmdb",
+            "key_type" => "",
+            "name_attcode" => "change",
+            "state_attcode" => "",
+            "reconc_keys" => array(),
+            "db_table" => "priv_changeop_setatt_tagset",
+            "db_key_field" => "id",
+            "db_finalclass_field" => "",
        );
        MetaModel::Init_Params($aParams);
        MetaModel::Init_InheritAttributes();
@@ -350,7 +350,7 @@ class CMDBChangeOpSetAttributeURL extends CMDBChangeOpSetAttribute
 	{
 		$aParams = array
 		(
-			"category"            => "core/cmdb, grant_by_profile",
+			"category"            => "core/cmdb",
 			"key_type"            => "",
 			"name_attcode"        => "change",
 			"state_attcode"       => "",
@@ -419,13 +419,13 @@ class CMDBChangeOpSetAttributeBlob extends CMDBChangeOpSetAttribute
 	{
 		$aParams = array
 		(
-			"category"            => "core/cmdb, grant_by_profile",
-			"key_type"            => "",
-			"name_attcode"        => "change",
-			"state_attcode"       => "",
-			"reconc_keys"         => array(),
-			"db_table"            => "priv_changeop_setatt_data",
-			"db_key_field"        => "id",
+			"category" => "core/cmdb",
+			"key_type" => "",
+			"name_attcode" => "change",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_changeop_setatt_data",
+			"db_key_field" => "id",
 			"db_finalclass_field" => "",
 		);
 		MetaModel::Init_Params($aParams);
@@ -498,13 +498,13 @@ class CMDBChangeOpSetAttributeOneWayPassword extends CMDBChangeOpSetAttribute
 	{
 		$aParams = array
 		(
-			"category"            => "core/cmdb, grant_by_profile",
-			"key_type"            => "",
-			"name_attcode"        => "change",
-			"state_attcode"       => "",
-			"reconc_keys"         => array(),
-			"db_table"            => "priv_changeop_setatt_pwd",
-			"db_key_field"        => "id",
+			"category" => "core/cmdb",
+			"key_type" => "",
+			"name_attcode" => "change",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_changeop_setatt_pwd",
+			"db_key_field" => "id",
 			"db_finalclass_field" => "",
 		);
 		MetaModel::Init_Params($aParams);
@@ -561,13 +561,13 @@ class CMDBChangeOpSetAttributeEncrypted extends CMDBChangeOpSetAttribute
 	{
 		$aParams = array
 		(
-			"category"            => "core/cmdb, grant_by_profile",
-			"key_type"            => "",
-			"name_attcode"        => "change",
-			"state_attcode"       => "",
-			"reconc_keys"         => array(),
-			"db_table"            => "priv_changeop_setatt_encrypted",
-			"db_key_field"        => "id",
+			"category" => "core/cmdb",
+			"key_type" => "",
+			"name_attcode" => "change",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_changeop_setatt_encrypted",
+			"db_key_field" => "id",
 			"db_finalclass_field" => "",
 		);
 		MetaModel::Init_Params($aParams);
@@ -627,13 +627,13 @@ class CMDBChangeOpSetAttributeText extends CMDBChangeOpSetAttribute
 	{
 		$aParams = array
 		(
-			"category"            => "core/cmdb, grant_by_profile",
-			"key_type"            => "",
-			"name_attcode"        => "change",
-			"state_attcode"       => "",
-			"reconc_keys"         => array(),
-			"db_table"            => "priv_changeop_setatt_text",
-			"db_key_field"        => "id",
+			"category" => "core/cmdb",
+			"key_type" => "",
+			"name_attcode" => "change",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_changeop_setatt_text",
+			"db_key_field" => "id",
 			"db_finalclass_field" => "",
 		);
 		MetaModel::Init_Params($aParams);
@@ -695,13 +695,13 @@ class CMDBChangeOpSetAttributeLongText extends CMDBChangeOpSetAttribute
 	{
 		$aParams = array
 		(
-			"category"            => "core/cmdb, grant_by_profile",
-			"key_type"            => "",
-			"name_attcode"        => "change",
-			"state_attcode"       => "",
-			"reconc_keys"         => array(),
-			"db_table"            => "priv_changeop_setatt_longtext",
-			"db_key_field"        => "id",
+			"category" => "core/cmdb",
+			"key_type" => "",
+			"name_attcode" => "change",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_changeop_setatt_longtext",
+			"db_key_field" => "id",
 			"db_finalclass_field" => "",
 		);
 		MetaModel::Init_Params($aParams);
@@ -760,13 +760,13 @@ class CMDBChangeOpSetAttributeHTML extends CMDBChangeOpSetAttributeLongText
 	{
 		$aParams = array
 		(
-			"category"            => "core/cmdb, grant_by_profile",
-			"key_type"            => "",
-			"name_attcode"        => "change",
-			"state_attcode"       => "",
-			"reconc_keys"         => array(),
-			"db_table"            => "priv_changeop_setatt_html",
-			"db_key_field"        => "id",
+			"category" => "core/cmdb",
+			"key_type" => "",
+			"name_attcode" => "change",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_changeop_setatt_html",
+			"db_key_field" => "id",
 			"db_finalclass_field" => "",
 		);
 		MetaModel::Init_Params($aParams);
@@ -824,13 +824,13 @@ class CMDBChangeOpSetAttributeCaseLog extends CMDBChangeOpSetAttribute
 	{
 		$aParams = array
 		(
-			"category"            => "core/cmdb, grant_by_profile",
-			"key_type"            => "",
-			"name_attcode"        => "change",
-			"state_attcode"       => "",
-			"reconc_keys"         => array(),
-			"db_table"            => "priv_changeop_setatt_log",
-			"db_key_field"        => "id",
+			"category" => "core/cmdb",
+			"key_type" => "",
+			"name_attcode" => "change",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_changeop_setatt_log",
+			"db_key_field" => "id",
 			"db_finalclass_field" => "",
 		);
 		MetaModel::Init_Params($aParams);
@@ -903,13 +903,13 @@ class CMDBChangeOpPlugin extends CMDBChangeOp
 	{
 		$aParams = array
 		(
-			"category"            => "core/cmdb, grant_by_profile",
-			"key_type"            => "",
-			"name_attcode"        => "change",
-			"state_attcode"       => "",
-			"reconc_keys"         => array(),
-			"db_table"            => "priv_changeop_plugin",
-			"db_key_field"        => "id",
+			"category" => "core/cmdb",
+			"key_type" => "",
+			"name_attcode" => "change",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_changeop_plugin",
+			"db_key_field" => "id",
 			"db_finalclass_field" => "",
 		);
 		MetaModel::Init_Params($aParams);
@@ -944,13 +944,13 @@ abstract class CMDBChangeOpSetAttributeLinks extends CMDBChangeOpSetAttribute
 	{
 		$aParams = array
 		(
-			"category"            => "core/cmdb, grant_by_profile",
-			"key_type"            => "",
-			"name_attcode"        => "change",
-			"state_attcode"       => "",
-			"reconc_keys"         => array(),
-			"db_table"            => "priv_changeop_links",
-			"db_key_field"        => "id",
+			"category" => "core/cmdb",
+			"key_type" => "",
+			"name_attcode" => "change",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_changeop_links",
+			"db_key_field" => "id",
 			"db_finalclass_field" => "",
 		);
 		MetaModel::Init_Params($aParams);
@@ -977,13 +977,13 @@ class CMDBChangeOpSetAttributeLinksAddRemove extends CMDBChangeOpSetAttributeLin
 	{
 		$aParams = array
 		(
-			"category"            => "core/cmdb, grant_by_profile",
-			"key_type"            => "",
-			"name_attcode"        => "change",
-			"state_attcode"       => "",
-			"reconc_keys"         => array(),
-			"db_table"            => "priv_changeop_links_addremove",
-			"db_key_field"        => "id",
+			"category" => "core/cmdb",
+			"key_type" => "",
+			"name_attcode" => "change",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_changeop_links_addremove",
+			"db_key_field" => "id",
 			"db_finalclass_field" => "",
 		);
 		MetaModel::Init_Params($aParams);
@@ -1044,13 +1044,13 @@ class CMDBChangeOpSetAttributeLinksTune extends CMDBChangeOpSetAttributeLinks
 	{
 		$aParams = array
 		(
-			"category"            => "core/cmdb, grant_by_profile",
-			"key_type"            => "",
-			"name_attcode"        => "change",
-			"state_attcode"       => "",
-			"reconc_keys"         => array(),
-			"db_table"            => "priv_changeop_links_tune",
-			"db_key_field"        => "id",
+			"category" => "core/cmdb",
+			"key_type" => "",
+			"name_attcode" => "change",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_changeop_links_tune",
+			"db_key_field" => "id",
 			"db_finalclass_field" => "",
 		);
 		MetaModel::Init_Params($aParams);
@@ -1134,13 +1134,13 @@ class CMDBChangeOpSetAttributeCustomFields extends CMDBChangeOpSetAttribute
 	{
 		$aParams = array
 		(
-			"category"            => "core/cmdb, grant_by_profile",
-			"key_type"            => "",
-			"name_attcode"        => "change",
-			"state_attcode"       => "",
-			"reconc_keys"         => array(),
-			"db_table"            => "priv_changeop_setatt_custfields",
-			"db_key_field"        => "id",
+			"category" => "core/cmdb",
+			"key_type" => "",
+			"name_attcode" => "change",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_changeop_setatt_custfields",
+			"db_key_field" => "id",
 			"db_finalclass_field" => "",
 		);
 		MetaModel::Init_Params($aParams);
--- a/core/config.class.inc.php
+++ b/core/config.class.inc.php
@@ -946,14 +946,6 @@ class Config
 			'source_of_value'     => '',
 			'show_in_conf_sample' => false,
 		],
-		'lifecycle.transitions_sort_type' => [
-			'type'                => 'string',
-			'description'         => 'How transitions will be sorted in the GUI. Possible values are "xml", "alphabetical", "fixed" or "relative"',
-			'default'             => DBObject::DEFAULT_TRANSITIONS_SORT_TYPE,
-			'value'               => DBObject::DEFAULT_TRANSITIONS_SORT_TYPE,
-			'source_of_value'     => '',
-			'show_in_conf_sample' => true,
-		],
 		'url_validation_pattern' => [
 			'type'                => 'string',
 			'description'         => 'Regular expression to validate/detect the format of an URL (URL attributes and Wiki formatting for Text attributes)',
@@ -1638,8 +1630,8 @@ class Config
 		'audit.enable_selection_landing_page' => [
 			'type'                => 'bool',
 			'description'         => 'If true audit categories must be selected before results are computed (use this setting in case of a lot of audit categories)',
-			'default'             => true,
-			'value'               => true,
+			'default'             => false,
+			'value'               => false,
 			'source_of_value'     => '',
 			'show_in_conf_sample' => false,
 		],
--- a/core/contexttag.class.inc.php
+++ b/core/contexttag.class.inc.php
@@ -3,7 +3,7 @@
 //
 //   This file is part of iTop.
 //
-//   iTop is free software; you can redistribute it and/or modify
+//   iTop is free software; you can redistribute it and/or modify	
 //   it under the terms of the GNU Affero General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
 //   (at your option) any later version.
@@ -58,16 +58,6 @@ class ContextTag
 	public const TAG_SETUP   = 'Setup';
 	public const TAG_SYNCHRO = 'Synchro';
 	public const TAG_REST    = 'REST/JSON';
-
-	/**
-	 * @since 3.1.0 N°6047
-	 */
-	public const TAG_IMPORT    = 'Import';
-		/**
-	 * @since 3.1.0 N°6047
-	 */
-	public const TAG_EXPORT    = 'Export';
-
 	/**
 	 * @var string
 	 * @since 3.1.0 N°3200
@@ -85,7 +75,7 @@ class ContextTag
 	{
 		static::$aStack[] = $sTag;
 	}
-
+	
 	public static function AddContext($sTag)
 	{
 		static::$aStack[] = $sTag;
--- a/core/datamodel.core.xml
+++ b/core/datamodel.core.xml
@@ -482,12 +482,6 @@
          <type>boolean</type>
          <default>true</default>
        </property>
-        <property id="with_php_constraint">
-          <php_param>with_php_constraint</php_param>
-          <mandatory>false</mandatory>
-          <type>boolean</type>
-          <default>false</default>
-        </property>
        <property id="on_target_delete">
          <php_param>on_target_delete</php_param>
          <mandatory>false</mandatory>
--- a/core/dbobject.class.php
+++ b/core/dbobject.class.php
@@ -64,32 +64,6 @@ require_once('mutex.class.inc.php');
 */
 abstract class DBObject implements iDisplay
 {
-	/**
-	 * @var string For sorting based on the XML order (like in iTop 3.0 and older)
-	 * @since 3.1.0 N°1345
-	 */
-	public const ENUM_TRANSITIONS_SORT_TYPE_XML = 'xml';
-	/**
-	 * @var string For sorting based on the transitions labels
-	 * @since 3.1.0 N°1345
-	 */
-	public const ENUM_TRANSITIONS_SORT_TYPE_ALPHABETICAL = 'alphabetical';
-	/**
-	 * @var string For sorting based on the arrival states rank, ascending sort
-	 * @since 3.1.0 N°1345
-	 */
-	public const ENUM_TRANSITIONS_SORT_TYPE_FIXED = 'fixed';
-	/**
-	 * @var string For sorting based on the arrival states rank but depending on the current state (first transitions to states with higher ranks, then transitions to states with lower ranks)
-	 * @since 3.1.0 N°1345
-	 */
-	public const ENUM_TRANSITIONS_SORT_TYPE_RELATIVE = 'relative';
-	/**
-	 * @var string Default sort type of the transitions
-	 * @since 3.1.0 N°1345
-	 */
-	public const DEFAULT_TRANSITIONS_SORT_TYPE = self::ENUM_TRANSITIONS_SORT_TYPE_RELATIVE;
-
 	private static $m_aMemoryObjectsByClass = array();

 	/** @var array class => array of ('table' => array of (array of <sql_value>)) */
@@ -1656,9 +1630,10 @@ abstract class DBObject implements iDisplay
 	/**
 	 * Helper to get the friendly name in a safe manner for displaying inside a web page
 	 *
+	 * @internal
 	 * @return string
 	 * @throws \CoreException
-	 * @since 3.0.0 N°4106 Method should not be overloaded anymore for performances reasons. It will be set final in 3.1.0 (N°4107)
+	 * @since 3.0.0 N°4106 This method is now internal. It will be set final in 3.1.0 (N°4107)
 	 * @since 3.0.0 N°580 New $sType parameter
 	 *
 	 */
@@ -3964,83 +3939,11 @@ abstract class DBObject implements iDisplay
 	public function EnumTransitions()
 	{
 		$sClass = get_class($this);
-		if (!MetaModel::HasLifecycle($sClass)) {
-			return [];
-		}
+		if (!MetaModel::HasLifecycle($sClass)) return array();

 		$sStateAttCode = MetaModel::GetStateAttributeCode($sClass);
 		$sState = $this->Get($sStateAttCode);
-		$aTransitions = MetaModel::EnumTransitions($sClass, $sState);
-
-		if (count($aTransitions) === 0) {
-			return $aTransitions;
-		}
-
-		// Try to sort transitions depending on the configuration
-		$sSortType = utils::GetConfig()->Get('lifecycle.transitions_sort_type');
-		switch ($sSortType) {
-			case static::ENUM_TRANSITIONS_SORT_TYPE_XML:
-				$aSortedTransitions = $aTransitions;
-				break;
-
-			case static::ENUM_TRANSITIONS_SORT_TYPE_ALPHABETICAL:
-				$aSortedTransitions = $aTransitions;
-				$aStimuli = MetaModel::EnumStimuli($sClass);
-
-				// Sort $aSortedTransitions based on labels from $aStimuli
-				uksort($aSortedTransitions, function($sKey1, $sKey2) use ($aStimuli) {
-					// If any transition is not in $aStimuli, put it at the end even though it's a weird situation
-					if ((false === isset($aStimuli[$sKey1])) || (false === isset($aStimuli[$sKey2]))) {
-						return 1;
-					}
-					return $aStimuli[$sKey1]->GetLabel() > $aStimuli[$sKey2]->GetLabel() ? 1 : -1;
-				});
-				break;
-
-			case static::ENUM_TRANSITIONS_SORT_TYPE_FIXED:
-			case static::ENUM_TRANSITIONS_SORT_TYPE_RELATIVE:
-				$aSortedTransitions = $aTransitions;
-
-				// Get states sorted as defined in the datamodel
-				$sStateAttCode = MetaModel::GetStateAttributeCode($sClass);
-				$oAttDef = MetaModel::GetAttributeDef($sClass, $sStateAttCode);
-				$aAllowedValues = $oAttDef->GetAllowedValues();
-				$aStatesSortFromDatamodel = array_keys($aAllowedValues);
-
-				// Sort $aSortedTransitions based on the states sort from the datamodel
-				uksort($aSortedTransitions, function($sKey1, $sKey2) use ($aSortedTransitions, $aStatesSortFromDatamodel) {
-					$sTargetState1 = $aSortedTransitions[$sKey1]['target_state'];
-					$sTargetState2 = $aSortedTransitions[$sKey2]['target_state'];
-
-					return array_search($sTargetState1, $aStatesSortFromDatamodel) > array_search($sTargetState2, $aStatesSortFromDatamodel) ? 1 : -1;
-				});
-
-				if ($sSortType === static::ENUM_TRANSITIONS_SORT_TYPE_RELATIVE) {
-					// Find current state position
-					$sCurrentState = $this->Get($sStateAttCode);
-					$iCurrentStatePos = array_search($sCurrentState, $aStatesSortFromDatamodel);
-
-					foreach ($aSortedTransitions as $sStimulusCode => $aTransitionDef) {
-						// Leave state with higher ranks than the current's in their positions
-						if (array_search($aTransitionDef['target_state'], $aStatesSortFromDatamodel) >= $iCurrentStatePos) {
-							continue;
-						}
-
-						// Remove transition from beginning of the array and move it back at the end
-						array_shift($aSortedTransitions);
-						$aSortedTransitions = array_merge($aSortedTransitions, [$sStimulusCode => $aTransitionDef]);
-					}
-				}
-				break;
-
-			default:
-				$aSortedTransitions = $aTransitions;
-				IssueLog::Error('Could not sort object transitions as the sort type is not correct. Check "lifecycle.transitions_sort_type" conf. parameter.', LogChannels::CORE, [
-					'lifecycle.transitions_sort_type' => $sSortType,
-				]);
-		}
-
-		return $aSortedTransitions;
+		return MetaModel::EnumTransitions($sClass, $sState);
 	}

    /**
--- a/core/dict.class.inc.php
+++ b/core/dict.class.inc.php
@@ -106,10 +106,10 @@ class Dict
 	}

 	/**
-	 * Returns a localised string from the dictionary
+	 * Returns a localised string from the dictonary
 	 *
 	 * @param string $sStringCode The code identifying the dictionary entry
-	 * @param string $sDefault Default value if there is no match in the dictionary, if no default provided, returns $sStringCode unchanged
+	 * @param string $sDefault Default value if there is no match in the dictionary
 	 * @param bool $bUserLanguageOnly False to allow the use of the default language as a fallback, true otherwise
 	 *
 	 * @return string
--- a/core/log.class.inc.php
+++ b/core/log.class.inc.php
@@ -1230,9 +1230,7 @@ class DeprecatedCallsLog extends LogAPI
 	}

 	/**
-	 * @since 3.0.1 3.1.0 N°4725 silently handles ConfigException
-	 * @since 3.0.4 3.1.0 N°4725 remove forgotten throw PHPDoc annotation
-	 *
+	 * @throws \ConfigException
 	 * @link https://www.php.net/debug_backtrace
 	 * @uses \debug_backtrace()
 	 */
--- a/core/metamodel.class.php
+++ b/core/metamodel.class.php
@@ -3621,7 +3621,8 @@ abstract class MetaModel
 	{
 		MyHelpers::CheckKeyInArray('list code', $sListCode, self::$m_aListInfos);

-		if (!$sTargetClass) {
+		if (!$sTargetClass)
+		{
 			$sTargetClass = self::GetCallersPHPClass("Init");
 		}

--- a/core/userrights.class.inc.php
+++ b/core/userrights.class.inc.php
@@ -248,8 +248,9 @@ abstract class User extends cmdbAbstractObject
 			"depends_on"      => array(),
 		)));

-		MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("profile_list",array("linked_class" => "URP_UserProfile", "ext_key_to_me" => "userid", "ext_key_to_remote" => "profileid", "allowed_values" => null, "count_min" => 1, "count_max" => 0, "depends_on" => array(), "display_style" => 'property', "with_php_constraint" => true)));
-		MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("allowed_org_list", array("linked_class" => "URP_UserOrg", "ext_key_to_me" => "userid", "ext_key_to_remote" => "allowed_org_id", "allowed_values" => null, "count_min" => 1, "count_max" => 0, "depends_on" => array(), 'with_php_constraint' => true)));
+		MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("profile_list",
+			array("linked_class" => "URP_UserProfile", "ext_key_to_me" => "userid", "ext_key_to_remote" => "profileid", "allowed_values" => null, "count_min" => 1, "count_max" => 0, "depends_on" => array(), "display_style" => 'property')));
+		MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("allowed_org_list", array("linked_class" => "URP_UserOrg", "ext_key_to_me" => "userid", "ext_key_to_remote" => "allowed_org_id", "allowed_values" => null, "count_min" => 1, "count_max" => 0, "depends_on" => array())));
 		MetaModel::Init_AddAttribute(new AttributeCaseLog("log", array("sql" => 'log', "is_null_allowed" => true, "default_value" => '', "allowed_values" => null, "depends_on" => array(), "always_load_in_tables" => false)));

 		// Display lists
--- a/core/valuesetdef.class.inc.php
+++ b/core/valuesetdef.class.inc.php
@@ -53,13 +53,7 @@ abstract class ValueSetDefinition
 		return $sAllowedValues;
 	}

-	/**
-	 * @param array  $aArgs
-	 * @param string $sContains
-	 * @param string $sOperation for the values {@see static::LoadValues()}
-	 *
-	 * @return array hash array of keys => values
-	 */
+
 	public function GetValues($aArgs, $sContains = '', $sOperation = 'contains')
 	{
 		if (!$this->m_bIsLoaded)
@@ -84,22 +78,11 @@ abstract class ValueSetDefinition
 				}
 			}
 		}
-		$this->SortValues($aRet);
+		// Sort on the display value
+		asort($aRet);
 		return $aRet;
 	}

-	/**
-	 * @param array $aValues Values to sort in the form keys => values
-	 *
-	 * @return void
-	 * @since 3.1.0 N°1646 Create method
-	 */
-	public function SortValues(array &$aValues): void
-	{
-		// Sort alphabetically on values
-		asort($aValues);
-	}
-
 	abstract protected function LoadValues($aArgs);
 }

@@ -206,7 +189,11 @@ class ValueSetObjects extends ValueSetDefinition
 	}

    /**
-     * @inheritDoc
+     * @param        $aArgs
+     * @param string $sContains
+     * @param string $sOperation for the values @see self::LoadValues()
+     *
+     * @return array
     * @throws CoreException
     * @throws OQLException
     */
@@ -464,33 +451,10 @@ class ValueSetObjects extends ValueSetDefinition
 class ValueSetEnum extends ValueSetDefinition
 {
 	protected $m_values;
-	/**
-	 * @var bool $bSortByValue If true, values will be sorted at runtime, otherwise it is sorted at compile time in a predefined order.
-	 *                         {@see \MFCompiler::CompileAttributeEnumValues()} for complete reasons.
-	 * @since 3.1.0 N°1646
-	 */
-	protected bool $bSortByValue;

-	/**
-	 * @param array|string $Values
-	 * @param bool $bLocalizedSort
-	 *
-	 * @since 3.1.0 N°1646 Add $bLocalizedSort parameter
-	 */
-	public function __construct($Values, bool $bSortByValue = false)
+	public function __construct($Values)
 	{
 		$this->m_values = $Values;
-		$this->bSortByValue = $bSortByValue;
-	}
-
-	/**
-	 * @see \ValueSetEnum::$bSortByValue
-	 * @return bool
-	 * @since 3.1.0 N°1646
-	 */
-	public function IsSortedByValues(): bool
-	{
-		return $this->bSortByValue;
 	}

 	// Helper to export the data model
@@ -500,27 +464,6 @@ class ValueSetEnum extends ValueSetDefinition
 		return $this->m_aValues;
 	}

-	/**
-	 * @inheritDoc
-	 * @since 3.1.0 N°1646 Overload method
-	 */
-	public function SortValues(array &$aValues): void
-	{
-		// Force sort by values only if necessary
-		if ($this->bSortByValue) {
-			asort($aValues);
-			return;
-		}
-
-		// Don't sort values as we rely on the order defined during compilation
-		return;
-	}
-
-	/**
-	 * @param array|string $aArgs
-	 *
-	 * @return true
-	 */
 	protected function LoadValues($aArgs)
 	{
 		if (is_array($this->m_values))
--- a/datamodels/2.x/authent-cas/dictionaries/es_cr.dict.authent-cas.php
+++ b/datamodels/2.x/authent-cas/dictionaries/es_cr.dict.authent-cas.php
@@ -1,5 +1,5 @@
 <?php
-/**
+ /**
 * Spanish Localized data
 *
 * @copyright   Copyright (C) 2010-2023 Combodo SARL
@@ -7,6 +7,7 @@
 * @traductor   Miguel Turrubiates <miguel_tf@yahoo.com> 
 * @notas       Utilizar codificación UTF-8 para mostrar acentos y otros caracteres especiales 
 */
+
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'CAS:Error:UserNotAllowed' => 'Usuario no permitido',
 	'CAS:Login:SignIn' => 'Iniciar sesión con CAS',
--- a/datamodels/2.x/authent-cas/dictionaries/pl.dict.authent-cas.php
+++ b/datamodels/2.x/authent-cas/dictionaries/pl.dict.authent-cas.php
@@ -5,6 +5,7 @@
 * @copyright   Copyright (C) 2013 XXXXX
 * @license     http://opensource.org/licenses/AGPL-3.0
 */
+
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'CAS:Error:UserNotAllowed' => 'Użytkownik niedozwolony',
 	'CAS:Login:SignIn' => 'Zaloguj się za pomocą CAS',
--- a/datamodels/2.x/authent-cas/src/CASLoginExtension.php
+++ b/datamodels/2.x/authent-cas/src/CASLoginExtension.php
@@ -49,11 +49,6 @@ class CASLoginExtension extends AbstractLoginFSMExtension implements iLogoutExte

 	protected function OnReadCredentials(&$iErrorCode)
 	{
-		if (LoginWebPage::getIOnExit() === LoginWebPage::EXIT_RETURN) {
-			// Not allowed if not already connected
-			return LoginWebPage::LOGIN_FSM_CONTINUE;
-		}
-
 		if (empty(Session::Get('login_mode')) || Session::Get('login_mode') == static::LOGIN_MODE)
 		{
 			static::InitCASClient();
@@ -119,10 +114,6 @@ class CASLoginExtension extends AbstractLoginFSMExtension implements iLogoutExte
 		if (Session::Get('login_mode') == static::LOGIN_MODE)
 		{
 			Session::Unset('phpCAS');
-			if (LoginWebPage::getIOnExit() === LoginWebPage::EXIT_RETURN) {
-				// don't display the login page
-				return LoginWebPage::LOGIN_FSM_CONTINUE;
-			}
 			if ($iErrorCode != LoginWebPage::EXIT_CODE_MISSINGLOGIN)
 			{
 				$oLoginWebPage = new LoginWebPage();
--- a/datamodels/2.x/authent-external/dictionaries/es_cr.dict.authent-external.php
+++ b/datamodels/2.x/authent-external/dictionaries/es_cr.dict.authent-external.php
@@ -15,7 +15,7 @@
 //
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
-/**
+ /**
 * Spanish Localized data
 *
 * @copyright   Copyright (C) 2010-2023 Combodo SARL
--- a/datamodels/2.x/authent-external/dictionaries/pl.dict.authent-external.php
+++ b/datamodels/2.x/authent-external/dictionaries/pl.dict.authent-external.php
@@ -20,6 +20,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with iTop. If not, see <http://www.gnu.org/licenses/>
 */
+
 // Dictionnay conventions
 // Class:<class_name>
 // Class:<class_name>+
@@ -29,9 +30,11 @@
 // Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
 // Class:<class_name>/Stimulus:<stimulus_code>
 // Class:<class_name>/Stimulus:<stimulus_code>+
+
 //
 // Class: UserExternal
 //
+
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:UserExternal' => 'Użytkownik zewnętrzny',
 	'Class:UserExternal+' => 'Użytkownik uwierzytelniony poza '.ITOP_APPLICATION_SHORT,
--- a/datamodels/2.x/authent-ldap/dictionaries/cs.dict.authent-ldap.php
+++ b/datamodels/2.x/authent-ldap/dictionaries/cs.dict.authent-ldap.php
@@ -38,5 +38,4 @@
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:UserLDAP' => 'LDAP uživatel',
 	'Class:UserLDAP+' => 'Uživatel ověřen přes LDAP',
-	'UserLDAP:server' => 'LDAP specifics~~',
 ));
--- a/datamodels/2.x/authent-ldap/dictionaries/da.dict.authent-ldap.php
+++ b/datamodels/2.x/authent-ldap/dictionaries/da.dict.authent-ldap.php
@@ -23,5 +23,4 @@
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:UserLDAP' => 'LDAP-Bruger',
 	'Class:UserLDAP+' => 'Bruger der godkendes via LDAP',
-	'UserLDAP:server' => 'LDAP specifics~~',
 ));
--- a/datamodels/2.x/authent-ldap/dictionaries/de.dict.authent-ldap.php
+++ b/datamodels/2.x/authent-ldap/dictionaries/de.dict.authent-ldap.php
@@ -25,5 +25,4 @@
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:UserLDAP' => 'LDAP-Benutzer',
 	'Class:UserLDAP+' => 'Benutzer, der via LDAP authentifiziert wird',
-	'UserLDAP:server' => 'LDAP specifics~~',
 ));
--- a/datamodels/2.x/authent-ldap/dictionaries/es_cr.dict.authent-ldap.php
+++ b/datamodels/2.x/authent-ldap/dictionaries/es_cr.dict.authent-ldap.php
@@ -15,7 +15,7 @@
 //
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
-/**
+ /**
 * Spanish Localized data
 *
 * @copyright   Copyright (C) 2010-2023 Combodo SARL
@@ -37,5 +37,4 @@
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:UserLDAP' => 'Usuario LDAP',
 	'Class:UserLDAP+' => 'Usuario autenticado vía LDAP',
-	'UserLDAP:server' => 'LDAP specifics~~',
 ));
--- a/datamodels/2.x/authent-ldap/dictionaries/hu.dict.authent-ldap.php
+++ b/datamodels/2.x/authent-ldap/dictionaries/hu.dict.authent-ldap.php
@@ -22,5 +22,4 @@
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:UserLDAP' => 'LDAP felhasználó',
 	'Class:UserLDAP+' => '',
-	'UserLDAP:server' => 'LDAP specifics~~',
 ));
--- a/datamodels/2.x/authent-ldap/dictionaries/it.dict.authent-ldap.php
+++ b/datamodels/2.x/authent-ldap/dictionaries/it.dict.authent-ldap.php
@@ -36,5 +36,4 @@
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:UserLDAP' => 'Utente LDAP',
 	'Class:UserLDAP+' => 'Utente autenticato da LDAP',
-	'UserLDAP:server' => 'LDAP specifics~~',
 ));
--- a/datamodels/2.x/authent-ldap/dictionaries/ja.dict.authent-ldap.php
+++ b/datamodels/2.x/authent-ldap/dictionaries/ja.dict.authent-ldap.php
@@ -23,5 +23,4 @@
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:UserLDAP' => 'LDAP ユーザー',
 	'Class:UserLDAP+' => 'LDAP認証ユーザー',
-	'UserLDAP:server' => 'LDAP specifics~~',
 ));
--- a/datamodels/2.x/authent-ldap/dictionaries/nl.dict.authent-ldap.php
+++ b/datamodels/2.x/authent-ldap/dictionaries/nl.dict.authent-ldap.php
@@ -37,5 +37,4 @@
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:UserLDAP' => 'LDAP-gebruiker',
 	'Class:UserLDAP+' => 'Gebruiker die aanmeldt via LDAP',
-	'UserLDAP:server' => 'LDAP specifics~~',
 ));
--- a/datamodels/2.x/authent-ldap/dictionaries/pl.dict.authent-ldap.php
+++ b/datamodels/2.x/authent-ldap/dictionaries/pl.dict.authent-ldap.php
@@ -20,6 +20,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with iTop. If not, see <http://www.gnu.org/licenses/>
 */
+
 // Dictionnay conventions
 // Class:<class_name>
 // Class:<class_name>+
@@ -29,11 +30,12 @@
 // Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
 // Class:<class_name>/Stimulus:<stimulus_code>
 // Class:<class_name>/Stimulus:<stimulus_code>+
+
 //
 // Class: UserLDAP
 //
+
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:UserLDAP' => 'Użytkownik LDAP',
 	'Class:UserLDAP+' => 'Użytkownik uwierzytelniony przez LDAP',
-	'UserLDAP:server' => 'LDAP specifics~~',
 ));
--- a/datamodels/2.x/authent-ldap/dictionaries/pt_br.dict.authent-ldap.php
+++ b/datamodels/2.x/authent-ldap/dictionaries/pt_br.dict.authent-ldap.php
@@ -22,5 +22,4 @@
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:UserLDAP' => 'Usuário externo via LDAP',
 	'Class:UserLDAP+' => '',
-	'UserLDAP:server' => 'LDAP specifics~~',
 ));
--- a/datamodels/2.x/authent-ldap/dictionaries/ru.dict.authent-ldap.php
+++ b/datamodels/2.x/authent-ldap/dictionaries/ru.dict.authent-ldap.php
@@ -14,5 +14,4 @@
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:UserLDAP' => 'Пользователь LDAP',
 	'Class:UserLDAP+' => 'Пользователь, аутентифицируемый через LDAP',
-	'UserLDAP:server' => 'LDAP specifics~~',
 ));
--- a/datamodels/2.x/authent-ldap/dictionaries/sk.dict.authent-ldap.php
+++ b/datamodels/2.x/authent-ldap/dictionaries/sk.dict.authent-ldap.php
@@ -35,5 +35,4 @@
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:UserLDAP' => 'LDAP užívateľ',
 	'Class:UserLDAP+' => '',
-	'UserLDAP:server' => 'LDAP specifics~~',
 ));
--- a/datamodels/2.x/authent-ldap/dictionaries/tr.dict.authent-ldap.php
+++ b/datamodels/2.x/authent-ldap/dictionaries/tr.dict.authent-ldap.php
@@ -37,5 +37,4 @@
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:UserLDAP' => 'LDAP kullanıcısı',
 	'Class:UserLDAP+' => 'Yetki kontrolü LDAP tarafından yapılan',
-	'UserLDAP:server' => 'LDAP specifics~~',
 ));
--- a/datamodels/2.x/authent-ldap/dictionaries/zh_cn.dict.authent-ldap.php
+++ b/datamodels/2.x/authent-ldap/dictionaries/zh_cn.dict.authent-ldap.php
@@ -36,5 +36,4 @@
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:UserLDAP' => 'LDAP 用户',
 	'Class:UserLDAP+' => '用户身份由LDAP 认证',
-	'UserLDAP:server' => 'LDAP specifics~~',
 ));
--- a/datamodels/2.x/authent-local/dictionaries/cs.dict.authent-local.php
+++ b/datamodels/2.x/authent-local/dictionaries/cs.dict.authent-local.php
@@ -40,6 +40,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:UserLocal+' => 'Uživatel ověřen interně v '.ITOP_APPLICATION_SHORT,
 	'Class:UserLocal/Attribute:password' => 'Heslo',
 	'Class:UserLocal/Attribute:password+' => '',
+
 	'Class:UserLocal/Attribute:expiration' => 'Password expiration~~',
 	'Class:UserLocal/Attribute:expiration+' => 'Password expiration status (requires an extension to have an effect)~~',
 	'Class:UserLocal/Attribute:expiration/Value:can_expire' => 'Can expire~~',
@@ -52,7 +53,9 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:UserLocal/Attribute:expiration/Value:otp_expire+' => 'Password cannot be changed by the user.~~',
 	'Class:UserLocal/Attribute:password_renewed_date' => 'Password renewal~~',
 	'Class:UserLocal/Attribute:password_renewed_date+' => 'When the password was last changed~~',
+
 	'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Password must be at least 8 characters and include uppercase, lowercase, numeric and special characters.~~',
+
 	'UserLocal:password:expiration' => 'The fields below require an extension~~',
 	'Class:UserLocal/Error:OneTimePasswordChangeIsNotAllowed' => 'Setting password expiration to "One-time password" is not allowed for your own User~~',
 ));
--- a/datamodels/2.x/authent-local/dictionaries/da.dict.authent-local.php
+++ b/datamodels/2.x/authent-local/dictionaries/da.dict.authent-local.php
@@ -25,6 +25,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:UserLocal+' => 'Bruger der godkendes af '.ITOP_APPLICATION_SHORT,
 	'Class:UserLocal/Attribute:password' => 'Password',
 	'Class:UserLocal/Attribute:password+' => 'Brugerens password',
+
 	'Class:UserLocal/Attribute:expiration' => 'Password expiration~~',
 	'Class:UserLocal/Attribute:expiration+' => 'Password expiration status (requires an extension to have an effect)~~',
 	'Class:UserLocal/Attribute:expiration/Value:can_expire' => 'Can expire~~',
@@ -37,7 +38,9 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:UserLocal/Attribute:expiration/Value:otp_expire+' => 'Password cannot be changed by the user.~~',
 	'Class:UserLocal/Attribute:password_renewed_date' => 'Password renewal~~',
 	'Class:UserLocal/Attribute:password_renewed_date+' => 'When the password was last changed~~',
+
 	'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Password must be at least 8 characters and include uppercase, lowercase, numeric and special characters.~~',
+
 	'UserLocal:password:expiration' => 'The fields below require an extension~~',
 	'Class:UserLocal/Error:OneTimePasswordChangeIsNotAllowed' => 'Setting password expiration to "One-time password" is not allowed for your own User~~',
 ));
--- a/datamodels/2.x/authent-local/dictionaries/de.dict.authent-local.php
+++ b/datamodels/2.x/authent-local/dictionaries/de.dict.authent-local.php
@@ -27,6 +27,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:UserLocal+' => 'Benutzer, der von '.ITOP_APPLICATION_SHORT.' authentifiziert wird',
 	'Class:UserLocal/Attribute:password' => 'Passwort',
 	'Class:UserLocal/Attribute:password+' => 'Benutzerpasswort',
+
 	'Class:UserLocal/Attribute:expiration' => 'Passwortablauf',
 	'Class:UserLocal/Attribute:expiration+' => 'Passwortablaufstatus (statusabhängige Effekte müssen per Extension implementiert werden)',
 	'Class:UserLocal/Attribute:expiration/Value:can_expire' => 'kann ablaufen',
@@ -39,7 +40,9 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:UserLocal/Attribute:expiration/Value:otp_expire+' => '',
 	'Class:UserLocal/Attribute:password_renewed_date' => 'Letzte Passworterneuerung',
 	'Class:UserLocal/Attribute:password_renewed_date+' => 'Letztes Änderungsdatum',
+
 	'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Das Passwort entspricht nicht dem in den Konfigurationsregeln hinterlegten RegEx-Ausdruck',
+
 	'UserLocal:password:expiration' => 'Die folgenden Felder benötigen eine '.ITOP_APPLICATION_SHORT.' Erweiterung',
 	'Class:UserLocal/Error:OneTimePasswordChangeIsNotAllowed' => 'Das setzen des Passwortablaufs auf "Einmalpasswort" ist für den eigenen Benutzer nicht erlaubt.',
 ));
--- a/datamodels/2.x/authent-local/dictionaries/es_cr.dict.authent-local.php
+++ b/datamodels/2.x/authent-local/dictionaries/es_cr.dict.authent-local.php
@@ -39,6 +39,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:UserLocal+' => 'Usuario Autenticado vía '.ITOP_APPLICATION_SHORT,
 	'Class:UserLocal/Attribute:password' => 'Contraseña',
 	'Class:UserLocal/Attribute:password+' => 'Contraseña',
+
 	'Class:UserLocal/Attribute:expiration' => 'Expiración de contraseña',
 	'Class:UserLocal/Attribute:expiration+' => 'Estatus de expiración de contraseña (requiere de una extensión para que tenga efecto)',
 	'Class:UserLocal/Attribute:expiration/Value:can_expire' => 'Puede expirar',
@@ -51,7 +52,9 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:UserLocal/Attribute:expiration/Value:otp_expire+' => 'El usuario no puede cambiar la contraseña.',
 	'Class:UserLocal/Attribute:password_renewed_date' => 'Renovación de contraseña',
 	'Class:UserLocal/Attribute:password_renewed_date+' => 'Cuando fue el último cambio de contraseña',
+
 	'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'La contraseña debe ser de al menos 8 caracteres e incluír mayúsculas, minúsculas, números y caracteres especiales.',
+
 	'UserLocal:password:expiration' => 'El siguiente campo requiere una extensión',
 	'Class:UserLocal/Error:OneTimePasswordChangeIsNotAllowed' => 'Configurar expiración de contraseña para "ontraseña de un solo uso" no está permitido para su propio Usuario',
 ));
--- a/datamodels/2.x/authent-local/dictionaries/fr.dict.authent-local.php
+++ b/datamodels/2.x/authent-local/dictionaries/fr.dict.authent-local.php
@@ -24,6 +24,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:UserLocal+' => 'Utilisateur authentifié par '.ITOP_APPLICATION_SHORT,
 	'Class:UserLocal/Attribute:password' => 'Mot de passe',
 	'Class:UserLocal/Attribute:password+' => '',
+
 	'Class:UserLocal/Attribute:expiration' => 'Validité du mot de passe',
 	'Class:UserLocal/Attribute:expiration+' => 'Statut du mot de passe (nécessite une extension pour avoir un effet)',
 	'Class:UserLocal/Attribute:expiration/Value:can_expire' => 'Durée limitée',
@@ -36,6 +37,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:UserLocal/Attribute:expiration/Value:otp_expire+' => '',
 	'Class:UserLocal/Attribute:password_renewed_date' => 'Mot de passe changé le',
 	'Class:UserLocal/Attribute:password_renewed_date+' => 'Dernière date à laquelle le mot de passe a été changé',
+
 	'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Le mot de passe doit contenir au moins 8 caractères, avec minuscule, majuscule, nombre et caractère spécial.',
 	'UserLocal:password:expiration' => 'Les champs ci-dessous nécessitent une extension',
 	'Class:UserLocal/Error:OneTimePasswordChangeIsNotAllowed' => 'Impossible de mettre "Usage unique" comme validité du mot de passe pour son propre utilisateur.',
--- a/datamodels/2.x/authent-local/dictionaries/hu.dict.authent-local.php
+++ b/datamodels/2.x/authent-local/dictionaries/hu.dict.authent-local.php
@@ -24,6 +24,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:UserLocal+' => '',
 	'Class:UserLocal/Attribute:password' => 'Jelszó',
 	'Class:UserLocal/Attribute:password+' => '',
+
 	'Class:UserLocal/Attribute:expiration' => 'Jelszó lejárati ideje',
 	'Class:UserLocal/Attribute:expiration+' => 'Jelszó lejárati státusz (bővítmény szükséges hozzá)',
 	'Class:UserLocal/Attribute:expiration/Value:can_expire' => 'Lejár',
@@ -34,9 +35,11 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:UserLocal/Attribute:expiration/Value:force_expire+' => '~~',
 	'Class:UserLocal/Attribute:expiration/Value:otp_expire' => 'Egyszeri jelszó',
 	'Class:UserLocal/Attribute:expiration/Value:otp_expire+' => 'A felhasználó nem változtathat jelszót.',
-	'Class:UserLocal/Attribute:password_renewed_date' => 'Jelszó megújítás ideje',
+    'Class:UserLocal/Attribute:password_renewed_date' => 'Jelszó megújítás ideje',
 	'Class:UserLocal/Attribute:password_renewed_date+' => 'A jelszó legutóbbi módosításának időpontja',
+
 	'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'A jelszónak legalább 8 karakterből kell állnia, és tartalmaznia kell nagybetűket, kisbetűket, numerikus és speciális karaktereket.',
+
 	'UserLocal:password:expiration' => 'Az alábbi mezőkhöz egy bővítmény szükséges',
 	'Class:UserLocal/Error:OneTimePasswordChangeIsNotAllowed' => 'A jelszó lejárati idejének beállítása "Egyszeri jelszóra" nem engedélyezett a saját Felhasználó számára.',
 ));
--- a/datamodels/2.x/authent-local/dictionaries/it.dict.authent-local.php
+++ b/datamodels/2.x/authent-local/dictionaries/it.dict.authent-local.php
@@ -38,6 +38,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:UserLocal+' => 'Utente autenticato da '.ITOP_APPLICATION_SHORT,
 	'Class:UserLocal/Attribute:password' => 'Password',
 	'Class:UserLocal/Attribute:password+' => 'user authentication string',
+
 	'Class:UserLocal/Attribute:expiration' => 'Password expiration~~',
 	'Class:UserLocal/Attribute:expiration+' => 'Password expiration status (requires an extension to have an effect)~~',
 	'Class:UserLocal/Attribute:expiration/Value:can_expire' => 'Can expire~~',
@@ -50,7 +51,9 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:UserLocal/Attribute:expiration/Value:otp_expire+' => 'Password cannot be changed by the user.~~',
 	'Class:UserLocal/Attribute:password_renewed_date' => 'Password renewal~~',
 	'Class:UserLocal/Attribute:password_renewed_date+' => 'When the password was last changed~~',
+
 	'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Password must be at least 8 characters and include uppercase, lowercase, numeric and special characters.~~',
+
 	'UserLocal:password:expiration' => 'The fields below require an extension~~',
 	'Class:UserLocal/Error:OneTimePasswordChangeIsNotAllowed' => 'Setting password expiration to "One-time password" is not allowed for your own User~~',
 ));
--- a/datamodels/2.x/authent-local/dictionaries/ja.dict.authent-local.php
+++ b/datamodels/2.x/authent-local/dictionaries/ja.dict.authent-local.php
@@ -25,6 +25,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:UserLocal+' => ITOP_APPLICATION_SHORT.'ローカル認証ユーザー',
 	'Class:UserLocal/Attribute:password' => 'パスワード',
 	'Class:UserLocal/Attribute:password+' => '認証文字列',
+
 	'Class:UserLocal/Attribute:expiration' => 'Password expiration~~',
 	'Class:UserLocal/Attribute:expiration+' => 'Password expiration status (requires an extension to have an effect)~~',
 	'Class:UserLocal/Attribute:expiration/Value:can_expire' => 'Can expire~~',
@@ -37,7 +38,9 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:UserLocal/Attribute:expiration/Value:otp_expire+' => 'Password cannot be changed by the user.~~',
 	'Class:UserLocal/Attribute:password_renewed_date' => 'Password renewal~~',
 	'Class:UserLocal/Attribute:password_renewed_date+' => 'When the password was last changed~~',
+
 	'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Password must be at least 8 characters and include uppercase, lowercase, numeric and special characters.~~',
+
 	'UserLocal:password:expiration' => 'The fields below require an extension~~',
 	'Class:UserLocal/Error:OneTimePasswordChangeIsNotAllowed' => 'Setting password expiration to "One-time password" is not allowed for your own User~~',
 ));
--- a/datamodels/2.x/authent-local/dictionaries/nl.dict.authent-local.php
+++ b/datamodels/2.x/authent-local/dictionaries/nl.dict.authent-local.php
@@ -29,6 +29,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:UserLocal+' => 'Gebruiker die aanmeldt met gegevens aangemaakt in het gebruikersbeheer van '.ITOP_APPLICATION_SHORT,
 	'Class:UserLocal/Attribute:password' => 'Wachtwoord',
 	'Class:UserLocal/Attribute:password+' => 'Het wachtwoord waarmee de gebruiker zich aanmeldt bij '.ITOP_APPLICATION_SHORT,
+
 	'Class:UserLocal/Attribute:expiration' => 'Wachtwoord verloopt',
 	'Class:UserLocal/Attribute:expiration+' => 'Of het wachtwoord al dan niet verlopen is (vereist een extensie vooraleer dit werkt)',
 	'Class:UserLocal/Attribute:expiration/Value:can_expire' => 'Kan verlopen',
@@ -41,7 +42,9 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:UserLocal/Attribute:expiration/Value:otp_expire+' => 'De gebruiker kan dit wachtwoord niet veranderen.',
 	'Class:UserLocal/Attribute:password_renewed_date' => 'Wachtwoord laatst aangepast',
 	'Class:UserLocal/Attribute:password_renewed_date+' => 'Tijdstip waarop het wachtwoord het laatst aangepast werd.',
+
 	'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Het wachtwoord bestaat uit minstens 8 tekens en bestaat uit een mix van minstens 1 hoofdletter, kleine letter, cijfer en speciaal teken.',
+
 	'UserLocal:password:expiration' => 'De velden hieronder vereisen een extensie.',
 	'Class:UserLocal/Error:OneTimePasswordChangeIsNotAllowed' => 'Je kan geen eenmalig wachtwoord instellen voor je eigen gebruiker.',
 ));
--- a/datamodels/2.x/authent-local/dictionaries/pl.dict.authent-local.php
+++ b/datamodels/2.x/authent-local/dictionaries/pl.dict.authent-local.php
@@ -37,6 +37,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:UserLocal+' => 'Użytkownik uwierzytelniony przez '.ITOP_APPLICATION_SHORT,
 	'Class:UserLocal/Attribute:password' => 'Hasło',
 	'Class:UserLocal/Attribute:password+' => 'Ciąg uwierzytelniania użytkownika',
+
 	'Class:UserLocal/Attribute:expiration' => 'Wygaśnięcie hasła',
 	'Class:UserLocal/Attribute:expiration+' => 'Stan wygaśnięcia hasła (wymaga rozszerzenia, aby zadziałało)',
 	'Class:UserLocal/Attribute:expiration/Value:can_expire' => 'Może wygasnąć',
@@ -49,7 +50,9 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:UserLocal/Attribute:expiration/Value:otp_expire+' => 'Hasło nie może być zmienione przez użytkownika.',
 	'Class:UserLocal/Attribute:password_renewed_date' => 'Odnowienie hasła',
 	'Class:UserLocal/Attribute:password_renewed_date+' => 'Kiedy ostatnio zmieniano hasło',
+
 	'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Hasło musi mieć co najmniej 8 znaków i zawierać duże, małe litery, cyfry i znaki specjalne.',
+
 	'UserLocal:password:expiration' => 'Poniższe pola wymagają rozszerzenia',
 	'Class:UserLocal/Error:OneTimePasswordChangeIsNotAllowed' => 'Ustawienie wygaśnięcia hasła "Hasło jednorazowe" nie jest dozwolone dla własnego użytkownika',
 ));
--- a/datamodels/2.x/authent-local/dictionaries/pt_br.dict.authent-local.php
+++ b/datamodels/2.x/authent-local/dictionaries/pt_br.dict.authent-local.php
@@ -24,6 +24,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:UserLocal+' => '',
 	'Class:UserLocal/Attribute:password' => 'Senha',
 	'Class:UserLocal/Attribute:password+' => '',
+
 	'Class:UserLocal/Attribute:expiration' => 'Expiração da senha',
 	'Class:UserLocal/Attribute:expiration+' => 'Status de expiração de senha (Requer uma extensão para fazer efeito)',
 	'Class:UserLocal/Attribute:expiration/Value:can_expire' => 'Senha expira',
@@ -36,7 +37,9 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:UserLocal/Attribute:expiration/Value:otp_expire+' => 'Senha não pode ser alterada pelo usuário',
 	'Class:UserLocal/Attribute:password_renewed_date' => 'Data da última alteração de senha',
 	'Class:UserLocal/Attribute:password_renewed_date+' => 'Quando a senha foi alterada anteriormente',
+
 	'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'A senha deve ter no mínimo 8 caracteres e incluir letras maiúsculas, minúsculas, números e símbolos',
+
 	'UserLocal:password:expiration' => 'O campo abaixo requer uma extensão',
 	'Class:UserLocal/Error:OneTimePasswordChangeIsNotAllowed' => 'Definir a expiração da senha para One-Time Password (OTP) não é permitido para o seu próprio usuário',
 ));
--- a/datamodels/2.x/authent-local/dictionaries/ru.dict.authent-local.php
+++ b/datamodels/2.x/authent-local/dictionaries/ru.dict.authent-local.php
@@ -16,6 +16,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:UserLocal+' => 'Пользователь, аутентифицируемый через '.ITOP_APPLICATION_SHORT,
 	'Class:UserLocal/Attribute:password' => 'Пароль',
 	'Class:UserLocal/Attribute:password+' => 'Строка аутентификации пользователя',
+
 	'Class:UserLocal/Attribute:expiration' => 'Срок действия пароля',
 	'Class:UserLocal/Attribute:expiration+' => 'Статус срока действия пароля (требуется расширение для эффекта)',
 	'Class:UserLocal/Attribute:expiration/Value:can_expire' => 'Органиченный',
@@ -28,7 +29,9 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:UserLocal/Attribute:expiration/Value:otp_expire+' => 'Password cannot be changed by the user.~~',
 	'Class:UserLocal/Attribute:password_renewed_date' => 'Дата изменения пароля',
 	'Class:UserLocal/Attribute:password_renewed_date+' => 'Когда пароль был изменен в последний раз',
+
 	'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Пароль должен содержать не менее 8 символов и включать прописные, строчные, числовые и специальные символы.',
+
 	'UserLocal:password:expiration' => 'Поля требуют наличия доп. расширения',
 	'Class:UserLocal/Error:OneTimePasswordChangeIsNotAllowed' => 'Setting password expiration to "One-time password" is not allowed for your own User~~',
 ));
--- a/datamodels/2.x/authent-local/dictionaries/sk.dict.authent-local.php
+++ b/datamodels/2.x/authent-local/dictionaries/sk.dict.authent-local.php
@@ -37,6 +37,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:UserLocal+' => '',
 	'Class:UserLocal/Attribute:password' => 'Heslo',
 	'Class:UserLocal/Attribute:password+' => '',
+
 	'Class:UserLocal/Attribute:expiration' => 'Password expiration~~',
 	'Class:UserLocal/Attribute:expiration+' => 'Password expiration status (requires an extension to have an effect)~~',
 	'Class:UserLocal/Attribute:expiration/Value:can_expire' => 'Can expire~~',
@@ -49,7 +50,9 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:UserLocal/Attribute:expiration/Value:otp_expire+' => 'Password cannot be changed by the user.~~',
 	'Class:UserLocal/Attribute:password_renewed_date' => 'Password renewal~~',
 	'Class:UserLocal/Attribute:password_renewed_date+' => 'When the password was last changed~~',
+
 	'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Password must be at least 8 characters and include uppercase, lowercase, numeric and special characters.~~',
+
 	'UserLocal:password:expiration' => 'The fields below require an extension~~',
 	'Class:UserLocal/Error:OneTimePasswordChangeIsNotAllowed' => 'Setting password expiration to "One-time password" is not allowed for your own User~~',
 ));
--- a/datamodels/2.x/authent-local/dictionaries/tr.dict.authent-local.php
+++ b/datamodels/2.x/authent-local/dictionaries/tr.dict.authent-local.php
@@ -39,6 +39,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:UserLocal+' => 'Yetki kontorlünü '.ITOP_APPLICATION_SHORT.' tarafından yapılan kullanıcı',
 	'Class:UserLocal/Attribute:password' => 'Şifre',
 	'Class:UserLocal/Attribute:password+' => 'şifre',
+
 	'Class:UserLocal/Attribute:expiration' => 'Password expiration~~',
 	'Class:UserLocal/Attribute:expiration+' => 'Password expiration status (requires an extension to have an effect)~~',
 	'Class:UserLocal/Attribute:expiration/Value:can_expire' => 'Can expire~~',
@@ -51,7 +52,9 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:UserLocal/Attribute:expiration/Value:otp_expire+' => 'Password cannot be changed by the user.~~',
 	'Class:UserLocal/Attribute:password_renewed_date' => 'Password renewal~~',
 	'Class:UserLocal/Attribute:password_renewed_date+' => 'When the password was last changed~~',
+
 	'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Password must be at least 8 characters and include uppercase, lowercase, numeric and special characters.~~',
+
 	'UserLocal:password:expiration' => 'The fields below require an extension~~',
 	'Class:UserLocal/Error:OneTimePasswordChangeIsNotAllowed' => 'Setting password expiration to "One-time password" is not allowed for your own User~~',
 ));
--- a/datamodels/2.x/authent-local/dictionaries/zh_cn.dict.authent-local.php
+++ b/datamodels/2.x/authent-local/dictionaries/zh_cn.dict.authent-local.php
@@ -38,6 +38,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:UserLocal+' => '用户由 '.ITOP_APPLICATION_SHORT.' 验证身份',
 	'Class:UserLocal/Attribute:password' => '密码',
 	'Class:UserLocal/Attribute:password+' => '用于验证用户身份的字符串',
+
 	'Class:UserLocal/Attribute:expiration' => '密码过期',
 	'Class:UserLocal/Attribute:expiration+' => '密码过期状态(需要一个扩展才能生效)',
 	'Class:UserLocal/Attribute:expiration/Value:can_expire' => '允许过期',
@@ -50,7 +51,9 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:UserLocal/Attribute:expiration/Value:otp_expire+' => '用户不允许修改密码.',
 	'Class:UserLocal/Attribute:password_renewed_date' => '密码更新',
 	'Class:UserLocal/Attribute:password_renewed_date+' => '上次修改密码的时间',
+
 	'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => '密码必须至少8个字符,包含大小写,数字和特殊字符.',
+
 	'UserLocal:password:expiration' => '下面的区域需要插件扩展',
 	'Class:UserLocal/Error:OneTimePasswordChangeIsNotAllowed' => '不允许用户为自己设置"一次性密码"的失效期限',
 ));
--- a/datamodels/2.x/combodo-backoffice-darkmoon-theme/dictionaries/cs.dict.combodo-backoffice-darkmoon-theme.php
+++ b/datamodels/2.x/combodo-backoffice-darkmoon-theme/dictionaries/cs.dict.combodo-backoffice-darkmoon-theme.php
@@ -20,6 +20,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with iTop. If not, see <http://www.gnu.org/licenses/>
 */
+
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'theme:darkmoon' => 'Dark moon~~',
 ));
--- a/datamodels/2.x/combodo-backoffice-darkmoon-theme/dictionaries/da.dict.combodo-backoffice-darkmoon-theme.php
+++ b/datamodels/2.x/combodo-backoffice-darkmoon-theme/dictionaries/da.dict.combodo-backoffice-darkmoon-theme.php
@@ -20,6 +20,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with iTop. If not, see <http://www.gnu.org/licenses/>
 */
+
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'theme:darkmoon' => 'Dark moon~~',
 ));
--- a/datamodels/2.x/combodo-backoffice-darkmoon-theme/dictionaries/de.dict.combodo-backoffice-darkmoon-theme.php
+++ b/datamodels/2.x/combodo-backoffice-darkmoon-theme/dictionaries/de.dict.combodo-backoffice-darkmoon-theme.php
@@ -20,6 +20,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with iTop. If not, see <http://www.gnu.org/licenses/>
 */
+
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'theme:darkmoon' => 'Dark moon',
-));
+));
--- a/datamodels/2.x/combodo-backoffice-darkmoon-theme/dictionaries/es_cr.dict.combodo-backoffice-darkmoon-theme.php
+++ b/datamodels/2.x/combodo-backoffice-darkmoon-theme/dictionaries/es_cr.dict.combodo-backoffice-darkmoon-theme.php
@@ -20,6 +20,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with iTop. If not, see <http://www.gnu.org/licenses/>
 */
+
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'theme:darkmoon' => 'Luna Obscura',
 ));
--- a/datamodels/2.x/combodo-backoffice-darkmoon-theme/dictionaries/fr.dict.combodo-backoffice-darkmoon-theme.php
+++ b/datamodels/2.x/combodo-backoffice-darkmoon-theme/dictionaries/fr.dict.combodo-backoffice-darkmoon-theme.php
@@ -20,6 +20,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with iTop. If not, see <http://www.gnu.org/licenses/>
 */
+
 Dict::Add('FR FR', 'French', 'Français', array(
 	'theme:darkmoon' => 'Dark moon~~',
 ));
--- a/datamodels/2.x/combodo-backoffice-darkmoon-theme/dictionaries/hu.dict.combodo-backoffice-darkmoon-theme.php
+++ b/datamodels/2.x/combodo-backoffice-darkmoon-theme/dictionaries/hu.dict.combodo-backoffice-darkmoon-theme.php
@@ -20,6 +20,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with iTop. If not, see <http://www.gnu.org/licenses/>
 */
+
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'theme:darkmoon' => 'Dark moon',
 ));
--- a/datamodels/2.x/combodo-backoffice-darkmoon-theme/dictionaries/it.dict.combodo-backoffice-darkmoon-theme.php
+++ b/datamodels/2.x/combodo-backoffice-darkmoon-theme/dictionaries/it.dict.combodo-backoffice-darkmoon-theme.php
@@ -20,6 +20,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with iTop. If not, see <http://www.gnu.org/licenses/>
 */
+
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'theme:darkmoon' => 'Dark moon~~',
 ));
--- a/datamodels/2.x/combodo-backoffice-darkmoon-theme/dictionaries/ja.dict.combodo-backoffice-darkmoon-theme.php
+++ b/datamodels/2.x/combodo-backoffice-darkmoon-theme/dictionaries/ja.dict.combodo-backoffice-darkmoon-theme.php
@@ -20,6 +20,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with iTop. If not, see <http://www.gnu.org/licenses/>
 */
+
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'theme:darkmoon' => 'Dark moon~~',
 ));
--- a/datamodels/2.x/combodo-backoffice-darkmoon-theme/dictionaries/nl.dict.combodo-backoffice-darkmoon-theme.php
+++ b/datamodels/2.x/combodo-backoffice-darkmoon-theme/dictionaries/nl.dict.combodo-backoffice-darkmoon-theme.php
@@ -20,6 +20,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with iTop. If not, see <http://www.gnu.org/licenses/>
 */
+
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'theme:darkmoon' => 'Dark moon',
 ));
--- a/datamodels/2.x/combodo-backoffice-darkmoon-theme/dictionaries/pt_br.dict.combodo-backoffice-darkmoon-theme.php
+++ b/datamodels/2.x/combodo-backoffice-darkmoon-theme/dictionaries/pt_br.dict.combodo-backoffice-darkmoon-theme.php
@@ -20,6 +20,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with iTop. If not, see <http://www.gnu.org/licenses/>
 */
+
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'theme:darkmoon' => 'Dark moon',
 ));
--- a/datamodels/2.x/combodo-backoffice-darkmoon-theme/dictionaries/ru.dict.combodo-backoffice-darkmoon-theme.php
+++ b/datamodels/2.x/combodo-backoffice-darkmoon-theme/dictionaries/ru.dict.combodo-backoffice-darkmoon-theme.php
@@ -20,6 +20,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with iTop. If not, see <http://www.gnu.org/licenses/>
 */
+
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'theme:darkmoon' => 'Dark moon~~',
 ));
--- a/datamodels/2.x/combodo-backoffice-darkmoon-theme/dictionaries/sk.dict.combodo-backoffice-darkmoon-theme.php
+++ b/datamodels/2.x/combodo-backoffice-darkmoon-theme/dictionaries/sk.dict.combodo-backoffice-darkmoon-theme.php
@@ -20,6 +20,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with iTop. If not, see <http://www.gnu.org/licenses/>
 */
+
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'theme:darkmoon' => 'Dark moon~~',
 ));
--- a/datamodels/2.x/combodo-backoffice-darkmoon-theme/dictionaries/tr.dict.combodo-backoffice-darkmoon-theme.php
+++ b/datamodels/2.x/combodo-backoffice-darkmoon-theme/dictionaries/tr.dict.combodo-backoffice-darkmoon-theme.php
@@ -20,6 +20,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with iTop. If not, see <http://www.gnu.org/licenses/>
 */
+
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'theme:darkmoon' => 'Dark moon~~',
 ));
--- a/datamodels/2.x/combodo-backoffice-darkmoon-theme/dictionaries/zh_cn.dict.combodo-backoffice-darkmoon-theme.php
+++ b/datamodels/2.x/combodo-backoffice-darkmoon-theme/dictionaries/zh_cn.dict.combodo-backoffice-darkmoon-theme.php
@@ -20,6 +20,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with iTop. If not, see <http://www.gnu.org/licenses/>
 */
+
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'theme:darkmoon' => 'Dark moon~~',
 ));
--- a/datamodels/2.x/combodo-db-tools/dictionaries/cs.dict.combodo-db-tools.php
+++ b/datamodels/2.x/combodo-db-tools/dictionaries/cs.dict.combodo-db-tools.php
@@ -41,12 +41,14 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'DBTools:IntegrityCheck' => 'Integrity check~~',
 	'DBTools:FetchCheck' => 'Fetch Check (long)~~',
 	'DBTools:SelectAnalysisType' => 'Select analysis type~~',
+
 	'DBTools:Analyze' => 'Analyze~~',
 	'DBTools:Details' => 'Show Details~~',
 	'DBTools:ShowAll' => 'Show All Errors~~',
+
 	'DBTools:Inconsistencies' => 'Database inconsistencies~~',
 	'DBTools:DetailedErrorTitle' => '%2$s error(s) in class %1$s: %3$s~~',
-	'DBTools:DetailedErrorLimit' => 'List limited to %1$s errors~~',
+
 	'DBAnalyzer-Integrity-OrphanRecord' => 'Orphan record in `%1$s`, it should have its counterpart in table `%2$s`~~',
 	'DBAnalyzer-Integrity-InvalidExtKey' => 'Invalid external key %1$s (column: `%2$s.%3$s`)~~',
 	'DBAnalyzer-Integrity-MissingExtKey' => 'Missing external key %1$s (column: `%2$s.%3$s`)~~',
@@ -69,19 +71,24 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'DBTools:LostAttachments' => 'Lost attachments~~',
 	'DBTools:LostAttachments:Disclaimer' => 'Here you can search your database for lost or misplaced attachments. This is NOT a data recovery tool, is does not retrieve deleted data.~~',
+
 	'DBTools:LostAttachments:Button:Analyze' => 'Analyze~~',
 	'DBTools:LostAttachments:Button:Restore' => 'Restore~~',
 	'DBTools:LostAttachments:Button:Restore:Confirm' => 'This action cannot be undone, please confirm that you want to restore the selected files.~~',
 	'DBTools:LostAttachments:Button:Busy' => 'Please wait...~~',
+
 	'DBTools:LostAttachments:Step:Analyze' => 'First, search for lost/misplaced attachments by analyzing the database.~~',
+
 	'DBTools:LostAttachments:Step:AnalyzeResults' => 'Analyze results:~~',
 	'DBTools:LostAttachments:Step:AnalyzeResults:None' => 'Great! Every thing seems to be at the right place.~~',
 	'DBTools:LostAttachments:Step:AnalyzeResults:Some' => 'Some attachments (%1$d) seem to be misplaced. Take a look at the following list and check the ones you would like to move.~~',
 	'DBTools:LostAttachments:Step:AnalyzeResults:Item:Filename' => 'Filename~~',
 	'DBTools:LostAttachments:Step:AnalyzeResults:Item:CurrentLocation' => 'Current location~~',
 	'DBTools:LostAttachments:Step:AnalyzeResults:Item:TargetLocation' => 'Move to...~~',
+
 	'DBTools:LostAttachments:Step:RestoreResults' => 'Restore results:~~',
 	'DBTools:LostAttachments:Step:RestoreResults:Results' => '%1$d/%2$d attachments were restored.~~',
+
 	'DBTools:LostAttachments:StoredAsInlineImage' => 'Stored as inline image~~',
 	'DBTools:LostAttachments:History' => 'Attachment "%1$s" restored with DB tools~~'
 ));
--- a/datamodels/2.x/combodo-db-tools/dictionaries/da.dict.combodo-db-tools.php
+++ b/datamodels/2.x/combodo-db-tools/dictionaries/da.dict.combodo-db-tools.php
@@ -41,12 +41,14 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'DBTools:IntegrityCheck' => 'Integrity check~~',
 	'DBTools:FetchCheck' => 'Fetch Check (long)~~',
 	'DBTools:SelectAnalysisType' => 'Select analysis type~~',
+
 	'DBTools:Analyze' => 'Analyze~~',
 	'DBTools:Details' => 'Show Details~~',
 	'DBTools:ShowAll' => 'Show All Errors~~',
+
 	'DBTools:Inconsistencies' => 'Database inconsistencies~~',
 	'DBTools:DetailedErrorTitle' => '%2$s error(s) in class %1$s: %3$s~~',
-	'DBTools:DetailedErrorLimit' => 'List limited to %1$s errors~~',
+
 	'DBAnalyzer-Integrity-OrphanRecord' => 'Orphan record in `%1$s`, it should have its counterpart in table `%2$s`~~',
 	'DBAnalyzer-Integrity-InvalidExtKey' => 'Invalid external key %1$s (column: `%2$s.%3$s`)~~',
 	'DBAnalyzer-Integrity-MissingExtKey' => 'Missing external key %1$s (column: `%2$s.%3$s`)~~',
@@ -69,19 +71,24 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'DBTools:LostAttachments' => 'Lost attachments~~',
 	'DBTools:LostAttachments:Disclaimer' => 'Here you can search your database for lost or misplaced attachments. This is NOT a data recovery tool, is does not retrieve deleted data.~~',
+
 	'DBTools:LostAttachments:Button:Analyze' => 'Analyze~~',
 	'DBTools:LostAttachments:Button:Restore' => 'Restore~~',
 	'DBTools:LostAttachments:Button:Restore:Confirm' => 'This action cannot be undone, please confirm that you want to restore the selected files.~~',
 	'DBTools:LostAttachments:Button:Busy' => 'Please wait...~~',
+
 	'DBTools:LostAttachments:Step:Analyze' => 'First, search for lost/misplaced attachments by analyzing the database.~~',
+
 	'DBTools:LostAttachments:Step:AnalyzeResults' => 'Analyze results:~~',
 	'DBTools:LostAttachments:Step:AnalyzeResults:None' => 'Great! Every thing seems to be at the right place.~~',
 	'DBTools:LostAttachments:Step:AnalyzeResults:Some' => 'Some attachments (%1$d) seem to be misplaced. Take a look at the following list and check the ones you would like to move.~~',
 	'DBTools:LostAttachments:Step:AnalyzeResults:Item:Filename' => 'Filename~~',
 	'DBTools:LostAttachments:Step:AnalyzeResults:Item:CurrentLocation' => 'Current location~~',
 	'DBTools:LostAttachments:Step:AnalyzeResults:Item:TargetLocation' => 'Move to...~~',
+
 	'DBTools:LostAttachments:Step:RestoreResults' => 'Restore results:~~',
 	'DBTools:LostAttachments:Step:RestoreResults:Results' => '%1$d/%2$d attachments were restored.~~',
+
 	'DBTools:LostAttachments:StoredAsInlineImage' => 'Stored as inline image~~',
 	'DBTools:LostAttachments:History' => 'Attachment "%1$s" restored with DB tools~~'
 ));
--- a/datamodels/2.x/combodo-db-tools/dictionaries/de.dict.combodo-db-tools.php
+++ b/datamodels/2.x/combodo-db-tools/dictionaries/de.dict.combodo-db-tools.php
@@ -38,12 +38,14 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'DBTools:IntegrityCheck' => 'Integritätscheck',
 	'DBTools:FetchCheck' => 'Fetch Check (dauert länger)',
 	'DBTools:SelectAnalysisType' => 'Analysetyp auswählen',
+
 	'DBTools:Analyze' => 'Analysiere',
 	'DBTools:Details' => 'Details anzeigen',
 	'DBTools:ShowAll' => 'Alle Fehler anzeigen',
+
 	'DBTools:Inconsistencies' => 'Datenbank-Inkonsistenzen',
 	'DBTools:DetailedErrorTitle' => '%2$s Fehler(s) in der Klasse %1$s: %3$s',
-	'DBTools:DetailedErrorLimit' => 'List limited to %1$s errors~~',
+
 	'DBAnalyzer-Integrity-OrphanRecord' => 'Verwaister Eintrag in `%1$s`, er sollte eine Entsprechung in Tabelle `%2$s` haben',
 	'DBAnalyzer-Integrity-InvalidExtKey' => 'Ungültiger Externer Key %1$s (Spalte: `%2$s.%3$s`)',
 	'DBAnalyzer-Integrity-MissingExtKey' => 'Fehlender Externer Key %1$s (Spalte: `%2$s.%3$s`)',
@@ -66,19 +68,24 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'DBTools:LostAttachments' => 'Verlorene Attachments',
 	'DBTools:LostAttachments:Disclaimer' => 'Hier können Sie Ihre Datenbank nach verlorenen oder falsch platzierten Attachments durchsuchen. Dies ist kein Recovery-Tool - es stellt keine gelöschten Daten wieder her.',
+
 	'DBTools:LostAttachments:Button:Analyze' => 'Analysieren',
 	'DBTools:LostAttachments:Button:Restore' => 'Wiederherstellen',
 	'DBTools:LostAttachments:Button:Restore:Confirm' => 'Diese Aktion kann nicht rückgängig gemacht werden, bitte bestätigen Sie, dass Sie die ausgewählten Dateien wiederherstellen möchten.',
 	'DBTools:LostAttachments:Button:Busy' => 'Bitte warten...',
+
 	'DBTools:LostAttachments:Step:Analyze' => 'Suche zunächst nach verlorenen / falsch platzierten Attachments mittels einer Analyse der Datenbank',
+
 	'DBTools:LostAttachments:Step:AnalyzeResults' => 'Analyseergebnisse:',
 	'DBTools:LostAttachments:Step:AnalyzeResults:None' => 'Toll! Alles scheint am richtigen Ort zu sein.',
 	'DBTools:LostAttachments:Step:AnalyzeResults:Some' => 'Manche Attachments scheinen am falschen Ort zu sein. Werfen Sie einen Blick auf die folgende Liste und wählen Sie diejenigen aus, die Sie gerne verschieben möchten.',
 	'DBTools:LostAttachments:Step:AnalyzeResults:Item:Filename' => 'Dateiname',
 	'DBTools:LostAttachments:Step:AnalyzeResults:Item:CurrentLocation' => 'Derzeitiger Ort',
 	'DBTools:LostAttachments:Step:AnalyzeResults:Item:TargetLocation' => 'Verschieben nach...',
+
 	'DBTools:LostAttachments:Step:RestoreResults' => 'Restore-Ergebnisse:',
 	'DBTools:LostAttachments:Step:RestoreResults:Results' => '%1$d/%2$d Attachments wurden wiederhergestellt.',
+
 	'DBTools:LostAttachments:StoredAsInlineImage' => 'Als Inline-Bild gespeichert',
 	'DBTools:LostAttachments:History' => 'Attachment "%1$s" mit DB-Tools wiederhergestellt'
 ));
--- a/datamodels/2.x/combodo-db-tools/dictionaries/es_cr.dict.combodo-db-tools.php
+++ b/datamodels/2.x/combodo-db-tools/dictionaries/es_cr.dict.combodo-db-tools.php
@@ -42,12 +42,14 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'DBTools:IntegrityCheck' => 'Verificación de integridad',
 	'DBTools:FetchCheck' => 'Verificación de búsqueda (larga)',
 	'DBTools:SelectAnalysisType' => 'Seleccionar tipo de análisis',
+
 	'DBTools:Analyze' => 'Analizar',
 	'DBTools:Details' => 'Mostrar detalles',
 	'DBTools:ShowAll' => 'Mostrar todos los errores',
+
 	'DBTools:Inconsistencies' => 'Inconsistencias de Base de Datos',
 	'DBTools:DetailedErrorTitle' => '%2$s error(es) en clase %1$s: %3$s',
-	'DBTools:DetailedErrorLimit' => 'List limited to %1$s errors~~',
+
 	'DBAnalyzer-Integrity-OrphanRecord' => 'Registro huérfano en `%1$s`, debería tener su contraparte en la tabla `%2$s`',
 	'DBAnalyzer-Integrity-InvalidExtKey' => 'Llave externa inválida %1$s (columna: `%2$s.%3$s`)',
 	'DBAnalyzer-Integrity-MissingExtKey' => 'Llave externa perdida %1$s (columna: `%2$s.%3$s`)',
@@ -70,19 +72,24 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'DBTools:LostAttachments' => 'Adjuntos perdidos',
 	'DBTools:LostAttachments:Disclaimer' => 'Aquí usted puede buscar anexos perdidos o fuera de lugar. Esta NO es una herramienta de recuperación de datos, no obtiene datos borrados.',
+
 	'DBTools:LostAttachments:Button:Analyze' => 'Analizar',
 	'DBTools:LostAttachments:Button:Restore' => 'Restaurar',
 	'DBTools:LostAttachments:Button:Restore:Confirm' => 'Esta acción no se puede deshacer, por favor confirme que quiere restaurar los archivos seleccionados.',
 	'DBTools:LostAttachments:Button:Busy' => 'Por favor espere...',
+
 	'DBTools:LostAttachments:Step:Analyze' => 'Primero, buscar anexos perdidos o fuera de lugar analizando la base de datos.',
+
 	'DBTools:LostAttachments:Step:AnalyzeResults' => 'Analizar resultados:',
 	'DBTools:LostAttachments:Step:AnalyzeResults:None' => '¡Genial! Todo parece estar en el lugar correcto.',
 	'DBTools:LostAttachments:Step:AnalyzeResults:Some' => 'Algunos adjuntos (%1$d) parecen estar desplazados. Mire la siguiente lista y verifique los que quiera mover.',
 	'DBTools:LostAttachments:Step:AnalyzeResults:Item:Filename' => 'Nombre de archivo',
 	'DBTools:LostAttachments:Step:AnalyzeResults:Item:CurrentLocation' => 'Ubicación actual',
 	'DBTools:LostAttachments:Step:AnalyzeResults:Item:TargetLocation' => 'Mover a...',
+
 	'DBTools:LostAttachments:Step:RestoreResults' => 'Resultados de restauración:',
 	'DBTools:LostAttachments:Step:RestoreResults:Results' => '%1$d/%2$d adjuntos fueron restaurados.',
+
 	'DBTools:LostAttachments:StoredAsInlineImage' => 'Almacenado como imagen en línea',
 	'DBTools:LostAttachments:History' => 'Adjunto "%1$s" restaurado con herramientas de base de datos'
 ));
--- a/datamodels/2.x/combodo-db-tools/dictionaries/fr.dict.combodo-db-tools.php
+++ b/datamodels/2.x/combodo-db-tools/dictionaries/fr.dict.combodo-db-tools.php
@@ -37,12 +37,15 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'DBTools:IntegrityCheck' => 'Contrôle d\'intégrité',
 	'DBTools:FetchCheck' => 'Contrôle de récupération (long)',
 	'DBTools:SelectAnalysisType' => 'Type d\'analyse',
+
 	'DBTools:Analyze' => 'Analyser',
 	'DBTools:Details' => 'Afficher détails',
 	'DBTools:ShowAll' => 'Afficher toutes les erreurs',
+
 	'DBTools:Inconsistencies' => 'Incohérences de base de données',
 	'DBTools:DetailedErrorTitle' => '%2$s erreur(s) dans la classe %1$s : %3$s',
 	'DBTools:DetailedErrorLimit' => 'Liste limitée à %1$s erreurs',
+
 	'DBAnalyzer-Integrity-OrphanRecord' => 'Enregistrement orphelin dans `%1$s`, il devrait avoir son équivalent dans la table `%2$s`',
 	'DBAnalyzer-Integrity-InvalidExtKey' => 'Clé externe invalide %1$s (colonne: `%2$s.%3$s`)',
 	'DBAnalyzer-Integrity-MissingExtKey' => 'Clé externe manquante %1$s (colonne: `%2$s.%3$s`)',
@@ -65,19 +68,24 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'DBTools:LostAttachments' => 'Pièces jointes perdues',
 	'DBTools:LostAttachments:Disclaimer' => 'Ici vous pouvez retrouver des pièces jointes perdues ou égarées dans votre base de données. Ceci n\'est PAS un outil de récupération des données, il ne récupère pas les données effacées.',
+
 	'DBTools:LostAttachments:Button:Analyze' => 'Analyser',
 	'DBTools:LostAttachments:Button:Restore' => 'Restaurer',
 	'DBTools:LostAttachments:Button:Restore:Confirm' => 'Cet action ne peut être annuler, veuillez confirmer que vous voulez restaurer les fichiers sélectionnés.',
 	'DBTools:LostAttachments:Button:Busy' => 'Patientez ...',
+
 	'DBTools:LostAttachments:Step:Analyze' => 'Tout d\'abord, scannez la base de données à la recherche de pièces jointes perdues/égarées.',
+
 	'DBTools:LostAttachments:Step:AnalyzeResults' => 'Résultat de l\'analyse :',
 	'DBTools:LostAttachments:Step:AnalyzeResults:None' => 'Parfait ! Il semble que tout soit en ordre.',
 	'DBTools:LostAttachments:Step:AnalyzeResults:Some' => 'Certaines pièces jointes (%1$d) semblent être au mauvais endroit. Examinez la liste suivante et cochez celles que vous souhaitez déplacer.',
 	'DBTools:LostAttachments:Step:AnalyzeResults:Item:Filename' => 'Nom de fichier',
 	'DBTools:LostAttachments:Step:AnalyzeResults:Item:CurrentLocation' => 'Emplacement actuel',
 	'DBTools:LostAttachments:Step:AnalyzeResults:Item:TargetLocation' => 'Déplacer vers ...',
+
 	'DBTools:LostAttachments:Step:RestoreResults' => 'Résultats de la restauration :',
 	'DBTools:LostAttachments:Step:RestoreResults:Results' => '%1$d/%2$d pièces jointes ont été restaurées.',
+
 	'DBTools:LostAttachments:StoredAsInlineImage' => 'Stockée comme "InlineImage"',
 	'DBTools:LostAttachments:History' => 'Pièce jointe "%1$s" restaurée avec l\'outil de BDD'
 ));
--- a/datamodels/2.x/combodo-db-tools/dictionaries/hu.dict.combodo-db-tools.php
+++ b/datamodels/2.x/combodo-db-tools/dictionaries/hu.dict.combodo-db-tools.php
@@ -41,13 +41,15 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'DBTools:IntegrityCheck' => 'Integritás ellenőrzés',
 	'DBTools:FetchCheck' => 'Lehívás ellenőrzés (hosszú)',
 	'DBTools:SelectAnalysisType' => 'Válasszon elemzés típust',
+
 	'DBTools:Analyze' => 'Elemzés',
 	'DBTools:Details' => 'Részletek mutatása',
 	'DBTools:ShowAll' => 'Minden hiba mutatása',
+
 	'DBTools:Inconsistencies' => 'Adatbázis inkonzisztenciák',
 	'DBTools:DetailedErrorTitle' => '%2$s hiba a %1$s osztályban: %3$s',
-	'DBTools:DetailedErrorLimit' => 'List limited to %1$s errors~~',
-	'DBAnalyzer-Integrity-OrphanRecord' => 'Árva rekord a `%1$s` -ban, kell hogy legyen megfelelője a `%2$s` táblázatban',
+
+    'DBAnalyzer-Integrity-OrphanRecord' => 'Árva rekord a `%1$s` -ban, kell hogy legyen megfelelője a `%2$s` táblázatban',
 	'DBAnalyzer-Integrity-InvalidExtKey' => 'Érvénytelen a %1$s  külső kulcs (oszlop: `%2$s.%3$s`)',
 	'DBAnalyzer-Integrity-MissingExtKey' => 'Hiányzik a %1$s külső külcs (oszlop: `%2$s.%3$s`)',
 	'DBAnalyzer-Integrity-InvalidValue' => '%1$s értéke érvénytelen (oszlop: `%2$s.%3$s`)~~',
@@ -69,19 +71,24 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'DBTools:LostAttachments' => 'Elveszett mellékletek',
 	'DBTools:LostAttachments:Disclaimer' => 'Itt kereshet az adatbázisban elveszett vagy elkeveredett mellékletek után. Ez NEM egy adat-visszaállítási eszköz, nem állítja vissza a törölt adatokat.',
+
 	'DBTools:LostAttachments:Button:Analyze' => 'Elemzés',
 	'DBTools:LostAttachments:Button:Restore' => 'Visszaállítás',
 	'DBTools:LostAttachments:Button:Restore:Confirm' => 'Ez a művelet nem vonható vissza, kérjük, erősítse meg, hogy vissza kívánja-e állítani a kiválasztott fájlokat.',
 	'DBTools:LostAttachments:Button:Busy' => 'Kérem várjon...',
+
 	'DBTools:LostAttachments:Step:Analyze' => 'Először az adatbázis elemzésével keresse meg az elveszett/áthelyezett mellékleteket.',
+
 	'DBTools:LostAttachments:Step:AnalyzeResults' => 'Elemzés eredménye:',
 	'DBTools:LostAttachments:Step:AnalyzeResults:None' => 'Nagyszerű! Úgy tűnik, minden a helyén van.',
 	'DBTools:LostAttachments:Step:AnalyzeResults:Some' => 'Úgy tűnik, hogy néhány melléklet (%1$d) rossz helyen van. Nézze meg az alábbi listát, és ellenőrizze azokat, amelyeket szeretne áthelyezni.',
 	'DBTools:LostAttachments:Step:AnalyzeResults:Item:Filename' => 'Fájlnév',
 	'DBTools:LostAttachments:Step:AnalyzeResults:Item:CurrentLocation' => 'Jelenlegi helye',
 	'DBTools:LostAttachments:Step:AnalyzeResults:Item:TargetLocation' => 'Áthelyezés...',
+
 	'DBTools:LostAttachments:Step:RestoreResults' => 'Visszaállítás eredménye:',
 	'DBTools:LostAttachments:Step:RestoreResults:Results' => '%1$d/%2$d melléklet lett visszaállítva.',
+
 	'DBTools:LostAttachments:StoredAsInlineImage' => 'Soron belüli képként tárolva',
 	'DBTools:LostAttachments:History' => 'A "%1$s" melléklet visszaállítva a DB eszközzel'
 ));
--- a/datamodels/2.x/combodo-db-tools/dictionaries/it.dict.combodo-db-tools.php
+++ b/datamodels/2.x/combodo-db-tools/dictionaries/it.dict.combodo-db-tools.php
@@ -41,12 +41,14 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'DBTools:IntegrityCheck' => 'Integrity check~~',
 	'DBTools:FetchCheck' => 'Fetch Check (long)~~',
 	'DBTools:SelectAnalysisType' => 'Select analysis type~~',
+
 	'DBTools:Analyze' => 'Analyze~~',
 	'DBTools:Details' => 'Show Details~~',
 	'DBTools:ShowAll' => 'Show All Errors~~',
+
 	'DBTools:Inconsistencies' => 'Database inconsistencies~~',
 	'DBTools:DetailedErrorTitle' => '%2$s error(s) in class %1$s: %3$s~~',
-	'DBTools:DetailedErrorLimit' => 'List limited to %1$s errors~~',
+
 	'DBAnalyzer-Integrity-OrphanRecord' => 'Orphan record in `%1$s`, it should have its counterpart in table `%2$s`~~',
 	'DBAnalyzer-Integrity-InvalidExtKey' => 'Invalid external key %1$s (column: `%2$s.%3$s`)~~',
 	'DBAnalyzer-Integrity-MissingExtKey' => 'Missing external key %1$s (column: `%2$s.%3$s`)~~',
@@ -69,19 +71,24 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'DBTools:LostAttachments' => 'Lost attachments~~',
 	'DBTools:LostAttachments:Disclaimer' => 'Here you can search your database for lost or misplaced attachments. This is NOT a data recovery tool, is does not retrieve deleted data.~~',
+
 	'DBTools:LostAttachments:Button:Analyze' => 'Analyze~~',
 	'DBTools:LostAttachments:Button:Restore' => 'Restore~~',
 	'DBTools:LostAttachments:Button:Restore:Confirm' => 'This action cannot be undone, please confirm that you want to restore the selected files.~~',
 	'DBTools:LostAttachments:Button:Busy' => 'Please wait...~~',
+
 	'DBTools:LostAttachments:Step:Analyze' => 'First, search for lost/misplaced attachments by analyzing the database.~~',
+
 	'DBTools:LostAttachments:Step:AnalyzeResults' => 'Analyze results:~~',
 	'DBTools:LostAttachments:Step:AnalyzeResults:None' => 'Great! Every thing seems to be at the right place.~~',
 	'DBTools:LostAttachments:Step:AnalyzeResults:Some' => 'Some attachments (%1$d) seem to be misplaced. Take a look at the following list and check the ones you would like to move.~~',
 	'DBTools:LostAttachments:Step:AnalyzeResults:Item:Filename' => 'Filename~~',
 	'DBTools:LostAttachments:Step:AnalyzeResults:Item:CurrentLocation' => 'Current location~~',
 	'DBTools:LostAttachments:Step:AnalyzeResults:Item:TargetLocation' => 'Move to...~~',
+
 	'DBTools:LostAttachments:Step:RestoreResults' => 'Restore results:~~',
 	'DBTools:LostAttachments:Step:RestoreResults:Results' => '%1$d/%2$d attachments were restored.~~',
+
 	'DBTools:LostAttachments:StoredAsInlineImage' => 'Stored as inline image~~',
 	'DBTools:LostAttachments:History' => 'Attachment "%1$s" restored with DB tools~~'
 ));
--- a/datamodels/2.x/combodo-db-tools/dictionaries/ja.dict.combodo-db-tools.php
+++ b/datamodels/2.x/combodo-db-tools/dictionaries/ja.dict.combodo-db-tools.php
@@ -41,12 +41,14 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'DBTools:IntegrityCheck' => 'Integrity check~~',
 	'DBTools:FetchCheck' => 'Fetch Check (long)~~',
 	'DBTools:SelectAnalysisType' => 'Select analysis type~~',
+
 	'DBTools:Analyze' => 'Analyze~~',
 	'DBTools:Details' => 'Show Details~~',
 	'DBTools:ShowAll' => 'Show All Errors~~',
+
 	'DBTools:Inconsistencies' => 'Database inconsistencies~~',
 	'DBTools:DetailedErrorTitle' => '%2$s error(s) in class %1$s: %3$s~~',
-	'DBTools:DetailedErrorLimit' => 'List limited to %1$s errors~~',
+
 	'DBAnalyzer-Integrity-OrphanRecord' => 'Orphan record in `%1$s`, it should have its counterpart in table `%2$s`~~',
 	'DBAnalyzer-Integrity-InvalidExtKey' => 'Invalid external key %1$s (column: `%2$s.%3$s`)~~',
 	'DBAnalyzer-Integrity-MissingExtKey' => 'Missing external key %1$s (column: `%2$s.%3$s`)~~',
@@ -69,19 +71,24 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'DBTools:LostAttachments' => 'Lost attachments~~',
 	'DBTools:LostAttachments:Disclaimer' => 'Here you can search your database for lost or misplaced attachments. This is NOT a data recovery tool, is does not retrieve deleted data.~~',
+
 	'DBTools:LostAttachments:Button:Analyze' => 'Analyze~~',
 	'DBTools:LostAttachments:Button:Restore' => 'Restore~~',
 	'DBTools:LostAttachments:Button:Restore:Confirm' => 'This action cannot be undone, please confirm that you want to restore the selected files.~~',
 	'DBTools:LostAttachments:Button:Busy' => 'Please wait...~~',
+
 	'DBTools:LostAttachments:Step:Analyze' => 'First, search for lost/misplaced attachments by analyzing the database.~~',
+
 	'DBTools:LostAttachments:Step:AnalyzeResults' => 'Analyze results:~~',
 	'DBTools:LostAttachments:Step:AnalyzeResults:None' => 'Great! Every thing seems to be at the right place.~~',
 	'DBTools:LostAttachments:Step:AnalyzeResults:Some' => 'Some attachments (%1$d) seem to be misplaced. Take a look at the following list and check the ones you would like to move.~~',
 	'DBTools:LostAttachments:Step:AnalyzeResults:Item:Filename' => 'Filename~~',
 	'DBTools:LostAttachments:Step:AnalyzeResults:Item:CurrentLocation' => 'Current location~~',
 	'DBTools:LostAttachments:Step:AnalyzeResults:Item:TargetLocation' => 'Move to...~~',
+
 	'DBTools:LostAttachments:Step:RestoreResults' => 'Restore results:~~',
 	'DBTools:LostAttachments:Step:RestoreResults:Results' => '%1$d/%2$d attachments were restored.~~',
+
 	'DBTools:LostAttachments:StoredAsInlineImage' => 'Stored as inline image~~',
 	'DBTools:LostAttachments:History' => 'Attachment "%1$s" restored with DB tools~~'
 ));
--- a/datamodels/2.x/combodo-db-tools/dictionaries/nl.dict.combodo-db-tools.php
+++ b/datamodels/2.x/combodo-db-tools/dictionaries/nl.dict.combodo-db-tools.php
@@ -43,12 +43,14 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'DBTools:IntegrityCheck' => 'Integriteitscheck',
 	'DBTools:FetchCheck' => 'Opvraag-check (fetch) (long)',
 	'DBTools:SelectAnalysisType' => 'Selecteer soort analyse',
+
 	'DBTools:Analyze' => 'Analyseer',
 	'DBTools:Details' => 'Toon details',
 	'DBTools:ShowAll' => 'Toon alle fouten',
+
 	'DBTools:Inconsistencies' => 'Inconsistenties in database',
 	'DBTools:DetailedErrorTitle' => '%2$s fout(en) in klasse %1$s: %3$s',
-	'DBTools:DetailedErrorLimit' => 'List limited to %1$s errors~~',
+
 	'DBAnalyzer-Integrity-OrphanRecord' => 'Wees-record in "%1$s", het zou een verwant record moeten hebben in de tabel "%2$s"',
 	'DBAnalyzer-Integrity-InvalidExtKey' => 'Ongeldige externe sleutel %1$s (kolom: "%2$s.%3$s")',
 	'DBAnalyzer-Integrity-MissingExtKey' => 'Ontbrekende externe sleutel %1$s (kolom: "%2$s.%3$s")',
@@ -71,19 +73,24 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'DBTools:LostAttachments' => 'Verloren bijlages',
 	'DBTools:LostAttachments:Disclaimer' => 'Zoek hier verloren or verkeerd geplaatste bijlages. Dit is geen recovery-tool, het kan geen gewiste data herstellen.',
+
 	'DBTools:LostAttachments:Button:Analyze' => 'Analyseer',
 	'DBTools:LostAttachments:Button:Restore' => 'Herstel',
 	'DBTools:LostAttachments:Button:Restore:Confirm' => 'Deze actie kan niet ongedaan worden gemaakt. Bevestig dat je de bijlages wil herstellen.',
 	'DBTools:LostAttachments:Button:Busy' => 'Even geduld...',
+
 	'DBTools:LostAttachments:Step:Analyze' => 'Zoek eerst verloren/verkeerd geplaatste bijlages door de database te analyseren.',
+
 	'DBTools:LostAttachments:Step:AnalyzeResults' => 'Resultaten analyse:',
 	'DBTools:LostAttachments:Step:AnalyzeResults:None' => 'Perfect, alles lijkt op de juiste plaats te staan!',
 	'DBTools:LostAttachments:Step:AnalyzeResults:Some' => 'Somme bijlages (%1$d) lijken verkeerd te staan. Overloop de lijst en duid aan welke je wil verplaatsen.',
 	'DBTools:LostAttachments:Step:AnalyzeResults:Item:Filename' => 'Bestandsnaam',
 	'DBTools:LostAttachments:Step:AnalyzeResults:Item:CurrentLocation' => 'Huidige locatie',
 	'DBTools:LostAttachments:Step:AnalyzeResults:Item:TargetLocation' => 'Verplaats naar ...',
+
 	'DBTools:LostAttachments:Step:RestoreResults' => 'Resultaten herstel:',
 	'DBTools:LostAttachments:Step:RestoreResults:Results' => '%1$d/%2$d bijlages werden hersteld.',
+
 	'DBTools:LostAttachments:StoredAsInlineImage' => 'Opgeslagen als afbeelding in tekst',
 	'DBTools:LostAttachments:History' => 'Bijlage "%1$s" werd hersteld met de databasetools'
 ));
--- a/datamodels/2.x/combodo-db-tools/dictionaries/pl.dict.combodo-db-tools.php
+++ b/datamodels/2.x/combodo-db-tools/dictionaries/pl.dict.combodo-db-tools.php
@@ -41,12 +41,14 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'DBTools:IntegrityCheck' => 'Sprawdzanie integralności',
 	'DBTools:FetchCheck' => 'Sprawdzenie przestrzeni (długie)',
 	'DBTools:SelectAnalysisType' => 'Wybierz typ analizy',
+
 	'DBTools:Analyze' => 'Analiza',
 	'DBTools:Details' => 'Pokaż szczegóły',
 	'DBTools:ShowAll' => 'Pokaż wszystkie błędy',
+
 	'DBTools:Inconsistencies' => 'Niespójności bazy danych',
 	'DBTools:DetailedErrorTitle' => '%2$s błąd(y) w klasie %1$s: %3$s',
-	'DBTools:DetailedErrorLimit' => 'List limited to %1$s errors~~',
+
 	'DBAnalyzer-Integrity-OrphanRecord' => 'Osierocony rekord w `%1$s`, powinien mieć swój odpowiednik w tabeli `%2$s`',
 	'DBAnalyzer-Integrity-InvalidExtKey' => 'Nieprawidłowy klucz zewnętrzny %1$s (kolumna: `%2$s.%3$s`)',
 	'DBAnalyzer-Integrity-MissingExtKey' => 'Brak klucza zewnętrznego %1$s (kolumna: `%2$s.%3$s`)',
@@ -69,19 +71,24 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'DBTools:LostAttachments' => 'Utracone załączniki',
 	'DBTools:LostAttachments:Disclaimer' => 'Tutaj możesz przeszukiwać bazę danych w poszukiwaniu zagubionych załączników. To NIE jest narzędzie do odzyskiwania danych, nie pobiera usuniętych danych.',
+
 	'DBTools:LostAttachments:Button:Analyze' => 'Analiza',
 	'DBTools:LostAttachments:Button:Restore' => 'Przywróć',
 	'DBTools:LostAttachments:Button:Restore:Confirm' => 'Tej czynności nie można cofnąć, potwierdź, że chcesz przywrócić wybrane pliki.',
 	'DBTools:LostAttachments:Button:Busy' => 'Proszę czekać...',
+
 	'DBTools:LostAttachments:Step:Analyze' => 'Najpierw wyszukaj zagubione załączniki, analizując bazę danych.',
+
 	'DBTools:LostAttachments:Step:AnalyzeResults' => 'Wynik analizy:',
 	'DBTools:LostAttachments:Step:AnalyzeResults:None' => 'Świetnie! Wszystko wydaje się być na właściwym miejscu.',
 	'DBTools:LostAttachments:Step:AnalyzeResults:Some' => 'Niektóre załączniki (%1$d) wydają się być zagubione. Spójrz na poniższą listę i zaznacz te, które chcesz przenieść.',
 	'DBTools:LostAttachments:Step:AnalyzeResults:Item:Filename' => 'Nazwa pliku',
 	'DBTools:LostAttachments:Step:AnalyzeResults:Item:CurrentLocation' => 'Aktualna lokalizacja',
 	'DBTools:LostAttachments:Step:AnalyzeResults:Item:TargetLocation' => 'Przenieś do...',
+
 	'DBTools:LostAttachments:Step:RestoreResults' => 'Wyniki przywracania:',
 	'DBTools:LostAttachments:Step:RestoreResults:Results' => '%1$d/%2$d załączniki zostały przywrócone.',
+
 	'DBTools:LostAttachments:StoredAsInlineImage' => 'Zapisane jako obraz w treści',
 	'DBTools:LostAttachments:History' => 'Załącznik "%1$s" przywrócony za pomocą narzędzi DB'
 ));
--- a/datamodels/2.x/combodo-db-tools/dictionaries/pt_br.dict.combodo-db-tools.php
+++ b/datamodels/2.x/combodo-db-tools/dictionaries/pt_br.dict.combodo-db-tools.php
@@ -41,12 +41,14 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'DBTools:IntegrityCheck' => 'Verificação de integridade',
 	'DBTools:FetchCheck' => 'Verificação de consulta (longa)',
 	'DBTools:SelectAnalysisType' => 'Selecione o tipo de análise',
+
 	'DBTools:Analyze' => 'Analisar',
 	'DBTools:Details' => 'Exibir detalhes',
 	'DBTools:ShowAll' => 'Exibir todos os erros',
+
 	'DBTools:Inconsistencies' => 'Inconsistências no banco de dados',
 	'DBTools:DetailedErrorTitle' => '%2$s erro(s) na classe %1$s: %3$s',
-	'DBTools:DetailedErrorLimit' => 'List limited to %1$s errors~~',
+
 	'DBAnalyzer-Integrity-OrphanRecord' => 'Item orfão em `%1$s`, ele deveria ter seu registro irmão na tabela `%2$s`',
 	'DBAnalyzer-Integrity-InvalidExtKey' => 'Chave externa inválida %1$s (coluna: `%2$s.%3$s`)',
 	'DBAnalyzer-Integrity-MissingExtKey' => 'Chave externa ausente %1$s (coluna: `%2$s.%3$s`)',
@@ -69,19 +71,24 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'DBTools:LostAttachments' => 'Anexos perdidos',
 	'DBTools:LostAttachments:Disclaimer' => 'Aqui você procurará no seu banco de dados por anexos perdidos. Isto NÃO é uma ferramenta de recuperação de dados, pois não busca dados apagados',
+
 	'DBTools:LostAttachments:Button:Analyze' => 'Analisar',
 	'DBTools:LostAttachments:Button:Restore' => 'Recuperar',
 	'DBTools:LostAttachments:Button:Restore:Confirm' => 'Esta ação não pode ser desfeita, você confirma que quer recuperar os arquivos selecionados?',
 	'DBTools:LostAttachments:Button:Busy' => 'Aguarde...',
+
 	'DBTools:LostAttachments:Step:Analyze' => 'Primeiro, vamos procurar por anexos perdidos através da análise do banco de dados',
+
 	'DBTools:LostAttachments:Step:AnalyzeResults' => 'Resultado da análise:',
 	'DBTools:LostAttachments:Step:AnalyzeResults:None' => 'Ótimo! Tudo parece estar nos seus devidos lugares (Nenhum anexo perdido foi encontrado)',
 	'DBTools:LostAttachments:Step:AnalyzeResults:Some' => 'Alguns anexos (%1$d) parecem estar perdidos. Verifique a lista abaixo e escolha os que você deseja mover',
 	'DBTools:LostAttachments:Step:AnalyzeResults:Item:Filename' => 'Nome do arquivo',
 	'DBTools:LostAttachments:Step:AnalyzeResults:Item:CurrentLocation' => 'Local atual',
 	'DBTools:LostAttachments:Step:AnalyzeResults:Item:TargetLocation' => 'Mover para',
+
 	'DBTools:LostAttachments:Step:RestoreResults' => 'Resultado da restauração:',
 	'DBTools:LostAttachments:Step:RestoreResults:Results' => '%1$d/%2$d anexo(s) recuperado(s)',
+
 	'DBTools:LostAttachments:StoredAsInlineImage' => 'Armazenar como imagem embutida',
 	'DBTools:LostAttachments:History' => 'Anexo "%1$s" recuperado com as Ferramentas de Banco de Dados'
 ));
--- a/datamodels/2.x/combodo-db-tools/dictionaries/ru.dict.combodo-db-tools.php
+++ b/datamodels/2.x/combodo-db-tools/dictionaries/ru.dict.combodo-db-tools.php
@@ -28,12 +28,14 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'DBTools:IntegrityCheck' => 'Проверка целостности',
 	'DBTools:FetchCheck' => 'Fetch Check (long)~~',
 	'DBTools:SelectAnalysisType' => 'Select analysis type~~',
+
 	'DBTools:Analyze' => 'Анализировать',
 	'DBTools:Details' => 'Показать подробности',
 	'DBTools:ShowAll' => 'Показать все ошибки',
+
 	'DBTools:Inconsistencies' => 'Несоответствия базы данных',
 	'DBTools:DetailedErrorTitle' => '%2$s error(s) in class %1$s: %3$s~~',
-	'DBTools:DetailedErrorLimit' => 'List limited to %1$s errors~~',
+
 	'DBAnalyzer-Integrity-OrphanRecord' => 'Сиротская запись в `%1$s`, она должна иметь свой аналог в таблице `%2$s`',
 	'DBAnalyzer-Integrity-InvalidExtKey' => 'Недопустимый внешний ключ %1$s (столбец: `%2$s.%3$s`)',
 	'DBAnalyzer-Integrity-MissingExtKey' => 'Отсутствует внешний ключ %1$s (столбец: `%2$s.%3$s`)',
@@ -56,19 +58,24 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'DBTools:LostAttachments' => 'Потерянные вложения',
 	'DBTools:LostAttachments:Disclaimer' => 'Здесь вы можете найти потерянные или ошибочно перемещённые вложения в вашей базе данных. Это не инструмент восстановления данных, он не восстанавливает удаленные данные.',
+
 	'DBTools:LostAttachments:Button:Analyze' => 'Анализировать',
 	'DBTools:LostAttachments:Button:Restore' => 'Восстановить',
 	'DBTools:LostAttachments:Button:Restore:Confirm' => 'Это действие не может быть отменено. Пожалуйста, подтвердите, что вы хотите восстановить выбранные файлы.',
 	'DBTools:LostAttachments:Button:Busy' => 'Пожалуйста, подождите...',
+
 	'DBTools:LostAttachments:Step:Analyze' => 'Для начала просканируйте базу данных на наличие потерянных вложений.',
+
 	'DBTools:LostAttachments:Step:AnalyzeResults' => 'Результат анализа:',
 	'DBTools:LostAttachments:Step:AnalyzeResults:None' => 'Отлично! Похоже, все в порядке.',
 	'DBTools:LostAttachments:Step:AnalyzeResults:Some' => 'Некоторые вложения (%1$d), похоже, находятся не в том месте. Просмотрите следующий список и отметьте те, которые вы хотите переместить.',
 	'DBTools:LostAttachments:Step:AnalyzeResults:Item:Filename' => 'Файл',
 	'DBTools:LostAttachments:Step:AnalyzeResults:Item:CurrentLocation' => 'Текущее местоположение',
 	'DBTools:LostAttachments:Step:AnalyzeResults:Item:TargetLocation' => 'Переместить в...',
+
 	'DBTools:LostAttachments:Step:RestoreResults' => 'Результат восстановления:',
 	'DBTools:LostAttachments:Step:RestoreResults:Results' => '%1$d/%2$d вложения были восстановлены.',
+
 	'DBTools:LostAttachments:StoredAsInlineImage' => 'Хранится в качестве "InlineImage"',
 	'DBTools:LostAttachments:History' => 'Вложение "%1$s" восстановлено с помощью инструментов обслуживания БД'
 ));
--- a/datamodels/2.x/combodo-db-tools/dictionaries/sk.dict.combodo-db-tools.php
+++ b/datamodels/2.x/combodo-db-tools/dictionaries/sk.dict.combodo-db-tools.php
@@ -41,12 +41,14 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'DBTools:IntegrityCheck' => 'Integrity check~~',
 	'DBTools:FetchCheck' => 'Fetch Check (long)~~',
 	'DBTools:SelectAnalysisType' => 'Select analysis type~~',
+
 	'DBTools:Analyze' => 'Analyze~~',
 	'DBTools:Details' => 'Show Details~~',
 	'DBTools:ShowAll' => 'Show All Errors~~',
+
 	'DBTools:Inconsistencies' => 'Database inconsistencies~~',
 	'DBTools:DetailedErrorTitle' => '%2$s error(s) in class %1$s: %3$s~~',
-	'DBTools:DetailedErrorLimit' => 'List limited to %1$s errors~~',
+
 	'DBAnalyzer-Integrity-OrphanRecord' => 'Orphan record in `%1$s`, it should have its counterpart in table `%2$s`~~',
 	'DBAnalyzer-Integrity-InvalidExtKey' => 'Invalid external key %1$s (column: `%2$s.%3$s`)~~',
 	'DBAnalyzer-Integrity-MissingExtKey' => 'Missing external key %1$s (column: `%2$s.%3$s`)~~',
@@ -69,19 +71,24 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'DBTools:LostAttachments' => 'Lost attachments~~',
 	'DBTools:LostAttachments:Disclaimer' => 'Here you can search your database for lost or misplaced attachments. This is NOT a data recovery tool, is does not retrieve deleted data.~~',
+
 	'DBTools:LostAttachments:Button:Analyze' => 'Analyze~~',
 	'DBTools:LostAttachments:Button:Restore' => 'Restore~~',
 	'DBTools:LostAttachments:Button:Restore:Confirm' => 'This action cannot be undone, please confirm that you want to restore the selected files.~~',
 	'DBTools:LostAttachments:Button:Busy' => 'Please wait...~~',
+
 	'DBTools:LostAttachments:Step:Analyze' => 'First, search for lost/misplaced attachments by analyzing the database.~~',
+
 	'DBTools:LostAttachments:Step:AnalyzeResults' => 'Analyze results:~~',
 	'DBTools:LostAttachments:Step:AnalyzeResults:None' => 'Great! Every thing seems to be at the right place.~~',
 	'DBTools:LostAttachments:Step:AnalyzeResults:Some' => 'Some attachments (%1$d) seem to be misplaced. Take a look at the following list and check the ones you would like to move.~~',
 	'DBTools:LostAttachments:Step:AnalyzeResults:Item:Filename' => 'Filename~~',
 	'DBTools:LostAttachments:Step:AnalyzeResults:Item:CurrentLocation' => 'Current location~~',
 	'DBTools:LostAttachments:Step:AnalyzeResults:Item:TargetLocation' => 'Move to...~~',
+
 	'DBTools:LostAttachments:Step:RestoreResults' => 'Restore results:~~',
 	'DBTools:LostAttachments:Step:RestoreResults:Results' => '%1$d/%2$d attachments were restored.~~',
+
 	'DBTools:LostAttachments:StoredAsInlineImage' => 'Stored as inline image~~',
 	'DBTools:LostAttachments:History' => 'Attachment "%1$s" restored with DB tools~~'
 ));
--- a/datamodels/2.x/combodo-db-tools/dictionaries/tr.dict.combodo-db-tools.php
+++ b/datamodels/2.x/combodo-db-tools/dictionaries/tr.dict.combodo-db-tools.php
@@ -41,12 +41,14 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'DBTools:IntegrityCheck' => 'Integrity check~~',
 	'DBTools:FetchCheck' => 'Fetch Check (long)~~',
 	'DBTools:SelectAnalysisType' => 'Select analysis type~~',
+
 	'DBTools:Analyze' => 'Analyze~~',
 	'DBTools:Details' => 'Show Details~~',
 	'DBTools:ShowAll' => 'Show All Errors~~',
+
 	'DBTools:Inconsistencies' => 'Database inconsistencies~~',
 	'DBTools:DetailedErrorTitle' => '%2$s error(s) in class %1$s: %3$s~~',
-	'DBTools:DetailedErrorLimit' => 'List limited to %1$s errors~~',
+
 	'DBAnalyzer-Integrity-OrphanRecord' => 'Orphan record in `%1$s`, it should have its counterpart in table `%2$s`~~',
 	'DBAnalyzer-Integrity-InvalidExtKey' => 'Invalid external key %1$s (column: `%2$s.%3$s`)~~',
 	'DBAnalyzer-Integrity-MissingExtKey' => 'Missing external key %1$s (column: `%2$s.%3$s`)~~',
@@ -69,19 +71,24 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'DBTools:LostAttachments' => 'Lost attachments~~',
 	'DBTools:LostAttachments:Disclaimer' => 'Here you can search your database for lost or misplaced attachments. This is NOT a data recovery tool, is does not retrieve deleted data.~~',
+
 	'DBTools:LostAttachments:Button:Analyze' => 'Analyze~~',
 	'DBTools:LostAttachments:Button:Restore' => 'Restore~~',
 	'DBTools:LostAttachments:Button:Restore:Confirm' => 'This action cannot be undone, please confirm that you want to restore the selected files.~~',
 	'DBTools:LostAttachments:Button:Busy' => 'Please wait...~~',
+
 	'DBTools:LostAttachments:Step:Analyze' => 'First, search for lost/misplaced attachments by analyzing the database.~~',
+
 	'DBTools:LostAttachments:Step:AnalyzeResults' => 'Analyze results:~~',
 	'DBTools:LostAttachments:Step:AnalyzeResults:None' => 'Great! Every thing seems to be at the right place.~~',
 	'DBTools:LostAttachments:Step:AnalyzeResults:Some' => 'Some attachments (%1$d) seem to be misplaced. Take a look at the following list and check the ones you would like to move.~~',
 	'DBTools:LostAttachments:Step:AnalyzeResults:Item:Filename' => 'Filename~~',
 	'DBTools:LostAttachments:Step:AnalyzeResults:Item:CurrentLocation' => 'Current location~~',
 	'DBTools:LostAttachments:Step:AnalyzeResults:Item:TargetLocation' => 'Move to...~~',
+
 	'DBTools:LostAttachments:Step:RestoreResults' => 'Restore results:~~',
 	'DBTools:LostAttachments:Step:RestoreResults:Results' => '%1$d/%2$d attachments were restored.~~',
+
 	'DBTools:LostAttachments:StoredAsInlineImage' => 'Stored as inline image~~',
 	'DBTools:LostAttachments:History' => 'Attachment "%1$s" restored with DB tools~~'
 ));
--- a/datamodels/2.x/combodo-db-tools/dictionaries/zh_cn.dict.combodo-db-tools.php
+++ b/datamodels/2.x/combodo-db-tools/dictionaries/zh_cn.dict.combodo-db-tools.php
@@ -41,12 +41,14 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'DBTools:IntegrityCheck' => '完整性检查',
 	'DBTools:FetchCheck' => '提取检查(耗时长)',
 	'DBTools:SelectAnalysisType' => '请选择分析类型',
+
 	'DBTools:Analyze' => '分析',
 	'DBTools:Details' => '显示详情',
 	'DBTools:ShowAll' => '显示所有错误',
+
 	'DBTools:Inconsistencies' => '数据库不一致',
 	'DBTools:DetailedErrorTitle' => '%2$s 个错误在类 %1$s: %3$s',
-	'DBTools:DetailedErrorLimit' => 'List limited to %1$s errors~~',
+
 	'DBAnalyzer-Integrity-OrphanRecord' => 'Orphan record in `%1$s`, it should have its counterpart in table `%2$s`~~',
 	'DBAnalyzer-Integrity-InvalidExtKey' => '无效的外键 %1$s (列: `%2$s.%3$s`)',
 	'DBAnalyzer-Integrity-MissingExtKey' => '外键丢失 %1$s (列: `%2$s.%3$s`)',
@@ -67,21 +69,26 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(

 // Lost attachments
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'DBTools:LostAttachments' => '附件缺失',
+	'DBTools:LostAttachments' => '缺失附件',
 	'DBTools:LostAttachments:Disclaimer' => '可以在此搜索数据库中丢失或错放的附件.这不是数据恢复工具,其无法恢复已删除的数据.',
+
 	'DBTools:LostAttachments:Button:Analyze' => '分析',
 	'DBTools:LostAttachments:Button:Restore' => '还原',
 	'DBTools:LostAttachments:Button:Restore:Confirm' => '此操作无法回退, 请确认是否继续还原.',
 	'DBTools:LostAttachments:Button:Busy' => '请稍后...',
+
 	'DBTools:LostAttachments:Step:Analyze' => '首先, 通过分析数据库来搜索丢失或误挪动的附件.',
+
 	'DBTools:LostAttachments:Step:AnalyzeResults' => '分析结果:',
 	'DBTools:LostAttachments:Step:AnalyzeResults:None' => '非常好! 所有附件都是正常的.',
 	'DBTools:LostAttachments:Step:AnalyzeResults:Some' => '某些附件 (%1$d) 看起来放错了位置. 请检查下面的列表并选择要挪动的文件.',
 	'DBTools:LostAttachments:Step:AnalyzeResults:Item:Filename' => '文件名',
 	'DBTools:LostAttachments:Step:AnalyzeResults:Item:CurrentLocation' => '当前位置',
 	'DBTools:LostAttachments:Step:AnalyzeResults:Item:TargetLocation' => '移动到...',
+
 	'DBTools:LostAttachments:Step:RestoreResults' => '还原结果:',
 	'DBTools:LostAttachments:Step:RestoreResults:Results' => '%1$d/%2$d 的附件被还原.',
+
 	'DBTools:LostAttachments:StoredAsInlineImage' => '存储为内嵌图像',
 	'DBTools:LostAttachments:History' => '附件 "%1$s" 已使用数据库工具还原'
 ));
--- a/datamodels/2.x/itop-attachments/dictionaries/cs.dict.itop-attachments.php
+++ b/datamodels/2.x/itop-attachments/dictionaries/cs.dict.itop-attachments.php
@@ -75,7 +75,6 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Attachments:File:Uploader' => 'Uploaded by~~',
 	'Attachments:File:Size' => 'Size~~',
 	'Attachments:File:MimeType' => 'Type~~',
-	'Attachments:File:DownloadsCount' => 'Downloads~~',
 ));
 //
 // Class: Attachment
@@ -89,12 +88,3 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:Attachment/Attribute:contact_id' => 'Contact id~~',
 	'Class:Attachment/Attribute:contact_id+' => '~~',
 ));
-
-//
-// Class: TriggerOnAttachmentDownload
-//
-
-Dict::Add('CS CZ', 'Czech', 'Čeština', array(
-	'Class:TriggerOnAttachmentDownload' => 'Trigger (on object\'s attachment download)~~',
-	'Class:TriggerOnAttachmentDownload+' => 'Trigger on object\'s attachment download of [a child class of] the given class~~',
-));
--- a/datamodels/2.x/itop-attachments/dictionaries/da.dict.itop-attachments.php
+++ b/datamodels/2.x/itop-attachments/dictionaries/da.dict.itop-attachments.php
@@ -72,7 +72,6 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Attachments:File:Uploader' => 'Uploaded by~~',
 	'Attachments:File:Size' => 'Size~~',
 	'Attachments:File:MimeType' => 'Type~~',
-	'Attachments:File:DownloadsCount' => 'Downloads~~',
 ));
 //
 // Class: Attachment
@@ -86,12 +85,3 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:Attachment/Attribute:contact_id' => 'Contact id~~',
 	'Class:Attachment/Attribute:contact_id+' => '~~',
 ));
-
-//
-// Class: TriggerOnAttachmentDownload
-//
-
-Dict::Add('DA DA', 'Danish', 'Dansk', array(
-	'Class:TriggerOnAttachmentDownload' => 'Trigger (on object\'s attachment download)~~',
-	'Class:TriggerOnAttachmentDownload+' => 'Trigger on object\'s attachment download of [a child class of] the given class~~',
-));
--- a/datamodels/2.x/itop-attachments/dictionaries/de.dict.itop-attachments.php
+++ b/datamodels/2.x/itop-attachments/dictionaries/de.dict.itop-attachments.php
@@ -74,7 +74,6 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Attachments:File:Uploader' => 'hochgeladen von',
 	'Attachments:File:Size' => 'Größe',
 	'Attachments:File:MimeType' => 'Typ',
-	'Attachments:File:DownloadsCount' => 'Downloads~~',
 ));
 //
 // Class: Attachment
@@ -88,12 +87,3 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:Attachment/Attribute:contact_id' => 'Kontakt ID',
 	'Class:Attachment/Attribute:contact_id+' => '',
 ));
-
-//
-// Class: TriggerOnAttachmentDownload
-//
-
-Dict::Add('DE DE', 'German', 'Deutsch', array(
-	'Class:TriggerOnAttachmentDownload' => 'Trigger (on object\'s attachment download)~~',
-	'Class:TriggerOnAttachmentDownload+' => 'Trigger on object\'s attachment download of [a child class of] the given class~~',
-));
--- a/datamodels/2.x/itop-attachments/dictionaries/es_cr.dict.itop-attachments.php
+++ b/datamodels/2.x/itop-attachments/dictionaries/es_cr.dict.itop-attachments.php
@@ -15,7 +15,7 @@
 //
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
-/**
+ /**
 * Spanish Localized data
 *
 * @copyright   Copyright (C) 2010-2023 Combodo SARL
@@ -74,7 +74,6 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Attachments:File:Uploader' => 'Cargado por',
 	'Attachments:File:Size' => 'Tamaño',
 	'Attachments:File:MimeType' => 'Tipo',
-	'Attachments:File:DownloadsCount' => 'Downloads~~',
 ));
 //
 // Class: Attachment
@@ -88,12 +87,3 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Attachment/Attribute:contact_id' => 'Id del Contacto',
 	'Class:Attachment/Attribute:contact_id+' => '',
 ));
-
-//
-// Class: TriggerOnAttachmentDownload
-//
-
-Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
-	'Class:TriggerOnAttachmentDownload' => 'Trigger (on object\'s attachment download)~~',
-	'Class:TriggerOnAttachmentDownload+' => 'Trigger on object\'s attachment download of [a child class of] the given class~~',
-));
--- a/datamodels/2.x/itop-attachments/dictionaries/hu.dict.itop-attachments.php
+++ b/datamodels/2.x/itop-attachments/dictionaries/hu.dict.itop-attachments.php
@@ -35,7 +35,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Attachments:NoAttachment' => 'Nincs melléklet. ',
 	'Attachments:PreviewNotAvailable' => 'Az előnézet nem érhető el ilyen típusú melléklethez',
 	'Attachments:Error:FileTooLarge' => 'Túl nagy a fájl a feltöltéshez. %1$s',
-	'Attachments:Error:UploadedFileEmpty' => 'A kapott fájl üres, ezért nem csatolható. Vagy egy üres fájlt húzott be, vagy kérdezze meg a rendszergazdát, hátha az iTop szerver lemeze telt meg.',
+    'Attachments:Error:UploadedFileEmpty' => 'A kapott fájl üres, ezért nem csatolható. Vagy egy üres fájlt húzott be, vagy kérdezze meg a rendszergazdát, hátha az iTop szerver lemeze telt meg.',
 	'Attachments:Render:Icons' => 'Mutassa ikonként',
 	'Attachments:Render:Table' => 'Mutassa listaként',
 	'UI:Attachments:DropYourFileHint' => 'Húzza a fájlokat erre a területre',
@@ -56,9 +56,9 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:Attachment/Attribute:item_class+' => '~~',
 	'Class:Attachment/Attribute:item_id' => 'Elem',
 	'Class:Attachment/Attribute:item_id+' => '~~',
-	'Class:Attachment/Attribute:item_org_id' => 'Elem szervezeti egység',
+    'Class:Attachment/Attribute:item_org_id' => 'Elem szervezeti egység',
 	'Class:Attachment/Attribute:item_org_id+' => '~~',
-	'Class:Attachment/Attribute:contents' => 'Tartalom',
+    'Class:Attachment/Attribute:contents' => 'Tartalom',
 	'Class:Attachment/Attribute:contents+' => '~~',
 ));

@@ -66,30 +66,20 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Attachments:File:Thumbnail' => 'Ikon',
 	'Attachments:File:Name' => 'Fájlnév',
-	'Attachments:File:Date' => 'Feltöltés dátuma',
+    'Attachments:File:Date' => 'Feltöltés dátuma',
 	'Attachments:File:Uploader' => 'Feltöltötte ',
 	'Attachments:File:Size' => 'Méret',
 	'Attachments:File:MimeType' => 'Típus',
-	'Attachments:File:DownloadsCount' => 'Downloads~~',
 ));
 //
 // Class: Attachment
 //

 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-	'Class:Attachment/Attribute:creation_date' => 'Létrehozás dátuma',
+    'Class:Attachment/Attribute:creation_date' => 'Létrehozás dátuma',
 	'Class:Attachment/Attribute:creation_date+' => '~~',
-	'Class:Attachment/Attribute:user_id' => 'Felhasználó',
+    'Class:Attachment/Attribute:user_id' => 'Felhasználó',
 	'Class:Attachment/Attribute:user_id+' => '~~',
-	'Class:Attachment/Attribute:contact_id' => 'Kapcsolattartó',
+    'Class:Attachment/Attribute:contact_id' => 'Kapcsolattartó',
 	'Class:Attachment/Attribute:contact_id+' => '~~',
 ));
-
-//
-// Class: TriggerOnAttachmentDownload
-//
-
-Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-	'Class:TriggerOnAttachmentDownload' => 'Trigger (on object\'s attachment download)~~',
-	'Class:TriggerOnAttachmentDownload+' => 'Trigger on object\'s attachment download of [a child class of] the given class~~',
-));
--- a/datamodels/2.x/itop-attachments/dictionaries/it.dict.itop-attachments.php
+++ b/datamodels/2.x/itop-attachments/dictionaries/it.dict.itop-attachments.php
@@ -72,7 +72,6 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Attachments:File:Uploader' => 'Uploaded by~~',
 	'Attachments:File:Size' => 'Size~~',
 	'Attachments:File:MimeType' => 'Type~~',
-	'Attachments:File:DownloadsCount' => 'Downloads~~',
 ));
 //
 // Class: Attachment
@@ -86,12 +85,3 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:Attachment/Attribute:contact_id' => 'Contact id~~',
 	'Class:Attachment/Attribute:contact_id+' => '~~',
 ));
-
-//
-// Class: TriggerOnAttachmentDownload
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:TriggerOnAttachmentDownload' => 'Trigger (on object\'s attachment download)~~',
-	'Class:TriggerOnAttachmentDownload+' => 'Trigger on object\'s attachment download of [a child class of] the given class~~',
-));
--- a/datamodels/2.x/itop-attachments/dictionaries/ja.dict.itop-attachments.php
+++ b/datamodels/2.x/itop-attachments/dictionaries/ja.dict.itop-attachments.php
@@ -71,7 +71,6 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Attachments:File:Uploader' => 'Uploaded by~~',
 	'Attachments:File:Size' => 'Size~~',
 	'Attachments:File:MimeType' => 'Type~~',
-	'Attachments:File:DownloadsCount' => 'Downloads~~',
 ));
 //
 // Class: Attachment
@@ -85,12 +84,3 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:Attachment/Attribute:contact_id' => 'Contact id~~',
 	'Class:Attachment/Attribute:contact_id+' => '~~',
 ));
-
-//
-// Class: TriggerOnAttachmentDownload
-//
-
-Dict::Add('JA JP', 'Japanese', '日本語', array(
-	'Class:TriggerOnAttachmentDownload' => 'Trigger (on object\'s attachment download)~~',
-	'Class:TriggerOnAttachmentDownload+' => 'Trigger on object\'s attachment download of [a child class of] the given class~~',
-));
--- a/datamodels/2.x/itop-attachments/dictionaries/nl.dict.itop-attachments.php
+++ b/datamodels/2.x/itop-attachments/dictionaries/nl.dict.itop-attachments.php
@@ -77,7 +77,6 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Attachments:File:Uploader' => 'Geüpload door',
 	'Attachments:File:Size' => 'Grootte',
 	'Attachments:File:MimeType' => 'Type',
-	'Attachments:File:DownloadsCount' => 'Downloads~~',
 ));
 //
 // Class: Attachment
@@ -91,12 +90,3 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:Attachment/Attribute:contact_id' => 'ID Contact',
 	'Class:Attachment/Attribute:contact_id+' => '',
 ));
-
-//
-// Class: TriggerOnAttachmentDownload
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:TriggerOnAttachmentDownload' => 'Trigger (on object\'s attachment download)~~',
-	'Class:TriggerOnAttachmentDownload+' => 'Trigger on object\'s attachment download of [a child class of] the given class~~',
-));
--- a/datamodels/2.x/itop-attachments/dictionaries/pl.dict.itop-attachments.php
+++ b/datamodels/2.x/itop-attachments/dictionaries/pl.dict.itop-attachments.php
@@ -16,6 +16,7 @@
 *
 * You should have received a copy of the GNU Affero General Public License
 */
+
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Attachments:TabTitle_Count' => 'Załączniki (%1$d)',
 	'Attachments:EmptyTabTitle' => 'Załączniki',
@@ -68,7 +69,6 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Attachments:File:Uploader' => 'Przesłany przez',
 	'Attachments:File:Size' => 'Rozmiar',
 	'Attachments:File:MimeType' => 'Typ',
-	'Attachments:File:DownloadsCount' => 'Downloads~~',
 ));
 //
 // Class: Attachment
@@ -82,12 +82,3 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:Attachment/Attribute:contact_id' => 'Id kontaktu',
 	'Class:Attachment/Attribute:contact_id+' => '',
 ));
-
-//
-// Class: TriggerOnAttachmentDownload
-//
-
-Dict::Add('PL PL', 'Polish', 'Polski', array(
-	'Class:TriggerOnAttachmentDownload' => 'Trigger (on object\'s attachment download)~~',
-	'Class:TriggerOnAttachmentDownload+' => 'Trigger on object\'s attachment download of [a child class of] the given class~~',
-));
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
acognet	2896357078	N°1318 - multiple choice in a template - WIP	2023-06-23 08:51:51 +02:00
acognet	413a798510	N°1318 - multiple choice in a template - first step	2023-06-05 23:26:58 +02:00
acognet	6abf65bfb7	N°1318 - multiple choice in a template - first step	2023-06-02 09:45:31 +02:00