diff --git a/.make/license/updateLicenses.php b/.make/license/updateLicenses.php
index 7531aa003b..a4aa0be038 100644
--- a/.make/license/updateLicenses.php
+++ b/.make/license/updateLicenses.php
@@ -19,17 +19,24 @@
  * 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";
 
-function get_scope($product_node)
-{
+$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) {
 	$scope = $product_node->getAttribute("scope");
 
-	if ($scope === "")
-	{   //put iTop first
+	if ($scope === "") {   //put iTop first
 		return "aaaaaaaaa";
 	}
+
 	return $scope;
 }
 
diff --git a/addons/userrights/userrightsprofile.class.inc.php b/addons/userrights/userrightsprofile.class.inc.php
index 610cb91837..6370e5fe3c 100644
--- a/addons/userrights/userrightsprofile.class.inc.php
+++ b/addons/userrights/userrightsprofile.class.inc.php
@@ -228,6 +228,7 @@ class URP_UserProfile extends UserRightsBaseClassGUI
 			"db_table"            => "priv_urp_userprofile",
 			"db_key_field"        => "id",
 			"db_finalclass_field" => "",
+			"is_link" 			  => true, /** @since 3.1.0 N°6482 */
 			'uniqueness_rules'    => array(
 				'no_duplicate' => array(
 					'attributes'  => array(
diff --git a/addons/userrights/userrightsprofile.db.class.inc.php b/addons/userrights/userrightsprofile.db.class.inc.php
index 8b02989f43..12a8874c94 100644
--- a/addons/userrights/userrightsprofile.db.class.inc.php
+++ b/addons/userrights/userrightsprofile.db.class.inc.php
@@ -334,6 +334,7 @@ class URP_UserProfile extends UserRightsBaseClassGUI
 			"db_table"            => "priv_urp_userprofile",
 			"db_key_field"        => "id",
 			"db_finalclass_field" => "",
+			"is_link" 			  => true, /** @since 3.1.0 N°6482 */
 		);
 		MetaModel::Init_Params($aParams);
 		//MetaModel::Init_InheritAttributes();
diff --git a/addons/userrights/userrightsprojection.class.inc.php b/addons/userrights/userrightsprojection.class.inc.php
index 7a9642218a..50413fabc5 100644
--- a/addons/userrights/userrightsprojection.class.inc.php
+++ b/addons/userrights/userrightsprojection.class.inc.php
@@ -277,6 +277,7 @@ class URP_UserProfile extends UserRightsBaseClass
 			"db_table"            => "priv_urp_userprofile",
 			"db_key_field"        => "id",
 			"db_finalclass_field" => "",
+			"is_link" 			  => true, /** @since 3.1.0 N°6482 */
 		);
 		MetaModel::Init_Params($aParams);
 		//MetaModel::Init_InheritAttributes();
diff --git a/application/applicationcontext.class.inc.php b/application/applicationcontext.class.inc.php
index b22654dad5..f8b6983431 100644
--- a/application/applicationcontext.class.inc.php
+++ b/application/applicationcontext.class.inc.php
@@ -238,7 +238,7 @@ class ApplicationContext
 	{
 		$aContextInputBlocks = [];
 		foreach ($this->aValues as $sName => $sValue) {
-			$aContextInputBlocks[] = InputUIBlockFactory::MakeForHidden("c[$sName]", utils::EscapeHtml($sValue));
+			$aContextInputBlocks[] = InputUIBlockFactory::MakeForHidden("c[$sName]", $sValue);
 		}
 		return $aContextInputBlocks;
 	}
diff --git a/application/audit.domain.class.inc.php b/application/audit.domain.class.inc.php
index 2980292e92..a54d457d4c 100644
--- a/application/audit.domain.class.inc.php
+++ b/application/audit.domain.class.inc.php
@@ -86,15 +86,26 @@ class lnkAuditCategoryToAuditDomain extends cmdbAbstractObject
 	{
 		$aParams = array
 		(
-			"category" => "application, grant_by_profile",
-			"key_type" => "autoincrement",
-			"name_attcode" => "",
-			"state_attcode" => "",
-			"reconc_keys" => array('category_id', 'domain_id'),
-			"db_table" => "priv_link_audit_category_domain",
-			"db_key_field" => "id",
+			"category"            => "application, grant_by_profile",
+			"key_type"            => "autoincrement",
+			"name_attcode"        => "",
+			"state_attcode"       => "",
+			"reconc_keys"         => array('category_id', 'domain_id'),
+			"db_table"            => "priv_link_audit_category_domain",
+			"db_key_field"        => "id",
 			"db_finalclass_field" => "",
-			"is_link" => true,
+			"is_link"             => true,
+			'uniqueness_rules'    => array(
+				'no_duplicate' => array(
+					'attributes'  => array(
+						0 => 'category_id',
+						1 => 'domain_id',
+					),
+					'filter'      => '',
+					'disabled'    => false,
+					'is_blocking' => true,
+				),
+			),
 		);
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_AddAttribute(new AttributeExternalKey("category_id", array("targetclass" => "AuditCategory", "jointype" => '', "allowed_values" => null, "sql" => "category_id", "is_null_allowed" => false, "on_target_delete" => DEL_AUTO, "depends_on" => array())));
diff --git a/application/cmdbabstract.class.inc.php b/application/cmdbabstract.class.inc.php
index ada63bbe2f..6fb1987add 100644
--- a/application/cmdbabstract.class.inc.php
+++ b/application/cmdbabstract.class.inc.php
@@ -47,6 +47,7 @@ use Combodo\iTop\Renderer\Console\ConsoleBlockRenderer;
 use Combodo\iTop\Renderer\Console\ConsoleFormRenderer;
 use Combodo\iTop\Service\Links\LinkSetDataTransformer;
 use Combodo\iTop\Service\Links\LinkSetModel;
+use Combodo\iTop\Service\TemporaryObjects\TemporaryObjectHelper;
 
 
 define('OBJECT_PROPERTIES_TAB', 'ObjectProperties');
@@ -187,9 +188,6 @@ abstract class cmdbAbstractObject extends CMDBObject implements iDisplay
 	/** @var array initial attributes flags cache [attcode]['flags'] */
 	protected $aInitialAttributesFlags;
 
-	protected $iUpdateLoopCount;
-
-	const MAX_UPDATE_LOOP_COUNT = 10;
 
 	/**
 	 * @var array First level classname, second level id, value number of calls done
@@ -227,7 +225,6 @@ abstract class cmdbAbstractObject extends CMDBObject implements iDisplay
 		$this->sDisplayMode = static::DEFAULT_DISPLAY_MODE;
 		$this->bAllowWrite = false;
 		$this->bAllowDelete = false;
-		$this->iUpdateLoopCount = 0;
 	}
 
 	/**
@@ -2822,33 +2819,33 @@ JS
 			}
 		}
 		// Custom operation for the form ?
-		if (isset($aExtraParams['custom_operation'])) {
-			$sOperation = $aExtraParams['custom_operation'];
-		} else {
-			if ($this->GetDisplayMode() === static::ENUM_DISPLAY_MODE_EDIT) {
-				$sOperation = 'apply_modify';
-			} else {
-				$sOperation = 'apply_new';
-			}
-		}
+        if (isset($aExtraParams['custom_operation'])) {
+            $sOperation = $aExtraParams['custom_operation'];
+        } else {
+            if ($this->GetDisplayMode() === static::ENUM_DISPLAY_MODE_EDIT) {
+                $sOperation = 'apply_modify';
+            } else {
+                $sOperation = 'apply_new';
+            }
+        }
 
-		$oContentBlock = new UIContentBlock();
-		$oPage->AddUiBlock($oContentBlock);
+        $oContentBlock = new UIContentBlock();
+        $oPage->AddUiBlock($oContentBlock);
 
-		$oForm = new Form("form_{$this->m_iFormId}");
-		$oForm->SetAction($sFormAction);
-		$sOnSubmitForm = "let bOnSubmitForm = OnSubmit('form_{$this->m_iFormId}');";
-		if (isset($aExtraParams['js_handlers']['form_on_submit'])) {
-			$oForm->SetOnSubmitJsCode($sOnSubmitForm.$aExtraParams['js_handlers']['form_on_submit']);
-		} else {
-			$oForm->SetOnSubmitJsCode($sOnSubmitForm."return bOnSubmitForm;");
-		}
-		$oContentBlock->AddSubBlock($oForm);
+        $oForm = new Form("form_{$this->m_iFormId}");
+        $oForm->SetAction($sFormAction);
+        $sOnSubmitForm = "let bOnSubmitForm = OnSubmit('form_{$this->m_iFormId}');";
+        if (isset($aExtraParams['js_handlers']['form_on_submit'])) {
+            $oForm->SetOnSubmitJsCode($sOnSubmitForm . $aExtraParams['js_handlers']['form_on_submit']);
+        } else {
+            $oForm->SetOnSubmitJsCode($sOnSubmitForm . "return bOnSubmitForm;");
+        }
+        $oContentBlock->AddSubBlock($oForm);
 
-		if ($this->GetDisplayMode() === static::ENUM_DISPLAY_MODE_EDIT) {
-			// The object already exists in the database, it's a modification
-			$oForm->AddSubBlock(InputUIBlockFactory::MakeForHidden('id', $iKey, "{$sPrefix}_id"));
-		}
+        if ($this->GetDisplayMode() === static::ENUM_DISPLAY_MODE_EDIT) {
+            // The object already exists in the database, it's a modification
+	        $oForm->AddSubBlock(InputUIBlockFactory::MakeForHidden('id', $iKey, "{$sPrefix}_id"));
+        }
 		$oForm->AddSubBlock(InputUIBlockFactory::MakeForHidden('operation', $sOperation));
 		$oForm->AddSubBlock(InputUIBlockFactory::MakeForHidden('class', $sClass));
 
@@ -2857,6 +2854,11 @@ JS
 		$oPage->SetTransactionId($iTransactionId);
 		$oForm->AddSubBlock(InputUIBlockFactory::MakeForHidden('transaction_id', $iTransactionId));
 
+		// Add temporary object watchdog (only on root form)
+		if (!utils::IsXmlHttpRequest()) {
+			$oPage->add_ready_script(TemporaryObjectHelper::GetWatchDogJS($iTransactionId));
+		}
+
 		// TODO 3.0.0: Is this (the if condition, not the code inside) still necessary?
 		if (isset($aExtraParams['wizard_container']) && $aExtraParams['wizard_container']) {
 			$sClassLabel = MetaModel::GetName($sClass);
@@ -2867,34 +2869,34 @@ JS
 			}
 		}
 
-		$oToolbarButtons = ToolbarUIBlockFactory::MakeStandard(null);
+        $oToolbarButtons = ToolbarUIBlockFactory::MakeStandard(null);
 
-		$oCancelButton = ButtonUIBlockFactory::MakeForCancel();
-		$oCancelButton->AddCSSClasses(['action', 'cancel']);
-		$oToolbarButtons->AddSubBlock($oCancelButton);
-		$oApplyButton = ButtonUIBlockFactory::MakeForPrimaryAction($sApplyButton, null, null, true);
-		$oApplyButton->AddCSSClass('action');
-		$oToolbarButtons->AddSubBlock($oApplyButton);
-		$bAreTransitionsHidden = isset($aExtraParams['hide_transitions']) && $aExtraParams['hide_transitions'] === true;
-		$aTransitions = $this->EnumTransitions();
-		if (!isset($aExtraParams['custom_operation']) && !$bAreTransitionsHidden && count($aTransitions)) {
-			// Transitions are displayed only for the standard new/modify actions, not for modify_all or any other case...
-			$oSetToCheckRights = DBObjectSet::FromObject($this);
+        $oCancelButton = ButtonUIBlockFactory::MakeForCancel();
+        $oCancelButton->AddCSSClasses(['action', 'cancel']);
+        $oToolbarButtons->AddSubBlock($oCancelButton);
+        $oApplyButton = ButtonUIBlockFactory::MakeForPrimaryAction($sApplyButton, null, null, true);
+        $oApplyButton->AddCSSClass('action');
+        $oToolbarButtons->AddSubBlock($oApplyButton);
+        $bAreTransitionsHidden = isset($aExtraParams['hide_transitions']) && $aExtraParams['hide_transitions'] === true;
+        $aTransitions = $this->EnumTransitions();
+        if (!isset($aExtraParams['custom_operation']) && !$bAreTransitionsHidden && count($aTransitions)) {
+            // Transitions are displayed only for the standard new/modify actions, not for modify_all or any other case...
+            $oSetToCheckRights = DBObjectSet::FromObject($this);
 
-			$oTransitionPopoverMenu = new PopoverMenu();
-			$sTPMSectionId = 'transitions';
-			$oTransitionPopoverMenu->AddSection($sTPMSectionId);
-			$aStimuli = Metamodel::EnumStimuli($sClass);
-			foreach ($aTransitions as $sStimulusCode => $aTransitionDef) {
-				$iActionAllowed = (get_class($aStimuli[$sStimulusCode]) == 'StimulusUserAction') ? UserRights::IsStimulusAllowed($sClass,
-					$sStimulusCode, $oSetToCheckRights) : UR_ALLOWED_NO;
-				switch ($iActionAllowed) {
-					case UR_ALLOWED_YES:
-						// Button to be displayed on its own on large screens
-						$oButton = ButtonUIBlockFactory::MakeForPrimaryAction($aStimuli[$sStimulusCode]->GetLabel(), 'next_action', $sStimulusCode, true);
-						$oButton->AddCSSClass('action');
-						$oButton->SetColor(Button::ENUM_COLOR_SCHEME_NEUTRAL);
-						$oToolbarButtons->AddSubBlock($oButton);
+            $oTransitionPopoverMenu = new PopoverMenu();
+            $sTPMSectionId = 'transitions';
+            $oTransitionPopoverMenu->AddSection($sTPMSectionId);
+            $aStimuli = Metamodel::EnumStimuli($sClass);
+            foreach ($aTransitions as $sStimulusCode => $aTransitionDef) {
+                $iActionAllowed = (get_class($aStimuli[$sStimulusCode]) == 'StimulusUserAction') ? UserRights::IsStimulusAllowed($sClass,
+                    $sStimulusCode, $oSetToCheckRights) : UR_ALLOWED_NO;
+                switch ($iActionAllowed) {
+                    case UR_ALLOWED_YES:
+                        // Button to be displayed on its own on large screens
+                        $oButton = ButtonUIBlockFactory::MakeForPrimaryAction($aStimuli[$sStimulusCode]->GetLabel(), 'next_action', $sStimulusCode, true);
+                        $oButton->AddCSSClass('action');
+                        $oButton->SetColor(Button::ENUM_COLOR_SCHEME_NEUTRAL);
+                        $oToolbarButtons->AddSubBlock($oButton);
 
 						// Button to be displayed in a grouped button on smaller screens
 						$oTPMPopupMenuItem = new JSPopupMenuItem('next_action--'.$oButton->GetId(), $oButton->GetLabel(), "$(`#{$oButton->GetId()}`).trigger(`click`);");
@@ -3049,16 +3051,21 @@ JS
 
 		$oPage->SetCurrentTab('');
 
+		// Static fields values for wizard helper serialization
+		$aWizardHelperStaticValues = [];
+
 		// Add as hidden inputs values that we want displayed if they're readonly
 		if(isset($aExtraParams['forceFieldsSubmission'])){
 			$aExtraFlags = $aExtraParams['fieldsFlags'] ?? [];
 			foreach ($aExtraParams['forceFieldsSubmission'] as $sAttCode) {
 					if(FormHelper::GetAttributeFlagsForObject($this, $sAttCode, $aExtraFlags) & OPT_ATT_READONLY) {
 						$oForm->AddSubBlock(InputUIBlockFactory::MakeForHidden('attr_'.$sPrefix.$sAttCode, $this->Get($sAttCode)));
+						$aWizardHelperStaticValues[$sAttCode] = $this->Get($sAttCode);
 					}
 			}
 		}
-		
+		$sWizardHelperStaticValues = json_encode($aWizardHelperStaticValues);
+
 		$oForm->AddSubBlock(InputUIBlockFactory::MakeForHidden('class', $sClass));
 		$oForm->AddSubBlock(InputUIBlockFactory::MakeForHidden('transaction_id', $iTransactionId));
 		foreach ($aExtraParams as $sName => $value) {
@@ -3101,6 +3108,7 @@ JS
 		var oWizardHelper$sPrefix = new WizardHelper('$sClass', '$sPrefix', '$sLifecycleStateForWizardHelper');
 		oWizardHelper$sPrefix.SetFieldsMap($sJsonFieldsMap);
 		oWizardHelper$sPrefix.SetFieldsCount($iFieldsCount);
+		oWizardHelper$sPrefix.SetStaticValues($sWizardHelperStaticValues);
 EOF
 		);
 		$oPage->add_ready_script(
@@ -4513,16 +4521,12 @@ HTML;
 	 */
 	public function DBInsertNoReload()
 	{
+		$this->LogCRUDEnter(__METHOD__);
 		try {
 			$res = parent::DBInsertNoReload();
 
 			$this->SetWarningsAsSessionMessages('create');
 
-			// Invoke extensions after insertion (the object must exist, have an id, etc.)
-			/** @var \iApplicationObjectExtension $oExtensionInstance */
-			foreach (MetaModel::EnumPlugins('iApplicationObjectExtension') as $oExtensionInstance) {
-				$oExtensionInstance->OnDBInsert($this, self::GetCurrentChange());
-			}
 		} finally {
 			if (static::IsCrudStackEmpty()) {
 				// Avoid signaling the current object that links were modified
@@ -4530,9 +4534,23 @@ HTML;
 				static::FireEventDbLinksChangedForAllObjects();
 			}
 		}
+		$this->LogCRUDExit(__METHOD__);
 		return $res;
 	}
 
+	public function PostInsertActions(): void
+	{
+		parent::PostInsertActions();
+
+		// Invoke extensions after insertion (the object must exist, have an id, etc.)
+		/** @var \iApplicationObjectExtension $oExtensionInstance */
+		foreach (MetaModel::EnumPlugins(iApplicationObjectExtension::class) as $oExtensionInstance) {
+			$sExtensionClass = get_class($oExtensionInstance);
+			$this->LogCRUDDebug(__METHOD__, "Calling $sExtensionClass::OnDBInsert()");
+			$oExtensionInstance->OnDBInsert($this, self::GetCurrentChange());
+		}
+	}
+
 	/**
 	 * @inheritdoc
 	 * Attaches InlineImages to the current object
@@ -4558,57 +4576,39 @@ HTML;
 
 	public function DBUpdate()
 	{
+		$this->LogCRUDEnter(__METHOD__);
+
 		try {
+			if (count($this->ListChanges()) === 0) {
+				$this->LogCRUDExit(__METHOD__);
+				return $this->GetKey();
+			}
 			$res = parent::DBUpdate();
 
 			$this->SetWarningsAsSessionMessages('update');
-
-			// Protection against reentrance (e.g. cascading the update of ticket logs)
-			// Note: This is based on the fix made on r 3190 in DBObject::DBUpdate()
-			if (!MetaModel::StartReentranceProtection($this)) {
-				$sClass = get_class($this);
-				$sKey = $this->GetKey();
-				IssueLog::Debug("CRUD: DBUpdate $sClass::$sKey Rejected (reentrance)", LogChannels::DM_CRUD);
-
-				return $res;
-			}
-
-			try {
-				// Invoke extensions after the update (could be before)
-				/** @var \iApplicationObjectExtension $oExtensionInstance */
-				foreach (MetaModel::EnumPlugins('iApplicationObjectExtension') as $oExtensionInstance) {
-					$oExtensionInstance->OnDBUpdate($this, self::GetCurrentChange());
-				}
-			}
-			finally {
-				MetaModel::StopReentranceProtection($this);
-			}
-
-			$aChanges = $this->ListChanges();
-			if (count($aChanges) != 0) {
-				$this->iUpdateLoopCount++;
-				if ($this->iUpdateLoopCount > self::MAX_UPDATE_LOOP_COUNT) {
-					$sClass = get_class($this);
-					$sKey = $this->GetKey();
-					$aPlugins = [];
-					foreach (MetaModel::EnumPlugins('iApplicationObjectExtension') as $oExtensionInstance) {
-						$aPlugins[] = get_class($oExtensionInstance);
-					}
-					$sPlugins = implode(', ', $aPlugins);
-					IssueLog::Error("CRUD: DBUpdate $sClass::$sKey Update loop detected plugins: $sPlugins", LogChannels::DM_CRUD);
-				} else {
-					return $this->DBUpdate();
-				}
-			}
 		} finally {
 			if (static::IsCrudStackEmpty()) {
 				static::FireEventDbLinksChangedForAllObjects();
 			}
 		}
+		$this->LogCRUDExit(__METHOD__);
 
 		return $res;
 	}
 
+	public function PostUpdateActions(array $aChanges): void
+	{
+		parent::PostUpdateActions($aChanges);
+
+		// Invoke extensions after the update (could be before)
+		/** @var \iApplicationObjectExtension $oExtensionInstance */
+		foreach (MetaModel::EnumPlugins(iApplicationObjectExtension::class) as $oExtensionInstance) {
+			$sExtensionClass = get_class($oExtensionInstance);
+			$this->LogCRUDDebug(__METHOD__, "Calling $sExtensionClass::OnDBUpdate()");
+			$oExtensionInstance->OnDBUpdate($this, self::GetCurrentChange());
+		}
+	}
+
 	/**
 	 * @param string $sMessageIdPrefix
 	 *
@@ -4628,6 +4628,7 @@ HTML;
 
 	public function DBDelete(&$oDeletionPlan = null)
 	{
+		$this->LogCRUDEnter(__METHOD__);
 		try {
 			parent::DBDelete($oDeletionPlan);
 		}  finally {
@@ -4637,6 +4638,7 @@ HTML;
 				static::FireEventDbLinksChangedForAllObjects();
 			}
 		}
+		$this->LogCRUDExit(__METHOD__);
 
 		return $oDeletionPlan;
 	}
@@ -4665,9 +4667,12 @@ HTML;
 		/** @var \iApplicationObjectExtension $oExtensionInstance */
 		foreach(MetaModel::EnumPlugins('iApplicationObjectExtension') as $oExtensionInstance)
 		{
-			if ($oExtensionInstance->OnIsModified($this))
-			{
+			$sExtensionClass = get_class($oExtensionInstance);
+			if ($oExtensionInstance->OnIsModified($this)) {
+				$this->LogCRUDDebug(__METHOD__, "Calling $sExtensionClass::OnIsModified() -> true");
 				return true;
+			} else {
+				$this->LogCRUDDebug(__METHOD__, "Calling $sExtensionClass::OnIsModified() -> false");
 			}
 		}
 
@@ -6021,14 +6026,16 @@ JS
 		// - we have a EVENT_DB_LINKS_CHANGED listener on Ticket that will update impacted items, so it will create new lnkApplicationSolutionToFunctionalCI
 		// We want to avoid launching the listener twice, first here, and secondly after saving the Ticket in the listener
 		// By disabling the event to be fired, we can remove the current object from the attribute !
-		/** @noinspection PhpRedundantOptionalArgumentInspection */
-		$oObject = MetaModel::GetObject($sClass, $sId, true);
-		self::SetEventDBLinksChangedBlocked(true);
-		MetaModel::StartReentranceProtection($oObject);
-		$oObject->FireEvent(EVENT_DB_LINKS_CHANGED);
-		MetaModel::StopReentranceProtection($oObject);
-		if ($oObject->IsModified()) {
-			$oObject->DBUpdate();
+		$oObject = MetaModel::GetObject($sClass, $sId, false);
+		// N°6408 The object can have been deleted
+		if (!is_null($oObject)) {
+			self::SetEventDBLinksChangedBlocked(true);
+			MetaModel::StartReentranceProtection($oObject);
+			$oObject->FireEvent(EVENT_DB_LINKS_CHANGED);
+			MetaModel::StopReentranceProtection($oObject);
+			if (count($oObject->ListChanges()) !== 0) {
+				$oObject->DBUpdate();
+			}
 		}
 		self::RemoveObjectAwaitingEventDbLinksChanged($sClass, $sId);
 		cmdbAbstractObject::SetEventDBLinksChangedBlocked(false);
diff --git a/application/dashlet.class.inc.php b/application/dashlet.class.inc.php
index a298a50693..43b06b666b 100644
--- a/application/dashlet.class.inc.php
+++ b/application/dashlet.class.inc.php
@@ -667,7 +667,7 @@ class DashletUnknown extends Dashlet
 	 */
 	public function GetPropertiesFields(DesignerForm $oForm)
 	{
-		$oField = new DesignerLongTextField('xml', Dict::S('UI:DashletUnknown:Prop-XMLConfiguration'), $this->sOriginalDashletXML);
+		$oField = new DesignerXMLField('xml', Dict::S('UI:DashletUnknown:Prop-XMLConfiguration'), $this->sOriginalDashletXML);
 		$oForm->AddField($oField);
 	}
 
diff --git a/application/datamodel.application.xml b/application/datamodel.application.xml
index fbd7fbe481..765e3563a0 100644
--- 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>
diff --git a/application/displayblock.class.inc.php b/application/displayblock.class.inc.php
index 1d58f53802..e79d94161e 100644
--- a/application/displayblock.class.inc.php
+++ b/application/displayblock.class.inc.php
@@ -1871,7 +1871,13 @@ class MenuBlock extends DisplayBlock
 		/** @var array $aToolkitActions Any "legacy" toolkit menu item, which are now displayed in the same menu as the $aRegularActions, after them */
 		$aToolkitActions = [];
 
-		if (!isset($aExtraParams['selection_mode']) || ($aExtraParams['selection_mode'] == "")) {
+		// Display menu actions only if...
+		if (
+			// ... NOT in a selection mode
+			(!isset($aExtraParams['selection_mode']) || ($aExtraParams['selection_mode'] == ""))
+			// ... "menu" parameter is NOT EXPLICITLY disabled
+			&& (!isset($aExtraParams['menu']) || $aExtraParams['menu'] === "1" || $aExtraParams['menu'] === true)
+		) {
 			$oAppContext = new ApplicationContext();
 			$sContext = $oAppContext->GetForLink();
 			if (utils::IsNotNullOrEmptyString($sContext)) {
diff --git a/application/forms.class.inc.php b/application/forms.class.inc.php
index 889efe04d2..ec952e0a37 100644
--- a/application/forms.class.inc.php
+++ b/application/forms.class.inc.php
@@ -1110,13 +1110,41 @@ $('#$sId').on('change keyup validate', function() { ValidateWithPattern('$sId',
 }
 EOF
 			);
-			$sValue = "<textarea $sCSSClasses id=\"$sId\" name=\"$sName\">".utils::EscapeHtml($this->defaultValue)."</textarea>";
+			$sValue = "<textarea $sCSSClasses id=\"$sId\" name=\"$sName\">".$this->PrepareValueForRendering()."</textarea>";
 		}
 		else {
-			$sValue = "<div $sCSSClasses id=\"$sId\">".utils::EscapeHtml($this->defaultValue)."</div>";
+			$sValue = "<div $sCSSClasses id=\"$sId\">".$this->PrepareValueForRendering()."</div>";
 		}
 		return array('label' => $this->sLabel, 'value' => $sValue);
 	}
+
+	/**
+	 * @return string|null The value itself as expected for rendering. May it be encoded, escaped or else.
+	 * @since 3.1.0 N°6405
+	 */
+	protected function PrepareValueForRendering(): ?string
+	{
+		return utils::EscapeHtml($this->defaultValue);
+	}
+}
+
+/**
+ * Class DesignerXMLField
+ *
+ * Field to display XML content
+ *
+ * @author Guillaume Lajarige <guillaume.lajarige@combodo.com>
+ * @since 3.1.0 N°6405
+ */
+class DesignerXMLField extends DesignerLongTextField
+{
+	/**
+	 * @inheritDoc
+	 */
+	protected function PrepareValueForRendering(): ?string
+	{
+		return utils::EscapeHtml($this->defaultValue, true);
+	}
 }
 
 class DesignerIntegerField extends DesignerFormField
diff --git a/application/query.class.inc.php b/application/query.class.inc.php
index 4de7682652..074b24e005 100644
--- a/application/query.class.inc.php
+++ b/application/query.class.inc.php
@@ -74,6 +74,7 @@ abstract class Query extends cmdbAbstractObject
 			"default_value" => 0,
 			"is_null_allowed" => false,
 			"depends_on" => array(),
+			"tracking_level" => ATTRIBUTE_TRACKING_NONE,
 		)));
 
 		MetaModel::Init_AddAttribute(new AttributeDateTime("export_last_date", array(
@@ -82,6 +83,7 @@ abstract class Query extends cmdbAbstractObject
 			"default_value" => null,
 			"is_null_allowed" => true,
 			"depends_on" => array(),
+			"tracking_level" => ATTRIBUTE_TRACKING_NONE,
 		)));
 
 		MetaModel::Init_AddAttribute(new AttributeExternalKey("export_last_user_id",
@@ -93,14 +95,16 @@ abstract class Query extends cmdbAbstractObject
 				"depends_on"=>array(),
 				"display_style"=>'select',
 				"always_load_in_tables"=>false,
-				"on_target_delete"=>DEL_SILENT
+				"on_target_delete"=>DEL_SILENT,
+				"tracking_level" => ATTRIBUTE_TRACKING_NONE,
 			)));
 
 		MetaModel::Init_AddAttribute(new AttributeExternalField("export_last_user_contact",
 			array(
 				"allowed_values"=>null,
 				"extkey_attcode"=> "export_last_user_id",
-				"target_attcode"=>"contactid"
+				"target_attcode"=>"contactid",
+				"tracking_level" => ATTRIBUTE_TRACKING_NONE,
 			)));
 
 		// Display lists
diff --git a/application/ui.extkeywidget.class.inc.php b/application/ui.extkeywidget.class.inc.php
index 9f3be25e8a..82e53ba80b 100644
--- a/application/ui.extkeywidget.class.inc.php
+++ b/application/ui.extkeywidget.class.inc.php
@@ -168,8 +168,6 @@ class UIExtKeyWidget
 		$sMessage = Dict::S('UI:Message:EmptyList:UseSearchForm');
 		$sAttrFieldPrefix = ($this->bSearchMode) ? '' : 'attr_';
 
-		
-		
 		$sFilter = addslashes($oAllowedValues->GetFilter()->ToOQL());
 		if ($this->bSearchMode) {
 			$sWizHelper = 'null';
@@ -1070,18 +1068,27 @@ JS
 		{
 			$oObj = MetaModel::NewObject($this->sTargetClass);
 			$aErrors = $oObj->UpdateObjectFromPostedForm($this->iId);
-			if (count($aErrors) == 0)
-			{
-				$oObj->DBInsert();
+			if (count($aErrors) == 0) {
+
+				// Retrieve JSON data
+				$sJSON = utils::ReadParam('json', '{}', false, utils::ENUM_SANITIZATION_FILTER_RAW_DATA);
+				$oJSON = json_decode($sJSON);
+
+				$oObj->SetContextSection('temporary_objects', [
+					'create' => [
+						'transaction_id' => utils::ReadParam('root_transaction_id', '', false, utils::ENUM_SANITIZATION_FILTER_TRANSACTION_ID),
+						'host_class'     => $oJSON->m_sClass,
+						'host_att_code'  => $this->sAttCode,
+					],
+				]);
+				$oObj->DBInsertNoReload();
+
 				return array('name' => $oObj->GetName(), 'id' => $oObj->GetKey());
-			}
-			else
-			{
+			} else {
 				return array('error' => implode(' ', $aErrors), 'id' => 0);
 			}
 		}
-		catch(Exception $e)
-		{
+		catch (Exception $e) {
 			return array('error' => $e->getMessage(), 'id' => 0);
 		}
 	}
diff --git a/application/utils.inc.php b/application/utils.inc.php
index 0ce86f468b..6d6e204c09 100644
--- a/application/utils.inc.php
+++ b/application/utils.inc.php
@@ -1970,6 +1970,7 @@ SQL;
 
 	/**
 	 * @param string $sValue
+	 * @param bool $bDoubleEncode Whether to double encode the value or not
 	 *
 	 * @return string passed value with only characters having a special meaning in HTML escaped as entities
 	 *    Since 3.0.0 we were using for this {@link HtmlEntities} but it was overkill and leads to double escaping !
@@ -1977,14 +1978,15 @@ SQL;
 	 * @uses \htmlspecialchars()
 	 * @link https://www.php.net/manual/fr/function.htmlspecialchars.php
 	 * @since 3.0.0 N°3623
+	 * @since 3.1.0 N°6405 Add $bDoubleEncode parameter
 	 */
-	public static function EscapeHtml($sValue)
+	public static function EscapeHtml($sValue, bool $bDoubleEncode = false)
 	{
 		return htmlspecialchars(
 			$sValue ?? '',
 			ENT_QUOTES | ENT_DISALLOWED | ENT_HTML5,
 			WebPage::PAGES_CHARSET,
-			false
+			$bDoubleEncode
 		);
 	}
 
@@ -2045,6 +2047,9 @@ SQL;
 	 */
 	public static function TextToHtml($sText)
 	{
+		if (static::IsNullOrEmptyString($sText)){
+			return '';
+		}
 		$sText = str_replace("\r\n", "\n", $sText);
 		$sText = str_replace("\r", "\n", $sText);
 
@@ -2904,7 +2909,8 @@ HTML;
 				if ($sClassNameFilter !== '' && strpos($sPHPClass, $sClassNameFilter) === false) {
 					$bSkipped = true;
 				}
-				else {
+				// 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)) {
 					$sPHPFile = self::LocalPath($sPHPFile);
 					if ($sPHPFile !== false) {
 						$sPHPFile = '/'.$sPHPFile; // for regex
@@ -3368,5 +3374,22 @@ HTML;
 	{
 		return in_array($sTrait, self::TraitsUsedByClass($sClass, true));
 	}
-	
+
+	/**
+	 * Get stack trace as string array.
+	 *
+	 * @return array
+	 * @since 3.1.0
+	 */
+	public static function GetStackTraceAsArray(): array
+	{
+		$e = new Exception();
+		$aTrace = explode("\n", $e->getTraceAsString());
+		// Remove call to this method
+		array_shift($aTrace);
+		// Remove Main
+		array_pop($aTrace);
+
+		return $aTrace;
+	}
 }
diff --git a/core/TemporaryObjectDescriptor.php b/core/TemporaryObjectDescriptor.php
new file mode 100644
index 0000000000..3a43b379f8
--- /dev/null
+++ b/core/TemporaryObjectDescriptor.php
@@ -0,0 +1,101 @@
+<?php
+/*
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+/**
+ * Class TemporaryObjectDescriptor
+ *
+ * Descriptor to track a temporary object.
+ *
+ * @experimental do not use, this feature will be part of a future version
+ *
+ * @since 3.1
+ */
+class TemporaryObjectDescriptor extends DBObject
+{
+	public static function Init()
+	{
+		$aParams = array(
+			'category'            => 'core',
+			'key_type'            => 'autoincrement',
+			'name_attcode'        => array('item_class', 'temp_id'),
+			'image_attcode'       => '',
+			'state_attcode'       => '',
+			'reconc_keys'         => array(''),
+			'db_table'            => 'priv_temporary_object_descriptor',
+			'db_key_field'        => 'id',
+			'db_finalclass_field' => '',
+			'style'               => new ormStyle(null, null, null, null, null, null),
+			'indexes'             => array(
+				1 =>
+					array(
+						0 => 'temp_id',
+					),
+				2 =>
+					array(
+						0 => 'item_class',
+						1 => 'item_id',
+					),
+			),
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeDateTime('expiration_date', array('sql' => 'expiration_date', 'is_null_allowed' => false, 'default_value' => '', 'allowed_values' => null, 'depends_on' => array(), 'always_load_in_tables' => false)));
+		MetaModel::Init_AddAttribute(new AttributeString('temp_id', array('sql' => 'temp_id', 'is_null_allowed' => true, 'default_value' => '', 'allowed_values' => null, 'depends_on' => array(), 'always_load_in_tables' => false)));
+		MetaModel::Init_AddAttribute(new AttributeString('item_class', array('sql' => 'item_class', 'is_null_allowed' => false, 'default_value' => '', 'allowed_values' => null, 'depends_on' => array(), 'always_load_in_tables' => false)));
+		MetaModel::Init_AddAttribute(new AttributeObjectKey('item_id', array('class_attcode' => 'item_class', 'sql' => 'item_id', 'is_null_allowed' => true, 'allowed_values' => null, 'depends_on' => array(), 'always_load_in_tables' => false)));
+		MetaModel::Init_AddAttribute(new AttributeDateTime('creation_date', array('sql' => 'creation_date', 'is_null_allowed' => true, 'default_value' => '', 'allowed_values' => null, 'depends_on' => array(), 'always_load_in_tables' => false)));
+		MetaModel::Init_AddAttribute(new AttributeString('host_class', array('sql' => 'host_class', 'is_null_allowed' => true, 'default_value' => '', 'allowed_values' => null, 'depends_on' => array(), 'always_load_in_tables' => false)));
+		MetaModel::Init_AddAttribute(new AttributeObjectKey('host_id', array('class_attcode' => 'host_class', 'sql' => 'host_id', 'is_null_allowed' => true, 'allowed_values' => null, 'depends_on' => array(), 'always_load_in_tables' => false)));
+		MetaModel::Init_AddAttribute(new AttributeString('host_att_code', array('sql' => 'host_att_code', 'is_null_allowed' => true, 'default_value' => '', 'allowed_values' => null, 'depends_on' => array(), 'always_load_in_tables' => false)));
+		MetaModel::Init_AddAttribute(new AttributeEnum("operation", array("allowed_values" => new ValueSetEnum('create,delete'), "sql" => "operation", "default_value" => "create", "is_null_allowed" => true, "depends_on" => array())));
+
+		MetaModel::Init_SetZListItems('details', array(
+			0 => 'temp_id',
+			1 => 'item_class',
+			2 => 'item_id',
+			3 => 'creation_date',
+			4 => 'expiration_date',
+			5 => 'meta',
+		));
+		MetaModel::Init_SetZListItems('standard_search', array(
+			0 => 'temp_id',
+			1 => 'item_class',
+			2 => 'item_id',
+		));
+		MetaModel::Init_SetZListItems('list', array(
+			0 => 'temp_id',
+			1 => 'item_class',
+			2 => 'item_id',
+			3 => 'creation_date',
+			4 => 'expiration_date',
+		));;
+	}
+
+
+	public function DBInsertNoReload()
+	{
+		$this->SetCurrentDateIfNull('creation_date');
+
+		return parent::DBInsertNoReload();
+	}
+
+
+	/**
+	 * Set/Update all of the '_item' fields
+	 *
+	 * @param object $oItem Container item
+	 *
+	 * @return void
+	 */
+	public function SetItem($oItem, $bUpdateOnChange = false)
+	{
+		$sClass = get_class($oItem);
+		$iItemId = $oItem->GetKey();
+
+		$this->Set('item_class', $sClass);
+		$this->Set('item_id', $iItemId);
+	}
+}
diff --git a/core/attributedef.class.inc.php b/core/attributedef.class.inc.php
index 936d36c928..d9980100b1 100644
--- a/core/attributedef.class.inc.php
+++ b/core/attributedef.class.inc.php
@@ -9,9 +9,7 @@ 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\Form\Validator\CustomRegexpValidator;
 use Combodo\iTop\Renderer\BlockRenderer;
 use Combodo\iTop\Renderer\Console\ConsoleBlockRenderer;
 use Combodo\iTop\Service\Links\LinkSetModel;
@@ -93,9 +91,6 @@ define('LINKSET_EDITMODE_ACTIONS', 2); // Show the usual 'Actions' popup menu
 define('LINKSET_EDITMODE_INPLACE', 3); // The "linked" objects can be created/modified/deleted in place
 define('LINKSET_EDITMODE_ADDREMOVE', 4); // The "linked" objects can be added/removed in place
 
-define('LINKSET_RELATIONTYPE_PROPERTY', 'property');
-define('LINKSET_RELATIONTYPE_LINK', 'link');
-
 define('LINKSET_DISPLAY_STYLE_PROPERTY', 'property');
 define('LINKSET_DISPLAY_STYLE_TAB', 'tab');
 
@@ -1126,7 +1121,7 @@ abstract class AttributeDefinition
 
 		// Validation pattern
 		if ($this->GetValidationPattern() !== '') {
-			$oFormField->AddValidator(new Validator($this->GetValidationPattern()));
+			$oFormField->AddValidator(new CustomRegexpValidator($this->GetValidationPattern()));
 		}
 
 		// Description
@@ -1155,6 +1150,13 @@ abstract class AttributeDefinition
 			$oFormField->AddMetadata('value-raw', (string)$oObject->Get($this->GetCode()));
 		}
 
+		// We don't want to invalidate field because of old untouched values that are no longer valid
+		$aModifiedAttCodes = $oObject->ListChanges();
+		$bAttributeHasBeenModified = array_key_exists($this->GetCode(), $aModifiedAttCodes);
+		if (false === $bAttributeHasBeenModified) {
+			$oFormField->SetValidationDisabled(true);
+		}
+
 		return $oFormField;
 	}
 
@@ -1697,22 +1699,12 @@ class AttributeLinkedSet extends AttributeDefinition
 
 	/**
 	 * @return string see LINKSET_EDITMODE_* constants
-	 * @since 3.1.0 N°5563 relations are edited using new attributes in details mode, but as nothing changed in edit mode we are still using edit_mode attribute
 	 */
 	public function GetEditMode()
 	{
 		return $this->GetOptional('edit_mode', LINKSET_EDITMODE_ACTIONS);
 	}
 
-	/**
-	 * @return string see LINKSET_RELATIONTYPE_* constants
-	 * @since 3.1.0 N°5563
-	 */
-	public function GetRelationType()
-	{
-		return $this->GetOptional('relation_type', LINKSET_RELATIONTYPE_LINK);
-	}
-
 	/**
 	 * @return string see LINKSET_DISPLAY_STYLE_* constants
 	 * @since 3.1.0 N°3190
@@ -1737,15 +1729,6 @@ class AttributeLinkedSet extends AttributeDefinition
 		return $this->GetOptional('with_php_constraint', false);
 	}
 
-	/**
-	 * @return boolean
-	 * @since 3.1.0 N°5563
-	 */
-	public function GetReadOnly()
-	{
-		return $this->GetOptional('read_only', false);
-	}
-
 	public function GetLinkedClass()
 	{
 		return $this->Get('linked_class');
@@ -1772,7 +1755,53 @@ class AttributeLinkedSet extends AttributeDefinition
 	}
 
 	/** @inheritDoc * */
-	public function GetAsHTML($sValue, $oHostObject = null, $bLocalize = true): string
+	public function GetAsHTML($sValue, $oHostObject = null, $bLocalize = true)
+	{
+		if($this->GetDisplayStyle() === LINKSET_DISPLAY_STYLE_TAB){
+			return $this->GetAsHTMLForTab($sValue, $oHostObject, $bLocalize);
+		}
+		else{
+			return $this->GetAsHTMLForProperty($sValue, $oHostObject, $bLocalize);
+		}
+	}
+
+	public function GetAsHTMLForTab($sValue, $oHostObject = null, $bLocalize = true)
+	{
+		if (is_object($sValue) && ($sValue instanceof ormLinkSet))
+		{
+			$sValue->Rewind();
+			$aItems = array();
+			while ($oObj = $sValue->Fetch())
+			{
+				// Show only relevant information (hide the external key to the current object)
+				$aAttributes = array();
+				foreach(MetaModel::ListAttributeDefs($this->GetLinkedClass()) as $sAttCode => $oAttDef)
+				{
+					if ($sAttCode == $this->GetExtKeyToMe())
+					{
+						continue;
+					}
+					if ($oAttDef->IsExternalField())
+					{
+						continue;
+					}
+					$sAttValue = $oObj->GetAsHTML($sAttCode);
+					if (strlen($sAttValue) > 0)
+					{
+						$aAttributes[] = $sAttValue;
+					}
+				}
+				$sAttributes = implode(', ', $aAttributes);
+				$aItems[] = $sAttributes;
+			}
+
+			return implode('<br/>', $aItems);
+		}
+
+		return null;
+	}
+
+	public function GetAsHTMLForProperty($sValue, $oHostObject = null, $bLocalize = true): string
 	{
 		try {
 
@@ -2447,8 +2476,6 @@ class AttributeLinkedSet extends AttributeDefinition
 			$oFormField->SetLnkAttributesToDisplay($aLnkAttributesToDisplay);
 		}
 
-		$oFormField->AddValidator(new LinkedSetValidator());
-
 		parent::MakeFormField($oObject, $oFormField);
 
 		return $oFormField;
@@ -2558,15 +2585,6 @@ class AttributeLinkedSetIndirect extends AttributeLinkedSet
 		return $this->GetOptional("duplicates", false);
 	} // The same object may be linked several times... or not...
 
-	/**
-	 * @return boolean
-	 * @since 3.1.0 N°5563
-	 */
-	public function GetReadOnly()
-	{
-		return $this->GetOptional('read_only', false);
-	}
-
 	public function GetTrackingLevel()
 	{
 		return $this->GetOptional('tracking_level',
@@ -3873,6 +3891,12 @@ class AttributeApplicationLanguage extends AttributeString
 		{
 			$aLanguageCodes[$sLangCode] = $aInfo['description'].' ('.$aInfo['localized_description'].')';
 		}
+
+		// N°6462 This should be sorted directly in \Dict during the compilation but we can't for 2 reasons:
+		// - Additional languages can be added on the fly even though it is not recommended
+		// - Formatting is done at run time (just above)
+		natcasesort($aLanguageCodes);
+
 		$aParams["allowed_values"] = new ValueSetEnum($aLanguageCodes);
 		parent::__construct($sCode, $aParams);
 	}
@@ -4163,7 +4187,7 @@ class AttributePassword extends AttributeString implements iAttributeNoGroupBy
 
 	public function GetAsHTML($sValue, $oHostObject = null, $bLocalize = true)
 	{
-		if (strlen($sValue) == 0)
+		if (utils::IsNullOrEmptyString($sValue))
 		{
 			return '';
 		}
@@ -7196,14 +7220,27 @@ class AttributeExternalKey extends AttributeDBFieldVoid
 		{
 			return 0;
 		}
-		if (MetaModel::IsValidObject($proposedValue))
-		{
+		if (MetaModel::IsValidObject($proposedValue)) {
 			return $proposedValue->GetKey();
 		}
 
 		return (int)$proposedValue;
 	}
 
+	/** @inheritdoc  @since 3.1 */
+	public function WriteExternalValues(DBObject $oHostObject): void
+	{
+		$sTargetKey = $oHostObject->Get($this->GetCode());
+		$oFilter = DBSearch::FromOQL('SELECT `'.TemporaryObjectDescriptor::class.'` WHERE item_class=:class AND item_id=:id');
+		$oSet = new DBObjectSet($oFilter, [], ['class' => $this->GetTargetClass(), 'id' => $sTargetKey]);
+		while ($oTemporaryObjectDescriptor = $oSet->Fetch()) {
+			$oTemporaryObjectDescriptor->Set('host_class', get_class($oHostObject));
+			$oTemporaryObjectDescriptor->Set('host_id', $oHostObject->GetKey());
+			$oTemporaryObjectDescriptor->Set('host_att_code', $this->GetCode());
+			$oTemporaryObjectDescriptor->DBUpdate();
+		}
+	}
+
 	public function GetMaximumComboLength()
 	{
 		return $this->GetOptional('max_combo_length', MetaModel::GetConfig()->Get('max_combo_length'));
@@ -7267,6 +7304,7 @@ class AttributeExternalKey extends AttributeDBFieldVoid
 
 	public function MakeFormField(DBObject $oObject, $oFormField = null)
 	{
+		/** @var \Combodo\iTop\Form\Field\Field $oFormField */
 		if ($oFormField === null) {
 			// Later : We should check $this->Get('display_style') and create a Radio / Select / ... regarding its value
 			$sFormFieldClass = static::GetFormFieldClass();
@@ -7297,19 +7335,12 @@ class AttributeExternalKey extends AttributeDBFieldVoid
 				}
 			});
 		}
-		else
-		{
+		else {
 			$oSearch = DBSearch::FromOQL($this->GetValuesDef()->GetFilterExpression());
 			$oSearch->SetInternalParams(array('this' => $oObject));
 			$oFormField->SetSearch($oSearch);
 		}
 
-		// If ExtKey is mandatory, we add a validator to ensure that the value 0 is not selected
-		if ($oObject->GetAttributeFlags($this->GetCode()) & OPT_ATT_MANDATORY)
-		{
-			$oFormField->AddValidator(new NotEmptyExtKeyValidator());
-		}
-
 		parent::MakeFormField($oObject, $oFormField);
 
 		return $oFormField;
@@ -7935,6 +7966,17 @@ class AttributeExternalField extends AttributeDefinition
 		return $oExtAttDef->MakeRealValue($proposedValue, $oHostObj);
 	}
 
+	/**
+	 * @inheritDoc
+	 * @since 3.1.0 N°6271 Delegate to remote attribute to ensure cascading computed values
+	 */
+	public function GetSQLValues($value)
+	{
+		$oExtAttDef = $this->GetExtAttDef();
+
+		return $oExtAttDef->GetSQLValues($value);
+	}
+
 	public function ScalarToSQL($value)
 	{
 		// This one could be used in case of filtering only
@@ -8343,7 +8385,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'] = ormDocument::DEFAULT_DOWNLOADS_COUNT;
 		}
 
 		return $aValues;
@@ -8533,6 +8575,22 @@ class AttributeBlob extends AttributeDefinition
 		return utils::IsNotNullOrEmptyString($proposedValue->GetData()) && utils::IsNotNullOrEmptyString($proposedValue->GetFileName());
 	}
 
+	/**
+	 * @inheritDoc
+	 * @param \ormDocument $original
+	 * @param \ormDocument $value
+	 * @since N°6502
+	 */
+	public function RecordAttChange(DBObject $oObject, $original, $value): void
+	{
+		// N°6502 Don't record history if only the download count has changed
+		if ($original->EqualsExceptDownloadsCount($value)) {
+			return;
+		}
+
+		parent::RecordAttChange($oObject, $original, $value);
+	}
+
 	protected function GetChangeRecordAdditionalData(CMDBChangeOp $oMyChangeOp, DBObject $oObject, $original, $value): void
 	{
 		if (is_null($original)) {
@@ -8692,7 +8750,7 @@ class AttributeImage extends AttributeBlob
 			return 'data:'.$value->GetMimeType().';base64,'.base64_encode($value->GetData());
 		}
 
-		return $value->GetDownloadURL(get_class($oHostObject), $oHostObject->GetKey(), $this->GetCode());
+		return $value->GetDisplayURL(get_class($oHostObject), $oHostObject->GetKey(), $this->GetCode());
 	}
 
 	public static function GetFormFieldClass()
@@ -8719,8 +8777,11 @@ class AttributeImage extends AttributeBlob
 		}
 		else
 		{
-			$oFormField->SetDownloadUrl($this->Get('default_image'));
-			$oFormField->SetDisplayUrl($this->Get('default_image'));
+			$oDefaultImage = $this->Get('default_image');
+			if (is_object($oDefaultImage) && !$oDefaultImage->IsEmpty()) {
+				$oFormField->SetDownloadUrl($oDefaultImage);
+				$oFormField->SetDisplayUrl($oDefaultImage);
+			}
 		}
 
 		return $oFormField;
@@ -11299,6 +11360,9 @@ class AttributeClassAttCodeSet extends AttributeSet
 			}
 			$aAllowedAttributes[$sAttCode] = $sLabel;
 		}
+		// N°6460 Always sort on the labels, not on the datamodel definition order
+		natcasesort($aAllowedAttributes);
+
 		return $aAllowedAttributes;
 	}
 
diff --git a/core/autoload.php b/core/autoload.php
index 7fde2d0bf4..f9551c4003 100644
--- a/core/autoload.php
+++ b/core/autoload.php
@@ -35,6 +35,7 @@ MetaModel::IncludeModule('synchro/synchrodatasource.class.inc.php');
 MetaModel::IncludeModule('core/backgroundtask.class.inc.php');
 MetaModel::IncludeModule('core/inlineimage.class.inc.php');
 MetaModel::IncludeModule('core/counter.class.inc.php');
+MetaModel::IncludeModule('core/TemporaryObjectDescriptor.php');
 
 MetaModel::IncludeModule('webservices/webservices.basic.php');
 
diff --git a/core/bulkchange.class.inc.php b/core/bulkchange.class.inc.php
index cdc14a0526..311ff54790 100644
--- a/core/bulkchange.class.inc.php
+++ b/core/bulkchange.class.inc.php
@@ -37,6 +37,14 @@ abstract class CellChangeSpec
 		return $this->m_proposedValue;
 	}
 
+	/**
+	 * @since 3.1.0 N°5305
+	 */
+	public function SetDisplayableValue(string $sDisplayableValue)
+	{
+		$this->m_proposedValue = $sDisplayableValue;
+	}
+
 	public function GetOql()
 	{
 		return $this->m_sOql;
@@ -136,6 +144,12 @@ class CellStatus_SearchIssue extends CellStatus_Issue
 	/** @var string|null $m_sTargetClass */
 	private $m_sTargetClass;
 
+	/**
+	 * @since 3.1.0 N°5305
+	 * @var string $sAllowedValuesSearch
+	 */
+	private $sAllowedValuesSearch;
+
 	/**
 	 * CellStatus_SearchIssue constructor.
 	 * @since 3.1.0 N°5305
@@ -144,13 +158,15 @@ class CellStatus_SearchIssue extends CellStatus_Issue
 	 * @param string $sReason : main message
 	 * @param null $sClass : used for additional message that provides allowed values for current class $sClass
 	 * @param null $sAllowedValues : used for additional message that provides allowed values $sAllowedValues for current class
+	 * @param string|null $sAllowedValuesSearch : used to search all allowed values
 	 */
-	public function __construct($sSerializedSearch, $sReason, $sClass=null, $sAllowedValues=null)
+	public function __construct($sSerializedSearch, $sReason, $sClass=null, $sAllowedValues=null, string $sAllowedValuesSearch=null)
 	{
 		parent::__construct(null, null, $sReason);
 		$this->sSerializedSearch = $sSerializedSearch;
 		$this->m_sAllowedValues = $sAllowedValues;
 		$this->m_sTargetClass = $sClass;
+		$this->sAllowedValuesSearch = $sAllowedValuesSearch;
 	}
 
 	public function GetDisplayableValue()
@@ -182,6 +198,17 @@ class CellStatus_SearchIssue extends CellStatus_Issue
 			rawurlencode($this->sSerializedSearch)
 		);
 	}
+
+	/**
+	 * @since 3.1.0 N°5305
+	 * @return null|string
+	 */
+	public function GetAllowedValuesLinkUrl(): ?string
+	{
+		return sprintf("UI.php?operation=search&filter=%s",
+			rawurlencode($this->sAllowedValuesSearch)
+		);
+	}
 }
 
 class CellStatus_NullIssue extends CellStatus_Issue
@@ -745,6 +772,7 @@ class BulkChange
 		$oDbSearchWithoutAnyCondition->AllowAllData(false);
 		$oExtObjectSetWithCurrentUserPermissions = new CMDBObjectSet($oDbSearchWithoutAnyCondition);
 		$iCurrentUserRightsObjectCount = $oExtObjectSetWithCurrentUserPermissions->Count();
+		$sAllowedValuesOql = $oDbSearchWithoutAnyCondition->serialize();
 
 		if ($iCurrentUserRightsObjectCount === 0){
 			// No objects visible by current user
@@ -785,7 +813,7 @@ class BulkChange
 		if ($iAllowAllDataObjectCount != $iCurrentUserRightsObjectCount) {
 			// No match and some objects NOT visible by current user. including current search maybe...
 			$sReason = Dict::Format('UI:CSVReport-Value-NoMatch-SomeObjectNotVisibleForCurrentUser', $oDbSearchWithConditions->GetClass());
-			return new CellStatus_SearchIssue($sSerializedSearch, $sReason, $oDbSearchWithConditions->GetClass(), $allowedValues);
+			return new CellStatus_SearchIssue($sSerializedSearch, $sReason, $oDbSearchWithConditions->GetClass(), $allowedValues, $sAllowedValuesOql);
 		}
 
 		// No match. This is not linked to any right issue
@@ -796,7 +824,7 @@ class BulkChange
 		}
 		$value =implode(" ", $aCurrentValueFields);
 		$sReason = Dict::Format('UI:CSVReport-Value-NoMatch', $value);
-		return new CellStatus_SearchIssue($sSerializedSearch, $sReason, $oDbSearchWithConditions->GetClass(), $allowedValues);
+		return new CellStatus_SearchIssue($sSerializedSearch, $sReason, $oDbSearchWithConditions->GetClass(), $allowedValues, $sAllowedValuesOql);
 	}
 
 	protected function PrepareMissingObject(&$oTargetObj, &$aErrors)
diff --git a/core/cmdbobject.class.inc.php b/core/cmdbobject.class.inc.php
index 4d6788eb01..99f5e1184d 100644
--- a/core/cmdbobject.class.inc.php
+++ b/core/cmdbobject.class.inc.php
@@ -469,7 +469,10 @@ abstract class CMDBObject extends DBObject
 	 */
 	public function DBDelete(&$oDeletionPlan = null)
 	{
-		return $this->DBDeleteTracked_Internal($oDeletionPlan);
+		$this->LogCRUDEnter(__METHOD__);
+		$oDeletionPlan = $this->DBDeleteTracked_Internal($oDeletionPlan);
+		$this->LogCRUDExit(__METHOD__);
+		return $oDeletionPlan;
 	}
 
 	/**
@@ -519,15 +522,6 @@ abstract class CMDBObject extends DBObject
 			utils::PopArchiveMode();
 		}
 	}
-
-	public function DBUpdate()
-	{
-		if (count($this->ListChanges()) === 0) {
-			$this->InitPreviousValuesForUpdatedAttributes();
-			return $this->GetKey();
-		}
-		return parent::DBUpdate(); // TODO: Change the autogenerated stub
-	}
 }
 
 
diff --git a/core/config.class.inc.php b/core/config.class.inc.php
index a7c64579f7..fab6169d13 100644
--- a/core/config.class.inc.php
+++ b/core/config.class.inc.php
@@ -137,7 +137,7 @@ class Config
 			'source_of_value'     => '',
 			'show_in_conf_sample' => false,
 		],
-		'log_purge.max_keep_days' => [
+		'log_purge.max_keep_days'                       => [
 			'type'                => 'integer',
 			'description'         => 'Optional purge number of days to keep logs.',
 			'default'             => 365,
@@ -145,7 +145,7 @@ class Config
 			'source_of_value'     => '',
 			'show_in_conf_sample' => false,
 		],
-		'event_service.debug.filter_events'  => [
+		'event_service.debug.filter_events'             => [
 			'type'                => 'array',
 			'description'         => 'List of events name to filter Event Service debug messages',
 			'default'             => [],
@@ -153,7 +153,7 @@ class Config
 			'source_of_value'     => '',
 			'show_in_conf_sample' => false,
 		],
-		'event_service.debug.filter_sources' => [
+		'event_service.debug.filter_sources'            => [
 			'type'                => 'array',
 			'description'         => 'List of event sources to filter Event Service debug messages',
 			'default'             => '',
@@ -161,6 +161,38 @@ class Config
 			'source_of_value'     => '',
 			'show_in_conf_sample' => false,
 		],
+		'temporary_object.force_creation'    => [
+			'type'                => 'bool',
+			'description'         => 'If true, all the objects created by the external key are temporary',
+			'default'             => false,
+			'value'               => false,
+			'source_of_value'     => '',
+			'show_in_conf_sample' => false,
+		],
+		'temporary_object.lifetime'          => [
+			'type'                => 'integer',
+			'description'         => 'Seconds for temporary objects created',
+			'default'             => 300,
+			'value'               => 300,
+			'source_of_value'     => '',
+			'show_in_conf_sample' => false,
+		],
+		'temporary_object.watchdog_interval' => [
+			'type'                => 'integer',
+			'description'         => 'Seconds between watchdog signals',
+			'default'             => 60,
+			'value'               => false,
+			'source_of_value'     => '',
+			'show_in_conf_sample' => false,
+		],
+		'temporary_object.garbage_interval'  => [
+			'type'                => 'integer',
+			'description'         => 'Seconds between garbage collections',
+			'default'             => 60,
+			'value'               => false,
+			'source_of_value'     => '',
+			'show_in_conf_sample' => false,
+		],
 		'app_env_label'                      => [
 			'type'                => 'string',
 			'description'         => 'Label displayed to describe the current application environment, defaults to the environment name (e.g. "production")',
@@ -185,7 +217,7 @@ class Config
 			'source_of_value'     => '',
 			'show_in_conf_sample' => false,
 		],
-		'db_host'                            => [
+		'db_host'                                       => [
 			'type'                => 'string',
 			'default'             => null,
 			'value'               => '',
diff --git a/core/contexttag.class.inc.php b/core/contexttag.class.inc.php
index 9660299c24..bd15600bb9 100644
--- 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,6 +58,16 @@ 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
@@ -75,7 +85,7 @@ class ContextTag
 	{
 		static::$aStack[] = $sTag;
 	}
-	
+
 	public static function AddContext($sTag)
 	{
 		static::$aStack[] = $sTag;
diff --git a/core/csvbulkexport.class.inc.php b/core/csvbulkexport.class.inc.php
index 3c88b542d5..52d9c12f67 100644
--- a/core/csvbulkexport.class.inc.php
+++ b/core/csvbulkexport.class.inc.php
@@ -137,7 +137,7 @@ class CSVBulkExport extends TabularBulkExport
 				$aSep['other'] = Dict::S('UI:CSVImport:SeparatorOther').' <input type="text" size="3" name="other-separator" value="'.utils::EscapeHtml($sOtherSeparator).'"/>';
 
 				foreach ($aSep as $sVal => $sLabel) {
-					$oRadio = InputUIBlockFactory::MakeForInputWithLabel($sLabel, "separator", utils::EscapeHtml($sVal), $sLabel, "radio");
+					$oRadio = InputUIBlockFactory::MakeForInputWithLabel($sLabel, "separator", $sVal, $sLabel, "radio");
 					$oRadio->GetInput()->SetIsChecked(($sVal == $sRawSeparator));
 					$oRadio->SetBeforeInput(false);
 					$oRadio->GetInput()->AddCSSClass('ibo-input--label-right');
@@ -163,8 +163,8 @@ class CSVBulkExport extends TabularBulkExport
 				$aQualifiers['other'] = Dict::S('UI:CSVImport:QualifierOther').' <input type="text" size="3" name="other-text-qualifier" value="'.utils::EscapeHtml($sOtherQualifier).'"/>';
 
 				foreach ($aQualifiers as $sVal => $sLabel) {
-					$oRadio = InputUIBlockFactory::MakeForInputWithLabel($sLabel, "text-qualifier", utils::EscapeHtml($sVal), $sLabel, "radio");
-					$oRadio->GetInput()->SetIsChecked(($sVal == $sRawSeparator));
+					$oRadio = InputUIBlockFactory::MakeForInputWithLabel($sLabel, "text-qualifier", $sVal, $sLabel, "radio");
+					$oRadio->GetInput()->SetIsChecked(($sVal == $sRawQualifier));
 					$oRadio->SetBeforeInput(false);
 					$oRadio->GetInput()->AddCSSClass('ibo-input--label-right');
 					$oRadio->GetInput()->AddCSSClass('ibo-input-checkbox');
diff --git a/core/datamodel.core.xml b/core/datamodel.core.xml
index 0a98b4da66..d15ca731b3 100644
--- a/core/datamodel.core.xml
+++ b/core/datamodel.core.xml
@@ -58,6 +58,7 @@
         <parent>cmdbAbstractObject</parent>
         <properties>
           <category>addon/userrights,grant_by_profile</category>
+          <is_link>1</is_link>
         </properties>
         <fields>
           <field id="userid" xsi:type="AttributeExternalKey">
@@ -488,6 +489,12 @@
           <type>boolean</type>
           <default>false</default>
         </property>
+        <property id="create_temporary_object">
+          <php_param>create_temporary_object</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>
diff --git a/core/dbobject.class.php b/core/dbobject.class.php
index 9612a294ea..5b1e3dd187 100644
--- a/core/dbobject.class.php
+++ b/core/dbobject.class.php
@@ -7,6 +7,7 @@
 use Combodo\iTop\Core\MetaModel\FriendlyNameType;
 use Combodo\iTop\Service\Events\EventData;
 use Combodo\iTop\Service\Events\EventService;
+use Combodo\iTop\Service\TemporaryObjects\TemporaryObjectManager;
 
 /**
  * All objects to be displayed in the application (either as a list or as details)
@@ -194,24 +195,33 @@ abstract class DBObject implements iDisplay
 	 */
 	protected static array $m_aCrudStack = [];
 
+	/** @var array Context for update insert operations */
+	private array $aContext = [];
+
+	// Protect DBUpdate against infinite loop
+	protected $iUpdateLoopCount;
+
+	const MAX_UPDATE_LOOP_COUNT = 10;
+
 	/**
-     * DBObject constructor.
-     *
-     * You should preferably use MetaModel::NewObject() instead of this constructor.
-     * The whole collection of parameters is [*optional*] please refer to DBObjectSet::FromRow()
-     *
-     * @internal The availability of this method is not guaranteed in the long term, you should preferably use MetaModel::NewObject().
-     * @see MetaModel::NewObject()
-     *
-     * @param null|array   $aRow                If given : DBObjectSet::FromRow() will be used to fetch the object
-     * @param string       $sClassAlias
-     * @param null|array   $aAttToLoad
-     * @param null|array   $aExtendedDataSpec
-     *
-     * @throws CoreException
-     */
+	 * DBObject constructor.
+	 *
+	 * You should preferably use MetaModel::NewObject() instead of this constructor.
+	 * The whole collection of parameters is [*optional*] please refer to DBObjectSet::FromRow()
+	 *
+	 * @internal The availability of this method is not guaranteed in the long term, you should preferably use MetaModel::NewObject().
+	 * @see MetaModel::NewObject()
+	 *
+	 * @param null|array $aRow If given : DBObjectSet::FromRow() will be used to fetch the object
+	 * @param string $sClassAlias
+	 * @param null|array $aAttToLoad
+	 * @param null|array $aExtendedDataSpec
+	 *
+	 * @throws CoreException
+	 */
 	public function __construct($aRow = null, $sClassAlias = '', $aAttToLoad = null, $aExtendedDataSpec = null)
 	{
+		$this->iUpdateLoopCount = 0;
 		if (!empty($aRow))
 		{
 			$this->FromRow($aRow, $sClassAlias, $aAttToLoad, $aExtendedDataSpec);
@@ -601,6 +611,14 @@ abstract class DBObject implements iDisplay
      */
 	public function Set($sAttCode, $value)
 	{
+		if (!utils::StartsWith(get_class($this), 'CMDBChange') && $this->GetKey() > 0) {
+			if (is_object($value) || is_array($value)) {
+				$this->LogCRUDEnter(__METHOD__, "$sAttCode => object or array");
+			} else {
+				$this->LogCRUDEnter(__METHOD__, "$sAttCode => ".print_r($value, true));
+			}
+		}
+
 		$sMessage = $this->IsReadOnly();
 		if ($sMessage !== false) {
 			throw new CoreException($sMessage);
@@ -622,6 +640,9 @@ abstract class DBObject implements iDisplay
 			// First time Set is called... ensure that the object gets fully loaded
 			// Otherwise we would lose the values on a further Reload
 			//           + consistency does not make sense !
+			$sFullyLoaded = $this->m_bFullyLoaded ? 'true' : 'false';
+			$sDirty = $this->m_bDirty ? 'true' : 'false';
+			$this->LogCRUDDebug(__METHOD__, "IsInDB: $this->m_bIsInDB, FullyLoaded: $sFullyLoaded, Dirty: $sDirty");
 			$this->Reload();
 		}
 
@@ -1413,7 +1434,7 @@ abstract class DBObject implements iDisplay
 		}
 		$sPreview = '';
 		if(SummaryCardService::IsAllowedForClass($sObjClass) && $bIgnorePreview === false){
-			$sPreview = SummaryCardService::GetHyperlinkMarkup($sObjClass, $sObjKey); 
+			$sPreview = SummaryCardService::GetHyperlinkMarkup($sObjClass, $sObjKey);
 		}
 		$sRet = "<span class=\"object-ref $sSpanClass\" $sPreview title=\"$sHint\">$sHLink</span>";
 		return $sRet;
@@ -1503,7 +1524,7 @@ abstract class DBObject implements iDisplay
      *
      * @api
      * 
-     * @return int|null
+     * @return string|null
      */
 	public function GetKey()
 	{
@@ -1658,7 +1679,7 @@ abstract class DBObject implements iDisplay
 	 *
 	 * @return string
 	 * @throws \CoreException
-	 * @since 3.0.0 N°4106 Method should be overloaded anymore for performances reasons. It will be set final in 3.1.0 (N°4107)
+	 * @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°580 New $sType parameter
 	 *
 	 */
@@ -2820,7 +2841,7 @@ abstract class DBObject implements iDisplay
 	 *
 	 * @param string $sTableClass
 	 *
-	 * @return bool|int false if nothing to persist (no change), new key value otherwise
+	 * @return bool|string false if nothing to persist (no change), new key value otherwise
 	 * @throws \CoreException
 	 * @throws \MySQLException
 	 */
@@ -2845,11 +2866,10 @@ abstract class DBObject implements iDisplay
 
 		$aHierarchicalKeys = array();
 		
-		foreach(MetaModel::ListAttributeDefs($sTableClass) as $sAttCode=>$oAttDef)
-		{
+		foreach(MetaModel::ListAttributeDefs($sTableClass) as $sAttCode=>$oAttDef) {
 			// Skip this attribute if not defined in this table
-			if (!MetaModel::IsAttributeOrigin($sTableClass, $sAttCode) && !$oAttDef->CopyOnAllTables())
-			{
+			if ((!MetaModel::IsAttributeOrigin($sTableClass, $sAttCode) && !$oAttDef->CopyOnAllTables())
+				|| $oAttDef->IsExternalField()) {
 				continue;
 			}
 			$aAttColumns = $oAttDef->GetSQLValues($this->m_aCurrValues[$sAttCode]);
@@ -2903,7 +2923,7 @@ abstract class DBObject implements iDisplay
 		if (empty($this->m_iKey))
 		{
 			// Take the autonumber
-			$this->m_iKey = $iNewKey;
+			$this->m_iKey = "$iNewKey";
 		}
 		return $this->m_iKey;
 	}
@@ -2926,6 +2946,8 @@ abstract class DBObject implements iDisplay
 	 */
 	public function DBInsert()
 	{
+		$this->LogCRUDEnter(__METHOD__);
+
 		$this->DBInsertNoReload();
 
 		foreach ($this->m_aLoadedAtt as $sAttCode => $bLoaded) {
@@ -2939,6 +2961,7 @@ abstract class DBObject implements iDisplay
 			}
 		}
 
+		$this->LogCRUDExit(__METHOD__);
 		return $this->m_iKey;
 	}
 
@@ -2970,10 +2993,13 @@ abstract class DBObject implements iDisplay
 		}
 
 		$aHierarchicalKeys = array();
-		foreach(MetaModel::ListAttributeDefs($sTableClass) as $sAttCode=>$oAttDef)
+		foreach(MetaModel::ListAttributeDefs($sTableClass) as $sAttCode => $oAttDef)
 		{
 			// Skip this attribute if not defined in this table
-			if (!MetaModel::IsAttributeOrigin($sTableClass, $sAttCode)) continue;
+			if ((!MetaModel::IsAttributeOrigin($sTableClass, $sAttCode))
+				|| $oAttDef->IsExternalField()) {
+				continue;
+			};
 			// Skip link set that can still be undefined though the object is 100% loaded
 			if ($oAttDef->IsLinkSet()) continue;
 
@@ -3055,7 +3081,7 @@ abstract class DBObject implements iDisplay
      * @api
      * @see DBWrite
      *
-	 * @return int|null inserted object key
+	 * @return string|null inserted object key
      *
 	 * @throws \ArchivedObjectException
 	 * @throws \CoreCannotSaveObjectException
@@ -3072,13 +3098,12 @@ abstract class DBObject implements iDisplay
 		$this->AddCurrentObjectInCrudStack('INSERT');
 
 		try {
-	        if (MetaModel::DBIsReadOnly())
-	        {
-	            $sErrorMessage = "Cannot Insert object of class '$sClass' because of an ongoing maintenance: the database is in ReadOnly mode";
+			if (MetaModel::DBIsReadOnly()) {
+				$sErrorMessage = "Cannot Insert object of class '$sClass' because of an ongoing maintenance: the database is in ReadOnly mode";
 
-	            IssueLog::Error("$sErrorMessage\n".MyHelpers::get_callstack_text(1));
-	            throw new CoreException("$sErrorMessage (see the log for more information)");
-	        }
+				IssueLog::Error("$sErrorMessage\n".MyHelpers::get_callstack_text(1));
+				throw new CoreException("$sErrorMessage (see the log for more information)");
+			}
 
 			if ($this->m_bIsInDB) {
 				throw new CoreException('The object already exists into the Database, you may want to use the clone function');
@@ -3112,7 +3137,7 @@ abstract class DBObject implements iDisplay
 			}
 
 			$this->ComputeStopWatchesDeadline(true);
-			
+
 			$iTransactionRetry = 1;
 			$bIsTransactionEnabled = MetaModel::GetConfig()->Get('db_core_transactions_enabled');
 			if ($bIsTransactionEnabled) {
@@ -3151,6 +3176,8 @@ abstract class DBObject implements iDisplay
 					$this->DBWriteLinks();
 					$this->WriteExternalAttributes();
 
+					$this->HandleTemporaryDescriptor();
+
 					// Write object creation history within the transaction
 					$this->RecordObjCreation();
 
@@ -3192,32 +3219,13 @@ abstract class DBObject implements iDisplay
 			MetaModel::StartReentranceProtection($this);
 
 			try {
-				$this->FireEventAfterWrite([], true);
-				$this->AfterInsert();
-
-				// Activate any existing trigger
-				$sClass = get_class($this);
-				$aParams = array('class_list' => MetaModel::EnumParentClasses($sClass, ENUM_PARENT_CLASSES_ALL));
-				$oSet = new DBObjectSet(DBObjectSearch::FromOQL('SELECT TriggerOnObjectCreate AS t WHERE t.target_class IN (:class_list)'), array(), $aParams);
-				while ($oTrigger = $oSet->Fetch()) {
-					/** @var \TriggerOnObjectCreate $oTrigger */
-					try {
-						$oTrigger->DoActivate($this->ToArgs('this'));
-					}
-					catch (Exception $e) {
-						$oTrigger->LogException($e, $this);
-						utils::EnrichRaisedException($oTrigger, $e);
-					}
-				}
-
-				// - TriggerOnObjectMention
-				$this->ActivateOnMentionTriggers(true);
+				$this->PostInsertActions();
 			}
 			finally {
 				MetaModel::StopReentranceProtection($this);
 			}
 
-			if ($this->IsModified()) {
+			if ((count($this->ListChanges()) !== 0)) {
 				$this->DBUpdate();
 			}
 		}
@@ -3228,6 +3236,38 @@ abstract class DBObject implements iDisplay
 		return $this->m_iKey;
 	}
 
+	/**
+	 * @return void
+	 * @throws \ArchivedObjectException
+	 * @throws \CoreException
+	 * @throws \CoreUnexpectedValue
+	 * @throws \MySQLException
+	 * @throws \OQLException
+	 */
+	public function PostInsertActions(): void
+	{
+		$this->FireEventAfterWrite([], true);
+		$this->AfterInsert();
+
+		// Activate any existing trigger
+		$sClass = get_class($this);
+		$aParams = array('class_list' => MetaModel::EnumParentClasses($sClass, ENUM_PARENT_CLASSES_ALL));
+		$oSet = new DBObjectSet(DBObjectSearch::FromOQL('SELECT TriggerOnObjectCreate AS t WHERE t.target_class IN (:class_list)'), array(), $aParams);
+		while ($oTrigger = $oSet->Fetch()) {
+			/** @var \TriggerOnObjectCreate $oTrigger */
+			try {
+				$oTrigger->DoActivate($this->ToArgs('this'));
+			}
+			catch (Exception $e) {
+				$oTrigger->LogException($e, $this);
+				utils::EnrichRaisedException($oTrigger, $e);
+			}
+		}
+
+		// - TriggerOnObjectMention
+		$this->ActivateOnMentionTriggers(true);
+	}
+
     /**
      * Creates a copy of the current object into the database
      *
@@ -3258,8 +3298,8 @@ abstract class DBObject implements iDisplay
 	 * This function is automatically called after cloning an object with the "clone" PHP language construct
 	 * The purpose of this method is to reset the appropriate attributes of the object in
 	 * order to make sure that the newly cloned object is really distinct from its clone
-     *
-     * @internal
+	 *
+	 * @internal
 	 */
 	public function __clone()
 	{
@@ -3268,7 +3308,6 @@ abstract class DBObject implements iDisplay
 		$this->m_iKey = self::GetNextTempId(get_class($this));
 	}
 
-
 	/**
 	 * Update an object in DB
 	 *
@@ -3283,210 +3322,183 @@ abstract class DBObject implements iDisplay
 	 */
 	public function DBUpdate()
 	{
+		$this->LogCRUDEnter(__METHOD__);
 		if (!$this->m_bIsInDB)
 		{
 			throw new CoreException("DBUpdate: could not update a newly created object, please call DBInsert instead");
 		}
-		// Protect against reentrance (e.g. cascading the update of ticket logs)
 		$sClass = get_class($this);
-		$sKey = $this->GetKey();
-		if (!MetaModel::StartReentranceProtection($this)) {
-			IssueLog::Debug("CRUD: DBUpdate $sClass::$sKey Rejected (reentrance)", LogChannels::DM_CRUD);
-
-			return false;
-		}
 
 		$this->AddCurrentObjectInCrudStack('UPDATE');
 
+		if (!MetaModel::StartReentranceProtection($this)) {
+			$this->RemoveCurrentObjectInCrudStack();
+			$this->LogCRUDExit(__METHOD__, 'Rejected (reentrance)');
+
+			return false;
+		}
 		try {
-			$this->DoComputeValues();
-			$this->ComputeStopWatchesDeadline(false);
-			$this->OnUpdate();
+			// Protect against infinite loop
+			$this->iUpdateLoopCount++;
 
-			$this->FireEventBeforeWrite();
 
-			// Freeze the changes at this point
-			$this->InitPreviousValuesForUpdatedAttributes();
-			$aChanges = $this->ListChanges();
-			if (count($aChanges) == 0)
-			{
-				// Attempting to update an unchanged object
-				IssueLog::Debug("CRUD: DBUpdate $sClass::$sKey Aborted (no change)", LogChannels::DM_CRUD);
-
-				return $this->m_iKey;
-			}
-
-			list($bRes, $aIssues) = $this->CheckToWrite(false);
-			if (!$bRes)
-			{
-				throw new CoreCannotSaveObjectException(['issues' => $aIssues, 'class' => $sClass, 'id' => $this->GetKey()]);
-			}
-
-			// Save the original values (will be reset to the new values when the object get written to the DB)
-			$aOriginalValues = $this->m_aOrigValues;
-
-			// Activate any existing trigger
-			$sClass = get_class($this);
-
-			$aHierarchicalKeys = array();
-			$aDBChanges = array();
-			foreach ($aChanges as $sAttCode => $currentValue)
-			{
-				$oAttDef = MetaModel::GetAttributeDef(get_class($this), $sAttCode);
-				if ($oAttDef->IsBasedOnDBColumns())
-				{
-					$aDBChanges[$sAttCode] = $currentValue;
-				}
-				if ($oAttDef->IsHierarchicalKey())
-				{
-					$aHierarchicalKeys[$sAttCode] = $oAttDef;
-				}
-			}
-
-			$iTransactionRetry = 1;
-			$bIsTransactionEnabled = MetaModel::GetConfig()->Get('db_core_transactions_enabled');
-			if ($bIsTransactionEnabled)
-			{
-				// TODO Deep clone this object before the transaction (to use it in case of rollback)
-				// $iTransactionRetryCount = MetaModel::GetConfig()->Get('db_core_transactions_retry_count');
-				$iTransactionRetryCount = 1;
-				$iIsTransactionRetryDelay = MetaModel::GetConfig()->Get('db_core_transactions_retry_delay_ms');
-				$iTransactionRetry = $iTransactionRetryCount;
-			}
-
-			while ($iTransactionRetry > 0)
-			{
-				try
-				{
-					$iTransactionRetry--;
-					if ($bIsTransactionEnabled)
-					{
-						CMDBSource::Query('START TRANSACTION');
-					}
-					if (!MetaModel::DBIsReadOnly())
-					{
-						// Update the left & right indexes for each hierarchical key
-						foreach ($aHierarchicalKeys as $sAttCode => $oAttDef)
-						{
-							$sTable = MetaModel::DBGetTable($sClass, $sAttCode);
-							$sSQL = "SELECT `".$oAttDef->GetSQLRight()."` AS `right`, `".$oAttDef->GetSQLLeft()."` AS `left` FROM `$sTable` WHERE id=".$this->GetKey();
-							$aRes = CMDBSource::QueryToArray($sSQL);
-							$iMyLeft = $aRes[0]['left'];
-							$iMyRight = $aRes[0]['right'];
-							$iDelta = $iMyRight - $iMyLeft + 1;
-							MetaModel::HKTemporaryCutBranch($iMyLeft, $iMyRight, $oAttDef, $sTable);
-
-							if ($aDBChanges[$sAttCode] == 0) {
-								// No new parent, insert completely at the right of the tree
-								$sSQL = "SELECT max(`".$oAttDef->GetSQLRight()."`) AS max FROM `$sTable`";
-								$aRes = CMDBSource::QueryToArray($sSQL);
-								if (count($aRes) == 0)
-								{
-									$iNewLeft = 1;
-								}
-								else
-								{
-									$iNewLeft = $aRes[0]['max'] + 1;
-								}
-							}
-							else
-							{
-								// Insert at the right of the specified parent
-								$sSQL = "SELECT `".$oAttDef->GetSQLRight()."` FROM `$sTable` WHERE id=".((int)$aDBChanges[$sAttCode]);
-								$iNewLeft = CMDBSource::QueryToScalar($sSQL);
-							}
-
-							MetaModel::HKReplugBranch($iNewLeft, $iNewLeft + $iDelta - 1, $oAttDef, $sTable);
-
-							$aHKChanges = [];
-							$aHKChanges[$sAttCode] = $aDBChanges[$sAttCode];
-							$aHKChanges[$oAttDef->GetSQLLeft()] = $iNewLeft;
-							$aHKChanges[$oAttDef->GetSQLRight()] = $iNewLeft + $iDelta - 1;
-							$aDBChanges[$sAttCode] = $aHKChanges; // the 3 values will be stored by MakeUpdateQuery below
-						}
-
-						// Update scalar attributes
-						if (count($aDBChanges) != 0)
-						{
-							$oFilter = new DBObjectSearch($sClass);
-							$oFilter->AddCondition('id', $this->m_iKey, '=');
-							$oFilter->AllowAllData();
-
-							$sSQL = $oFilter->MakeUpdateQuery($aDBChanges);
-							CMDBSource::Query($sSQL);
-						}
-					}
-					$this->DBWriteLinks();
-					$this->WriteExternalAttributes();
-
-					if (count($aChanges) != 0) {
-						$this->RecordAttChanges($aChanges, $aOriginalValues);
-					}
-
-					if ($bIsTransactionEnabled) {
-						CMDBSource::Query('COMMIT');
-					}
-					break;
-				}
-				catch (MySQLException $e)
-				{
-					IssueLog::Error($e->getMessage());
-					if ($bIsTransactionEnabled)
-					{
-						CMDBSource::Query('ROLLBACK');
-						if (!CMDBSource::IsInsideTransaction() && CMDBSource::IsDeadlockException($e))
-						{
-							// Deadlock found when trying to get lock; try restarting transaction (only in main transaction)
-							if ($iTransactionRetry > 0)
-							{
-								// wait and retry
-								IssueLog::Error("Update TRANSACTION Retrying...");
-								usleep(random_int(1, 5) * 1000 * $iIsTransactionRetryDelay * ($iTransactionRetryCount - $iTransactionRetry));
-								continue;
-							}
-							else
-							{
-								IssueLog::Error("Update Deadlock TRANSACTION prevention failed.");
-							}
-						}
-					}
-					$aErrors = array($e->getMessage());
-					throw new CoreCannotSaveObjectException(['id' => $this->GetKey(), 'class' => $sClass, 'issues' => $aErrors], $e);
-				}
-				catch (CoreCannotSaveObjectException $e)
-				{
-					IssueLog::Error($e->getMessage());
-					if ($bIsTransactionEnabled)
-					{
-						CMDBSource::Query('ROLLBACK');
-					}
-					throw $e;
-				}
-				catch (Exception $e)
-				{
-					IssueLog::Error($e->getMessage());
-					if ($bIsTransactionEnabled)
-					{
-						CMDBSource::Query('ROLLBACK');
-					}
-					$aErrors = [$e->getMessage()];
-					throw new CoreCannotSaveObjectException(['id' => $this->GetKey(), 'class' => $sClass, 'issues' => $aErrors,]);
-				}
-			}
-
-			// following lines are resetting changes (so after this {@see DBObject::ListChanges()} won't return changes anymore)
-			// new values are already in the object (call {@see DBObject::Get()} to get them)
-			// call {@see DBObject::ListPreviousValuesForUpdatedAttributes()} to get changed fields and previous values
-			$this->m_bDirty = false;
-			$this->m_aTouchedAtt = array();
-			$this->m_aModifiedAtt = array();
-			$bModifiedByUpdateDone = false;
 			try {
-				$this->FireEventAfterWrite($aChanges, false);
-				$this->AfterUpdate();
-				// Save the status as it is reset just after...
-				$bModifiedByUpdateDone = $this->IsModified();
+				$this->DoComputeValues();
+				$this->ComputeStopWatchesDeadline(false);
+				$this->OnUpdate();
 
+				$this->FireEventBeforeWrite();
+
+				// Freeze the changes at this point
+				$this->InitPreviousValuesForUpdatedAttributes();
+				$aChanges = $this->ListChanges();
+				if (count($aChanges) == 0) {
+					// Attempting to update an unchanged object
+					$this->LogCRUDExit(__METHOD__, 'Aborted (no change)');
+
+					return $this->m_iKey;
+				}
+
+				list($bRes, $aIssues) = $this->CheckToWrite(false);
+				if (!$bRes) {
+					throw new CoreCannotSaveObjectException(['issues' => $aIssues, 'class' => $sClass, 'id' => $this->GetKey()]);
+				}
+
+				// Save the original values (will be reset to the new values when the object get written to the DB)
+				$aOriginalValues = $this->m_aOrigValues;
+
+				// Activate any existing trigger
+				$sClass = get_class($this);
+
+				$aHierarchicalKeys = array();
+				$aDBChanges = array();
+				foreach ($aChanges as $sAttCode => $currentValue) {
+					$oAttDef = MetaModel::GetAttributeDef(get_class($this), $sAttCode);
+					if ($oAttDef->IsBasedOnDBColumns()) {
+						$aDBChanges[$sAttCode] = $currentValue;
+					}
+					if ($oAttDef->IsHierarchicalKey()) {
+						$aHierarchicalKeys[$sAttCode] = $oAttDef;
+					}
+				}
+
+				$iTransactionRetry = 1;
+				$bIsTransactionEnabled = MetaModel::GetConfig()->Get('db_core_transactions_enabled');
+				if ($bIsTransactionEnabled) {
+					// TODO Deep clone this object before the transaction (to use it in case of rollback)
+					// $iTransactionRetryCount = MetaModel::GetConfig()->Get('db_core_transactions_retry_count');
+					$iTransactionRetryCount = 1;
+					$iIsTransactionRetryDelay = MetaModel::GetConfig()->Get('db_core_transactions_retry_delay_ms');
+					$iTransactionRetry = $iTransactionRetryCount;
+				}
+
+				while ($iTransactionRetry > 0) {
+					try {
+						$iTransactionRetry--;
+						if ($bIsTransactionEnabled) {
+							CMDBSource::Query('START TRANSACTION');
+						}
+						if (!MetaModel::DBIsReadOnly()) {
+							// Update the left & right indexes for each hierarchical key
+							foreach ($aHierarchicalKeys as $sAttCode => $oAttDef) {
+								$sTable = MetaModel::DBGetTable($sClass, $sAttCode);
+								$sSQL = "SELECT `".$oAttDef->GetSQLRight()."` AS `right`, `".$oAttDef->GetSQLLeft()."` AS `left` FROM `$sTable` WHERE id=".$this->GetKey();
+								$aRes = CMDBSource::QueryToArray($sSQL);
+								$iMyLeft = $aRes[0]['left'];
+								$iMyRight = $aRes[0]['right'];
+								$iDelta = $iMyRight - $iMyLeft + 1;
+								MetaModel::HKTemporaryCutBranch($iMyLeft, $iMyRight, $oAttDef, $sTable);
+
+								if ($aDBChanges[$sAttCode] == 0) {
+									// No new parent, insert completely at the right of the tree
+									$sSQL = "SELECT max(`".$oAttDef->GetSQLRight()."`) AS max FROM `$sTable`";
+									$aRes = CMDBSource::QueryToArray($sSQL);
+									if (count($aRes) == 0) {
+										$iNewLeft = 1;
+									} else {
+										$iNewLeft = $aRes[0]['max'] + 1;
+									}
+								} else {
+									// Insert at the right of the specified parent
+									$sSQL = "SELECT `".$oAttDef->GetSQLRight()."` FROM `$sTable` WHERE id=".((int)$aDBChanges[$sAttCode]);
+									$iNewLeft = CMDBSource::QueryToScalar($sSQL);
+								}
+
+								MetaModel::HKReplugBranch($iNewLeft, $iNewLeft + $iDelta - 1, $oAttDef, $sTable);
+
+								$aHKChanges = [];
+								$aHKChanges[$sAttCode] = $aDBChanges[$sAttCode];
+								$aHKChanges[$oAttDef->GetSQLLeft()] = $iNewLeft;
+								$aHKChanges[$oAttDef->GetSQLRight()] = $iNewLeft + $iDelta - 1;
+								$aDBChanges[$sAttCode] = $aHKChanges; // the 3 values will be stored by MakeUpdateQuery below
+							}
+
+							// Update scalar attributes
+							if (count($aDBChanges) != 0) {
+								$oFilter = new DBObjectSearch($sClass);
+								$oFilter->AddCondition('id', $this->m_iKey, '=');
+								$oFilter->AllowAllData();
+
+								$sSQL = $oFilter->MakeUpdateQuery($aDBChanges);
+								CMDBSource::Query($sSQL);
+							}
+						}
+						$this->DBWriteLinks();
+						$this->WriteExternalAttributes();
+
+					$this->HandleTemporaryDescriptor();
+
+						if (count($aChanges) != 0) {
+							$this->RecordAttChanges($aChanges, $aOriginalValues);
+						}
+
+						if ($bIsTransactionEnabled) {
+							CMDBSource::Query('COMMIT');
+						}
+						break;
+					}
+					catch (MySQLException $e) {
+						IssueLog::Error($e->getMessage());
+						if ($bIsTransactionEnabled) {
+							CMDBSource::Query('ROLLBACK');
+							if (!CMDBSource::IsInsideTransaction() && CMDBSource::IsDeadlockException($e)) {
+								// Deadlock found when trying to get lock; try restarting transaction (only in main transaction)
+								if ($iTransactionRetry > 0) {
+									// wait and retry
+									IssueLog::Error("Update TRANSACTION Retrying...");
+									usleep(random_int(1, 5) * 1000 * $iIsTransactionRetryDelay * ($iTransactionRetryCount - $iTransactionRetry));
+									continue;
+								} else {
+									IssueLog::Error("Update Deadlock TRANSACTION prevention failed.");
+								}
+							}
+						}
+						$aErrors = array($e->getMessage());
+						throw new CoreCannotSaveObjectException(['id' => $this->GetKey(), 'class' => $sClass, 'issues' => $aErrors], $e);
+					}
+					catch (CoreCannotSaveObjectException $e) {
+						IssueLog::Error($e->getMessage());
+						if ($bIsTransactionEnabled) {
+							CMDBSource::Query('ROLLBACK');
+						}
+						throw $e;
+					}
+					catch (Exception $e) {
+						IssueLog::Error($e->getMessage());
+						if ($bIsTransactionEnabled) {
+							CMDBSource::Query('ROLLBACK');
+						}
+						$aErrors = [$e->getMessage()];
+						throw new CoreCannotSaveObjectException(['id' => $this->GetKey(), 'class' => $sClass, 'issues' => $aErrors,]);
+					}
+				}
+
+				// following lines are resetting changes (so after this {@see DBObject::ListChanges()} won't return changes anymore)
+				// new values are already in the object (call {@see DBObject::Get()} to get them)
+				// call {@see DBObject::ListPreviousValuesForUpdatedAttributes()} to get changed fields and previous values
+				$this->m_bDirty = false;
+				$this->m_aTouchedAtt = array();
+				$this->m_aModifiedAtt = array();
 				// Reset original values although the object has not been reloaded
 				foreach ($this->m_aLoadedAtt as $sAttCode => $bLoaded) {
 					if ($bLoaded) {
@@ -3502,46 +3514,74 @@ abstract class DBObject implements iDisplay
 					}
 				}
 
-				// - TriggerOnObjectUpdate
-				$aParams = array('class_list' => MetaModel::EnumParentClasses($sClass, ENUM_PARENT_CLASSES_ALL));
-				$oSet = new DBObjectSet(DBObjectSearch::FromOQL('SELECT TriggerOnObjectUpdate AS t WHERE t.target_class IN (:class_list)'),
-					array(), $aParams);
-				while ($oTrigger = $oSet->Fetch()) {
-					/** @var \TriggerOnObjectUpdate $oTrigger */
-					try {
-						$oTrigger->DoActivate($this->ToArgs());
-					}
-					catch (Exception $e) {
-						$oTrigger->LogException($e, $this);
-						utils::EnrichRaisedException($oTrigger, $e);
-					}
+				try {
+					$this->PostUpdateActions($aChanges, $sClass);
+				}
+				catch (Exception $e) {
+					$this->LogCRUDExit(__METHOD__, 'Error: '.$e->getMessage());
+					$aErrors = [$e->getMessage()];
+					throw new CoreException($e->getMessage(), ['id' => $this->GetKey(), 'class' => $sClass, 'issues' => $aErrors]);
 				}
-
-				// Activate any existing trigger
-				// - TriggerOnObjectMention
-				// Forgotten by the fix of N°3245
-				$this->ActivateOnMentionTriggers(false, $aChanges);
 			}
-			catch (Exception $e)
-			{
-				$aErrors = [$e->getMessage()];
-				throw new CoreException($e->getMessage(), ['id' => $this->GetKey(), 'class' => $sClass, 'issues' => $aErrors]);
+			finally {
+				MetaModel::StopReentranceProtection($this);
+			}
+
+			if (count($this->ListChanges()) !== 0) {
+				// Controlled reentrance
+				if ($this->iUpdateLoopCount >= self::MAX_UPDATE_LOOP_COUNT) {
+					$this->LogCRUDExit(__METHOD__, 'Max update loop reached');
+					return false;
+				}
+				$this->DBUpdate();
 			}
 		}
-		finally
-		{
-			MetaModel::StopReentranceProtection($this);
+		finally {
 			$this->RemoveCurrentObjectInCrudStack();
+			$this->iUpdateLoopCount--;
 		}
 
-		if ($this->IsModified() || $bModifiedByUpdateDone) {
-			// Controlled reentrance
-			$this->DBUpdate();
-		}
+		$this->LogCRUDExit(__METHOD__);
 
 		return $this->m_iKey;
 	}
 
+	/**
+	 * @param array $aChanges
+	 *
+	 * @return void
+	 * @throws \ArchivedObjectException
+	 * @throws \CoreException
+	 * @throws \CoreUnexpectedValue
+	 * @throws \MySQLException
+	 * @throws \OQLException
+	 */
+	public function PostUpdateActions(array $aChanges): void
+	{
+		$this->FireEventAfterWrite($aChanges, false);
+		$this->AfterUpdate();
+
+		// - TriggerOnObjectUpdate
+		$aParams = array('class_list' => MetaModel::EnumParentClasses(get_class($this), ENUM_PARENT_CLASSES_ALL));
+		$oSet = new DBObjectSet(DBObjectSearch::FromOQL('SELECT TriggerOnObjectUpdate AS t WHERE t.target_class IN (:class_list)'),
+			array(), $aParams);
+		while ($oTrigger = $oSet->Fetch()) {
+			/** @var \TriggerOnObjectUpdate $oTrigger */
+			try {
+				$oTrigger->DoActivate($this->ToArgs());
+			}
+			catch (Exception $e) {
+				$oTrigger->LogException($e, $this);
+				utils::EnrichRaisedException($oTrigger, $e);
+			}
+		}
+
+		// Activate any existing trigger
+		// - TriggerOnObjectMention
+		// Forgotten by the fix of N°3245
+		$this->ActivateOnMentionTriggers(false, $aChanges);
+	}
+
 
 	/**
 	 * Increment attribute with specified value.
@@ -3742,6 +3782,7 @@ abstract class DBObject implements iDisplay
 	{
 		if (MetaModel::DBIsReadOnly())
 		{
+			$this->LogCRUDExit(__METHOD__, 'DB is read-only');
 			return;
 		}
 
@@ -3847,6 +3888,7 @@ abstract class DBObject implements iDisplay
 						}
 					}
 				}
+				$this->LogCRUDError(__METHOD__, ' Error: '.$e->getMessage());
 				throw $e;
 			}
 		}
@@ -3885,6 +3927,8 @@ abstract class DBObject implements iDisplay
      */
 	public function DBDelete(&$oDeletionPlan = null)
 	{
+		$this->LogCRUDEnter(__METHOD__);
+
 		static $iLoopTimeLimit = null;
 		if ($iLoopTimeLimit == null)
 		{
@@ -3900,6 +3944,7 @@ abstract class DBObject implements iDisplay
 		if ($oDeletionPlan->FoundStopper())
 		{
 			$aIssues = $oDeletionPlan->GetIssues();
+			$this->LogCRUDError(__METHOD__, ' Errors: '.implode(', ', $aIssues));
 			throw new DeleteException('Found issue(s)', array('target_class' => get_class($this), 'target_id' => $this->GetKey(), 'issues' => implode(', ', $aIssues)));
 		}
 
@@ -3950,6 +3995,7 @@ abstract class DBObject implements iDisplay
 
 		set_time_limit(intval($iPreviousTimeLimit));
 
+		$this->LogCRUDExit(__METHOD__);
 		return $oDeletionPlan;
 	}
 
@@ -5986,11 +6032,8 @@ abstract class DBObject implements iDisplay
 			}
 
 			$oAttDef = MetaModel::GetAttributeDef(get_class($this), $sAttCode);
-			$aSQLValues = $oAttDef->GetSQLValues($this->m_aCurrValues[$sAttCode]);
+			$aSQLValues = $oAttDef->GetSQLValues($this->Get($sAttCode));
 			$value = reset($aSQLValues);
-			if ($oAttDef->IsNull($value)) {
-				return '';
-			}
 			$aArgs[$sFieldDesc] = $value;
 		}
 
@@ -6321,5 +6364,129 @@ abstract class DBObject implements iDisplay
 	{
 		return count(self::$m_aCrudStack) === 0;
 	}
+
+	protected function LogCRUDEnter($sFunction, $sComment = '')
+	{
+		$sClass = get_class($this);
+		$sKey = $this->GetKey();
+		$sPadding = str_pad('', count(self::$m_aCrudStack), '-');
+		IssueLog::Debug("CRUD +$sPadding> $sFunction $sClass:$sKey $sComment", LogChannels::DM_CRUD);
+	}
+
+	protected function LogCRUDExit($sFunction, $sComment = '')
+	{
+		$sClass = get_class($this);
+		$sKey = $this->GetKey();
+		$sPadding = str_pad('', count(self::$m_aCrudStack), '-');
+		if (strlen($sComment) === 0) {
+			IssueLog::Trace("CRUD <$sPadding+ $sFunction $sClass:$sKey", LogChannels::DM_CRUD);
+		} else {
+			IssueLog::Debug("CRUD <$sPadding+ $sFunction $sClass:$sKey $sComment", LogChannels::DM_CRUD);
+		}
+	}
+
+	protected function LogCRUDDebug($sFunction, $sComment = '')
+	{
+		$sClass = get_class($this);
+		$sKey = $this->GetKey();
+		$sPadding = str_pad('', count(self::$m_aCrudStack), '-');
+		IssueLog::Debug("CRUD --$sPadding $sFunction $sClass:$sKey $sComment", LogChannels::DM_CRUD);
+	}
+
+	protected function LogCRUDError($sFunction, $sComment = '')
+	{
+		$sClass = get_class($this);
+		$sKey = $this->GetKey();
+		$sPadding = str_pad('', count(self::$m_aCrudStack), '!');
+		IssueLog::Error("CRUD !!$sPadding Error $sFunction $sClass:$sKey $sComment", LogChannels::DM_CRUD);
+	}
+
+	/**
+	 * Handle temporary descriptors.
+	 *
+	 * @return void
+	 *
+	 * @throws \ArchivedObjectException
+	 * @throws \CoreException
+	 * @throws \CoreUnexpectedValue
+	 * @throws \MySQLException
+	 * @throws \OQLException
+	 *
+	 * @experimental do not use, this feature will be part of a future version
+	 *
+	 * @since 3.1
+	 */
+	private function HandleTemporaryDescriptor()
+	{
+		if ($this->HasContextSection('temporary_objects')) {
+			TemporaryObjectManager::GetInstance()->HandleTemporaryObjects($this, $this->GetContextSection('temporary_objects'));
+		}
+	}
+
+	/**
+	 * Return context information.
+	 *
+	 * @return array
+	 *
+	 * @experimental do not use, this feature will be part of a future version
+	 *
+	 * @since 3.1
+	 */
+	public function GetContext(): array
+	{
+		return $this->aContext;
+	}
+
+	/**
+	 * Set context section data.
+	 *
+	 * @param string $sSection
+	 * @param $value
+	 *
+	 * @experimental do not use, this feature will be part of a future version
+	 *
+	 * @since 3.1
+	 *
+	 */
+	public function SetContextSection(string $sSection, $value)
+	{
+		$this->aContext[$sSection] = $value;
+	}
+
+	/**
+	 * Get context section data.
+	 *
+	 * @param string $sSection
+	 *
+	 * @return mixed
+	 *
+	 * experimental do not use, this feature will be part of a future version
+	 *
+	 * @since 3.1
+	 */
+	public function GetContextSection(string $sSection)
+	{
+		if ($this->HasContextSection($sSection)) {
+			return $this->aContext[$sSection];
+		}
+
+		return null;
+	}
+
+	/**
+	 * Test context section existence.
+	 *
+	 * @param string $sSection
+	 *
+	 * @return bool
+	 *
+	 * experimental do not use, this feature will be part of a future version
+	 *
+	 * @since 3.1
+	 */
+	public function HasContextSection(string $sSection): bool
+	{
+		return array_key_exists($sSection, $this->aContext);
+	}
 }
 
diff --git a/core/log.class.inc.php b/core/log.class.inc.php
index 169bc72d9c..2af8dc5b2b 100644
--- a/core/log.class.inc.php
+++ b/core/log.class.inc.php
@@ -583,6 +583,12 @@ class LogChannels
 	 */
 	public const DM_CRUD = 'DMCRUD';
 
+	/**
+	 * @var string Everything related to the datamodel CRUD
+	 * @since 3.1.0
+	 */
+	public const WEB_REQUEST = 'WebRequest';
+
 	/**
 	 * @var string Everything related to the event service
 	 * @since 3.1.0
@@ -606,6 +612,8 @@ class LogChannels
 
 	public const PORTAL       = 'portal';
 
+	public const TEMPORARY_OBJECTS = 'TemporaryObjects';
+
 	/**
 	 * @var string
 	 * @since 3.1.0
@@ -1230,7 +1238,9 @@ class DeprecatedCallsLog extends LogAPI
 	}
 
 	/**
-	 * @throws \ConfigException
+	 * @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
+	 *
 	 * @link https://www.php.net/debug_backtrace
 	 * @uses \debug_backtrace()
 	 */
@@ -1404,7 +1414,7 @@ class LogFileRotationProcess implements iScheduledProcess
 		$iMaxDays = MetaModel::GetConfig()->Get(LogAPI::ENUM_CONFIG_PARAM_PURGE_MAX_KEEP_DAYS);
 
 		// Files iterator (*.*)
-		$oIterator = new \GlobIterator(APPROOT.'log'.DIRECTORY_SEPARATOR.'/*.*');
+		$oIterator = new \GlobIterator(APPROOT.'log'.DIRECTORY_SEPARATOR.'*.*');
 		$aLogFiles = iterator_to_array($oIterator);
 
 		// Reference date
@@ -1416,6 +1426,11 @@ class LogFileRotationProcess implements iScheduledProcess
 			// File real path
 			$sFileRealPath = $oLogFile->getRealPath();
 
+			// Check file extension
+			if(!in_array($oLogFile->getExtension(), ['log','sql','xml'])){
+				continue;
+		    }
+
 			// Compute number of days since last modification
 			$oDateFileLastModification = new DateTime();
 			$oDateFileLastModification->setTimestamp($oLogFile->getMTime());
diff --git a/core/metamodel.class.php b/core/metamodel.class.php
index 8d80ff6186..7e3b8cdc85 100644
--- a/core/metamodel.class.php
+++ b/core/metamodel.class.php
@@ -2927,52 +2927,7 @@ abstract class MetaModel
 		}
 
 		self::$m_sTablePrefix = $sTablePrefix;
-
-		// Build the list of available extensions
-		//
-		$aInterfaces = [
-			'iApplicationUIExtension',
-			'iPreferencesExtension',
-			'iApplicationObjectExtension',
-			'iLoginFSMExtension',
-			'iLoginUIExtension',
-			'iLogoutExtension',
-			'iQueryModifier',
-			'iOnClassInitialization',
-			'iPopupMenuExtension',
-			'iPageUIExtension',
-			'iPageUIBlockExtension',
-			'iBackofficeLinkedScriptsExtension',
-			'iBackofficeEarlyScriptExtension',
-			'iBackofficeScriptExtension',
-			'iBackofficeInitScriptExtension',
-			'iBackofficeReadyScriptExtension',
-			'iBackofficeLinkedStylesheetsExtension',
-			'iBackofficeStyleExtension',
-			'iBackofficeDictEntriesExtension',
-			'iBackofficeDictEntriesPrefixesExtension',
-			'iPortalUIExtension',
-			'ModuleHandlerApiInterface',
-			'iNewsroomProvider',
-			'iModuleExtension',
-		];
-		foreach($aInterfaces as $sInterface)
-		{
-			self::$m_aExtensionClassNames[$sInterface] = array();
-		}
-
-		foreach(get_declared_classes() as $sPHPClass)
-		{
-			$oRefClass = new ReflectionClass($sPHPClass);
-			$oExtensionInstance = null;
-			foreach($aInterfaces as $sInterface)
-			{
-				if ($oRefClass->implementsInterface($sInterface) && $oRefClass->isInstantiable())
-				{
-					self::$m_aExtensionClassNames[$sInterface][$sPHPClass] = $sPHPClass;
-				}
-			}
-		}
+		self::InitExtensions();
 
 		// Initialize the classes (declared attributes, etc.)
 		//
@@ -7642,6 +7597,56 @@ abstract class MetaModel
 			unset(self::$m_aReentranceProtection[get_class($oObject)][$oObject->GetKey()]);
 		}
 	}
+
+	/**
+	 * For test purpose
+	 * @throws \ReflectionException
+	 * @since 3.1.0
+	 */
+	public static function InitExtensions()
+	{
+		// Build the list of available extensions
+		//
+		$aInterfaces = [
+			'iApplicationUIExtension',
+			'iPreferencesExtension',
+			'iApplicationObjectExtension',
+			'iLoginFSMExtension',
+			'iLoginUIExtension',
+			'iLogoutExtension',
+			'iQueryModifier',
+			'iOnClassInitialization',
+			'iPopupMenuExtension',
+			'iPageUIExtension',
+			'iPageUIBlockExtension',
+			'iBackofficeLinkedScriptsExtension',
+			'iBackofficeEarlyScriptExtension',
+			'iBackofficeScriptExtension',
+			'iBackofficeInitScriptExtension',
+			'iBackofficeReadyScriptExtension',
+			'iBackofficeLinkedStylesheetsExtension',
+			'iBackofficeStyleExtension',
+			'iBackofficeDictEntriesExtension',
+			'iBackofficeDictEntriesPrefixesExtension',
+			'iPortalUIExtension',
+			'ModuleHandlerApiInterface',
+			'iNewsroomProvider',
+			'iModuleExtension',
+		];
+		foreach ($aInterfaces as $sInterface) {
+			self::$m_aExtensionClassNames[$sInterface] = array();
+		}
+
+		foreach (get_declared_classes() as $sPHPClass) {
+			$oRefClass = new ReflectionClass($sPHPClass);
+			$oExtensionInstance = null;
+			foreach ($aInterfaces as $sInterface) {
+				if ($oRefClass->implementsInterface($sInterface) && $oRefClass->isInstantiable()) {
+					self::$m_aExtensionClassNames[$sInterface][$sPHPClass] = $sPHPClass;
+				}
+			}
+		}
+	}
 }
 
 
diff --git a/core/oql/expression.class.inc.php b/core/oql/expression.class.inc.php
index 78a9636ddd..0a6db899e9 100644
--- a/core/oql/expression.class.inc.php
+++ b/core/oql/expression.class.inc.php
@@ -3526,6 +3526,7 @@ class CharConcatWSExpression extends CharConcatExpression
 		$aRes = array();
 		foreach ($this->m_aExpressions as $oExpr)
 		{
+			// TODO: Seems weird, this should rather be $aRes[] = $oExpr->Evaluate($aArgs);
 			$aRes .= $oExpr->Evaluate($aArgs);
 		}
 		return implode($this->m_separator, $aRes);
diff --git a/core/ormdocument.class.inc.php b/core/ormdocument.class.inc.php
index da96f07378..2ee6dfd33e 100644
--- a/core/ormdocument.class.inc.php
+++ b/core/ormdocument.class.inc.php
@@ -86,6 +86,33 @@ class ormDocument
 	{
 		return ($this->m_data == null);
 	}
+
+	/**
+	 * @param \ormDocument $oCompared
+	 *
+	 * @return bool True if the current ormDocument is equals to $oCompared EXCEPT for its download count. False if any other property is different OR if count is the same.
+	 * @since 3.1.0 N°6502
+	 */
+	public function EqualsExceptDownloadsCount(ormDocument $oCompared): bool
+	{
+		// First checking equality on others properties
+		if ($oCompared->GetData() !== $this->GetData()) {
+			return false;
+		}
+		if ($oCompared->GetMimeType() !== $this->GetMimeType()) {
+			return false;
+		}
+		if ($oCompared->GetFileName() !== $this->GetFileName()) {
+			return false;
+		}
+
+		// Finally check equality of the download count
+		if ($oCompared->GetDownloadsCount() === $this->GetDownloadsCount()) {
+			return false;
+		} else {
+			return true;
+		}
+	}
 	
 	public function GetMimeType()
 	{
diff --git a/core/pluginmanager.class.inc.php b/core/pluginmanager.class.inc.php
index 3e7c2c711a..b6f7e58056 100644
--- a/core/pluginmanager.class.inc.php
+++ b/core/pluginmanager.class.inc.php
@@ -98,4 +98,14 @@ class PluginManager
 
 		return $oInstance;
 	}
+
+	/**
+	 * For test purpose
+	 * @return void
+	 * @since 3.1.0
+	 */
+	protected static function ResetPlugins()
+	{
+		self::$m_aExtensionClasses = null;
+	}
 }
diff --git a/core/simplecrypt.class.inc.php b/core/simplecrypt.class.inc.php
index c73bed1bdd..3cbaaa91a8 100644
--- a/core/simplecrypt.class.inc.php
+++ b/core/simplecrypt.class.inc.php
@@ -43,6 +43,12 @@
 
 class SimpleCrypt
 {
+	/**
+	 * @var \SimpleCrypt
+	 * @since 3.1.0 N°5388
+	 */
+	protected $oEngine;
+
 	public static function GetNewDefaultParams()
 	{
 		if(function_exists('sodium_crypto_secretbox_open') && function_exists('random_bytes')){
@@ -62,6 +68,7 @@ class SimpleCrypt
 		$sEngineName = 'SimpleCrypt' . $sEngineName . 'Engine';
 		return $sEngineName::GetNewDefaultParams();
 	}
+
     /**
      * Constructor
      * @param string $sEngineName Engine for encryption. Values: Simple, Mcrypt, Sodium or OpenSSL
diff --git a/core/sqlobjectquerybuilder.class.inc.php b/core/sqlobjectquerybuilder.class.inc.php
index 4b1ea37792..568e4b3435 100644
--- a/core/sqlobjectquerybuilder.class.inc.php
+++ b/core/sqlobjectquerybuilder.class.inc.php
@@ -218,8 +218,8 @@ class SQLObjectQueryBuilder
 					continue;
 				}
 				$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
-				// Skip this attribute if not made of SQL columns
-				if (count($oAttDef->GetSQLExpressions()) == 0)
+				// Skip this attribute if not made of SQL columns nor in current table
+				if (count($oAttDef->GetSQLExpressions()) == 0 || $oAttDef->IsExternalField())
 				{
 					continue;
 				}
diff --git a/core/trigger.class.inc.php b/core/trigger.class.inc.php
index f3264146c8..aefbc60505 100644
--- a/core/trigger.class.inc.php
+++ b/core/trigger.class.inc.php
@@ -50,7 +50,7 @@ abstract class Trigger extends cmdbAbstractObject
 		MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("action_list",
 			array("linked_class" => "lnkTriggerAction", "ext_key_to_me" => "trigger_id", "ext_key_to_remote" => "action_id", "allowed_values" => null, "count_min" => 1, "count_max" => 0, "depends_on" => array())));
 		$aTags = ContextTag::GetTags();
-		MetaModel::Init_AddAttribute(new AttributeEnumSet("context", array("allowed_values" => null, "possible_values" => new ValueSetEnumPadded($aTags), "sql" => "context", "depends_on" => array(), "is_null_allowed" => true, "max_items" => 12)));
+		MetaModel::Init_AddAttribute(new AttributeEnumSet("context", array("allowed_values" => null, "possible_values" => new ValueSetEnumPadded($aTags, true), "sql" => "context", "depends_on" => array(), "is_null_allowed" => true, "max_items" => 12)));
 		// "complement" is a computed field, fed by Trigger sub-classes, in general in ComputeValues method, for eg. the TriggerOnObject fed it with target_class info
 		MetaModel::Init_AddAttribute(new AttributeString("complement", array("allowed_values" => null, "sql" => "complement", "default_value" => null, "is_null_allowed" => true, "depends_on" => array())));
 
diff --git a/core/valuesetdef.class.inc.php b/core/valuesetdef.class.inc.php
index ef9ba674db..c32766b0f4 100644
--- a/core/valuesetdef.class.inc.php
+++ b/core/valuesetdef.class.inc.php
@@ -97,7 +97,7 @@ abstract class ValueSetDefinition
 	public function SortValues(array &$aValues): void
 	{
 		// Sort alphabetically on values
-		asort($aValues);
+		natcasesort($aValues);
 	}
 
 	abstract protected function LoadValues($aArgs);
@@ -465,11 +465,11 @@ 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.
+	 * @var bool $bSortByValues If true, values will be sorted at runtime (on their values, not their keys), 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;
+	protected bool $bSortByValues;
 
 	/**
 	 * @param array|string $Values
@@ -477,20 +477,20 @@ class ValueSetEnum extends ValueSetDefinition
 	 *
 	 * @since 3.1.0 N°1646 Add $bLocalizedSort parameter
 	 */
-	public function __construct($Values, bool $bSortByValue = false)
+	public function __construct($Values, bool $bSortByValues = false)
 	{
 		$this->m_values = $Values;
-		$this->bSortByValue = $bSortByValue;
+		$this->bSortByValues = $bSortByValues;
 	}
 
 	/**
-	 * @see \ValueSetEnum::$bSortByValue
+	 * @see \ValueSetEnum::$bSortByValues
 	 * @return bool
 	 * @since 3.1.0 N°1646
 	 */
 	public function IsSortedByValues(): bool
 	{
-		return $this->bSortByValue;
+		return $this->bSortByValues;
 	}
 
 	// Helper to export the data model
@@ -507,8 +507,8 @@ class ValueSetEnum extends ValueSetDefinition
 	public function SortValues(array &$aValues): void
 	{
 		// Force sort by values only if necessary
-		if ($this->bSortByValue) {
-			asort($aValues);
+		if ($this->bSortByValues) {
+			natcasesort($aValues);
 			return;
 		}
 
@@ -548,9 +548,13 @@ class ValueSetEnum extends ValueSetDefinition
 
 class ValueSetEnumPadded extends ValueSetEnum
 {
-	public function __construct($Values)
+	/**
+	 * @inheritDoc
+	 * @since 3.1.0 N°6448 Add $bSortByValues parameter
+	 */
+	public function __construct($Values, bool $bSortByValues = false)
 	{
-		parent::__construct($Values);
+		parent::__construct($Values, $bSortByValues);
 		if (is_string($Values))
 		{
 			$this->LoadValues(null);
@@ -562,6 +566,7 @@ class ValueSetEnumPadded extends ValueSetEnum
 		$aPaddedValues = array();
 		foreach ($this->m_aValues as $sKey => $sVal)
 		{
+			// Pad keys to the min. length required by the \AttributeSet
 			$sKey = str_pad($sKey, 3, '_', STR_PAD_LEFT);
 			$aPaddedValues[$sKey] = $sVal;
 		}
@@ -610,7 +615,7 @@ class ValueSetEnumClasses extends ValueSetEnum
 	public function __construct($sCategories = '', $sAdditionalValues = '')
 	{
 		$this->m_sCategories = $sCategories;
-		parent::__construct($sAdditionalValues);
+		parent::__construct($sAdditionalValues, true /* Classes are always sorted alphabetically */);
 	}
 
 	protected function LoadValues($aArgs)
diff --git 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
index 440edff7f3..e0df7e0ae5 100644
--- 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,7 +7,6 @@
  * @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',
diff --git a/datamodels/2.x/authent-cas/dictionaries/pl.dict.authent-cas.php b/datamodels/2.x/authent-cas/dictionaries/pl.dict.authent-cas.php
index 52d4d5124c..9b9eff5009 100644
--- 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,7 +5,6 @@
  * @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',
diff --git 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
index 53ad06ba60..db00f2df9a 100644
--- 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
diff --git a/datamodels/2.x/authent-external/dictionaries/pl.dict.authent-external.php b/datamodels/2.x/authent-external/dictionaries/pl.dict.authent-external.php
index 84197c5472..99bad23a2f 100644
--- 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,7 +20,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/>
  */
-
 // Dictionnay conventions
 // Class:<class_name>
 // Class:<class_name>+
@@ -30,11 +29,9 @@
 // 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,
diff --git a/datamodels/2.x/authent-ldap/dictionaries/cs.dict.authent-ldap.php b/datamodels/2.x/authent-ldap/dictionaries/cs.dict.authent-ldap.php
index e51a87d6db..18f1b296ce 100644
--- 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,4 +38,5 @@
 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~~',
 ));
diff --git a/datamodels/2.x/authent-ldap/dictionaries/da.dict.authent-ldap.php b/datamodels/2.x/authent-ldap/dictionaries/da.dict.authent-ldap.php
index d7f1bd599f..3a2b38ef0e 100644
--- 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,4 +23,5 @@
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:UserLDAP' => 'LDAP-Bruger',
 	'Class:UserLDAP+' => 'Bruger der godkendes via LDAP',
+	'UserLDAP:server' => 'LDAP specifics~~',
 ));
diff --git a/datamodels/2.x/authent-ldap/dictionaries/de.dict.authent-ldap.php b/datamodels/2.x/authent-ldap/dictionaries/de.dict.authent-ldap.php
index 7ca7db04a4..64d349104e 100644
--- 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,4 +25,7 @@
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:UserLDAP' => 'LDAP-Benutzer',
 	'Class:UserLDAP+' => 'Benutzer, der via LDAP authentifiziert wird',
+	'Class:UserLDAP/Attribute:ldap_server' => 'LDAP-Server',
+	'Class:UserLDAP/Attribute:ldap_server+' => 'Optional: LDAP-Server, der zur Authentifizierung verwendet werden soll, falls mehrere LDAP-Server konfiguriert sind.',
+	'UserLDAP:server' => 'LDAP-Einstellungen',
 ));
diff --git 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
index 8564aebeb0..cb9296e42f 100644
--- 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,4 +37,5 @@
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:UserLDAP' => 'Usuario LDAP',
 	'Class:UserLDAP+' => 'Usuario autenticado vía LDAP',
+	'UserLDAP:server' => 'LDAP specifics~~',
 ));
diff --git a/datamodels/2.x/authent-ldap/dictionaries/hu.dict.authent-ldap.php b/datamodels/2.x/authent-ldap/dictionaries/hu.dict.authent-ldap.php
index a84e3b7485..34f4fb68db 100644
--- 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,4 +22,5 @@
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:UserLDAP' => 'LDAP felhasználó',
 	'Class:UserLDAP+' => '',
+	'UserLDAP:server' => 'LDAP specifics~~',
 ));
diff --git a/datamodels/2.x/authent-ldap/dictionaries/it.dict.authent-ldap.php b/datamodels/2.x/authent-ldap/dictionaries/it.dict.authent-ldap.php
index cee912820d..bab7384796 100644
--- 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,4 +36,5 @@
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:UserLDAP' => 'Utente LDAP',
 	'Class:UserLDAP+' => 'Utente autenticato da LDAP',
+	'UserLDAP:server' => 'LDAP specifics~~',
 ));
diff --git a/datamodels/2.x/authent-ldap/dictionaries/ja.dict.authent-ldap.php b/datamodels/2.x/authent-ldap/dictionaries/ja.dict.authent-ldap.php
index fdcb574eee..1bcdab84d3 100644
--- 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,4 +23,5 @@
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:UserLDAP' => 'LDAP ユーザー',
 	'Class:UserLDAP+' => 'LDAP認証ユーザー',
+	'UserLDAP:server' => 'LDAP specifics~~',
 ));
diff --git a/datamodels/2.x/authent-ldap/dictionaries/nl.dict.authent-ldap.php b/datamodels/2.x/authent-ldap/dictionaries/nl.dict.authent-ldap.php
index 3f66f62c1d..01e1598245 100644
--- 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,4 +37,5 @@
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:UserLDAP' => 'LDAP-gebruiker',
 	'Class:UserLDAP+' => 'Gebruiker die aanmeldt via LDAP',
+	'UserLDAP:server' => 'LDAP specifics~~',
 ));
diff --git a/datamodels/2.x/authent-ldap/dictionaries/pl.dict.authent-ldap.php b/datamodels/2.x/authent-ldap/dictionaries/pl.dict.authent-ldap.php
index 4e329c11be..3f0c453c89 100644
--- 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,7 +20,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/>
  */
-
 // Dictionnay conventions
 // Class:<class_name>
 // Class:<class_name>+
@@ -30,12 +29,11 @@
 // 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~~',
 ));
diff --git 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
index c3241b250d..31663bf796 100644
--- 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,4 +22,5 @@
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:UserLDAP' => 'Usuário externo via LDAP',
 	'Class:UserLDAP+' => '',
+	'UserLDAP:server' => 'LDAP specifics~~',
 ));
diff --git a/datamodels/2.x/authent-ldap/dictionaries/ru.dict.authent-ldap.php b/datamodels/2.x/authent-ldap/dictionaries/ru.dict.authent-ldap.php
index b6b4a0276f..60db75eee8 100644
--- 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,4 +14,5 @@
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:UserLDAP' => 'Пользователь LDAP',
 	'Class:UserLDAP+' => 'Пользователь, аутентифицируемый через LDAP',
+	'UserLDAP:server' => 'LDAP specifics~~',
 ));
diff --git a/datamodels/2.x/authent-ldap/dictionaries/sk.dict.authent-ldap.php b/datamodels/2.x/authent-ldap/dictionaries/sk.dict.authent-ldap.php
index d5a5cc4b6a..e2d0e47351 100644
--- 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,4 +35,5 @@
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:UserLDAP' => 'LDAP užívateľ',
 	'Class:UserLDAP+' => '',
+	'UserLDAP:server' => 'LDAP specifics~~',
 ));
diff --git a/datamodels/2.x/authent-ldap/dictionaries/tr.dict.authent-ldap.php b/datamodels/2.x/authent-ldap/dictionaries/tr.dict.authent-ldap.php
index 894614f7d8..ec7f486df2 100644
--- 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,4 +37,5 @@
 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~~',
 ));
diff --git 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
index 536cab3449..0a74ba93fe 100644
--- 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,4 +36,5 @@
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:UserLDAP' => 'LDAP 用户',
 	'Class:UserLDAP+' => '用户身份由LDAP 认证',
+	'UserLDAP:server' => 'LDAP specifics~~',
 ));
diff --git a/datamodels/2.x/authent-local/dictionaries/cs.dict.authent-local.php b/datamodels/2.x/authent-local/dictionaries/cs.dict.authent-local.php
index 1db549b92c..7af2aec0e7 100644
--- 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,7 +40,6 @@ 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~~',
@@ -53,9 +52,7 @@ 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~~',
 ));
diff --git a/datamodels/2.x/authent-local/dictionaries/da.dict.authent-local.php b/datamodels/2.x/authent-local/dictionaries/da.dict.authent-local.php
index f4245c9096..10ae557655 100644
--- 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,7 +25,6 @@ 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~~',
@@ -38,9 +37,7 @@ 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~~',
 ));
diff --git a/datamodels/2.x/authent-local/dictionaries/de.dict.authent-local.php b/datamodels/2.x/authent-local/dictionaries/de.dict.authent-local.php
index 9f43987370..4067c85197 100644
--- 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,7 +27,6 @@ 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',
@@ -40,9 +39,7 @@ 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.',
 ));
diff --git 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
index 3c8cf1a6c4..61a5c9b1f2 100644
--- 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,7 +39,6 @@ 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',
@@ -52,9 +51,7 @@ 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',
 ));
diff --git a/datamodels/2.x/authent-local/dictionaries/fr.dict.authent-local.php b/datamodels/2.x/authent-local/dictionaries/fr.dict.authent-local.php
index 848fbf45c9..e87fbce5a1 100644
--- 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,7 +24,6 @@ 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',
@@ -37,7 +36,6 @@ 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.',
diff --git a/datamodels/2.x/authent-local/dictionaries/hu.dict.authent-local.php b/datamodels/2.x/authent-local/dictionaries/hu.dict.authent-local.php
index 806972d73f..cadb4c717c 100644
--- 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,7 +24,6 @@ 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',
@@ -35,11 +34,9 @@ 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.',
 ));
diff --git a/datamodels/2.x/authent-local/dictionaries/it.dict.authent-local.php b/datamodels/2.x/authent-local/dictionaries/it.dict.authent-local.php
index ee854ed233..a410f23df6 100644
--- 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,7 +38,6 @@ 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~~',
@@ -51,9 +50,7 @@ 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~~',
 ));
diff --git a/datamodels/2.x/authent-local/dictionaries/ja.dict.authent-local.php b/datamodels/2.x/authent-local/dictionaries/ja.dict.authent-local.php
index fa71fe5194..1b1866a7df 100644
--- 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,7 +25,6 @@ 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~~',
@@ -38,9 +37,7 @@ 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~~',
 ));
diff --git a/datamodels/2.x/authent-local/dictionaries/nl.dict.authent-local.php b/datamodels/2.x/authent-local/dictionaries/nl.dict.authent-local.php
index a128c65b86..14f1292e79 100644
--- 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,7 +29,6 @@ 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',
@@ -42,9 +41,7 @@ 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.',
 ));
diff --git a/datamodels/2.x/authent-local/dictionaries/pl.dict.authent-local.php b/datamodels/2.x/authent-local/dictionaries/pl.dict.authent-local.php
index 0fc37b6052..a3e3a67d47 100644
--- 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,7 +37,6 @@ 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ąć',
@@ -50,9 +49,7 @@ 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',
 ));
diff --git 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
index a789163522..04ef61c0d5 100644
--- 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,7 +24,6 @@ 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',
@@ -37,9 +36,7 @@ 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',
 ));
diff --git a/datamodels/2.x/authent-local/dictionaries/ru.dict.authent-local.php b/datamodels/2.x/authent-local/dictionaries/ru.dict.authent-local.php
index 0e55ffa123..113eb80946 100644
--- 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,7 +16,6 @@ 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' => 'Органиченный',
@@ -29,9 +28,7 @@ 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~~',
 ));
diff --git a/datamodels/2.x/authent-local/dictionaries/sk.dict.authent-local.php b/datamodels/2.x/authent-local/dictionaries/sk.dict.authent-local.php
index a997386da0..1c12548bac 100644
--- 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,7 +37,6 @@ 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~~',
@@ -50,9 +49,7 @@ 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~~',
 ));
diff --git a/datamodels/2.x/authent-local/dictionaries/tr.dict.authent-local.php b/datamodels/2.x/authent-local/dictionaries/tr.dict.authent-local.php
index a75a4daf54..b0092e68d9 100644
--- 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,7 +39,6 @@ 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~~',
@@ -52,9 +51,7 @@ 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~~',
 ));
diff --git 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
index 7db64a0dee..d84aaf34bf 100644
--- 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,7 +38,6 @@ 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' => '允许过期',
@@ -51,9 +50,7 @@ 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' => '不允许用户为自己设置"一次性密码"的失效期限',
 ));
diff --git 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
index 865e40e115..d4e8a2cb59 100644
--- 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,7 +20,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/>
  */
-
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'theme:darkmoon' => 'Dark moon~~',
 ));
\ No newline at end of file
diff --git 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
index 9a72858670..3eb7bd0056 100644
--- 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,7 +20,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/>
  */
-
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'theme:darkmoon' => 'Dark moon~~',
 ));
\ No newline at end of file
diff --git 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
index 5ad4569c77..c012cd0f11 100644
--- 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,7 +20,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/>
  */
-
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'theme:darkmoon' => 'Dark moon',
-));
+));
\ No newline at end of file
diff --git 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
index e5b2ee2809..06cfd9aff2 100644
--- 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,7 +20,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/>
  */
-
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'theme:darkmoon' => 'Luna Obscura',
 ));
\ No newline at end of file
diff --git 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
index 8ab61839cf..65ccf5be81 100644
--- 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,7 +20,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/>
  */
-
 Dict::Add('FR FR', 'French', 'Français', array(
 	'theme:darkmoon' => 'Dark moon~~',
 ));
\ No newline at end of file
diff --git 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
index 06ab52eed4..64fb4cd9ea 100644
--- 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,7 +20,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/>
  */
-
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'theme:darkmoon' => 'Dark moon',
 ));
\ No newline at end of file
diff --git 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
index e01fcd51c1..3be37f9101 100644
--- 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,7 +20,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/>
  */
-
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'theme:darkmoon' => 'Dark moon~~',
 ));
\ No newline at end of file
diff --git 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
index 0f0cff1b54..61bcba0114 100644
--- 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,7 +20,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/>
  */
-
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'theme:darkmoon' => 'Dark moon~~',
 ));
\ No newline at end of file
diff --git 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
index 22471abdaf..c74c96cfd8 100644
--- 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,7 +20,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/>
  */
-
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'theme:darkmoon' => 'Dark moon',
 ));
\ No newline at end of file
diff --git 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
index 1ef998d59e..f9929b94b1 100644
--- 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,7 +20,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/>
  */
-
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'theme:darkmoon' => 'Dark moon',
 ));
\ No newline at end of file
diff --git 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
index b025b790c6..772d1b07dd 100644
--- 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,7 +20,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/>
  */
-
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'theme:darkmoon' => 'Dark moon~~',
 ));
\ No newline at end of file
diff --git 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
index 111ada62b8..5139f8c6e5 100644
--- 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,7 +20,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/>
  */
-
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'theme:darkmoon' => 'Dark moon~~',
 ));
\ No newline at end of file
diff --git 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
index 4d41d5138b..fc1c0d9a59 100644
--- 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,7 +20,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/>
  */
-
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'theme:darkmoon' => 'Dark moon~~',
 ));
\ No newline at end of file
diff --git 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
index 752a9b56c8..b2b91898dc 100644
--- 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,7 +20,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/>
  */
-
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'theme:darkmoon' => 'Dark moon~~',
 ));
\ No newline at end of file
diff --git a/datamodels/2.x/combodo-db-tools/db_analyzer.class.inc.php b/datamodels/2.x/combodo-db-tools/db_analyzer.class.inc.php
index 849899f8b9..3162e69970 100644
--- a/datamodels/2.x/combodo-db-tools/db_analyzer.class.inc.php
+++ b/datamodels/2.x/combodo-db-tools/db_analyzer.class.inc.php
@@ -462,6 +462,12 @@ class DatabaseAnalyzer
 			$aCols = $oAttDef->GetSQLExpressions(); // Workaround a PHP bug: sometimes issuing a Notice if invoking current(somefunc())
 			$sMyAttributeField = current($aCols); // get the first column for the moment
 			$sFilter = "FROM `$sTable` WHERE `$sTable`.`$sMyAttributeField` NOT IN ($sExpectedValues)";
+			if ($oAttDef->IsNullAllowed()) {
+				// NotEmptyToSql should have been in AttributeDefinition, as a workaround the search type is used
+				$sSearchType = $oAttDef->GetSearchType();
+				$sCondition = $this->NotEmptyToSql("`$sTable`.`$sMyAttributeField`", $sSearchType);
+				$sFilter .= " AND $sCondition";
+			}
 			$sDelete = "DELETE `$sTable`";
 			$sSelect = "SELECT DISTINCT `$sTable`.`$sKeyField` AS id, `$sTable`.`$sMyAttributeField` AS value";
 			$sSelWrongRecs = "$sSelect $sFilter";
@@ -492,6 +498,26 @@ class DatabaseAnalyzer
 		}
 	}
 
+	/**
+	 * @param $sRef
+	 * @param string $sSearchType
+	 *
+	 * @return string
+	 * @since 3.1.0 N°6442
+	 */
+	private function NotEmptyToSql($sRef, string $sSearchType)
+	{
+		switch ($sSearchType) {
+			case AttributeDefinition::SEARCH_WIDGET_TYPE_NUMERIC:
+			case AttributeDefinition::SEARCH_WIDGET_TYPE_EXTERNAL_FIELD:
+			case AttributeDefinition::SEARCH_WIDGET_TYPE_DATE:
+			case AttributeDefinition::SEARCH_WIDGET_TYPE_DATE_TIME:
+				return "ISNULL({$sRef}) = 0";
+		}
+
+		return "({$sRef} != '')";
+	}
+
 	/**
 	 * Check user accounts without profile
 	 *
diff --git 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
index 2d560b0719..e75e65b893 100644
--- 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,14 +41,12 @@ 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`)~~',
@@ -71,24 +69,19 @@ 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~~'
 ));
diff --git 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
index fb4825d291..931812344a 100644
--- 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,14 +41,12 @@ 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`)~~',
@@ -71,24 +69,19 @@ 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~~'
 ));
diff --git 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
index 575105081b..b7a2152afe 100644
--- 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,14 +38,12 @@ 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' => 'Liste auf %1$s Fehler begrenzt',
 	'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`)',
@@ -68,24 +66,19 @@ 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'
 ));
diff --git 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
index 251d4e069a..b4068f1983 100644
--- 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,14 +42,12 @@ 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`)',
@@ -72,24 +70,19 @@ 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'
 ));
diff --git 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
index 6083716b4c..32c6cc37d6 100644
--- 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,15 +37,12 @@ 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`)',
@@ -68,24 +65,19 @@ 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'
 ));
diff --git 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
index ee3bd2bebc..110c954630 100644
--- 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,15 +41,13 @@ 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',
-
-    'DBAnalyzer-Integrity-OrphanRecord' => 'Árva rekord a `%1$s` -ban, kell hogy legyen megfelelője a `%2$s` táblázatban',
+	'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-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`)~~',
@@ -71,24 +69,19 @@ 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'
 ));
diff --git 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
index 88533bd274..ad2db0f862 100644
--- 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,14 +41,12 @@ 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`)~~',
@@ -71,24 +69,19 @@ 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~~'
 ));
diff --git 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
index 1d16fda600..5a98dc3b29 100644
--- 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,14 +41,12 @@ 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`)~~',
@@ -71,24 +69,19 @@ 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~~'
 ));
diff --git 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
index 34579087dc..bee6dec0bb 100644
--- 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,14 +43,12 @@ 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")',
@@ -73,24 +71,19 @@ 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'
 ));
diff --git 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
index 1538b0b884..6886fcdbb4 100644
--- 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,14 +41,12 @@ 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`)',
@@ -71,24 +69,19 @@ 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'
 ));
diff --git 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
index a28f47f8b1..8e6da07e75 100644
--- 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,14 +41,12 @@ 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`)',
@@ -71,24 +69,19 @@ 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'
 ));
diff --git 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
index 082043ce7b..ec81407a06 100644
--- 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,14 +28,12 @@ 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`)',
@@ -58,24 +56,19 @@ 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" восстановлено с помощью инструментов обслуживания БД'
 ));
diff --git 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
index 678a5827a6..43b77c2574 100644
--- 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,14 +41,12 @@ 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`)~~',
@@ -71,24 +69,19 @@ 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~~'
 ));
diff --git 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
index 670af96ac4..f6c90679e2 100644
--- 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,14 +41,12 @@ 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`)~~',
@@ -71,24 +69,19 @@ 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~~'
 ));
diff --git 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
index d72fe4d9a7..929bbd7b17 100644
--- 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,14 +41,12 @@ 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`)',
@@ -69,26 +67,21 @@ 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" 已使用数据库工具还原'
 ));
diff --git a/datamodels/2.x/itop-attachments/dictionaries/cs.dict.itop-attachments.php b/datamodels/2.x/itop-attachments/dictionaries/cs.dict.itop-attachments.php
index b376a5e8ec..a1260e7ab2 100644
--- 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,6 +75,7 @@ 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
@@ -88,3 +89,12 @@ 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~~',
+));
diff --git a/datamodels/2.x/itop-attachments/dictionaries/da.dict.itop-attachments.php b/datamodels/2.x/itop-attachments/dictionaries/da.dict.itop-attachments.php
index 917194927a..9864501f57 100644
--- 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,6 +72,7 @@ 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
@@ -85,3 +86,12 @@ 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~~',
+));
diff --git a/datamodels/2.x/itop-attachments/dictionaries/de.dict.itop-attachments.php b/datamodels/2.x/itop-attachments/dictionaries/de.dict.itop-attachments.php
index ac16d1c66a..64a23ce6f5 100644
--- 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,6 +74,7 @@ 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
@@ -87,3 +88,12 @@ 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 (beim Herunterladen eines Attachment eines Objekts)',
+	'Class:TriggerOnAttachmentDownload+' => 'Trigger für das Herunterladen des Attachments der angegebenen Klasse oder einer Unterklasse',
+));
diff --git 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
index 55d212ba26..903435285d 100644
--- 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,6 +74,7 @@ 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
@@ -87,3 +88,12 @@ 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~~',
+));
diff --git a/datamodels/2.x/itop-attachments/dictionaries/hu.dict.itop-attachments.php b/datamodels/2.x/itop-attachments/dictionaries/hu.dict.itop-attachments.php
index 22d58fc438..01599c527f 100644
--- 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,20 +66,30 @@ 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~~',
+));
diff --git a/datamodels/2.x/itop-attachments/dictionaries/it.dict.itop-attachments.php b/datamodels/2.x/itop-attachments/dictionaries/it.dict.itop-attachments.php
index 6c2739624e..24acff1525 100644
--- 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,6 +72,7 @@ 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
@@ -85,3 +86,12 @@ 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~~',
+));
diff --git a/datamodels/2.x/itop-attachments/dictionaries/ja.dict.itop-attachments.php b/datamodels/2.x/itop-attachments/dictionaries/ja.dict.itop-attachments.php
index c36f9a1aac..12c8ad1845 100644
--- 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,6 +71,7 @@ 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
@@ -84,3 +85,12 @@ 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~~',
+));
diff --git a/datamodels/2.x/itop-attachments/dictionaries/nl.dict.itop-attachments.php b/datamodels/2.x/itop-attachments/dictionaries/nl.dict.itop-attachments.php
index db92f10b97..00b8495c65 100644
--- 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,6 +77,7 @@ 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
@@ -90,3 +91,12 @@ 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~~',
+));
diff --git a/datamodels/2.x/itop-attachments/dictionaries/pl.dict.itop-attachments.php b/datamodels/2.x/itop-attachments/dictionaries/pl.dict.itop-attachments.php
index 9d8b2ebf7e..98d48134e8 100644
--- 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,7 +16,6 @@
  *
  * 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',
@@ -69,6 +68,7 @@ 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,3 +82,12 @@ 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~~',
+));
diff --git a/datamodels/2.x/itop-attachments/dictionaries/pt_br.dict.itop-attachments.php b/datamodels/2.x/itop-attachments/dictionaries/pt_br.dict.itop-attachments.php
index 7fa61b5a1d..a7725ad983 100644
--- a/datamodels/2.x/itop-attachments/dictionaries/pt_br.dict.itop-attachments.php
+++ b/datamodels/2.x/itop-attachments/dictionaries/pt_br.dict.itop-attachments.php
@@ -73,6 +73,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Attachments:File:Uploader' => 'Enviado por',
 	'Attachments:File:Size' => 'Tamanho',
 	'Attachments:File:MimeType' => 'Tipo',
+	'Attachments:File:DownloadsCount' => 'Downloads~~',
 ));
 //
 // Class: Attachment
@@ -86,3 +87,12 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:Attachment/Attribute:contact_id' => 'Identificador do contato',
 	'Class:Attachment/Attribute:contact_id+' => '',
 ));
+
+//
+// Class: TriggerOnAttachmentDownload
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', 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~~',
+));
diff --git a/datamodels/2.x/itop-attachments/dictionaries/ru.dict.itop-attachments.php b/datamodels/2.x/itop-attachments/dictionaries/ru.dict.itop-attachments.php
index 28e9b3e7d1..0c94d78739 100644
--- a/datamodels/2.x/itop-attachments/dictionaries/ru.dict.itop-attachments.php
+++ b/datamodels/2.x/itop-attachments/dictionaries/ru.dict.itop-attachments.php
@@ -60,6 +60,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Attachments:File:Uploader' => 'Пользователь',
 	'Attachments:File:Size' => 'Размер',
 	'Attachments:File:MimeType' => 'Тип',
+	'Attachments:File:DownloadsCount' => 'Downloads~~',
 ));
 //
 // Class: Attachment
@@ -73,3 +74,12 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:Attachment/Attribute:contact_id' => 'Контакт',
 	'Class:Attachment/Attribute:contact_id+' => '',
 ));
+
+//
+// Class: TriggerOnAttachmentDownload
+//
+
+Dict::Add('RU RU', 'Russian', 'Русский', 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~~',
+));
diff --git a/datamodels/2.x/itop-attachments/dictionaries/sk.dict.itop-attachments.php b/datamodels/2.x/itop-attachments/dictionaries/sk.dict.itop-attachments.php
index 48d9ce7bdf..f2908bbb46 100644
--- a/datamodels/2.x/itop-attachments/dictionaries/sk.dict.itop-attachments.php
+++ b/datamodels/2.x/itop-attachments/dictionaries/sk.dict.itop-attachments.php
@@ -72,6 +72,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Attachments:File:Uploader' => 'Uploaded by~~',
 	'Attachments:File:Size' => 'Size~~',
 	'Attachments:File:MimeType' => 'Type~~',
+	'Attachments:File:DownloadsCount' => 'Downloads~~',
 ));
 //
 // Class: Attachment
@@ -85,3 +86,12 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:Attachment/Attribute:contact_id' => 'Contact id~~',
 	'Class:Attachment/Attribute:contact_id+' => '~~',
 ));
+
+//
+// Class: TriggerOnAttachmentDownload
+//
+
+Dict::Add('SK SK', 'Slovak', 'Slovenčina', 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~~',
+));
diff --git a/datamodels/2.x/itop-attachments/dictionaries/tr.dict.itop-attachments.php b/datamodels/2.x/itop-attachments/dictionaries/tr.dict.itop-attachments.php
index 85d61c469d..57239db0c1 100644
--- a/datamodels/2.x/itop-attachments/dictionaries/tr.dict.itop-attachments.php
+++ b/datamodels/2.x/itop-attachments/dictionaries/tr.dict.itop-attachments.php
@@ -72,6 +72,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Attachments:File:Uploader' => 'Uploaded by~~',
 	'Attachments:File:Size' => 'Size~~',
 	'Attachments:File:MimeType' => 'Type~~',
+	'Attachments:File:DownloadsCount' => 'Downloads~~',
 ));
 //
 // Class: Attachment
@@ -85,3 +86,12 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:Attachment/Attribute:contact_id' => 'Contact id~~',
 	'Class:Attachment/Attribute:contact_id+' => '~~',
 ));
+
+//
+// Class: TriggerOnAttachmentDownload
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', 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~~',
+));
diff --git a/datamodels/2.x/itop-attachments/dictionaries/zh_cn.dict.itop-attachments.php b/datamodels/2.x/itop-attachments/dictionaries/zh_cn.dict.itop-attachments.php
index 1264313a88..f74116038f 100644
--- a/datamodels/2.x/itop-attachments/dictionaries/zh_cn.dict.itop-attachments.php
+++ b/datamodels/2.x/itop-attachments/dictionaries/zh_cn.dict.itop-attachments.php
@@ -66,6 +66,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Attachments:File:Uploader' => '上传者',
 	'Attachments:File:Size' => '大小',
 	'Attachments:File:MimeType' => '类型',
+	'Attachments:File:DownloadsCount' => 'Downloads~~',
 ));
 //
 // Class: Attachment
@@ -79,3 +80,12 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:Attachment/Attribute:contact_id' => '联系人id',
 	'Class:Attachment/Attribute:contact_id+' => '~~',
 ));
+
+//
+// Class: TriggerOnAttachmentDownload
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', 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~~',
+));
diff --git a/datamodels/2.x/itop-backup/check-backup.php b/datamodels/2.x/itop-backup/check-backup.php
index 16a6ab06d6..30b1c956d5 100644
--- a/datamodels/2.x/itop-backup/check-backup.php
+++ b/datamodels/2.x/itop-backup/check-backup.php
@@ -102,14 +102,19 @@ if (!function_exists('sys_get_temp_dir'))
 }
 
 
-
+/**
+ * @param int $iRefTime Reference date time as a unix timestamp
+ *
+ * @return string Absolute path to the backup file, WITHOUT the file extension (`.tar.gz`)
+ * @throws \Exception
+ */
 function MakeArchiveFileName($iRefTime = null)
 {
 	$sDefaultBackupFileName = sys_get_temp_dir().'/'."__DB__-%Y-%m-%d";
 	$sBackupFile =  utils::ReadParam('backup_file', $sDefaultBackupFileName, true, 'raw_data');
 
 	$oBackup = new DBBackup();
-	$oDateTime = $iRefTime !== null ? new DateTime($iRefTime) : new DateTime();
+	$oDateTime = $iRefTime !== null ? DateTime::createFromFormat('U', $iRefTime) : new DateTime();
 	$sBackupFile = $oBackup->MakeName($sBackupFile, $oDateTime);
 
 	return $sBackupFile;
diff --git a/datamodels/2.x/itop-backup/dictionaries/cs.dict.itop-backup.php b/datamodels/2.x/itop-backup/dictionaries/cs.dict.itop-backup.php
index c3c60115ce..c1979566af 100644
--- a/datamodels/2.x/itop-backup/dictionaries/cs.dict.itop-backup.php
+++ b/datamodels/2.x/itop-backup/dictionaries/cs.dict.itop-backup.php
@@ -8,10 +8,8 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
-
 	'bkp-backup-running' => 'Probíhá záloha. Vyčkejte prosím...',
 	'bkp-restore-running' => 'Probíhá obnova ze zálohy. Vyčkejte prosím...',
-
 	'Menu:BackupStatus' => 'Plánované zálohování',
 	'bkp-status-title' => 'Plánované zálohování',
 	'bkp-status-checks' => 'Nastavení testy',
diff --git a/datamodels/2.x/itop-backup/dictionaries/da.dict.itop-backup.php b/datamodels/2.x/itop-backup/dictionaries/da.dict.itop-backup.php
index 86e0fd4903..b10f00d1e0 100644
--- a/datamodels/2.x/itop-backup/dictionaries/da.dict.itop-backup.php
+++ b/datamodels/2.x/itop-backup/dictionaries/da.dict.itop-backup.php
@@ -21,10 +21,8 @@
  * along with iTop. If not, see <http://www.gnu.org/licenses/>
  */
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
-
 	'bkp-backup-running' => 'A backup is running. Please wait...~~',
 	'bkp-restore-running' => 'A restore is running. Please wait...~~',
-
 	'Menu:BackupStatus' => 'Scheduled Backups~~',
 	'bkp-status-title' => 'Scheduled Backups~~',
 	'bkp-status-checks' => 'Settings and checks~~',
diff --git a/datamodels/2.x/itop-backup/dictionaries/de.dict.itop-backup.php b/datamodels/2.x/itop-backup/dictionaries/de.dict.itop-backup.php
index 691ec91626..46f3f7ce50 100644
--- a/datamodels/2.x/itop-backup/dictionaries/de.dict.itop-backup.php
+++ b/datamodels/2.x/itop-backup/dictionaries/de.dict.itop-backup.php
@@ -23,10 +23,8 @@
 *
 */
 Dict::Add('DE DE', 'German', 'Deutsch', array(
-
 	'bkp-backup-running' => 'Backup wird durchgeführt. Bitte warten ...',
 	'bkp-restore-running' => 'Wiederherstellung läuft. Bitte warten ...',
-
 	'Menu:BackupStatus' => 'Geplante Backups',
 	'bkp-status-title' => 'Geplante Backups',
 	'bkp-status-checks' => 'Einstellungen und Prüfungen',
diff --git a/datamodels/2.x/itop-backup/dictionaries/es_cr.dict.itop-backup.php b/datamodels/2.x/itop-backup/dictionaries/es_cr.dict.itop-backup.php
index 83249595b4..25f8a77438 100644
--- a/datamodels/2.x/itop-backup/dictionaries/es_cr.dict.itop-backup.php
+++ b/datamodels/2.x/itop-backup/dictionaries/es_cr.dict.itop-backup.php
@@ -22,10 +22,8 @@
  * along with iTop. If not, see <http://www.gnu.org/licenses/>
  */
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
-
 	'bkp-backup-running' => 'Un respaldo está en ejecuión.  Por favor espere...',
 	'bkp-restore-running' => 'Una restauración está en ejecución. Por favor espere...',
-
 	'Menu:BackupStatus' => 'Respaldos programados',
 	'bkp-status-title' => 'Respaldos Programados',
 	'bkp-status-checks' => 'Configuraciones y verificaciones',
diff --git a/datamodels/2.x/itop-backup/dictionaries/fr.dict.itop-backup.php b/datamodels/2.x/itop-backup/dictionaries/fr.dict.itop-backup.php
index 573d741361..3cdbe1aeb1 100644
--- a/datamodels/2.x/itop-backup/dictionaries/fr.dict.itop-backup.php
+++ b/datamodels/2.x/itop-backup/dictionaries/fr.dict.itop-backup.php
@@ -6,10 +6,8 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 Dict::Add('FR FR', 'French', 'Français', array(
-
 	'bkp-backup-running' => 'Une sauvegarde est en cours. Veuillez patienter...',
 	'bkp-restore-running' => 'Une restauration des données est en cours. Veuillez patienter...',
-
 	'Menu:BackupStatus' => 'Sauvegardes',
 	'bkp-status-title' => 'Sauvegardes',
 	'bkp-status-checks' => 'Réglages et vérifications',
diff --git a/datamodels/2.x/itop-backup/dictionaries/hu.dict.itop-backup.php b/datamodels/2.x/itop-backup/dictionaries/hu.dict.itop-backup.php
index d836f4d1b0..e082c6d618 100644
--- a/datamodels/2.x/itop-backup/dictionaries/hu.dict.itop-backup.php
+++ b/datamodels/2.x/itop-backup/dictionaries/hu.dict.itop-backup.php
@@ -21,12 +21,10 @@
  * along with iTop. If not, see <http://www.gnu.org/licenses/>
  */
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-
-    'bkp-backup-running' => 'A mentés fut. Kérem várjon...',
+	'bkp-backup-running' => 'A mentés fut. Kérem várjon...',
 	'bkp-restore-running' => 'A visszaállítás fut. Kérem várjon...',
-
-    'Menu:BackupStatus' => 'Ütemezett biztonsági mentés',
-    'bkp-status-title' => 'Ütemezett biztonsági mentés',
+	'Menu:BackupStatus' => 'Ütemezett biztonsági mentés',
+	'bkp-status-title' => 'Ütemezett biztonsági mentés',
 	'bkp-status-checks' => 'Beállítás és ellenőrzés',
 	'bkp-mysqldump-ok' => 'mysqldump megvan: %1$s',
 	'bkp-mysqldump-notfound' => 'mysqldump nem található: %1$s - Győződjön meg róla, hogy telepítve van és szerepel az elérési útvonalban, vagy szerkessze a konfigurációs fájlt a mysql_bindir beállításához..',
@@ -35,26 +33,26 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'bkp-free-disk-space' => '<b>%1$s szabad</b> a <code>%2$s</code> -ből',
 	'bkp-dir-not-writeable' => '%1$s nem írható',
 	'bkp-wrong-format-spec' => 'A fájlnevek formázására vonatkozó jelenlegi specifikáció helytelen (%1$s). Alapértelmezett specifikáció lesz érvényben: %2$s',
-    'bkp-name-sample' => 'A mentési fájlok neve a DB azonosítóktól, a dátumtól és az időponttól függ. Példa: %1$s',
-    'bkp-week-days' => 'Biztonsági mentés lesz végrehajtva <b>minden %1$s  %2$s -kor</b>',
-    'bkp-retention' => 'Legfeljebb <b>%1$d biztonsági mentés lesz megőrizve</b> a célkönyvtárban.',
-    'bkp-next-to-delete' => 'Törölve lesz a következő mentés alkalmával (lásd a "retention_count" beállítást)',
+	'bkp-name-sample' => 'A mentési fájlok neve a DB azonosítóktól, a dátumtól és az időponttól függ. Példa: %1$s',
+	'bkp-week-days' => 'Biztonsági mentés lesz végrehajtva <b>minden %1$s  %2$s -kor</b>',
+	'bkp-retention' => 'Legfeljebb <b>%1$d biztonsági mentés lesz megőrizve</b> a célkönyvtárban.',
+	'bkp-next-to-delete' => 'Törölve lesz a következő mentés alkalmával (lásd a "retention_count" beállítást)',
 	'bkp-table-file' => 'Fájl',
 	'bkp-table-file+' => 'Csak a .zip kiterjesztésű fájlokat tekintjük biztonsági mentésnek.',
 	'bkp-table-size' => 'Méret',
 	'bkp-table-size+' => '~~',
 	'bkp-table-actions' => 'Műveletek',
 	'bkp-table-actions+' => '~~',
-    'bkp-status-backups-auto' => 'Ütemezett biztonsági mentés',
-    'bkp-status-backups-manual' => 'Manuális biztonsági mentés',
-    'bkp-status-backups-none' => 'Még nincs biztonsági mentés',
-    'bkp-next-backup' => 'A következő mentés <b>%1$s</b> (%2$s) fog lefutni %3$s -kor',
-    'bkp-next-backup-unknown' => 'A következő mentés még <b>nincs ütemezve</b>',
-    'bkp-button-backup-now' => 'Mentés most!',
+	'bkp-status-backups-auto' => 'Ütemezett biztonsági mentés',
+	'bkp-status-backups-manual' => 'Manuális biztonsági mentés',
+	'bkp-status-backups-none' => 'Még nincs biztonsági mentés',
+	'bkp-next-backup' => 'A következő mentés <b>%1$s</b> (%2$s) fog lefutni %3$s -kor',
+	'bkp-next-backup-unknown' => 'A következő mentés még <b>nincs ütemezve</b>',
+	'bkp-button-backup-now' => 'Mentés most!',
 	'bkp-button-restore-now' => 'Visszaállítás!',
 	'bkp-confirm-backup' => 'Erősítse meg, hogy a biztonsági mentést most kéri.',
-    'bkp-confirm-restore' => 'Kérjük, erősítse meg, hogy vissza szeretné állítani a %1$s biztonsági mentést.',
-    'bkp-wait-backup' => 'Várjon a mentés befejezéséig...',
+	'bkp-confirm-restore' => 'Kérjük, erősítse meg, hogy vissza szeretné állítani a %1$s biztonsági mentést.',
+	'bkp-wait-backup' => 'Várjon a mentés befejezéséig...',
 	'bkp-wait-restore' => 'Várjon a visszaállítás befejezéséig...',
 	'bkp-success-restore' => 'A visszaállítás sikerült.',
 ));
diff --git a/datamodels/2.x/itop-backup/dictionaries/it.dict.itop-backup.php b/datamodels/2.x/itop-backup/dictionaries/it.dict.itop-backup.php
index c64aa0c05c..4d8b3c3ce1 100644
--- a/datamodels/2.x/itop-backup/dictionaries/it.dict.itop-backup.php
+++ b/datamodels/2.x/itop-backup/dictionaries/it.dict.itop-backup.php
@@ -21,10 +21,8 @@
  * along with iTop. If not, see <http://www.gnu.org/licenses/>
  */
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
-
 	'bkp-backup-running' => 'A backup is running. Please wait...~~',
 	'bkp-restore-running' => 'A restore is running. Please wait...~~',
-
 	'Menu:BackupStatus' => 'Scheduled backups~~',
 	'bkp-status-title' => 'Scheduled Backups~~',
 	'bkp-status-checks' => 'Settings and checks~~',
diff --git a/datamodels/2.x/itop-backup/dictionaries/ja.dict.itop-backup.php b/datamodels/2.x/itop-backup/dictionaries/ja.dict.itop-backup.php
index 16a2351dfe..9358937b10 100644
--- a/datamodels/2.x/itop-backup/dictionaries/ja.dict.itop-backup.php
+++ b/datamodels/2.x/itop-backup/dictionaries/ja.dict.itop-backup.php
@@ -21,10 +21,8 @@
  * along with iTop. If not, see <http://www.gnu.org/licenses/>
  */
 Dict::Add('JA JP', 'Japanese', '日本語', array(
-
 	'bkp-backup-running' => 'A backup is running. Please wait...~~',
 	'bkp-restore-running' => 'A restore is running. Please wait...~~',
-
 	'Menu:BackupStatus' => 'Scheduled backups~~',
 	'bkp-status-title' => 'Scheduled Backups~~',
 	'bkp-status-checks' => 'Settings and checks~~',
diff --git a/datamodels/2.x/itop-backup/dictionaries/nl.dict.itop-backup.php b/datamodels/2.x/itop-backup/dictionaries/nl.dict.itop-backup.php
index 7ca6efa28b..4e66a6e7be 100644
--- a/datamodels/2.x/itop-backup/dictionaries/nl.dict.itop-backup.php
+++ b/datamodels/2.x/itop-backup/dictionaries/nl.dict.itop-backup.php
@@ -24,10 +24,8 @@
  * along with iTop. If not, see <http://www.gnu.org/licenses/>
  */
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-
 	'bkp-backup-running' => 'Er wordt een backup gemaakt. Even geduld...',
 	'bkp-restore-running' => 'Er wordt een herstel uitgevoerd. Even geduld...',
-
 	'Menu:BackupStatus' => 'Geplande backups',
 	'bkp-status-title' => 'Geplande backups',
 	'bkp-status-checks' => 'Instellingen en controles',
diff --git a/datamodels/2.x/itop-backup/dictionaries/pl.dict.itop-backup.php b/datamodels/2.x/itop-backup/dictionaries/pl.dict.itop-backup.php
index 28784d8f0f..ce58f1965a 100644
--- a/datamodels/2.x/itop-backup/dictionaries/pl.dict.itop-backup.php
+++ b/datamodels/2.x/itop-backup/dictionaries/pl.dict.itop-backup.php
@@ -21,10 +21,8 @@
  * along with iTop. If not, see <http://www.gnu.org/licenses/>
  */
 Dict::Add('PL PL', 'Polish', 'Polski', array(
-
 	'bkp-backup-running' => 'Kopia zapasowa jest uruchomiona. Proszę czekać...',
 	'bkp-restore-running' => 'Trwa przywracanie. Proszę czekać...',
-
 	'Menu:BackupStatus' => 'Kopie zapasowe',
 	'bkp-status-title' => 'Kopie zapasowe',
 	'bkp-status-checks' => 'Ustawienia i kontrole',
diff --git a/datamodels/2.x/itop-backup/dictionaries/pt_br.dict.itop-backup.php b/datamodels/2.x/itop-backup/dictionaries/pt_br.dict.itop-backup.php
index f073031c5d..71df3f7d4a 100644
--- a/datamodels/2.x/itop-backup/dictionaries/pt_br.dict.itop-backup.php
+++ b/datamodels/2.x/itop-backup/dictionaries/pt_br.dict.itop-backup.php
@@ -6,10 +6,8 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-
 	'bkp-backup-running' => 'Um backup está sendo executado. Por favor, espere...',
 	'bkp-restore-running' => 'Uma restauração está sendo executada. Por favor, espere...',
-
 	'Menu:BackupStatus' => 'Backups agendados',
 	'bkp-status-title' => 'Backups Agendados',
 	'bkp-status-checks' => 'Configurações e verificações',
diff --git a/datamodels/2.x/itop-backup/dictionaries/ru.dict.itop-backup.php b/datamodels/2.x/itop-backup/dictionaries/ru.dict.itop-backup.php
index 60e5baab8d..bd10c237f3 100644
--- a/datamodels/2.x/itop-backup/dictionaries/ru.dict.itop-backup.php
+++ b/datamodels/2.x/itop-backup/dictionaries/ru.dict.itop-backup.php
@@ -9,10 +9,8 @@
  *
  */
 Dict::Add('RU RU', 'Russian', 'Русский', array(
-
 	'bkp-backup-running' => 'Выполняется резервное копирование. Пожалуйста, подождите...',
 	'bkp-restore-running' => 'Выполняется восстановление из резервной копии. Пожалуйста, подождите...',
-
 	'Menu:BackupStatus' => 'Резервное копирование',
 	'bkp-status-title' => 'Резервное копирование по расписанию',
 	'bkp-status-checks' => 'Настройки и проверки',
diff --git a/datamodels/2.x/itop-backup/dictionaries/sk.dict.itop-backup.php b/datamodels/2.x/itop-backup/dictionaries/sk.dict.itop-backup.php
index 191f549806..813d9282e3 100644
--- a/datamodels/2.x/itop-backup/dictionaries/sk.dict.itop-backup.php
+++ b/datamodels/2.x/itop-backup/dictionaries/sk.dict.itop-backup.php
@@ -21,10 +21,8 @@
  * along with iTop. If not, see <http://www.gnu.org/licenses/>
  */
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
-
 	'bkp-backup-running' => 'A backup is running. Please wait...~~',
 	'bkp-restore-running' => 'A restore is running. Please wait...~~',
-
 	'Menu:BackupStatus' => 'Scheduled Backups~~',
 	'bkp-status-title' => 'Scheduled Backups~~',
 	'bkp-status-checks' => 'Settings and checks~~',
diff --git a/datamodels/2.x/itop-backup/dictionaries/tr.dict.itop-backup.php b/datamodels/2.x/itop-backup/dictionaries/tr.dict.itop-backup.php
index 87d22223a6..3c2298e846 100644
--- a/datamodels/2.x/itop-backup/dictionaries/tr.dict.itop-backup.php
+++ b/datamodels/2.x/itop-backup/dictionaries/tr.dict.itop-backup.php
@@ -21,10 +21,8 @@
  * along with iTop. If not, see <http://www.gnu.org/licenses/>
  */
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-
 	'bkp-backup-running' => 'A backup is running. Please wait...~~',
 	'bkp-restore-running' => 'A restore is running. Please wait...~~',
-
 	'Menu:BackupStatus' => 'Scheduled Backups~~',
 	'bkp-status-title' => 'Scheduled Backups~~',
 	'bkp-status-checks' => 'Settings and checks~~',
diff --git a/datamodels/2.x/itop-backup/dictionaries/zh_cn.dict.itop-backup.php b/datamodels/2.x/itop-backup/dictionaries/zh_cn.dict.itop-backup.php
index d583c97a5e..cf553d5eaf 100644
--- a/datamodels/2.x/itop-backup/dictionaries/zh_cn.dict.itop-backup.php
+++ b/datamodels/2.x/itop-backup/dictionaries/zh_cn.dict.itop-backup.php
@@ -21,10 +21,8 @@
  * along with iTop. If not, see <http://www.gnu.org/licenses/>
  */
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-
 	'bkp-backup-running' => '备份正在进行,请稍后...',
 	'bkp-restore-running' => '还原正在进行,请稍等...',
-
 	'Menu:BackupStatus' => '定时备份',
 	'bkp-status-title' => '定时备份',
 	'bkp-status-checks' => '设置与检查',
diff --git a/datamodels/2.x/itop-bridge-cmdb-services/datamodel.itop-bridge-cmdb-services.xml b/datamodels/2.x/itop-bridge-cmdb-services/datamodel.itop-bridge-cmdb-services.xml
index 263af3618a..0c70ff2c95 100644
--- a/datamodels/2.x/itop-bridge-cmdb-services/datamodel.itop-bridge-cmdb-services.xml
+++ b/datamodels/2.x/itop-bridge-cmdb-services/datamodel.itop-bridge-cmdb-services.xml
@@ -197,7 +197,6 @@
           <count_max>0</count_max>
           <ext_key_to_remote>providercontract_id</ext_key_to_remote>
           <duplicates/>
-          <read_only>false</read_only>
         </field>
         <field id="services_list" xsi:type="AttributeLinkedSetIndirect" _delta="define">
           <linked_class>lnkFunctionalCIToService</linked_class>
@@ -206,7 +205,6 @@
           <count_max>0</count_max>
           <ext_key_to_remote>service_id</ext_key_to_remote>
           <duplicates/>
-          <read_only>false</read_only>
         </field>
       </fields>
       <presentation>
@@ -385,7 +383,6 @@
           <count_max>0</count_max>
           <ext_key_to_remote>contract_id</ext_key_to_remote>
           <duplicates/>
-          <read_only>false</read_only>
         </field>
         <field id="services_list" xsi:type="AttributeLinkedSetIndirect" _delta="define">
           <linked_class>lnkDocumentToService</linked_class>
@@ -394,7 +391,6 @@
           <count_max>0</count_max>
           <ext_key_to_remote>service_id</ext_key_to_remote>
           <duplicates/>
-          <read_only>false</read_only>
         </field>
       </fields>
       <methods/>
diff --git a/datamodels/2.x/itop-bridge-cmdb-services/dictionaries/cs.dict.itop-bridge-cmdb-services.php b/datamodels/2.x/itop-bridge-cmdb-services/dictionaries/cs.dict.itop-bridge-cmdb-services.php
index 463ef0210c..b7049ff853 100644
--- a/datamodels/2.x/itop-bridge-cmdb-services/dictionaries/cs.dict.itop-bridge-cmdb-services.php
+++ b/datamodels/2.x/itop-bridge-cmdb-services/dictionaries/cs.dict.itop-bridge-cmdb-services.php
@@ -30,10 +30,10 @@
 //
 // Class: lnkFunctionalCIToProviderContract
 //
-
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:lnkFunctionalCIToProviderContract' => 'Spojení (Funkční konfigurační položka / Smlouva s poskytovatelem)',
 	'Class:lnkFunctionalCIToProviderContract+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Name' => '%1$s / %2$s~~',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Smlouva s poskytovatelem',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Název smlouvy s poskytovatelem',
@@ -51,6 +51,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:lnkFunctionalCIToService' => 'Spojení (Funkční konfigurační položka / Služba)',
 	'Class:lnkFunctionalCIToService+' => '',
+	'Class:lnkFunctionalCIToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Služba',
 	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '',
 	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Název služby',
diff --git a/datamodels/2.x/itop-bridge-cmdb-services/dictionaries/da.dict.itop-bridge-cmdb-services.php b/datamodels/2.x/itop-bridge-cmdb-services/dictionaries/da.dict.itop-bridge-cmdb-services.php
index 1a38beb895..5d1f7674de 100644
--- a/datamodels/2.x/itop-bridge-cmdb-services/dictionaries/da.dict.itop-bridge-cmdb-services.php
+++ b/datamodels/2.x/itop-bridge-cmdb-services/dictionaries/da.dict.itop-bridge-cmdb-services.php
@@ -30,10 +30,10 @@
 //
 // Class: lnkFunctionalCIToProviderContract
 //
-
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:lnkFunctionalCIToProviderContract' => 'Sammenhæng FunctionalCI/Leverandør Kontrakt',
 	'Class:lnkFunctionalCIToProviderContract+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Name' => '%1$s / %2$s~~',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Leverandør kontrakt',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Leverandør kontrakt navn',
@@ -51,6 +51,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:lnkFunctionalCIToService' => 'Sammenhæng FunctionalCI/Ydelse',
 	'Class:lnkFunctionalCIToService+' => '',
+	'Class:lnkFunctionalCIToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Ydelse',
 	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '',
 	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Ydelses navn',
diff --git a/datamodels/2.x/itop-bridge-cmdb-services/dictionaries/de.dict.itop-bridge-cmdb-services.php b/datamodels/2.x/itop-bridge-cmdb-services/dictionaries/de.dict.itop-bridge-cmdb-services.php
index 8a235b95fa..0be0dfd215 100644
--- a/datamodels/2.x/itop-bridge-cmdb-services/dictionaries/de.dict.itop-bridge-cmdb-services.php
+++ b/datamodels/2.x/itop-bridge-cmdb-services/dictionaries/de.dict.itop-bridge-cmdb-services.php
@@ -30,10 +30,10 @@
 //
 // Class: lnkFunctionalCIToProviderContract
 //
-
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:lnkFunctionalCIToProviderContract' => 'Verknüpfung FunctionalCI/Provider-Vertrag',
 	'Class:lnkFunctionalCIToProviderContract+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Name' => '%1$s / %2$s',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Provider-Vertrag',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Provider-Vertragsname',
@@ -51,6 +51,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:lnkFunctionalCIToService' => 'Verknüpfung FunctionalCI/Service',
 	'Class:lnkFunctionalCIToService+' => '',
+	'Class:lnkFunctionalCIToService/Name' => '%1$s / %2$s',
 	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Service',
 	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '',
 	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Service-Name',
@@ -78,7 +79,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:Document/Attribute:contracts_list' => 'Verträge',
-	'Class:Document/Attribute:contracts_list+' => 'All the contracts linked to this document~~',
+	'Class:Document/Attribute:contracts_list+' => 'Alle mit diesem Dokument verknüpften Verträge',
 	'Class:Document/Attribute:services_list' => 'Services',
-	'Class:Document/Attribute:services_list+' => 'All the services linked to this document~~',
+	'Class:Document/Attribute:services_list+' => 'Alle mit diesem Dokument verknüpften Services',
 ));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-bridge-cmdb-services/dictionaries/es_cr.dict.itop-bridge-cmdb-services.php b/datamodels/2.x/itop-bridge-cmdb-services/dictionaries/es_cr.dict.itop-bridge-cmdb-services.php
index a9e6fe6825..aa7f998725 100644
--- a/datamodels/2.x/itop-bridge-cmdb-services/dictionaries/es_cr.dict.itop-bridge-cmdb-services.php
+++ b/datamodels/2.x/itop-bridge-cmdb-services/dictionaries/es_cr.dict.itop-bridge-cmdb-services.php
@@ -30,10 +30,10 @@
 //
 // Class: lnkFunctionalCIToProviderContract
 //
-
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkFunctionalCIToProviderContract' => 'Relación EC Funcional y Contrato con Proveedor',
 	'Class:lnkFunctionalCIToProviderContract+' => 'Relación EC Funcional y Contrato con Proveedor',
+	'Class:lnkFunctionalCIToProviderContract/Name' => '%1$s / %2$s~~',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Contrato con Proveedor',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => 'Contrato con Proveedor',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Contrato con Proveedor',
@@ -51,6 +51,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkFunctionalCIToService' => 'Relación EC Funcional y Servicio',
 	'Class:lnkFunctionalCIToService+' => 'Relación EC Funcional y Servicio',
+	'Class:lnkFunctionalCIToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Servicio',
 	'Class:lnkFunctionalCIToService/Attribute:service_id+' => 'Servicio',
 	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Servicio',
diff --git a/datamodels/2.x/itop-bridge-cmdb-services/dictionaries/fr.dict.itop-bridge-cmdb-services.php b/datamodels/2.x/itop-bridge-cmdb-services/dictionaries/fr.dict.itop-bridge-cmdb-services.php
index cea48ed548..eb41f18d90 100644
--- a/datamodels/2.x/itop-bridge-cmdb-services/dictionaries/fr.dict.itop-bridge-cmdb-services.php
+++ b/datamodels/2.x/itop-bridge-cmdb-services/dictionaries/fr.dict.itop-bridge-cmdb-services.php
@@ -30,10 +30,10 @@
 //
 // Class: lnkFunctionalCIToProviderContract
 //
-
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:lnkFunctionalCIToProviderContract' => 'Lien CI / Contrat fournisseur',
 	'Class:lnkFunctionalCIToProviderContract+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Name' => '%1$s / %2$s',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Contrat fournisseur',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Nom contrat fournisseur',
@@ -51,6 +51,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:lnkFunctionalCIToService' => 'Lien CI / Service',
 	'Class:lnkFunctionalCIToService+' => '',
+	'Class:lnkFunctionalCIToService/Name' => '%1$s / %2$s',
 	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Service',
 	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '',
 	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Nom service',
diff --git a/datamodels/2.x/itop-bridge-cmdb-services/dictionaries/hu.dict.itop-bridge-cmdb-services.php b/datamodels/2.x/itop-bridge-cmdb-services/dictionaries/hu.dict.itop-bridge-cmdb-services.php
index 76d0611860..f6c27ad697 100644
--- a/datamodels/2.x/itop-bridge-cmdb-services/dictionaries/hu.dict.itop-bridge-cmdb-services.php
+++ b/datamodels/2.x/itop-bridge-cmdb-services/dictionaries/hu.dict.itop-bridge-cmdb-services.php
@@ -30,18 +30,18 @@
 //
 // Class: lnkFunctionalCIToProviderContract
 //
-
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:lnkFunctionalCIToProviderContract' => 'Funkcionális CI / Szolgáltatói szerződés',
-    'Class:lnkFunctionalCIToProviderContract+' => '~~',
-    'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Szolgáltatói szerződés',
-    'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '~~',
-    'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Szolgáltatói szerződés név',
-    'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '~~',
-    'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'CI',
-    'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '~~',
-    'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'CI név',
-    'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '~~',
+	'Class:lnkFunctionalCIToProviderContract' => 'Funkcionális CI / Szolgáltatói szerződés',
+	'Class:lnkFunctionalCIToProviderContract+' => '~~',
+	'Class:lnkFunctionalCIToProviderContract/Name' => '%1$s / %2$s~~',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Szolgáltatói szerződés',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '~~',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Szolgáltatói szerződés név',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '~~',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'CI',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '~~',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'CI név',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '~~',
 ));
 
 //
@@ -49,16 +49,17 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:lnkFunctionalCIToService' => 'Funkcionális CI / Szolgáltatás',
-    'Class:lnkFunctionalCIToService+' => '~~',
-    'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Szolgáltatás',
-    'Class:lnkFunctionalCIToService/Attribute:service_id+' => '~~',
-    'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Szolgáltatás név',
-    'Class:lnkFunctionalCIToService/Attribute:service_name+' => '~~',
-    'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => 'CI',
-    'Class:lnkFunctionalCIToService/Attribute:functionalci_id+' => '~~',
-    'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => 'CI név',
-    'Class:lnkFunctionalCIToService/Attribute:functionalci_name+' => '~~',
+	'Class:lnkFunctionalCIToService' => 'Funkcionális CI / Szolgáltatás',
+	'Class:lnkFunctionalCIToService+' => '~~',
+	'Class:lnkFunctionalCIToService/Name' => '%1$s / %2$s~~',
+	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Szolgáltatás',
+	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '~~',
+	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Szolgáltatás név',
+	'Class:lnkFunctionalCIToService/Attribute:service_name+' => '~~',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => 'CI',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_id+' => '~~',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => 'CI név',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_name+' => '~~',
 ));
 
 //
@@ -66,10 +67,10 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:FunctionalCI/Attribute:providercontracts_list' => 'Szolgáltatói szerződések',
-    'Class:FunctionalCI/Attribute:providercontracts_list+' => 'Ehhez a konfigurációs elemhez tartozó szolgáltatói szerződések',
-    'Class:FunctionalCI/Attribute:services_list' => 'Szolgáltatások',
-    'Class:FunctionalCI/Attribute:services_list+' => 'Szolgáltatások amelyek hatással vannak erre a konfigurációs elemre',
+	'Class:FunctionalCI/Attribute:providercontracts_list' => 'Szolgáltatói szerződések',
+	'Class:FunctionalCI/Attribute:providercontracts_list+' => 'Ehhez a konfigurációs elemhez tartozó szolgáltatói szerződések',
+	'Class:FunctionalCI/Attribute:services_list' => 'Szolgáltatások',
+	'Class:FunctionalCI/Attribute:services_list+' => 'Szolgáltatások amelyek hatással vannak erre a konfigurációs elemre',
 ));
 
 //
@@ -81,4 +82,4 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:Document/Attribute:contracts_list+' => 'All the contracts linked to this document~~',
 	'Class:Document/Attribute:services_list' => 'Szolgáltatások',
 	'Class:Document/Attribute:services_list+' => 'All the services linked to this document~~',
-));
+));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-bridge-cmdb-services/dictionaries/it.dict.itop-bridge-cmdb-services.php b/datamodels/2.x/itop-bridge-cmdb-services/dictionaries/it.dict.itop-bridge-cmdb-services.php
index d2e7f2d0bf..019fb749e7 100644
--- a/datamodels/2.x/itop-bridge-cmdb-services/dictionaries/it.dict.itop-bridge-cmdb-services.php
+++ b/datamodels/2.x/itop-bridge-cmdb-services/dictionaries/it.dict.itop-bridge-cmdb-services.php
@@ -30,10 +30,10 @@
 //
 // Class: lnkFunctionalCIToProviderContract
 //
-
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:lnkFunctionalCIToProviderContract' => 'Link FunctionalCI / ProviderContract~~',
 	'Class:lnkFunctionalCIToProviderContract+' => '~~',
+	'Class:lnkFunctionalCIToProviderContract/Name' => '%1$s / %2$s~~',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Provider contract~~',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '~~',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Provider contract Name~~',
@@ -51,6 +51,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:lnkFunctionalCIToService' => 'Link FunctionalCI / Service~~',
 	'Class:lnkFunctionalCIToService+' => '~~',
+	'Class:lnkFunctionalCIToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Service~~',
 	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '~~',
 	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Service Name~~',
diff --git a/datamodels/2.x/itop-bridge-cmdb-services/dictionaries/ja.dict.itop-bridge-cmdb-services.php b/datamodels/2.x/itop-bridge-cmdb-services/dictionaries/ja.dict.itop-bridge-cmdb-services.php
index 28b3d3273c..808e1ddd04 100644
--- a/datamodels/2.x/itop-bridge-cmdb-services/dictionaries/ja.dict.itop-bridge-cmdb-services.php
+++ b/datamodels/2.x/itop-bridge-cmdb-services/dictionaries/ja.dict.itop-bridge-cmdb-services.php
@@ -30,10 +30,10 @@
 //
 // Class: lnkFunctionalCIToProviderContract
 //
-
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:lnkFunctionalCIToProviderContract' => 'リンク 機能的CI/プロバイダー契約',
 	'Class:lnkFunctionalCIToProviderContract+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Name' => '%1$s / %2$s~~',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'プロバイダー契約',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'プロバイダー契約名',
@@ -51,6 +51,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:lnkFunctionalCIToService' => 'リンク 機能的CI/サービス',
 	'Class:lnkFunctionalCIToService+' => '',
+	'Class:lnkFunctionalCIToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'サービス',
 	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '',
 	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'サービス名',
diff --git a/datamodels/2.x/itop-bridge-cmdb-services/dictionaries/nl.dict.itop-bridge-cmdb-services.php b/datamodels/2.x/itop-bridge-cmdb-services/dictionaries/nl.dict.itop-bridge-cmdb-services.php
index 3098c3f9a2..837490e765 100644
--- a/datamodels/2.x/itop-bridge-cmdb-services/dictionaries/nl.dict.itop-bridge-cmdb-services.php
+++ b/datamodels/2.x/itop-bridge-cmdb-services/dictionaries/nl.dict.itop-bridge-cmdb-services.php
@@ -30,10 +30,10 @@
 //
 // Class: lnkFunctionalCIToProviderContract
 //
-
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:lnkFunctionalCIToProviderContract' => 'Link Functioneel CI / Leverancierscontract',
 	'Class:lnkFunctionalCIToProviderContract+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Name' => '%1$s / %2$s~~',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Leverancierscontract',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Naam leverancierscontract',
@@ -51,6 +51,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:lnkFunctionalCIToService' => 'Link Functioneel CI / Service',
 	'Class:lnkFunctionalCIToService+' => '',
+	'Class:lnkFunctionalCIToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Service',
 	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '',
 	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Naam service',
diff --git a/datamodels/2.x/itop-bridge-cmdb-services/dictionaries/pl.dict.itop-bridge-cmdb-services.php b/datamodels/2.x/itop-bridge-cmdb-services/dictionaries/pl.dict.itop-bridge-cmdb-services.php
index 771e3b69aa..c2ac91485e 100644
--- a/datamodels/2.x/itop-bridge-cmdb-services/dictionaries/pl.dict.itop-bridge-cmdb-services.php
+++ b/datamodels/2.x/itop-bridge-cmdb-services/dictionaries/pl.dict.itop-bridge-cmdb-services.php
@@ -30,10 +30,10 @@
 //
 // Class: lnkFunctionalCIToProviderContract
 //
-
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:lnkFunctionalCIToProviderContract' => 'Połączenie Konfiguracja / Umowa z dostawcą',
 	'Class:lnkFunctionalCIToProviderContract+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Name' => '%1$s / %2$s~~',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Umowa z dostawcą',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Nazwa umowy z dostawcą',
@@ -51,6 +51,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:lnkFunctionalCIToService' => 'Połączenie Konfiguracja / Usługa',
 	'Class:lnkFunctionalCIToService+' => '',
+	'Class:lnkFunctionalCIToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Usługa',
 	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '',
 	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Nazwa usługi',
diff --git a/datamodels/2.x/itop-bridge-cmdb-services/dictionaries/pt_br.dict.itop-bridge-cmdb-services.php b/datamodels/2.x/itop-bridge-cmdb-services/dictionaries/pt_br.dict.itop-bridge-cmdb-services.php
index d3e29e9ace..c8a0e200de 100644
--- a/datamodels/2.x/itop-bridge-cmdb-services/dictionaries/pt_br.dict.itop-bridge-cmdb-services.php
+++ b/datamodels/2.x/itop-bridge-cmdb-services/dictionaries/pt_br.dict.itop-bridge-cmdb-services.php
@@ -30,10 +30,10 @@
 //
 // Class: lnkFunctionalCIToProviderContract
 //
-
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:lnkFunctionalCIToProviderContract' => 'Link IC / Contrato de provedor',
 	'Class:lnkFunctionalCIToProviderContract+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Name' => '%1$s / %2$s~~',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Contrato de provedor',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Nome do contrato de provedor',
@@ -51,6 +51,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:lnkFunctionalCIToService' => 'Link IC / Serviço',
 	'Class:lnkFunctionalCIToService+' => '',
+	'Class:lnkFunctionalCIToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Serviço',
 	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '',
 	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Nome do serviço',
diff --git a/datamodels/2.x/itop-bridge-cmdb-services/dictionaries/ru.dict.itop-bridge-cmdb-services.php b/datamodels/2.x/itop-bridge-cmdb-services/dictionaries/ru.dict.itop-bridge-cmdb-services.php
index 0c4a23da85..1bb98a9ce9 100644
--- a/datamodels/2.x/itop-bridge-cmdb-services/dictionaries/ru.dict.itop-bridge-cmdb-services.php
+++ b/datamodels/2.x/itop-bridge-cmdb-services/dictionaries/ru.dict.itop-bridge-cmdb-services.php
@@ -30,10 +30,10 @@
 //
 // Class: lnkFunctionalCIToProviderContract
 //
-
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:lnkFunctionalCIToProviderContract' => 'Связь Функциональная КЕ/Договор с поставщиком',
 	'Class:lnkFunctionalCIToProviderContract+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Name' => '%1$s / %2$s~~',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Договор с поставщиком',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Договор с поставщиком',
@@ -51,6 +51,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:lnkFunctionalCIToService' => 'Связь Функциональная КЕ/Услуга',
 	'Class:lnkFunctionalCIToService+' => '',
+	'Class:lnkFunctionalCIToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Услуга',
 	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '',
 	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Услуга',
diff --git a/datamodels/2.x/itop-bridge-cmdb-services/dictionaries/sk.dict.itop-bridge-cmdb-services.php b/datamodels/2.x/itop-bridge-cmdb-services/dictionaries/sk.dict.itop-bridge-cmdb-services.php
index 8a72dc53cf..6d73b89f88 100644
--- a/datamodels/2.x/itop-bridge-cmdb-services/dictionaries/sk.dict.itop-bridge-cmdb-services.php
+++ b/datamodels/2.x/itop-bridge-cmdb-services/dictionaries/sk.dict.itop-bridge-cmdb-services.php
@@ -30,10 +30,10 @@
 //
 // Class: lnkFunctionalCIToProviderContract
 //
-
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:lnkFunctionalCIToProviderContract' => 'väzba - Komponent / Poskytovateľská zmluva',
 	'Class:lnkFunctionalCIToProviderContract+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Name' => '%1$s / %2$s~~',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Poskytovateľská zmluva',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Názov poskytovateľského zmluvy',
@@ -51,6 +51,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:lnkFunctionalCIToService' => 'väzba - Komponent / Služba',
 	'Class:lnkFunctionalCIToService+' => '',
+	'Class:lnkFunctionalCIToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Služba',
 	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '',
 	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Názov služby',
diff --git a/datamodels/2.x/itop-bridge-cmdb-services/dictionaries/tr.dict.itop-bridge-cmdb-services.php b/datamodels/2.x/itop-bridge-cmdb-services/dictionaries/tr.dict.itop-bridge-cmdb-services.php
index d9100e0fe8..2b76950fe7 100644
--- a/datamodels/2.x/itop-bridge-cmdb-services/dictionaries/tr.dict.itop-bridge-cmdb-services.php
+++ b/datamodels/2.x/itop-bridge-cmdb-services/dictionaries/tr.dict.itop-bridge-cmdb-services.php
@@ -30,10 +30,10 @@
 //
 // Class: lnkFunctionalCIToProviderContract
 //
-
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:lnkFunctionalCIToProviderContract' => 'İşlevsel CI / Sağlayıcı Sözleşmesi bağla',
 	'Class:lnkFunctionalCIToProviderContract+' => '~~',
+	'Class:lnkFunctionalCIToProviderContract/Name' => '%1$s / %2$s~~',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Sağlayıcı Sözleşmesi',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '~~',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Sağlayıcı Sözleşme Adı',
@@ -51,6 +51,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:lnkFunctionalCIToService' => 'İşlevsel CI / servis bağla',
 	'Class:lnkFunctionalCIToService+' => '~~',
+	'Class:lnkFunctionalCIToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Servis',
 	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '~~',
 	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Servis Adı',
diff --git a/datamodels/2.x/itop-bridge-cmdb-services/dictionaries/zh_cn.dict.itop-bridge-cmdb-services.php b/datamodels/2.x/itop-bridge-cmdb-services/dictionaries/zh_cn.dict.itop-bridge-cmdb-services.php
index bc55dbdcd9..8381e25246 100644
--- a/datamodels/2.x/itop-bridge-cmdb-services/dictionaries/zh_cn.dict.itop-bridge-cmdb-services.php
+++ b/datamodels/2.x/itop-bridge-cmdb-services/dictionaries/zh_cn.dict.itop-bridge-cmdb-services.php
@@ -30,10 +30,10 @@
 //
 // Class: lnkFunctionalCIToProviderContract
 //
-
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:lnkFunctionalCIToProviderContract' => '关联 功能配置项/供应商合同',
 	'Class:lnkFunctionalCIToProviderContract+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Name' => '%1$s / %2$s~~',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => '供应商合同',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => '供应商合同名称',
@@ -51,6 +51,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:lnkFunctionalCIToService' => '关联 功能配置项/服务',
 	'Class:lnkFunctionalCIToService+' => '',
+	'Class:lnkFunctionalCIToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkFunctionalCIToService/Attribute:service_id' => '服务',
 	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '',
 	'Class:lnkFunctionalCIToService/Attribute:service_name' => '服务名称',
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/datamodel.itop-bridge-cmdb-ticket.xml b/datamodels/2.x/itop-bridge-cmdb-ticket/datamodel.itop-bridge-cmdb-ticket.xml
index 8c7e1e76e2..a421d06706 100644
--- a/datamodels/2.x/itop-bridge-cmdb-ticket/datamodel.itop-bridge-cmdb-ticket.xml
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/datamodel.itop-bridge-cmdb-ticket.xml
@@ -139,7 +139,6 @@
           <count_max>0</count_max>
           <ext_key_to_remote>ticket_id</ext_key_to_remote>
           <duplicates/>
-          <read_only>false</read_only>
         </field>
       </fields>
     </class>
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/cs.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/cs.dict.itop-bridge-cmdb-ticket.php
index 9b6006bfee..e2dc5ec622 100644
--- a/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/cs.dict.itop-bridge-cmdb-ticket.php
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/cs.dict.itop-bridge-cmdb-ticket.php
@@ -33,6 +33,7 @@
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:lnkFunctionalCIToTicket' => 'Spojení (Funkční konfigurační položka / Tiket)',
 	'Class:lnkFunctionalCIToTicket+' => '',
+	'Class:lnkFunctionalCIToTicket/Name' => '%1$s / %2$s~~',
 	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id' => 'Tiket',
 	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id+' => '',
 	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref' => 'ID',
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/da.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/da.dict.itop-bridge-cmdb-ticket.php
index aab7af82aa..4c716d233e 100644
--- a/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/da.dict.itop-bridge-cmdb-ticket.php
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/da.dict.itop-bridge-cmdb-ticket.php
@@ -33,6 +33,7 @@
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:lnkFunctionalCIToTicket' => 'Sammenhæng FunctionalCI/Ticket',
 	'Class:lnkFunctionalCIToTicket+' => '',
+	'Class:lnkFunctionalCIToTicket/Name' => '%1$s / %2$s~~',
 	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id' => 'Ticket',
 	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id+' => '',
 	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref' => 'Reference',
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/de.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/de.dict.itop-bridge-cmdb-ticket.php
index 02400852d3..7d191d397a 100644
--- a/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/de.dict.itop-bridge-cmdb-ticket.php
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/de.dict.itop-bridge-cmdb-ticket.php
@@ -33,6 +33,7 @@
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:lnkFunctionalCIToTicket' => 'Verknüpfung FunctionalCI/Ticket',
 	'Class:lnkFunctionalCIToTicket+' => '',
+	'Class:lnkFunctionalCIToTicket/Name' => '%1$s / %2$s',
 	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id' => 'Ticket',
 	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id+' => '',
 	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref' => 'Referenz',
@@ -56,5 +57,5 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 //
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:FunctionalCI/Attribute:tickets_list' => 'Tickets',
-	'Class:FunctionalCI/Attribute:tickets_list+' => 'All the tickets for this configuration item~~',
+	'Class:FunctionalCI/Attribute:tickets_list+' => 'Alle Ticket, die mit diesem CI verknüpft sind',
 ));
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/es_cr.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/es_cr.dict.itop-bridge-cmdb-ticket.php
index 4af002aca1..f710b39240 100644
--- a/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/es_cr.dict.itop-bridge-cmdb-ticket.php
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/es_cr.dict.itop-bridge-cmdb-ticket.php
@@ -33,6 +33,7 @@
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkFunctionalCIToTicket' => 'Relación EC Funcional y Ticket',
 	'Class:lnkFunctionalCIToTicket+' => 'Relación EC Funcional y Ticket',
+	'Class:lnkFunctionalCIToTicket/Name' => '%1$s / %2$s~~',
 	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id' => 'Ticket',
 	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id+' => 'Ticket',
 	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref' => 'Ref.',
@@ -51,7 +52,6 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:not_impacted' => 'No impactado',
 ));
 
-
 //
 // Class: FunctionalCI
 //
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/fr.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/fr.dict.itop-bridge-cmdb-ticket.php
index e7f35f1a1d..8bfcda086f 100644
--- a/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/fr.dict.itop-bridge-cmdb-ticket.php
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/fr.dict.itop-bridge-cmdb-ticket.php
@@ -33,6 +33,7 @@
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:lnkFunctionalCIToTicket' => 'Lien CI / Ticket',
 	'Class:lnkFunctionalCIToTicket+' => '',
+	'Class:lnkFunctionalCIToTicket/Name' => '%1$s / %2$s',
 	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id' => 'Ticket',
 	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id+' => '',
 	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref' => 'Référence',
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/hu.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/hu.dict.itop-bridge-cmdb-ticket.php
index f16828e2d4..3cc6d2ffed 100644
--- a/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/hu.dict.itop-bridge-cmdb-ticket.php
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/hu.dict.itop-bridge-cmdb-ticket.php
@@ -33,6 +33,7 @@
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:lnkFunctionalCIToTicket' => 'Funkcionális CI / Hibajegy',
 	'Class:lnkFunctionalCIToTicket+' => '~~',
+	'Class:lnkFunctionalCIToTicket/Name' => '%1$s / %2$s~~',
 	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id' => 'Hibajegy',
 	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id+' => '~~',
 	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref' => 'Ref',
@@ -43,9 +44,9 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id+' => '~~',
 	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name' => 'CI név',
 	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name+' => '~~',
-    'Class:lnkFunctionalCIToTicket/Attribute:impact' => 'Hatása (szöveg)',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact' => 'Hatása (szöveg)',
 	'Class:lnkFunctionalCIToTicket/Attribute:impact+' => '~~',
-    'Class:lnkFunctionalCIToTicket/Attribute:impact_code' => 'Hatása',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code' => 'Hatása',
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:manual' => 'Kézzel hozzáadva',
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:computed' => 'Számított',
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:not_impacted' => 'Nincs hatása',
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/it.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/it.dict.itop-bridge-cmdb-ticket.php
index da1a559415..6896b1fe9b 100644
--- a/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/it.dict.itop-bridge-cmdb-ticket.php
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/it.dict.itop-bridge-cmdb-ticket.php
@@ -33,6 +33,7 @@
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:lnkFunctionalCIToTicket' => 'Link FunctionalCI / Ticket~~',
 	'Class:lnkFunctionalCIToTicket+' => '~~',
+	'Class:lnkFunctionalCIToTicket/Name' => '%1$s / %2$s~~',
 	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id' => 'Ticket~~',
 	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id+' => '~~',
 	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref' => 'Ref~~',
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/ja.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/ja.dict.itop-bridge-cmdb-ticket.php
index 72f79cff9f..0b6d14c7f2 100644
--- a/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/ja.dict.itop-bridge-cmdb-ticket.php
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/ja.dict.itop-bridge-cmdb-ticket.php
@@ -33,6 +33,7 @@
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:lnkFunctionalCIToTicket' => 'リンク 機能的CI/チケット',
 	'Class:lnkFunctionalCIToTicket+' => '',
+	'Class:lnkFunctionalCIToTicket/Name' => '%1$s / %2$s~~',
 	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id' => 'チケット',
 	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id+' => '',
 	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref' => '参照',
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/nl.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/nl.dict.itop-bridge-cmdb-ticket.php
index 1a84ecd592..04b9f49fbb 100644
--- a/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/nl.dict.itop-bridge-cmdb-ticket.php
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/nl.dict.itop-bridge-cmdb-ticket.php
@@ -33,6 +33,7 @@
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:lnkFunctionalCIToTicket' => 'Link Functioneel CI / Ticket',
 	'Class:lnkFunctionalCIToTicket+' => '',
+	'Class:lnkFunctionalCIToTicket/Name' => '%1$s / %2$s~~',
 	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id' => 'Ticket',
 	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id+' => '',
 	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref' => 'Referentie',
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/pl.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/pl.dict.itop-bridge-cmdb-ticket.php
index 16c0c2e2b0..59902570a3 100644
--- a/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/pl.dict.itop-bridge-cmdb-ticket.php
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/pl.dict.itop-bridge-cmdb-ticket.php
@@ -33,6 +33,7 @@
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:lnkFunctionalCIToTicket' => 'Połączenie Konfiguracja / Zgłoszenie',
 	'Class:lnkFunctionalCIToTicket+' => '',
+	'Class:lnkFunctionalCIToTicket/Name' => '%1$s / %2$s~~',
 	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id' => 'Zgłoszenie',
 	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id+' => '',
 	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref' => 'Adnotacja',
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/pt_br.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/pt_br.dict.itop-bridge-cmdb-ticket.php
index 762c911f69..30ccc8bd66 100644
--- a/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/pt_br.dict.itop-bridge-cmdb-ticket.php
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/pt_br.dict.itop-bridge-cmdb-ticket.php
@@ -33,6 +33,7 @@
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:lnkFunctionalCIToTicket' => 'Link IC / Solicitação',
 	'Class:lnkFunctionalCIToTicket+' => '',
+	'Class:lnkFunctionalCIToTicket/Name' => '%1$s / %2$s~~',
 	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id' => 'Solicitação',
 	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id+' => '',
 	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref' => 'Ref.',
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/ru.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/ru.dict.itop-bridge-cmdb-ticket.php
index fd78ef7d9c..ec70eba428 100644
--- a/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/ru.dict.itop-bridge-cmdb-ticket.php
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/ru.dict.itop-bridge-cmdb-ticket.php
@@ -33,6 +33,7 @@
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:lnkFunctionalCIToTicket' => 'Связь Функциональная КЕ/Тикет',
 	'Class:lnkFunctionalCIToTicket+' => '',
+	'Class:lnkFunctionalCIToTicket/Name' => '%1$s / %2$s~~',
 	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id' => 'Тикет',
 	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id+' => '',
 	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref' => 'Тикет',
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/sk.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/sk.dict.itop-bridge-cmdb-ticket.php
index c4062d1e96..019e6a1c15 100644
--- a/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/sk.dict.itop-bridge-cmdb-ticket.php
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/sk.dict.itop-bridge-cmdb-ticket.php
@@ -33,6 +33,7 @@
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:lnkFunctionalCIToTicket' => 'väzba - Komponent / Ticket',
 	'Class:lnkFunctionalCIToTicket+' => '',
+	'Class:lnkFunctionalCIToTicket/Name' => '%1$s / %2$s~~',
 	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id' => 'Ticket',
 	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id+' => '',
 	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref' => 'Referencia na Ticket',
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/tr.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/tr.dict.itop-bridge-cmdb-ticket.php
index 68c4f80d86..b1d144f4f6 100644
--- a/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/tr.dict.itop-bridge-cmdb-ticket.php
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/tr.dict.itop-bridge-cmdb-ticket.php
@@ -33,6 +33,7 @@
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:lnkFunctionalCIToTicket' => 'İşlevsel CI / Çağrı kaydı bağla',
 	'Class:lnkFunctionalCIToTicket+' => '~~',
+	'Class:lnkFunctionalCIToTicket/Name' => '%1$s / %2$s~~',
 	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id' => 'Çağrı Kaydı',
 	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id+' => '~~',
 	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref' => 'Ref',
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/zh_cn.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/zh_cn.dict.itop-bridge-cmdb-ticket.php
index 7382c9c4c7..8757c7a3ff 100644
--- a/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/zh_cn.dict.itop-bridge-cmdb-ticket.php
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/zh_cn.dict.itop-bridge-cmdb-ticket.php
@@ -33,6 +33,7 @@
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:lnkFunctionalCIToTicket' => '关联 功能配置项/工单',
 	'Class:lnkFunctionalCIToTicket+' => '',
+	'Class:lnkFunctionalCIToTicket/Name' => '%1$s / %2$s~~',
 	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id' => '工单',
 	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id+' => '',
 	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref' => '工单编号',
diff --git a/datamodels/2.x/itop-change-mgmt-itil/datamodel.itop-change-mgmt-itil.xml b/datamodels/2.x/itop-change-mgmt-itil/datamodel.itop-change-mgmt-itil.xml
index f99dc7162b..a4388efb6e 100755
--- a/datamodels/2.x/itop-change-mgmt-itil/datamodel.itop-change-mgmt-itil.xml
+++ b/datamodels/2.x/itop-change-mgmt-itil/datamodel.itop-change-mgmt-itil.xml
@@ -264,8 +264,6 @@
           <edit_mode>add_remove</edit_mode>
           <count_min>0</count_min>
           <count_max>0</count_max>
-          <relation_type>link</relation_type>
-          <read_only>false</read_only>
         </field>
         <field id="related_incident_list" xsi:type="AttributeLinkedSet">
           <linked_class>Incident</linked_class>
@@ -273,8 +271,6 @@
           <edit_mode>add_remove</edit_mode>
           <count_min>0</count_min>
           <count_max>0</count_max>
-          <relation_type>link</relation_type>
-          <read_only>false</read_only>
         </field>
         <field id="related_problems_list" xsi:type="AttributeLinkedSet">
           <linked_class>Problem</linked_class>
@@ -282,8 +278,6 @@
           <edit_mode>add_remove</edit_mode>
           <count_min>0</count_min>
           <count_max>0</count_max>
-          <relation_type>link</relation_type>
-          <read_only>false</read_only>
         </field>
         <field id="child_changes_list" xsi:type="AttributeLinkedSet">
           <linked_class>Change</linked_class>
@@ -292,8 +286,6 @@
           <filter><![CDATA[SELECT Change WHERE id != :this->id]]></filter>
           <count_min>0</count_min>
           <count_max>0</count_max>
-          <relation_type>link</relation_type>
-          <read_only>false</read_only>
         </field>
       </fields>
       <lifecycle>
diff --git a/datamodels/2.x/itop-change-mgmt-itil/dictionaries/de.dict.itop-change-mgmt-itil.php b/datamodels/2.x/itop-change-mgmt-itil/dictionaries/de.dict.itop-change-mgmt-itil.php
index 24a9923601..5c48e0b766 100644
--- a/datamodels/2.x/itop-change-mgmt-itil/dictionaries/de.dict.itop-change-mgmt-itil.php
+++ b/datamodels/2.x/itop-change-mgmt-itil/dictionaries/de.dict.itop-change-mgmt-itil.php
@@ -27,21 +27,21 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Menu:Change:Overview' => 'Übersicht',
 	'Menu:Change:Overview+' => '',
 	'Menu:NewChange' => 'Neuer Change',
-	'Menu:NewChange+' => 'Ein neues Change Ticket erstellen',
-	'Menu:SearchChanges' => 'Nach Changes suchen',
-	'Menu:SearchChanges+' => 'Nach Change Tickets suchen',
+	'Menu:NewChange+' => 'Einen neuen Change erstellen',
+	'Menu:SearchChanges' => 'Suche nach Changes',
+	'Menu:SearchChanges+' => 'Unter den bestehenden Changes suchen',
 	'Menu:Change:Shortcuts' => 'Shortcuts',
 	'Menu:Change:Shortcuts+' => '',
 	'Menu:WaitingAcceptance' => 'Changes, die auf Annahme warten',
-	'Menu:WaitingAcceptance+' => '',
+	'Menu:WaitingAcceptance+' => 'Changes, die auf Annahme warten',
 	'Menu:WaitingApproval' => 'Changes, die auf Genehmigung warten',
-	'Menu:WaitingApproval+' => '',
+	'Menu:WaitingApproval+' => 'Changes, die auf Genehmigung warten',
 	'Menu:Changes' => 'Offene Changes',
-	'Menu:Changes+' => 'Alle Offene Changes',
-	'Menu:MyChanges' => 'Mir zugewiesene Changes',
-	'Menu:MyChanges+' => 'Mir zugewiesene Changes (als Bearbeiter)',
+	'Menu:Changes+' => 'Offene Changes',
+	'Menu:MyChanges' => 'Changes, die mir zugewiesen sind',
+	'Menu:MyChanges+' => 'Changes, die mir zugewiesen sind',
 	'UI-ChangeManagementOverview-ChangeByCategory-last-7-days' => 'Changes der letzten sieben Tage nach Kategorie',
-	'UI-ChangeManagementOverview-Last-7-days' => 'Anzahl der Changes der letzten sieben Tage',
+	'UI-ChangeManagementOverview-Last-7-days' => 'Zahl der Changes in den letzten sieben Tagen',
 	'UI-ChangeManagementOverview-ChangeByDomain-last-7-days' => 'Changes der letzten sieben Tage nach Typ',
 	'UI-ChangeManagementOverview-ChangeByStatus-last-7-days' => 'Changes der letzten sieben Tage nach Status',
 	'Tickets:Related:OpenChanges' => 'Offene Changes',
@@ -127,14 +127,14 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:Change/Attribute:parent_name' => 'Parent Change Ref',
 	'Class:Change/Attribute:parent_name+' => '',
 	'Class:Change/Attribute:related_request_list' => 'Verwandte Requests',
-	'Class:Change/Attribute:related_request_list+' => 'All the user requests linked to this change~~',
+	'Class:Change/Attribute:related_request_list+' => 'Alle Benutzeranfragen, die mit diesem Change verknüpft sind',
 	'Class:Change/Attribute:related_problems_list' => 'Verwandte Probleme',
-	'Class:Change/Attribute:related_problems_list+' => 'All the problems linked to this change~~',
+	'Class:Change/Attribute:related_problems_list+' => 'Alle Probleme, die mit diesem Change verknüpft sind',
 	'Class:Change/Attribute:related_incident_list' => 'Verwandte Incidents',
-	'Class:Change/Attribute:related_incident_list+' => 'All the incidents linked to this change~~',
+	'Class:Change/Attribute:related_incident_list+' => 'Alle Incidents, die mit diesem Change verknüpft sind',
 	'Class:Change/Attribute:child_changes_list' => 'Abgeleitete Changes',
-	'Class:Change/Attribute:child_changes_list+' => 'All the sub changes linked to this change~~',
-	'Class:Change/Attribute:parent_id_friendlyname' => 'Parent Friendly Name',
+	'Class:Change/Attribute:child_changes_list+' => 'Alle abgeleiteten Changes, die mit diesem Change verknüpft sind',
+	'Class:Change/Attribute:parent_id_friendlyname' => 'Parent Change Anzeigename',
 	'Class:Change/Attribute:parent_id_friendlyname+' => '',
 	'Class:Change/Attribute:parent_id_finalclass_recall' => 'Change-Typ',
 	'Class:Change/Attribute:parent_id_finalclass_recall+' => '',
diff --git a/datamodels/2.x/itop-change-mgmt-itil/dictionaries/es_cr.dict.itop-change-mgmt-itil.php b/datamodels/2.x/itop-change-mgmt-itil/dictionaries/es_cr.dict.itop-change-mgmt-itil.php
index 6852e828d8..74ee1450e7 100644
--- a/datamodels/2.x/itop-change-mgmt-itil/dictionaries/es_cr.dict.itop-change-mgmt-itil.php
+++ b/datamodels/2.x/itop-change-mgmt-itil/dictionaries/es_cr.dict.itop-change-mgmt-itil.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
diff --git a/datamodels/2.x/itop-change-mgmt-itil/dictionaries/fr.dict.itop-change-mgmt-itil.php b/datamodels/2.x/itop-change-mgmt-itil/dictionaries/fr.dict.itop-change-mgmt-itil.php
index 934a6083bf..a297cd4354 100644
--- a/datamodels/2.x/itop-change-mgmt-itil/dictionaries/fr.dict.itop-change-mgmt-itil.php
+++ b/datamodels/2.x/itop-change-mgmt-itil/dictionaries/fr.dict.itop-change-mgmt-itil.php
@@ -198,7 +198,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 //
 
 Dict::Add('FR FR', 'French', 'Français', array(
-	'Class:ApprovedChange' => 'Changements pré-approuvés',
+	'Class:ApprovedChange' => 'Changement pré-approuvé',
 	'Class:ApprovedChange+' => '',
 	'Class:ApprovedChange/Attribute:approval_date' => 'Date d\'approbation',
 	'Class:ApprovedChange/Attribute:approval_date+' => '',
@@ -268,7 +268,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 //
 
 Dict::Add('FR FR', 'French', 'Français', array(
-	'Class:EmergencyChange' => 'Changement d\'Urgence',
+	'Class:EmergencyChange' => 'Changement urgent',
 	'Class:EmergencyChange+' => '',
 	'Class:EmergencyChange/Stimulus:ev_validate' => 'Valider',
 	'Class:EmergencyChange/Stimulus:ev_validate+' => '',
@@ -293,7 +293,6 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:EmergencyChange/Stimulus:ev_finish' => 'Fermer',
 	'Class:EmergencyChange/Stimulus:ev_finish+' => '',
 ));
-
 // 1:n relations custom labels for tooltip and pop-up title
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:Change/Attribute:child_changes_list/UI:Links:Create:Button+' => 'Créer un %4$s',
@@ -319,6 +318,5 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:Change/Attribute:related_request_list/UI:Links:Remove:Button+' => 'Retirer cette %4$s',
 	'Class:Change/Attribute:related_request_list/UI:Links:Remove:Modal:Title' => 'Retirer cette %4$s de son %1$s',
 	'Class:Change/Attribute:related_request_list/UI:Links:Delete:Button+' => 'Supprimer cette %4$s',
-	'Class:Change/Attribute:related_request_list/UI:Links:Delete:Modal:Title' => 'Supprimer une %4$s',
+	'Class:Change/Attribute:related_request_list/UI:Links:Delete:Modal:Title' => 'Supprimer une %4$s'
 ));
-
diff --git a/datamodels/2.x/itop-change-mgmt-itil/dictionaries/hu.dict.itop-change-mgmt-itil.php b/datamodels/2.x/itop-change-mgmt-itil/dictionaries/hu.dict.itop-change-mgmt-itil.php
index 52260a38a3..8ebbf646aa 100644
--- a/datamodels/2.x/itop-change-mgmt-itil/dictionaries/hu.dict.itop-change-mgmt-itil.php
+++ b/datamodels/2.x/itop-change-mgmt-itil/dictionaries/hu.dict.itop-change-mgmt-itil.php
@@ -20,27 +20,27 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Menu:ChangeManagement' => 'Változáskezelés',
+	'Menu:ChangeManagement' => 'Változáskezelés',
 	'Menu:Change:Overview' => 'Áttekintő',
-    'Menu:Change:Overview+' => '~~',
+	'Menu:Change:Overview+' => '~~',
 	'Menu:NewChange' => 'Új változás',
 	'Menu:NewChange+' => 'Új változásjegy létrehozása',
 	'Menu:SearchChanges' => 'Változás keresés',
 	'Menu:SearchChanges+' => 'Változásjegy keresés',
-    'Menu:Change:Shortcuts' => 'Gyorsgombok',
-    'Menu:Change:Shortcuts+' => '~~',
+	'Menu:Change:Shortcuts' => 'Gyorsgombok',
+	'Menu:Change:Shortcuts+' => '~~',
 	'Menu:WaitingAcceptance' => 'Elfogadásra váró változások',
-    'Menu:WaitingAcceptance+' => '~~',
+	'Menu:WaitingAcceptance+' => '~~',
 	'Menu:WaitingApproval' => 'Jóváhagyásra váró változások',
-    'Menu:WaitingApproval+' => '~~',
+	'Menu:WaitingApproval+' => '~~',
 	'Menu:Changes' => 'Nyitott változási kérelmek',
 	'Menu:Changes+' => 'Minden nyitott változási kérelem',
 	'Menu:MyChanges' => 'Hozzám rendelt változások',
 	'Menu:MyChanges+' => 'Changes assigned to me (as Agent)~~',
 	'UI-ChangeManagementOverview-ChangeByCategory-last-7-days' => 'Változások kategóriánként az elmúlt 7 napban',
 	'UI-ChangeManagementOverview-Last-7-days' => 'A változások száma az elmúlt 7 napban',
-    'UI-ChangeManagementOverview-ChangeByDomain-last-7-days' => 'Változások tartományonként az elmúlt 7 napban',
-    'UI-ChangeManagementOverview-ChangeByStatus-last-7-days' => 'Változások állapotuk szerint az elmúlt 7 napban',
+	'UI-ChangeManagementOverview-ChangeByDomain-last-7-days' => 'Változások tartományonként az elmúlt 7 napban',
+	'UI-ChangeManagementOverview-ChangeByStatus-last-7-days' => 'Változások állapotuk szerint az elmúlt 7 napban',
 	'Tickets:Related:OpenChanges' => 'Nyitott változások',
 	'Tickets:Related:RecentChanges' => 'Legutóbbi változások (72h)',
 ));
@@ -63,13 +63,13 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:Change' => 'Változás',
 	'Class:Change+' => '',
-    'Class:Change/Attribute:status' => 'Állapot',
+	'Class:Change/Attribute:status' => 'Állapot',
 	'Class:Change/Attribute:status+' => '',
 	'Class:Change/Attribute:status/Value:new' => 'Új',
 	'Class:Change/Attribute:status/Value:new+' => '',
 	'Class:Change/Attribute:status/Value:validated' => 'Ellenőrzött',
 	'Class:Change/Attribute:status/Value:validated+' => '',
-    'Class:Change/Attribute:status/Value:rejected' => 'Elutasított',
+	'Class:Change/Attribute:status/Value:rejected' => 'Elutasított',
 	'Class:Change/Attribute:status/Value:rejected+' => '',
 	'Class:Change/Attribute:status/Value:assigned' => 'Hozzárendelt',
 	'Class:Change/Attribute:status/Value:assigned+' => '',
@@ -81,47 +81,47 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:Change/Attribute:status/Value:notapproved+' => '',
 	'Class:Change/Attribute:status/Value:implemented' => 'Végrehajtott',
 	'Class:Change/Attribute:status/Value:implemented+' => '',
-    'Class:Change/Attribute:status/Value:monitored' => 'Felügyelt',
+	'Class:Change/Attribute:status/Value:monitored' => 'Felügyelt',
 	'Class:Change/Attribute:status/Value:monitored+' => '',
 	'Class:Change/Attribute:status/Value:closed' => 'Lezárt',
 	'Class:Change/Attribute:status/Value:closed+' => '',
-    'Class:Change/Attribute:reason' => 'Indoklás',
+	'Class:Change/Attribute:reason' => 'Indoklás',
 	'Class:Change/Attribute:reason+' => '',
-    'Class:Change/Attribute:requestor_id' => 'Kérelmező',
+	'Class:Change/Attribute:requestor_id' => 'Kérelmező',
 	'Class:Change/Attribute:requestor_id+' => '',
-    'Class:Change/Attribute:requestor_email' => 'Kérelmező email címe',
+	'Class:Change/Attribute:requestor_email' => 'Kérelmező email címe',
 	'Class:Change/Attribute:requestor_email+' => '',
 	'Class:Change/Attribute:creation_date' => 'Létrehozás dátuma',
 	'Class:Change/Attribute:creation_date+' => '',
-    'Class:Change/Attribute:impact' => 'Hatása',
+	'Class:Change/Attribute:impact' => 'Hatása',
 	'Class:Change/Attribute:impact+' => '',
 	'Class:Change/Attribute:supervisor_group_id' => 'Supervisor csoport',
 	'Class:Change/Attribute:supervisor_group_id+' => '',
-    'Class:Change/Attribute:supervisor_group_name' => 'Supervisor csoport név',
+	'Class:Change/Attribute:supervisor_group_name' => 'Supervisor csoport név',
 	'Class:Change/Attribute:supervisor_group_name+' => '',
 	'Class:Change/Attribute:supervisor_id' => 'Supervisor',
 	'Class:Change/Attribute:supervisor_id+' => '',
-    'Class:Change/Attribute:supervisor_email' => 'Supervisor email címe',
+	'Class:Change/Attribute:supervisor_email' => 'Supervisor email címe',
 	'Class:Change/Attribute:supervisor_email+' => '',
 	'Class:Change/Attribute:manager_group_id' => 'Menedzser csoport',
 	'Class:Change/Attribute:manager_group_id+' => '',
-    'Class:Change/Attribute:manager_group_name' => 'Menedzser csoport név',
+	'Class:Change/Attribute:manager_group_name' => 'Menedzser csoport név',
 	'Class:Change/Attribute:manager_group_name+' => '',
 	'Class:Change/Attribute:manager_id' => 'Menedzser',
 	'Class:Change/Attribute:manager_id+' => '',
-    'Class:Change/Attribute:manager_email' => 'Menedzser email címe',
+	'Class:Change/Attribute:manager_email' => 'Menedzser email címe',
 	'Class:Change/Attribute:manager_email+' => '',
-    'Class:Change/Attribute:outage' => 'Üzemszünet',
+	'Class:Change/Attribute:outage' => 'Üzemszünet',
 	'Class:Change/Attribute:outage+' => '',
 	'Class:Change/Attribute:outage/Value:no' => 'Nem',
 	'Class:Change/Attribute:outage/Value:no+' => '',
 	'Class:Change/Attribute:outage/Value:yes' => 'Igen',
 	'Class:Change/Attribute:outage/Value:yes+' => '',
-    'Class:Change/Attribute:fallback' => 'Visszavonás',
+	'Class:Change/Attribute:fallback' => 'Visszavonás',
 	'Class:Change/Attribute:fallback+' => '',
 	'Class:Change/Attribute:parent_id' => 'Szülő változás',
 	'Class:Change/Attribute:parent_id+' => '~~',
-    'Class:Change/Attribute:parent_name' => 'Szülő változás Ref',
+	'Class:Change/Attribute:parent_name' => 'Szülő változás Ref',
 	'Class:Change/Attribute:parent_name+' => '~~',
 	'Class:Change/Attribute:related_request_list' => 'Kapcsolódó kérelmek',
 	'Class:Change/Attribute:related_request_list+' => 'All the user requests linked to this change~~',
@@ -137,7 +137,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:Change/Attribute:parent_id_finalclass_recall+' => '~~',
 	'Class:Change/Stimulus:ev_validate' => 'Ellenőrzés',
 	'Class:Change/Stimulus:ev_validate+' => '',
-    'Class:Change/Stimulus:ev_reject' => 'Elutasítás',
+	'Class:Change/Stimulus:ev_reject' => 'Elutasítás',
 	'Class:Change/Stimulus:ev_reject+' => '',
 	'Class:Change/Stimulus:ev_assign' => 'Hozzárendelés',
 	'Class:Change/Stimulus:ev_assign+' => '',
@@ -149,9 +149,9 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:Change/Stimulus:ev_approve+' => '',
 	'Class:Change/Stimulus:ev_replan' => 'Újratervezés',
 	'Class:Change/Stimulus:ev_replan+' => '',
-    'Class:Change/Stimulus:ev_notapprove' => 'Nincs jóváhagyás',
+	'Class:Change/Stimulus:ev_notapprove' => 'Nincs jóváhagyás',
 	'Class:Change/Stimulus:ev_notapprove+' => '',
-    'Class:Change/Stimulus:ev_implement' => 'Megvalósítás alatt',
+	'Class:Change/Stimulus:ev_implement' => 'Megvalósítás alatt',
 	'Class:Change/Stimulus:ev_implement+' => '',
 	'Class:Change/Stimulus:ev_monitor' => 'Felügyelet',
 	'Class:Change/Stimulus:ev_monitor+' => '',
@@ -168,9 +168,9 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:RoutineChange+' => '',
 	'Class:RoutineChange/Stimulus:ev_validate' => 'Ellenőrzés',
 	'Class:RoutineChange/Stimulus:ev_validate+' => '',
-    'Class:RoutineChange/Stimulus:ev_reject' => 'Elutasítás',
+	'Class:RoutineChange/Stimulus:ev_reject' => 'Elutasítás',
 	'Class:RoutineChange/Stimulus:ev_reject+' => '~~',
-    'Class:RoutineChange/Stimulus:ev_assign' => 'Hozzárendelés',
+	'Class:RoutineChange/Stimulus:ev_assign' => 'Hozzárendelés',
 	'Class:RoutineChange/Stimulus:ev_assign+' => '',
 	'Class:RoutineChange/Stimulus:ev_reopen' => 'Újranyitás',
 	'Class:RoutineChange/Stimulus:ev_reopen+' => '',
@@ -180,9 +180,9 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:RoutineChange/Stimulus:ev_approve+' => '~~',
 	'Class:RoutineChange/Stimulus:ev_replan' => 'Újratervezés',
 	'Class:RoutineChange/Stimulus:ev_replan+' => '',
-    'Class:RoutineChange/Stimulus:ev_notapprove' => 'Nincs jóváhagyás',
+	'Class:RoutineChange/Stimulus:ev_notapprove' => 'Nincs jóváhagyás',
 	'Class:RoutineChange/Stimulus:ev_notapprove+' => '~~',
-    'Class:RoutineChange/Stimulus:ev_implement' => 'Megvalósítás alatt',
+	'Class:RoutineChange/Stimulus:ev_implement' => 'Megvalósítás alatt',
 	'Class:RoutineChange/Stimulus:ev_implement+' => '',
 	'Class:RoutineChange/Stimulus:ev_monitor' => 'Felügyelet',
 	'Class:RoutineChange/Stimulus:ev_monitor+' => '',
@@ -203,7 +203,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:ApprovedChange/Attribute:approval_comment+' => '',
 	'Class:ApprovedChange/Stimulus:ev_validate' => 'Ellenőrzés',
 	'Class:ApprovedChange/Stimulus:ev_validate+' => '',
-    'Class:ApprovedChange/Stimulus:ev_reject' => 'Elutasítás',
+	'Class:ApprovedChange/Stimulus:ev_reject' => 'Elutasítás',
 	'Class:ApprovedChange/Stimulus:ev_reject+' => '',
 	'Class:ApprovedChange/Stimulus:ev_assign' => 'Hozzárendelés',
 	'Class:ApprovedChange/Stimulus:ev_assign+' => '',
@@ -215,9 +215,9 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:ApprovedChange/Stimulus:ev_approve+' => '',
 	'Class:ApprovedChange/Stimulus:ev_replan' => 'Újratervezés',
 	'Class:ApprovedChange/Stimulus:ev_replan+' => '',
-    'Class:ApprovedChange/Stimulus:ev_notapprove' => 'Nincs jóváhagyás',
+	'Class:ApprovedChange/Stimulus:ev_notapprove' => 'Nincs jóváhagyás',
 	'Class:ApprovedChange/Stimulus:ev_notapprove+' => '',
-    'Class:ApprovedChange/Stimulus:ev_implement' => 'Megvalósítás alatt',
+	'Class:ApprovedChange/Stimulus:ev_implement' => 'Megvalósítás alatt',
 	'Class:ApprovedChange/Stimulus:ev_implement+' => '',
 	'Class:ApprovedChange/Stimulus:ev_monitor' => 'Felügyelet',
 	'Class:ApprovedChange/Stimulus:ev_monitor+' => '',
@@ -238,7 +238,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:NormalChange/Attribute:acceptance_comment+' => '',
 	'Class:NormalChange/Stimulus:ev_validate' => 'Ellenőrzés',
 	'Class:NormalChange/Stimulus:ev_validate+' => '',
-    'Class:NormalChange/Stimulus:ev_reject' => 'Elutasítás',
+	'Class:NormalChange/Stimulus:ev_reject' => 'Elutasítás',
 	'Class:NormalChange/Stimulus:ev_reject+' => '',
 	'Class:NormalChange/Stimulus:ev_assign' => 'Hozzárendelés',
 	'Class:NormalChange/Stimulus:ev_assign+' => '',
@@ -250,9 +250,9 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:NormalChange/Stimulus:ev_approve+' => '',
 	'Class:NormalChange/Stimulus:ev_replan' => 'Újratervezés',
 	'Class:NormalChange/Stimulus:ev_replan+' => '',
-    'Class:NormalChange/Stimulus:ev_notapprove' => 'Nincs jóváhagyás',
+	'Class:NormalChange/Stimulus:ev_notapprove' => 'Nincs jóváhagyás',
 	'Class:NormalChange/Stimulus:ev_notapprove+' => '',
-    'Class:NormalChange/Stimulus:ev_implement' => 'Megvalósítás alatt',
+	'Class:NormalChange/Stimulus:ev_implement' => 'Megvalósítás alatt',
 	'Class:NormalChange/Stimulus:ev_implement+' => '',
 	'Class:NormalChange/Stimulus:ev_monitor' => 'Felügyelet',
 	'Class:NormalChange/Stimulus:ev_monitor+' => '',
@@ -265,11 +265,11 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:EmergencyChange' => 'Sürgős változás',
+	'Class:EmergencyChange' => 'Sürgős változás',
 	'Class:EmergencyChange+' => '',
 	'Class:EmergencyChange/Stimulus:ev_validate' => 'Ellenőrzés',
 	'Class:EmergencyChange/Stimulus:ev_validate+' => '',
-    'Class:EmergencyChange/Stimulus:ev_reject' => 'Elutasítás',
+	'Class:EmergencyChange/Stimulus:ev_reject' => 'Elutasítás',
 	'Class:EmergencyChange/Stimulus:ev_reject+' => '',
 	'Class:EmergencyChange/Stimulus:ev_assign' => 'Hozzárendelés',
 	'Class:EmergencyChange/Stimulus:ev_assign+' => '',
@@ -281,9 +281,9 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:EmergencyChange/Stimulus:ev_approve+' => '',
 	'Class:EmergencyChange/Stimulus:ev_replan' => 'Újratervezés',
 	'Class:EmergencyChange/Stimulus:ev_replan+' => '',
-    'Class:EmergencyChange/Stimulus:ev_notapprove' => 'Nincs jóváhagyás',
+	'Class:EmergencyChange/Stimulus:ev_notapprove' => 'Nincs jóváhagyás',
 	'Class:EmergencyChange/Stimulus:ev_notapprove+' => '',
-    'Class:EmergencyChange/Stimulus:ev_implement' => 'Megvalósítás alatt',
+	'Class:EmergencyChange/Stimulus:ev_implement' => 'Megvalósítás alatt',
 	'Class:EmergencyChange/Stimulus:ev_implement+' => '',
 	'Class:EmergencyChange/Stimulus:ev_monitor' => 'Felügyelet',
 	'Class:EmergencyChange/Stimulus:ev_monitor+' => '',
diff --git a/datamodels/2.x/itop-change-mgmt-itil/dictionaries/pl.dict.itop-change-mgmt-itil.php b/datamodels/2.x/itop-change-mgmt-itil/dictionaries/pl.dict.itop-change-mgmt-itil.php
index 7720f508d2..d035fa37dd 100644
--- a/datamodels/2.x/itop-change-mgmt-itil/dictionaries/pl.dict.itop-change-mgmt-itil.php
+++ b/datamodels/2.x/itop-change-mgmt-itil/dictionaries/pl.dict.itop-change-mgmt-itil.php
@@ -20,7 +20,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/>
  */
-
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Menu:ChangeManagement' => 'Zarządzanie zmianami',
 	'Menu:Change:Overview' => 'Przegląd',
diff --git a/datamodels/2.x/itop-change-mgmt/datamodel.itop-change-mgmt.xml b/datamodels/2.x/itop-change-mgmt/datamodel.itop-change-mgmt.xml
index f7160f92fe..0e7b68d8be 100755
--- a/datamodels/2.x/itop-change-mgmt/datamodel.itop-change-mgmt.xml
+++ b/datamodels/2.x/itop-change-mgmt/datamodel.itop-change-mgmt.xml
@@ -192,8 +192,6 @@
           <edit_mode>add_remove</edit_mode>
           <count_min>0</count_min>
           <count_max>0</count_max>
-          <relation_type>link</relation_type>
-          <read_only>false</read_only>
         </field>
         <field id="related_incident_list" xsi:type="AttributeLinkedSet">
           <linked_class>Incident</linked_class>
@@ -201,8 +199,6 @@
           <edit_mode>add_remove</edit_mode>
           <count_min>0</count_min>
           <count_max>0</count_max>
-          <relation_type>link</relation_type>
-          <read_only>false</read_only>
         </field>
         <field id="related_problems_list" xsi:type="AttributeLinkedSet">
           <linked_class>Problem</linked_class>
@@ -210,8 +206,6 @@
           <edit_mode>add_remove</edit_mode>
           <count_min>0</count_min>
           <count_max>0</count_max>
-          <relation_type>link</relation_type>
-          <read_only>false</read_only>
         </field>
         <field id="child_changes_list" xsi:type="AttributeLinkedSet">
           <linked_class>Change</linked_class>
@@ -220,8 +214,6 @@
           <filter><![CDATA[SELECT Change WHERE id != :this->id]]></filter>
           <count_min>0</count_min>
           <count_max>0</count_max>
-          <relation_type>link</relation_type>
-          <read_only>false</read_only>
         </field>
       </fields>
       <lifecycle>
diff --git a/datamodels/2.x/itop-change-mgmt/dictionaries/de.dict.itop-change-mgmt.php b/datamodels/2.x/itop-change-mgmt/dictionaries/de.dict.itop-change-mgmt.php
index 9d826cba20..cfcade2f80 100644
--- a/datamodels/2.x/itop-change-mgmt/dictionaries/de.dict.itop-change-mgmt.php
+++ b/datamodels/2.x/itop-change-mgmt/dictionaries/de.dict.itop-change-mgmt.php
@@ -27,19 +27,19 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Menu:Change:Overview' => 'Übersicht',
 	'Menu:Change:Overview+' => '',
 	'Menu:NewChange' => 'Neuer Change',
-	'Menu:NewChange+' => '',
+	'Menu:NewChange+' => 'Einen neuen Change erstellen',
 	'Menu:SearchChanges' => 'Suche nach Changes',
-	'Menu:SearchChanges+' => '',
+	'Menu:SearchChanges+' => 'Unter den bestehenden Changes suchen',
 	'Menu:Change:Shortcuts' => 'Shortcuts',
 	'Menu:Change:Shortcuts+' => '',
 	'Menu:WaitingAcceptance' => 'Changes, die auf Annahme warten',
-	'Menu:WaitingAcceptance+' => '',
+	'Menu:WaitingAcceptance+' => 'Changes, die auf Annahme warten',
 	'Menu:WaitingApproval' => 'Changes, die auf Genehmigung warten',
-	'Menu:WaitingApproval+' => '',
+	'Menu:WaitingApproval+' => 'Changes, die auf Genehmigung warten',
 	'Menu:Changes' => 'Offene Changes',
-	'Menu:Changes+' => '',
+	'Menu:Changes+' => 'Offene Changes',
 	'Menu:MyChanges' => 'Changes, die mir zugewiesen sind',
-	'Menu:MyChanges+' => '',
+	'Menu:MyChanges+' => 'Changes, die mir zugewiesen sind',
 	'UI-ChangeManagementOverview-ChangeByCategory-last-7-days' => 'Changes der letzten sieben Tage nach Kategorie',
 	'UI-ChangeManagementOverview-Last-7-days' => 'Zahl der Changes in den letzten sieben Tagen',
 	'UI-ChangeManagementOverview-ChangeByDomain-last-7-days' => 'Changes der letzten sieben Tage nach Typ',
@@ -83,17 +83,17 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:Change/Attribute:category' => 'Kategorie',
 	'Class:Change/Attribute:category+' => '',
 	'Class:Change/Attribute:category/Value:application' => 'Applikation',
-	'Class:Change/Attribute:category/Value:application+' => '',
+	'Class:Change/Attribute:category/Value:application+' => 'Applikation',
 	'Class:Change/Attribute:category/Value:hardware' => 'Hardware',
-	'Class:Change/Attribute:category/Value:hardware+' => '',
+	'Class:Change/Attribute:category/Value:hardware+' => 'Hardware',
 	'Class:Change/Attribute:category/Value:network' => 'Netzwerk',
-	'Class:Change/Attribute:category/Value:network+' => '',
+	'Class:Change/Attribute:category/Value:network+' => 'Netzwerk',
 	'Class:Change/Attribute:category/Value:other' => 'Andere',
-	'Class:Change/Attribute:category/Value:other+' => '',
+	'Class:Change/Attribute:category/Value:other+' => 'Andere',
 	'Class:Change/Attribute:category/Value:software' => 'Software',
-	'Class:Change/Attribute:category/Value:software+' => '',
+	'Class:Change/Attribute:category/Value:software+' => 'Software',
 	'Class:Change/Attribute:category/Value:system' => 'System',
-	'Class:Change/Attribute:category/Value:system+' => '',
+	'Class:Change/Attribute:category/Value:system+' => 'System',
 	'Class:Change/Attribute:reject_reason' => 'Ablehnungsgrund',
 	'Class:Change/Attribute:reject_reason+' => '',
 	'Class:Change/Attribute:changemanager_id' => 'Change Manager',
@@ -111,14 +111,14 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:Change/Attribute:fallback_plan' => 'Fallback-Plan',
 	'Class:Change/Attribute:fallback_plan+' => '',
 	'Class:Change/Attribute:related_request_list' => 'Verwandte Requests',
-	'Class:Change/Attribute:related_request_list+' => 'All the user requests linked to this change~~',
+	'Class:Change/Attribute:related_request_list+' => 'Alle Benutzeranfragen, die mit diesem Change verknüpft sind',
 	'Class:Change/Attribute:related_incident_list' => 'Verwandte Incidents',
-	'Class:Change/Attribute:related_incident_list+' => 'All the incidents linked to this change~~',
+	'Class:Change/Attribute:related_incident_list+' => 'Alle Incidents, die mit diesem Change verknüpft sind',
 	'Class:Change/Attribute:related_problems_list' => 'Verwandte Probleme',
-	'Class:Change/Attribute:related_problems_list+' => 'All the problems linked to this change~~',
+	'Class:Change/Attribute:related_problems_list+' => 'Alle Probleme, die mit diesem Change verknüpft sind',
 	'Class:Change/Attribute:child_changes_list' => 'Abgeleitete Changes',
-	'Class:Change/Attribute:child_changes_list+' => 'All the sub changes linked to this change~~',
-	'Class:Change/Attribute:parent_id_friendlyname' => 'Parent Change',
+	'Class:Change/Attribute:child_changes_list+' => 'Alle abgeleiteten Changes, die mit diesem Change verknüpft sind',
+	'Class:Change/Attribute:parent_id_friendlyname' => 'Parent Change Anzeigename',
 	'Class:Change/Attribute:parent_id_friendlyname+' => '',
 	'Class:Change/Stimulus:ev_assign' => 'Zuweisen',
 	'Class:Change/Stimulus:ev_assign+' => '',
diff --git a/datamodels/2.x/itop-change-mgmt/dictionaries/es_cr.dict.itop-change-mgmt.php b/datamodels/2.x/itop-change-mgmt/dictionaries/es_cr.dict.itop-change-mgmt.php
index 5ae81fe75e..8657572bcb 100644
--- a/datamodels/2.x/itop-change-mgmt/dictionaries/es_cr.dict.itop-change-mgmt.php
+++ b/datamodels/2.x/itop-change-mgmt/dictionaries/es_cr.dict.itop-change-mgmt.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
diff --git a/datamodels/2.x/itop-change-mgmt/dictionaries/fr.dict.itop-change-mgmt.php b/datamodels/2.x/itop-change-mgmt/dictionaries/fr.dict.itop-change-mgmt.php
index 86d913a05c..cea20ea0a9 100644
--- a/datamodels/2.x/itop-change-mgmt/dictionaries/fr.dict.itop-change-mgmt.php
+++ b/datamodels/2.x/itop-change-mgmt/dictionaries/fr.dict.itop-change-mgmt.php
@@ -139,7 +139,6 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:Change/Attribute:outage/Value:yes' => 'Oui',
 	'Class:Change/Attribute:outage/Value:yes+' => '',
 ));
-
 // 1:n relations custom labels for tooltip and pop-up title
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:Change/Attribute:child_changes_list/UI:Links:Create:Button+' => 'Créer un %4$s',
@@ -165,6 +164,5 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:Change/Attribute:related_request_list/UI:Links:Remove:Button+' => 'Retirer cette %4$s',
 	'Class:Change/Attribute:related_request_list/UI:Links:Remove:Modal:Title' => 'Retirer cette %4$s de son %1$s',
 	'Class:Change/Attribute:related_request_list/UI:Links:Delete:Button+' => 'Supprimer cette %4$s',
-	'Class:Change/Attribute:related_request_list/UI:Links:Delete:Modal:Title' => 'Supprimer une %4$s',
+	'Class:Change/Attribute:related_request_list/UI:Links:Delete:Modal:Title' => 'Supprimer une %4$s'
 ));
-
diff --git a/datamodels/2.x/itop-change-mgmt/dictionaries/hu.dict.itop-change-mgmt.php b/datamodels/2.x/itop-change-mgmt/dictionaries/hu.dict.itop-change-mgmt.php
index 4dc63cc7be..6c2af11f8e 100644
--- a/datamodels/2.x/itop-change-mgmt/dictionaries/hu.dict.itop-change-mgmt.php
+++ b/datamodels/2.x/itop-change-mgmt/dictionaries/hu.dict.itop-change-mgmt.php
@@ -21,14 +21,14 @@
  * along with iTop. If not, see <http://www.gnu.org/licenses/>
  */
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Menu:ChangeManagement' => 'Változáskezelés',
+	'Menu:ChangeManagement' => 'Változáskezelés',
 	'Menu:Change:Overview' => 'Áttekintő',
 	'Menu:Change:Overview+' => '~~',
 	'Menu:NewChange' => 'Új változás',
 	'Menu:NewChange+' => 'Új változásjegy létrehozása',
 	'Menu:SearchChanges' => 'Változás keresés',
 	'Menu:SearchChanges+' => 'Változásjegy keresés',
-    'Menu:Change:Shortcuts' => 'Gyorsgombok',
+	'Menu:Change:Shortcuts' => 'Gyorsgombok',
 	'Menu:Change:Shortcuts+' => '~~',
 	'Menu:WaitingAcceptance' => 'Elfogadásra váró változások',
 	'Menu:WaitingAcceptance+' => '~~',
@@ -40,8 +40,8 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Menu:MyChanges+' => 'Changes assigned to me (as Agent)~~',
 	'UI-ChangeManagementOverview-ChangeByCategory-last-7-days' => 'Változások kategóriánként az elmúlt 7 napban',
 	'UI-ChangeManagementOverview-Last-7-days' => 'A változások száma az elmúlt 7 napban',
-    'UI-ChangeManagementOverview-ChangeByDomain-last-7-days' => 'Változások tartományonként az elmúlt 7 napban',
-    'UI-ChangeManagementOverview-ChangeByStatus-last-7-days' => 'Változások állapotuk szerint az elmúlt 7 napban',
+	'UI-ChangeManagementOverview-ChangeByDomain-last-7-days' => 'Változások tartományonként az elmúlt 7 napban',
+	'UI-ChangeManagementOverview-ChangeByStatus-last-7-days' => 'Változások állapotuk szerint az elmúlt 7 napban',
 	'Tickets:Related:OpenChanges' => 'Nyitott változások',
 	'Tickets:Related:RecentChanges' => 'Legutóbbi változások (72h)',
 ));
@@ -64,7 +64,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:Change' => 'Változás',
 	'Class:Change+' => '~~',
-    'Class:Change/Attribute:status' => 'Állapot',
+	'Class:Change/Attribute:status' => 'Állapot',
 	'Class:Change/Attribute:status+' => '~~',
 	'Class:Change/Attribute:status/Value:new' => 'Új',
 	'Class:Change/Attribute:status/Value:new+' => '~~',
@@ -72,7 +72,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:Change/Attribute:status/Value:assigned+' => '~~',
 	'Class:Change/Attribute:status/Value:planned' => 'Tervezett',
 	'Class:Change/Attribute:status/Value:planned+' => '~~',
-    'Class:Change/Attribute:status/Value:rejected' => 'Elutasított',
+	'Class:Change/Attribute:status/Value:rejected' => 'Elutasított',
 	'Class:Change/Attribute:status/Value:rejected+' => '~~',
 	'Class:Change/Attribute:status/Value:approved' => 'Jóváhagyott',
 	'Class:Change/Attribute:status/Value:approved+' => '~~',
@@ -80,31 +80,31 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:Change/Attribute:status/Value:closed+' => '~~',
 	'Class:Change/Attribute:category' => 'Kategória',
 	'Class:Change/Attribute:category+' => '~~',
-    'Class:Change/Attribute:category/Value:application' => 'Alkalmazás',
+	'Class:Change/Attribute:category/Value:application' => 'Alkalmazás',
 	'Class:Change/Attribute:category/Value:application+' => 'application~~',
-    'Class:Change/Attribute:category/Value:hardware' => 'Hardver',
+	'Class:Change/Attribute:category/Value:hardware' => 'Hardver',
 	'Class:Change/Attribute:category/Value:hardware+' => 'hardware~~',
-    'Class:Change/Attribute:category/Value:network' => 'Hálózat',
+	'Class:Change/Attribute:category/Value:network' => 'Hálózat',
 	'Class:Change/Attribute:category/Value:network+' => 'network~~',
-    'Class:Change/Attribute:category/Value:other' => 'Egyéb',
+	'Class:Change/Attribute:category/Value:other' => 'Egyéb',
 	'Class:Change/Attribute:category/Value:other+' => 'other~~',
-    'Class:Change/Attribute:category/Value:software' => 'Szoftver',
+	'Class:Change/Attribute:category/Value:software' => 'Szoftver',
 	'Class:Change/Attribute:category/Value:software+' => 'software~~',
-    'Class:Change/Attribute:category/Value:system' => 'Rendszer',
+	'Class:Change/Attribute:category/Value:system' => 'Rendszer',
 	'Class:Change/Attribute:category/Value:system+' => 'system~~',
-    'Class:Change/Attribute:reject_reason' => 'Elutasítás oka',
+	'Class:Change/Attribute:reject_reason' => 'Elutasítás oka',
 	'Class:Change/Attribute:reject_reason+' => '~~',
 	'Class:Change/Attribute:changemanager_id' => 'Változás menedzser',
 	'Class:Change/Attribute:changemanager_id+' => '~~',
-    'Class:Change/Attribute:changemanager_email' => 'Változás menedzser email címe',
+	'Class:Change/Attribute:changemanager_email' => 'Változás menedzser email címe',
 	'Class:Change/Attribute:changemanager_email+' => '~~',
 	'Class:Change/Attribute:parent_id' => 'Szülő változás',
 	'Class:Change/Attribute:parent_id+' => '~~',
-    'Class:Change/Attribute:parent_name' => 'Szülő változás ref.',
+	'Class:Change/Attribute:parent_name' => 'Szülő változás ref.',
 	'Class:Change/Attribute:parent_name+' => '~~',
-    'Class:Change/Attribute:creation_date' => 'Létrehozás dátuma',
+	'Class:Change/Attribute:creation_date' => 'Létrehozás dátuma',
 	'Class:Change/Attribute:creation_date+' => '~~',
-    'Class:Change/Attribute:approval_date' => 'Jóváhagyás dátuma',
+	'Class:Change/Attribute:approval_date' => 'Jóváhagyás dátuma',
 	'Class:Change/Attribute:approval_date+' => '~~',
 	'Class:Change/Attribute:fallback_plan' => 'Tartalék terv',
 	'Class:Change/Attribute:fallback_plan+' => '~~',
@@ -118,11 +118,11 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:Change/Attribute:child_changes_list+' => 'All the sub changes linked to this change~~',
 	'Class:Change/Attribute:parent_id_friendlyname' => 'Szülő változás rövid név',
 	'Class:Change/Attribute:parent_id_friendlyname+' => '~~',
-    'Class:Change/Stimulus:ev_assign' => 'Hozzárendelés',
+	'Class:Change/Stimulus:ev_assign' => 'Hozzárendelés',
 	'Class:Change/Stimulus:ev_assign+' => '~~',
 	'Class:Change/Stimulus:ev_plan' => 'Tervezés',
 	'Class:Change/Stimulus:ev_plan+' => '~~',
-    'Class:Change/Stimulus:ev_reject' => 'Elutasítás',
+	'Class:Change/Stimulus:ev_reject' => 'Elutasítás',
 	'Class:Change/Stimulus:ev_reject+' => '~~',
 	'Class:Change/Stimulus:ev_reopen' => 'Újranyitás',
 	'Class:Change/Stimulus:ev_reopen+' => '~~',
@@ -130,7 +130,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:Change/Stimulus:ev_approve+' => '~~',
 	'Class:Change/Stimulus:ev_finish' => 'Befejezés',
 	'Class:Change/Stimulus:ev_finish+' => '~~',
-    'Class:Change/Attribute:outage' => 'Üzemszünet',
+	'Class:Change/Attribute:outage' => 'Üzemszünet',
 	'Class:Change/Attribute:outage+' => '~~',
 	'Class:Change/Attribute:outage/Value:no' => 'Nem',
 	'Class:Change/Attribute:outage/Value:no+' => '~~',
diff --git a/datamodels/2.x/itop-change-mgmt/dictionaries/pl.dict.itop-change-mgmt.php b/datamodels/2.x/itop-change-mgmt/dictionaries/pl.dict.itop-change-mgmt.php
index 482cb6e3a3..37581ded8b 100644
--- a/datamodels/2.x/itop-change-mgmt/dictionaries/pl.dict.itop-change-mgmt.php
+++ b/datamodels/2.x/itop-change-mgmt/dictionaries/pl.dict.itop-change-mgmt.php
@@ -20,7 +20,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/>
  */
-
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Menu:ChangeManagement' => 'Zarządzanie zmianami',
 	'Menu:Change:Overview' => 'Przegląd',
diff --git a/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml b/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml
index b6eb9ab2df..543f62c3c1 100755
--- a/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml
+++ b/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml
@@ -84,7 +84,6 @@
           <count_max>0</count_max>
           <ext_key_to_remote>contact_id</ext_key_to_remote>
           <duplicates/>
-          <read_only>false</read_only>
         </field>
         <field id="documents_list" xsi:type="AttributeLinkedSetIndirect">
           <linked_class>lnkDocumentToFunctionalCI</linked_class>
@@ -93,7 +92,6 @@
           <count_max>0</count_max>
           <ext_key_to_remote>document_id</ext_key_to_remote>
           <duplicates/>
-          <read_only>false</read_only>
         </field>
         <field id="applicationsolution_list" xsi:type="AttributeLinkedSetIndirect">
           <linked_class>lnkApplicationSolutionToFunctionalCI</linked_class>
@@ -102,7 +100,6 @@
           <count_max>0</count_max>
           <ext_key_to_remote>applicationsolution_id</ext_key_to_remote>
           <duplicates/>
-          <read_only>false</read_only>
         </field>
         <field id="softwares_list" xsi:type="AttributeLinkedSet">
           <linked_class>SoftwareInstance</linked_class>
@@ -111,8 +108,6 @@
           <tracking_level>all</tracking_level>
           <count_min>0</count_min>
           <count_max>0</count_max>
-          <relation_type>property</relation_type>
-          <read_only>false</read_only>
         </field>
       </fields>
       <presentation>
@@ -559,7 +554,6 @@
           <count_max>0</count_max>
           <ext_key_to_remote>networkdevice_id</ext_key_to_remote>
           <duplicates>true</duplicates>
-          <read_only>false</read_only>
         </field>
         <field id="physicalinterface_list" xsi:type="AttributeLinkedSet">
           <linked_class>PhysicalInterface</linked_class>
@@ -568,8 +562,6 @@
           <tracking_level>all</tracking_level>
           <count_min>0</count_min>
           <count_max>0</count_max>
-          <relation_type>property</relation_type>
-          <read_only>false</read_only>
         </field>
       </fields>
       <presentation>
@@ -804,8 +796,6 @@
           <tracking_level>all</tracking_level>
           <count_min>0</count_min>
           <count_max>0</count_max>
-          <relation_type>property</relation_type>
-          <read_only>false</read_only>
         </field>
         <field id="san_list" xsi:type="AttributeLinkedSetIndirect">
           <linked_class>lnkSanToDatacenterDevice</linked_class>
@@ -814,7 +804,6 @@
           <count_max>0</count_max>
           <ext_key_to_remote>san_id</ext_key_to_remote>
           <duplicates/>
-          <read_only>false</read_only>
         </field>
         <field id="redundancy" xsi:type="AttributeRedundancySettings">
           <sql>redundancy</sql>
@@ -1036,7 +1025,6 @@
           <count_max>0</count_max>
           <ext_key_to_remote>connectableci_id</ext_key_to_remote>
           <duplicates>true</duplicates>
-          <read_only>false</read_only>
         </field>
         <field id="iosversion_id" xsi:type="AttributeExternalKey">
           <sql>iosversion_id</sql>
@@ -1376,7 +1364,6 @@
           <count_max>0</count_max>
           <ext_key_to_remote>volume_id</ext_key_to_remote>
           <duplicates/>
-          <read_only>false</read_only>
         </field>
       </fields>
       <presentation>
@@ -1662,7 +1649,6 @@
           <count_max>0</count_max>
           <ext_key_to_remote>functionalci_id</ext_key_to_remote>
           <duplicates/>
-          <read_only>false</read_only>
         </field>
         <field id="businessprocess_list" xsi:type="AttributeLinkedSetIndirect">
           <linked_class>lnkApplicationSolutionToBusinessProcess</linked_class>
@@ -1671,7 +1657,6 @@
           <count_max>0</count_max>
           <ext_key_to_remote>businessprocess_id</ext_key_to_remote>
           <duplicates/>
-          <read_only>false</read_only>
         </field>
         <field id="status" xsi:type="AttributeEnum">
           <values>
@@ -1840,7 +1825,6 @@
           <count_max>0</count_max>
           <ext_key_to_remote>applicationsolution_id</ext_key_to_remote>
           <duplicates/>
-          <read_only>false</read_only>
         </field>
         <field id="status" xsi:type="AttributeEnum">
           <values>
@@ -2185,8 +2169,6 @@
           <tracking_level>all</tracking_level>
           <count_min>0</count_min>
           <count_max>0</count_max>
-          <relation_type>property</relation_type>
-          <read_only>false</read_only>
         </field>
       </fields>
       <presentation>
@@ -2341,8 +2323,6 @@
           <tracking_level>all</tracking_level>
           <count_min>0</count_min>
           <count_max>0</count_max>
-          <relation_type>property</relation_type>
-          <read_only>false</read_only>
         </field>
       </fields>
       <presentation>
@@ -2497,8 +2477,6 @@
           <tracking_level>all</tracking_level>
           <count_min>0</count_min>
           <count_max>0</count_max>
-          <relation_type>property</relation_type>
-          <read_only>false</read_only>
         </field>
       </fields>
       <presentation>
@@ -3364,7 +3342,6 @@
           <count_max>0</count_max>
           <ext_key_to_remote>document_id</ext_key_to_remote>
           <duplicates/>
-          <read_only>false</read_only>
         </field>
         <field id="type" xsi:type="AttributeEnum">
           <sort_type>label</sort_type>
@@ -3396,8 +3373,6 @@
           <edit_mode>add_only</edit_mode>
           <count_min>0</count_min>
           <count_max>0</count_max>
-          <relation_type>link</relation_type>
-          <read_only>false</read_only>
         </field>
         <field id="softwarepatch_list" xsi:type="AttributeLinkedSet">
           <linked_class>SoftwarePatch</linked_class>
@@ -3405,8 +3380,6 @@
           <edit_mode>add_only</edit_mode>
           <count_min>0</count_min>
           <count_max>0</count_max>
-          <relation_type>link</relation_type>
-          <read_only>false</read_only>
         </field>
         <field id="softwarelicence_list" xsi:type="AttributeLinkedSet">
           <linked_class>SoftwareLicence</linked_class>
@@ -3414,8 +3387,6 @@
           <edit_mode>add_only</edit_mode>
           <count_min>0</count_min>
           <count_max>0</count_max>
-          <relation_type>link</relation_type>
-          <read_only>false</read_only>
         </field>
       </fields>
       <methods/>
@@ -3542,7 +3513,6 @@
           <count_max>0</count_max>
           <ext_key_to_remote>document_id</ext_key_to_remote>
           <duplicates/>
-          <read_only>false</read_only>
         </field>
         <field id="description" xsi:type="AttributeText">
           <sql>description</sql>
@@ -3628,7 +3598,6 @@
           <count_max>0</count_max>
           <ext_key_to_remote>functionalci_id</ext_key_to_remote>
           <duplicates/>
-          <read_only>false</read_only>
         </field>
         <field id="osversion_id" xsi:type="AttributeExternalKey">
           <sql>osversion_id</sql>
@@ -3741,7 +3710,6 @@
           <count_max>0</count_max>
           <ext_key_to_remote>softwareinstance_id</ext_key_to_remote>
           <duplicates/>
-          <read_only>false</read_only>
         </field>
       </fields>
       <methods/>
@@ -3845,7 +3813,6 @@
           <count_max>0</count_max>
           <ext_key_to_remote>document_id</ext_key_to_remote>
           <duplicates/>
-          <read_only>false</read_only>
         </field>
         <field id="org_id" xsi:type="AttributeExternalKey">
           <sql>org_id</sql>
@@ -4035,8 +4002,6 @@
           <edit_mode>none</edit_mode>
           <count_min>0</count_min>
           <count_max>0</count_max>
-          <relation_type>link</relation_type>
-          <read_only>true</read_only>
         </field>
         <field id="servers_list" xsi:type="AttributeLinkedSet">
           <linked_class>Server</linked_class>
@@ -4044,8 +4009,6 @@
           <edit_mode>none</edit_mode>
           <count_min>0</count_min>
           <count_max>0</count_max>
-          <relation_type>link</relation_type>
-          <read_only>true</read_only>
         </field>
       </fields>
       <methods/>
@@ -4197,8 +4160,6 @@
           <edit_mode>none</edit_mode>
           <count_min>0</count_min>
           <count_max>0</count_max>
-          <relation_type>link</relation_type>
-          <read_only>true</read_only>
         </field>
       </fields>
       <methods/>
@@ -4556,8 +4517,6 @@
           <count_min>0</count_min>
           <count_max>0</count_max>
           <duplicates/>
-          <relation_type>link</relation_type>
-          <read_only>false</read_only>
         </field>
       </fields>
       <methods/>
@@ -4708,8 +4667,6 @@
           <count_min>0</count_min>
           <count_max>0</count_max>
           <duplicates/>
-          <relation_type>link</relation_type>
-          <read_only>false</read_only>
         </field>
       </fields>
       <methods/>
@@ -4796,8 +4753,6 @@
           <count_min>0</count_min>
           <count_max>0</count_max>
           <duplicates/>
-          <relation_type>link</relation_type>
-          <read_only>false</read_only>
         </field>
       </fields>
       <methods/>
@@ -5524,7 +5479,6 @@
           <count_max>0</count_max>
           <ext_key_to_remote>vlan_id</ext_key_to_remote>
           <duplicates/>
-          <read_only>false</read_only>
         </field>
       </fields>
       <methods>
@@ -5737,7 +5691,6 @@
           <count_max>0</count_max>
           <ext_key_to_remote>subnet_id</ext_key_to_remote>
           <duplicates/>
-          <read_only>false</read_only>
         </field>
         <field id="physicalinterfaces_list" xsi:type="AttributeLinkedSetIndirect">
           <linked_class>lnkPhysicalInterfaceToVLAN</linked_class>
@@ -5746,7 +5699,6 @@
           <count_max>0</count_max>
           <ext_key_to_remote>physicalinterface_id</ext_key_to_remote>
           <duplicates/>
-          <read_only>false</read_only>
         </field>
       </fields>
       <methods>
@@ -6178,7 +6130,6 @@
           <count_max>0</count_max>
           <ext_key_to_remote>vlan_id</ext_key_to_remote>
           <duplicates/>
-          <read_only>false</read_only>
         </field>
       </fields>
       <methods/>
@@ -6977,7 +6928,6 @@
           <count_max>0</count_max>
           <ext_key_to_remote>ci_id</ext_key_to_remote>
           <duplicates/>
-          <read_only>false</read_only>
         </field>
       </fields>
       <methods/>
@@ -7186,7 +7136,6 @@
           <count_max>0</count_max>
           <ext_key_to_remote>functionalci_id</ext_key_to_remote>
           <duplicates/>
-          <read_only>false</read_only>
         </field>
       </fields>
       <methods/>
@@ -7208,8 +7157,6 @@
           <edit_mode>add_only</edit_mode>
           <count_min>0</count_min>
           <count_max>0</count_max>
-          <relation_type>link</relation_type>
-          <read_only>false</read_only>
         </field>
       </fields>
       <presentation>
@@ -7231,7 +7178,6 @@
           <count_max>0</count_max>
           <ext_key_to_remote>functionalci_id</ext_key_to_remote>
           <duplicates/>
-          <read_only>false</read_only>
         </field>
       </fields>
     </class>
diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/cs.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/cs.dict.itop-config-mgmt.php
index ba16968450..b9c243cbb2 100644
--- a/datamodels/2.x/itop-config-mgmt/dictionaries/cs.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/cs.dict.itop-config-mgmt.php
@@ -37,7 +37,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Relation:depends on/Description' => 'Prvky ovlivňující objekt',
 	'Relation:depends on/DownStream' => 'Závislost na',
 	'Relation:depends on/UpStream' => 'Dopad na',
-	'Relation:impacts/LoadData'       => 'Load data~~',
+	'Relation:impacts/LoadData' => 'Load data~~',
 	'Relation:impacts/NoFilteredData' => 'please select objects in Graphical view tag~~',
 ));
 
@@ -86,6 +86,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:lnkContactToFunctionalCI' => 'Spojení (Kontakt / Funkční konfigurační položka)',
 	'Class:lnkContactToFunctionalCI+' => '',
+	'Class:lnkContactToFunctionalCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'Funkční konfigurační položka',
 	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
 	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Název funkční konfigurační položky',
@@ -132,6 +133,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:FunctionalCI/Attribute:finalclass' => 'Typ konfigurační položky',
 	'Class:FunctionalCI/Attribute:finalclass+' => '',
 	'Class:FunctionalCI/Tab:OpenedTickets' => 'Aktivní tikety',
+	'Class:FunctionalCI/Tab:OpenedTickets+' => 'Active Tickets which are impacting this functional CI~~',
 ));
 
 //
@@ -141,6 +143,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:PhysicalDevice' => 'Fyzické zařízení',
 	'Class:PhysicalDevice+' => '',
+	'Class:PhysicalDevice/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:PhysicalDevice/Attribute:serialnumber' => 'Sériové číslo',
 	'Class:PhysicalDevice/Attribute:serialnumber+' => '',
 	'Class:PhysicalDevice/Attribute:location_id' => 'Umístění',
@@ -180,6 +183,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:Rack' => 'Rack',
 	'Class:Rack+' => '',
+	'Class:Rack/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Rack/Attribute:nb_u' => 'Velikost (U)',
 	'Class:Rack/Attribute:nb_u+' => '',
 	'Class:Rack/Attribute:device_list' => 'Zařízení',
@@ -246,6 +250,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:ConnectableCI' => 'Připojitelná konfigurační položka',
 	'Class:ConnectableCI+' => '',
+	'Class:ConnectableCI/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:ConnectableCI/Attribute:networkdevice_list' => 'Síťové prvky',
 	'Class:ConnectableCI/Attribute:networkdevice_list+' => 'All network devices connected to this device~~',
 	'Class:ConnectableCI/Attribute:physicalinterface_list' => 'Síťová rozhraní',
@@ -259,6 +264,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:DatacenterDevice' => 'Zařízení datového centra',
 	'Class:DatacenterDevice+' => '',
+	'Class:DatacenterDevice/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:DatacenterDevice/Attribute:rack_id' => 'Rack',
 	'Class:DatacenterDevice/Attribute:rack_id+' => '',
 	'Class:DatacenterDevice/Attribute:rack_name' => 'Název racku',
@@ -297,6 +303,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:NetworkDevice' => 'Síťový prvek',
 	'Class:NetworkDevice+' => '',
+	'Class:NetworkDevice/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:NetworkDevice/Attribute:networkdevicetype_id' => 'Typ zařízení',
 	'Class:NetworkDevice/Attribute:networkdevicetype_id+' => '',
 	'Class:NetworkDevice/Attribute:networkdevicetype_name' => 'Název typu zařízení',
@@ -318,6 +325,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:Server' => 'Server',
 	'Class:Server+' => '',
+	'Class:Server/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Server/Attribute:osfamily_id' => 'Rodina OS',
 	'Class:Server/Attribute:osfamily_id+' => '',
 	'Class:Server/Attribute:osfamily_name' => 'Název rodiny OS',
@@ -345,6 +353,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:StorageSystem' => 'Úložný systém',
 	'Class:StorageSystem+' => '',
+	'Class:StorageSystem/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:StorageSystem/Attribute:logicalvolume_list' => 'Logické svazky',
 	'Class:StorageSystem/Attribute:logicalvolume_list+' => 'Všechny logické svazky připojené k tomuto úložnému systému',
 ));
@@ -356,6 +365,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:SANSwitch' => 'SAN Switch',
 	'Class:SANSwitch+' => '',
+	'Class:SANSwitch/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:SANSwitch/Attribute:datacenterdevice_list' => 'Zařízení',
 	'Class:SANSwitch/Attribute:datacenterdevice_list+' => 'Všechna zařízení připojená k tomuto SAN switchi',
 ));
@@ -367,6 +377,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:TapeLibrary' => 'Pásková knihovna',
 	'Class:TapeLibrary+' => '',
+	'Class:TapeLibrary/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:TapeLibrary/Attribute:tapes_list' => 'Pásky',
 	'Class:TapeLibrary/Attribute:tapes_list+' => 'Všechny pásky v této páskové knihovně',
 ));
@@ -378,6 +389,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:NAS' => 'NAS',
 	'Class:NAS+' => '',
+	'Class:NAS/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:NAS/Attribute:nasfilesystem_list' => 'Souborové systémy',
 	'Class:NAS/Attribute:nasfilesystem_list+' => 'Všechny souborové systémy na tomto NASu',
 ));
@@ -389,6 +401,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:PC' => 'PC',
 	'Class:PC+' => '',
+	'Class:PC/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:PC/Attribute:osfamily_id' => 'Rodina OS',
 	'Class:PC/Attribute:osfamily_id+' => '',
 	'Class:PC/Attribute:osfamily_name' => 'Název rodiny OS',
@@ -416,6 +429,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:Printer' => 'Tiskárna',
 	'Class:Printer+' => '',
+	'Class:Printer/ComplementaryName' => '%1$s - %2$s~~',
 ));
 
 //
@@ -425,6 +439,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:PowerConnection' => 'Připojení k napájení',
 	'Class:PowerConnection+' => '',
+	'Class:PowerConnection/ComplementaryName' => '%1$s - %2$s~~',
 ));
 
 //
@@ -434,6 +449,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:PowerSource' => 'Zdroj napájení',
 	'Class:PowerSource+' => '',
+	'Class:PowerSource/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:PowerSource/Attribute:pdus_list' => 'PDU',
 	'Class:PowerSource/Attribute:pdus_list+' => 'Všechny jednotky pro rozvod energie využívající tento zdroj napájení',
 ));
@@ -445,6 +461,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:PDU' => 'PDU',
 	'Class:PDU+' => '',
+	'Class:PDU/ComplementaryName' => '%1$s - %2$s - %3$s - %4$s~~',
 	'Class:PDU/Attribute:rack_id' => 'Rack',
 	'Class:PDU/Attribute:rack_id+' => '',
 	'Class:PDU/Attribute:rack_name' => 'Název racku',
@@ -462,6 +479,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:Peripheral' => 'Periferie',
 	'Class:Peripheral+' => '',
+	'Class:Peripheral/ComplementaryName' => '%1$s - %2$s~~',
 ));
 
 //
@@ -471,6 +489,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:Enclosure' => 'Šasi',
 	'Class:Enclosure+' => '',
+	'Class:Enclosure/ComplementaryName' => '%1$s - %2$s - %3$s~~',
 	'Class:Enclosure/Attribute:rack_id' => 'Rack',
 	'Class:Enclosure/Attribute:rack_id+' => '',
 	'Class:Enclosure/Attribute:rack_name' => 'Název racku',
@@ -608,6 +627,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:MiddlewareInstance' => 'Instance middlewaru',
 	'Class:MiddlewareInstance+' => '',
+	'Class:MiddlewareInstance/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:MiddlewareInstance/Attribute:middleware_id' => 'Middleware',
 	'Class:MiddlewareInstance/Attribute:middleware_id+' => '',
 	'Class:MiddlewareInstance/Attribute:middleware_name' => 'Název middlewaru',
@@ -621,6 +641,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:DatabaseSchema' => 'DB Schéma',
 	'Class:DatabaseSchema+' => '',
+	'Class:DatabaseSchema/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:DatabaseSchema/Attribute:dbserver_id' => 'DB server',
 	'Class:DatabaseSchema/Attribute:dbserver_id+' => '',
 	'Class:DatabaseSchema/Attribute:dbserver_name' => 'Název DB serveru',
@@ -634,6 +655,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:WebApplication' => 'Web aplikace',
 	'Class:WebApplication+' => '',
+	'Class:WebApplication/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:WebApplication/Attribute:webserver_id' => 'Web server',
 	'Class:WebApplication/Attribute:webserver_id+' => '',
 	'Class:WebApplication/Attribute:webserver_name' => 'Název web serveru',
@@ -714,6 +736,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:VirtualMachine' => 'Virtuální stroj (VM)',
 	'Class:VirtualMachine+' => '',
+	'Class:VirtualMachine/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:VirtualMachine/Attribute:virtualhost_id' => 'Virtual host',
 	'Class:VirtualMachine/Attribute:virtualhost_id+' => '',
 	'Class:VirtualMachine/Attribute:virtualhost_name' => 'Název virtual hosta',
@@ -774,6 +797,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:lnkServerToVolume' => 'Spojení (Server / Svazek)',
 	'Class:lnkServerToVolume+' => '',
+	'Class:lnkServerToVolume/Name' => '%1$s / %2$s~~',
 	'Class:lnkServerToVolume/Attribute:volume_id' => 'Svazek',
 	'Class:lnkServerToVolume/Attribute:volume_id+' => '',
 	'Class:lnkServerToVolume/Attribute:volume_name' => 'Název svazku',
@@ -793,6 +817,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:lnkVirtualDeviceToVolume' => 'Spojení (Virtuální zařízení / Svazek)',
 	'Class:lnkVirtualDeviceToVolume+' => '',
+	'Class:lnkVirtualDeviceToVolume/Name' => '%1$s / %2$s~~',
 	'Class:lnkVirtualDeviceToVolume/Attribute:volume_id' => 'Svazek',
 	'Class:lnkVirtualDeviceToVolume/Attribute:volume_id+' => '',
 	'Class:lnkVirtualDeviceToVolume/Attribute:volume_name' => 'Název svazku',
@@ -812,6 +837,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:lnkSanToDatacenterDevice' => 'Spojení (SAN / Zařízení datového centra)',
 	'Class:lnkSanToDatacenterDevice+' => '',
+	'Class:lnkSanToDatacenterDevice/Name' => '%1$s / %2$s~~',
 	'Class:lnkSanToDatacenterDevice/Attribute:san_id' => 'SAN switch',
 	'Class:lnkSanToDatacenterDevice/Attribute:san_id+' => '',
 	'Class:lnkSanToDatacenterDevice/Attribute:san_name' => 'název SAN switche',
@@ -873,6 +899,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:Software' => 'Software',
 	'Class:Software+' => '',
+	'Class:Software/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Software/Attribute:name' => 'Název',
 	'Class:Software/Attribute:name+' => '',
 	'Class:Software/Attribute:vendor' => 'Dodavatel',
@@ -990,6 +1017,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:OSLicence' => 'Licence OS',
 	'Class:OSLicence+' => '',
+	'Class:OSLicence/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:OSLicence/Attribute:osversion_id' => 'Verze OS',
 	'Class:OSLicence/Attribute:osversion_id+' => '',
 	'Class:OSLicence/Attribute:osversion_name' => 'Název verze OS',
@@ -1007,6 +1035,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:SoftwareLicence' => 'Licence softwaru',
 	'Class:SoftwareLicence+' => '',
+	'Class:SoftwareLicence/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:SoftwareLicence/Attribute:software_id' => 'Software',
 	'Class:SoftwareLicence/Attribute:software_id+' => '',
 	'Class:SoftwareLicence/Attribute:software_name' => 'Název softwaru',
@@ -1022,6 +1051,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:lnkDocumentToLicence' => 'Spojení (Dokument / Licence)',
 	'Class:lnkDocumentToLicence+' => '',
+	'Class:lnkDocumentToLicence/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToLicence/Attribute:licence_id' => 'Licence',
 	'Class:lnkDocumentToLicence/Attribute:licence_id+' => '',
 	'Class:lnkDocumentToLicence/Attribute:licence_name' => 'Název licence',
@@ -1074,6 +1104,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:Model' => 'Model',
 	'Class:Model+' => '',
+	'Class:Model/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Model/Attribute:brand_id' => 'Výrobce',
 	'Class:Model/Attribute:brand_id+' => '',
 	'Class:Model/Attribute:brand_name' => 'Název výrobce',
@@ -1153,6 +1184,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:lnkDocumentToPatch' => 'Spojení (Dokument / Záplata (patch))',
 	'Class:lnkDocumentToPatch+' => '',
+	'Class:lnkDocumentToPatch/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToPatch/Attribute:patch_id' => 'Záplata (patch)',
 	'Class:lnkDocumentToPatch/Attribute:patch_id+' => '',
 	'Class:lnkDocumentToPatch/Attribute:patch_name' => 'Název záplaty (patche)',
@@ -1170,6 +1202,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:lnkSoftwareInstanceToSoftwarePatch' => 'Spojení (Instance softwaru / Záplata (patch) softwaru)',
 	'Class:lnkSoftwareInstanceToSoftwarePatch+' => '',
+	'Class:lnkSoftwareInstanceToSoftwarePatch/Name' => '%1$s / %2$s~~',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id' => 'Záplata (patch) softwaru',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id+' => '',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_name' => 'Název záplaty (patche) softwaru',
@@ -1187,6 +1220,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:lnkFunctionalCIToOSPatch' => 'Spojení (Funkční konfigurační položka / Záplata (patch) OS)',
 	'Class:lnkFunctionalCIToOSPatch+' => '',
+	'Class:lnkFunctionalCIToOSPatch/Name' => '%1$s / %2$s~~',
 	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id' => 'Záplata (patch) OS',
 	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id+' => '',
 	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_name' => 'Název záplaty (patche) OS',
@@ -1204,6 +1238,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:lnkDocumentToSoftware' => 'Spojení (Dokument / Software)',
 	'Class:lnkDocumentToSoftware+' => '',
+	'Class:lnkDocumentToSoftware/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToSoftware/Attribute:software_id' => 'Software',
 	'Class:lnkDocumentToSoftware/Attribute:software_id+' => '',
 	'Class:lnkDocumentToSoftware/Attribute:software_name' => 'Název software',
@@ -1221,6 +1256,8 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:Subnet' => 'Podsíť (subnet)',
 	'Class:Subnet+' => '',
+	'Class:Subnet/Name' => '%1$s/%2$s~~',
+	'Class:Subnet/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Subnet/Attribute:description' => 'Popis',
 	'Class:Subnet/Attribute:description+' => '',
 	'Class:Subnet/Attribute:subnet_name' => 'Název podsítě (subnetu)',
@@ -1265,6 +1302,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:lnkSubnetToVLAN' => 'Spojení (Podsíť (subnet) / VLAN)',
 	'Class:lnkSubnetToVLAN+' => '',
+	'Class:lnkSubnetToVLAN/Name' => '%1$s / %2$s~~',
 	'Class:lnkSubnetToVLAN/Attribute:subnet_id' => 'Podsíť (subnet)',
 	'Class:lnkSubnetToVLAN/Attribute:subnet_id+' => '',
 	'Class:lnkSubnetToVLAN/Attribute:subnet_ip' => 'IP Podsítě (subnetu)',
@@ -1299,8 +1337,6 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:IPInterface+' => '',
 	'Class:IPInterface/Attribute:ipaddress' => 'IP adresa',
 	'Class:IPInterface/Attribute:ipaddress+' => '',
-
-
 	'Class:IPInterface/Attribute:macaddress' => 'MAC adresa',
 	'Class:IPInterface/Attribute:macaddress+' => '',
 	'Class:IPInterface/Attribute:comment' => 'Komentář',
@@ -1320,6 +1356,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:PhysicalInterface' => 'Fyzické rozhraní',
 	'Class:PhysicalInterface+' => '',
+	'Class:PhysicalInterface/Name' => '%2$s %1$s~~',
 	'Class:PhysicalInterface/Attribute:connectableci_id' => 'Zařízení',
 	'Class:PhysicalInterface/Attribute:connectableci_id+' => '',
 	'Class:PhysicalInterface/Attribute:connectableci_name' => 'Název zařízení',
@@ -1335,6 +1372,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:lnkPhysicalInterfaceToVLAN' => 'Spojení (Fyzické rozhraní / VLAN)',
 	'Class:lnkPhysicalInterfaceToVLAN+' => '',
+	'Class:lnkPhysicalInterfaceToVLAN/Name' => '%1$s %2$s / %3$s~~',
 	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_id' => 'Fyzické rozhraní',
 	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_id+' => '',
 	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_name' => 'Název fyzického rozhraní',
@@ -1389,6 +1427,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:lnkConnectableCIToNetworkDevice' => 'Spojení (Připojitelná konfigurační položka / Síťový prvek)',
 	'Class:lnkConnectableCIToNetworkDevice+' => '',
+	'Class:lnkConnectableCIToNetworkDevice/Name' => '%1$s / %2$s~~',
 	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id' => 'Síťový prvek',
 	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id+' => '',
 	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_name' => 'Název síťového prvku',
@@ -1416,6 +1455,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:lnkApplicationSolutionToFunctionalCI' => 'Spojení (Aplikační řešení / Funkční konfigurační položka)',
 	'Class:lnkApplicationSolutionToFunctionalCI+' => '',
+	'Class:lnkApplicationSolutionToFunctionalCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_id' => 'Aplikační řešení',
 	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_id+' => '',
 	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_name' => 'Název aplikačního řešení',
@@ -1433,6 +1473,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:lnkApplicationSolutionToBusinessProcess' => 'Spojení (Aplikační řešení / Obchodní proces)',
 	'Class:lnkApplicationSolutionToBusinessProcess+' => '',
+	'Class:lnkApplicationSolutionToBusinessProcess/Name' => '%1$s / %2$s~~',
 	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_id' => 'Obchodní proces',
 	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_id+' => '',
 	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_name' => 'Název obchodního procesu',
@@ -1450,6 +1491,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:Group' => 'Skupina',
 	'Class:Group+' => '',
+	'Class:Group/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Group/Attribute:name' => 'Název',
 	'Class:Group/Attribute:name+' => '',
 	'Class:Group/Attribute:status' => 'Stav',
@@ -1469,7 +1511,6 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:Group/Attribute:type' => 'Typ',
 	'Class:Group/Attribute:type+' => '',
 	'Class:Group/Attribute:parent_id' => 'Nadřazená skupina',
-
 	'Class:Group/Attribute:parent_id+' => '',
 	'Class:Group/Attribute:parent_name' => 'Název',
 	'Class:Group/Attribute:parent_name+' => '',
@@ -1486,6 +1527,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:lnkGroupToCI' => 'Spojení (Skupina / Konfigurační položka)',
 	'Class:lnkGroupToCI+' => '',
+	'Class:lnkGroupToCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkGroupToCI/Attribute:group_id' => 'Skupina',
 	'Class:lnkGroupToCI/Attribute:group_id+' => '',
 	'Class:lnkGroupToCI/Attribute:group_name' => 'Název',
@@ -1507,6 +1549,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Server:otherinfo' => 'Další informace',
 	'Server:power' => 'Napájení',
 	'Class:Subnet/Tab:IPUsage' => 'Využití IP',
+	'Class:Subnet/Tab:IPUsage+' => 'Which IP within this Subnet are used or not~~',
 	'Class:Subnet/Tab:IPUsage-explain' => 'Rozhraní, která mají IP adresu v rozsahu: <em>%1$s</em>-<em>%2$s</em>',
 	'Class:Subnet/Tab:FreeIPs' => 'Volné IP adresy',
 	'Class:Subnet/Tab:FreeIPs-count' => 'Počet volných adres: %1$s',
@@ -1522,6 +1565,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:lnkDocumentToFunctionalCI' => 'Spojení (Dokument / Funkční konfigurační položka)',
 	'Class:lnkDocumentToFunctionalCI+' => '',
+	'Class:lnkDocumentToFunctionalCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id' => 'Funkční konfigurační položka',
 	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id+' => '',
 	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_name' => 'Název funkční konfigurační položky',
diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/da.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/da.dict.itop-config-mgmt.php
index e79432a77c..9d74700f64 100644
--- a/datamodels/2.x/itop-config-mgmt/dictionaries/da.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/da.dict.itop-config-mgmt.php
@@ -30,7 +30,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Relation:depends on/Description' => 'Elementer, som afhænger af dette element',
 	'Relation:depends on/DownStream' => 'Afhænger af ...',
 	'Relation:depends on/UpStream' => 'Påvirker ...',
-	'Relation:impacts/LoadData'       => 'Load data~~',
+	'Relation:impacts/LoadData' => 'Load data~~',
 	'Relation:impacts/NoFilteredData' => 'please select objects in Graphical view tag~~',
 ));
 
@@ -79,6 +79,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:lnkContactToFunctionalCI' => 'Sammenhæng Kontakt/FunctionalCI',
 	'Class:lnkContactToFunctionalCI+' => '',
+	'Class:lnkContactToFunctionalCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'FunctionalCI',
 	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
 	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'FunctionalCI navn',
@@ -125,6 +126,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:FunctionalCI/Attribute:finalclass' => 'Type',
 	'Class:FunctionalCI/Attribute:finalclass+' => '',
 	'Class:FunctionalCI/Tab:OpenedTickets' => 'Active Tickets~~',
+	'Class:FunctionalCI/Tab:OpenedTickets+' => 'Active Tickets which are impacting this functional CI~~',
 ));
 
 //
@@ -134,6 +136,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:PhysicalDevice' => 'Fysiske enheder',
 	'Class:PhysicalDevice+' => '',
+	'Class:PhysicalDevice/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:PhysicalDevice/Attribute:serialnumber' => 'Seriennummer',
 	'Class:PhysicalDevice/Attribute:serialnumber+' => '',
 	'Class:PhysicalDevice/Attribute:location_id' => 'Placering',
@@ -173,6 +176,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:Rack' => 'Rack',
 	'Class:Rack+' => '',
+	'Class:Rack/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Rack/Attribute:nb_u' => 'NB U',
 	'Class:Rack/Attribute:nb_u+' => '',
 	'Class:Rack/Attribute:device_list' => 'Enheder',
@@ -239,6 +243,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:ConnectableCI' => 'Forbindbare CI',
 	'Class:ConnectableCI+' => 'Fysiske CI',
+	'Class:ConnectableCI/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:ConnectableCI/Attribute:networkdevice_list' => 'Netværks enheder',
 	'Class:ConnectableCI/Attribute:networkdevice_list+' => 'All network devices connected to this device~~',
 	'Class:ConnectableCI/Attribute:physicalinterface_list' => 'Netværks interfaces',
@@ -252,6 +257,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:DatacenterDevice' => 'Datacenterenhed',
 	'Class:DatacenterDevice+' => '',
+	'Class:DatacenterDevice/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:DatacenterDevice/Attribute:rack_id' => 'Rack',
 	'Class:DatacenterDevice/Attribute:rack_id+' => '',
 	'Class:DatacenterDevice/Attribute:rack_name' => 'Racknavn',
@@ -290,6 +296,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:NetworkDevice' => 'Netværks enhed',
 	'Class:NetworkDevice+' => '',
+	'Class:NetworkDevice/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:NetworkDevice/Attribute:networkdevicetype_id' => 'Netværks type',
 	'Class:NetworkDevice/Attribute:networkdevicetype_id+' => '',
 	'Class:NetworkDevice/Attribute:networkdevicetype_name' => 'Netværktypenavn',
@@ -311,6 +318,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:Server' => 'Server',
 	'Class:Server+' => '',
+	'Class:Server/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Server/Attribute:osfamily_id' => 'OS Familie',
 	'Class:Server/Attribute:osfamily_id+' => '',
 	'Class:Server/Attribute:osfamily_name' => 'OS familienavn',
@@ -338,6 +346,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:StorageSystem' => 'Storage-System',
 	'Class:StorageSystem+' => '',
+	'Class:StorageSystem/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:StorageSystem/Attribute:logicalvolume_list' => 'Logical Volumes',
 	'Class:StorageSystem/Attribute:logicalvolume_list+' => 'All the logical volumes in this storage system~~',
 ));
@@ -349,6 +358,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:SANSwitch' => 'SAN-Switch',
 	'Class:SANSwitch+' => '',
+	'Class:SANSwitch/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:SANSwitch/Attribute:datacenterdevice_list' => 'Enhed',
 	'Class:SANSwitch/Attribute:datacenterdevice_list+' => 'All the devices connected to this SAN switch~~',
 ));
@@ -360,6 +370,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:TapeLibrary' => 'Tape-Library',
 	'Class:TapeLibrary+' => '',
+	'Class:TapeLibrary/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:TapeLibrary/Attribute:tapes_list' => 'Bånd',
 	'Class:TapeLibrary/Attribute:tapes_list+' => 'All the tapes in the tape library~~',
 ));
@@ -371,6 +382,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:NAS' => 'NAS',
 	'Class:NAS+' => '',
+	'Class:NAS/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:NAS/Attribute:nasfilesystem_list' => 'NAS filsystem liste',
 	'Class:NAS/Attribute:nasfilesystem_list+' => 'All the file systems in this NAS~~',
 ));
@@ -382,6 +394,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:PC' => 'PC',
 	'Class:PC+' => '',
+	'Class:PC/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:PC/Attribute:osfamily_id' => 'OS-Familie',
 	'Class:PC/Attribute:osfamily_id+' => '',
 	'Class:PC/Attribute:osfamily_name' => 'OS familienavn',
@@ -409,6 +422,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:Printer' => 'Printer',
 	'Class:Printer+' => '',
+	'Class:Printer/ComplementaryName' => '%1$s - %2$s~~',
 ));
 
 //
@@ -418,6 +432,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:PowerConnection' => 'Strømtilslutning',
 	'Class:PowerConnection+' => '',
+	'Class:PowerConnection/ComplementaryName' => '%1$s - %2$s~~',
 ));
 
 //
@@ -427,6 +442,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:PowerSource' => 'Strømkilde',
 	'Class:PowerSource+' => '',
+	'Class:PowerSource/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:PowerSource/Attribute:pdus_list' => 'PDUs',
 	'Class:PowerSource/Attribute:pdus_list+' => 'All the PDUs using this power source~~',
 ));
@@ -438,6 +454,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:PDU' => 'PDU',
 	'Class:PDU+' => '',
+	'Class:PDU/ComplementaryName' => '%1$s - %2$s - %3$s - %4$s~~',
 	'Class:PDU/Attribute:rack_id' => 'Rack',
 	'Class:PDU/Attribute:rack_id+' => '',
 	'Class:PDU/Attribute:rack_name' => 'Racknavn',
@@ -455,6 +472,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:Peripheral' => 'Perifer enhed',
 	'Class:Peripheral+' => '',
+	'Class:Peripheral/ComplementaryName' => '%1$s - %2$s~~',
 ));
 
 //
@@ -464,6 +482,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:Enclosure' => 'Enclosure',
 	'Class:Enclosure+' => '',
+	'Class:Enclosure/ComplementaryName' => '%1$s - %2$s - %3$s~~',
 	'Class:Enclosure/Attribute:rack_id' => 'Rack',
 	'Class:Enclosure/Attribute:rack_id+' => '',
 	'Class:Enclosure/Attribute:rack_name' => 'Racknavn',
@@ -601,6 +620,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:MiddlewareInstance' => 'Middleware instans',
 	'Class:MiddlewareInstance+' => '',
+	'Class:MiddlewareInstance/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:MiddlewareInstance/Attribute:middleware_id' => 'Middleware',
 	'Class:MiddlewareInstance/Attribute:middleware_id+' => '',
 	'Class:MiddlewareInstance/Attribute:middleware_name' => 'Middleware navn',
@@ -614,6 +634,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:DatabaseSchema' => 'Datenbase schema',
 	'Class:DatabaseSchema+' => '',
+	'Class:DatabaseSchema/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:DatabaseSchema/Attribute:dbserver_id' => 'DB-Server',
 	'Class:DatabaseSchema/Attribute:dbserver_id+' => '',
 	'Class:DatabaseSchema/Attribute:dbserver_name' => 'DB servernavn',
@@ -627,6 +648,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:WebApplication' => 'Webapplikation',
 	'Class:WebApplication+' => '',
+	'Class:WebApplication/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:WebApplication/Attribute:webserver_id' => 'Web server',
 	'Class:WebApplication/Attribute:webserver_id+' => '',
 	'Class:WebApplication/Attribute:webserver_name' => 'Web servernavn',
@@ -707,6 +729,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:VirtualMachine' => 'Virtuel Maskine',
 	'Class:VirtualMachine+' => '',
+	'Class:VirtualMachine/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:VirtualMachine/Attribute:virtualhost_id' => 'Host',
 	'Class:VirtualMachine/Attribute:virtualhost_id+' => '',
 	'Class:VirtualMachine/Attribute:virtualhost_name' => 'Hostnavn',
@@ -767,6 +790,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:lnkServerToVolume' => 'Sammenhæng Server/Volume',
 	'Class:lnkServerToVolume+' => '',
+	'Class:lnkServerToVolume/Name' => '%1$s / %2$s~~',
 	'Class:lnkServerToVolume/Attribute:volume_id' => 'Volume',
 	'Class:lnkServerToVolume/Attribute:volume_id+' => '',
 	'Class:lnkServerToVolume/Attribute:volume_name' => 'Volume navn',
@@ -786,6 +810,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:lnkVirtualDeviceToVolume' => 'Sammenhæng virtuel enhed/volume',
 	'Class:lnkVirtualDeviceToVolume+' => '',
+	'Class:lnkVirtualDeviceToVolume/Name' => '%1$s / %2$s~~',
 	'Class:lnkVirtualDeviceToVolume/Attribute:volume_id' => 'Volume',
 	'Class:lnkVirtualDeviceToVolume/Attribute:volume_id+' => '',
 	'Class:lnkVirtualDeviceToVolume/Attribute:volume_name' => 'Volume navn',
@@ -805,6 +830,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:lnkSanToDatacenterDevice' => 'Sammenhæng SAN/Datacenterenhed',
 	'Class:lnkSanToDatacenterDevice+' => '',
+	'Class:lnkSanToDatacenterDevice/Name' => '%1$s / %2$s~~',
 	'Class:lnkSanToDatacenterDevice/Attribute:san_id' => 'SAN Switch',
 	'Class:lnkSanToDatacenterDevice/Attribute:san_id+' => '',
 	'Class:lnkSanToDatacenterDevice/Attribute:san_name' => 'SAN Switchnavn',
@@ -866,6 +892,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:Software' => 'Software',
 	'Class:Software+' => '',
+	'Class:Software/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Software/Attribute:name' => 'Navn',
 	'Class:Software/Attribute:name+' => '',
 	'Class:Software/Attribute:vendor' => 'Producent',
@@ -983,6 +1010,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:OSLicence' => 'OS-Licens',
 	'Class:OSLicence+' => '',
+	'Class:OSLicence/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:OSLicence/Attribute:osversion_id' => 'OS-Version',
 	'Class:OSLicence/Attribute:osversion_id+' => '',
 	'Class:OSLicence/Attribute:osversion_name' => 'OS versionsnavn',
@@ -1000,6 +1028,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:SoftwareLicence' => 'Software-Licens',
 	'Class:SoftwareLicence+' => '',
+	'Class:SoftwareLicence/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:SoftwareLicence/Attribute:software_id' => 'Software',
 	'Class:SoftwareLicence/Attribute:software_id+' => '',
 	'Class:SoftwareLicence/Attribute:software_name' => 'Software navn',
@@ -1015,6 +1044,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:lnkDocumentToLicence' => 'Sammenhæng Dokument/Licens',
 	'Class:lnkDocumentToLicence+' => '',
+	'Class:lnkDocumentToLicence/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToLicence/Attribute:licence_id' => 'Licens',
 	'Class:lnkDocumentToLicence/Attribute:licence_id+' => '',
 	'Class:lnkDocumentToLicence/Attribute:licence_name' => 'Licensnavn',
@@ -1067,6 +1097,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:Model' => 'Model',
 	'Class:Model+' => '',
+	'Class:Model/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Model/Attribute:brand_id' => 'Mærke',
 	'Class:Model/Attribute:brand_id+' => '',
 	'Class:Model/Attribute:brand_name' => 'Mærkenavn',
@@ -1146,6 +1177,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:lnkDocumentToPatch' => 'Sammenhæng Dokument/Patch',
 	'Class:lnkDocumentToPatch+' => '',
+	'Class:lnkDocumentToPatch/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToPatch/Attribute:patch_id' => 'Patch',
 	'Class:lnkDocumentToPatch/Attribute:patch_id+' => '',
 	'Class:lnkDocumentToPatch/Attribute:patch_name' => 'Patch navn',
@@ -1163,6 +1195,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:lnkSoftwareInstanceToSoftwarePatch' => 'Sammenhæng Software-Instans/Softeware-Patch',
 	'Class:lnkSoftwareInstanceToSoftwarePatch+' => '',
+	'Class:lnkSoftwareInstanceToSoftwarePatch/Name' => '%1$s / %2$s~~',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id' => 'Software Patch',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id+' => '',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_name' => 'Software Patch navn',
@@ -1180,6 +1213,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:lnkFunctionalCIToOSPatch' => 'Sammenhæng FunctionalCI/OS-Patch',
 	'Class:lnkFunctionalCIToOSPatch+' => '',
+	'Class:lnkFunctionalCIToOSPatch/Name' => '%1$s / %2$s~~',
 	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id' => 'OS Patch',
 	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id+' => '',
 	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_name' => 'OS-Patch-Navn',
@@ -1197,6 +1231,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:lnkDocumentToSoftware' => 'Sammenhæng Dokument/Software',
 	'Class:lnkDocumentToSoftware+' => '',
+	'Class:lnkDocumentToSoftware/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToSoftware/Attribute:software_id' => 'Software',
 	'Class:lnkDocumentToSoftware/Attribute:software_id+' => '',
 	'Class:lnkDocumentToSoftware/Attribute:software_name' => 'Software navn',
@@ -1214,6 +1249,8 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:Subnet' => 'Subnet',
 	'Class:Subnet+' => '',
+	'Class:Subnet/Name' => '%1$s/%2$s~~',
+	'Class:Subnet/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Subnet/Attribute:description' => 'Beskrivelse',
 	'Class:Subnet/Attribute:description+' => '',
 	'Class:Subnet/Attribute:subnet_name' => 'Subnet name~~',
@@ -1258,6 +1295,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:lnkSubnetToVLAN' => 'Link Subnet / VLAN~~',
 	'Class:lnkSubnetToVLAN+' => '~~',
+	'Class:lnkSubnetToVLAN/Name' => '%1$s / %2$s~~',
 	'Class:lnkSubnetToVLAN/Attribute:subnet_id' => 'Subnet~~',
 	'Class:lnkSubnetToVLAN/Attribute:subnet_id+' => '~~',
 	'Class:lnkSubnetToVLAN/Attribute:subnet_ip' => 'Subnet IP~~',
@@ -1292,8 +1330,6 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:IPInterface+' => '',
 	'Class:IPInterface/Attribute:ipaddress' => 'IP Adresse',
 	'Class:IPInterface/Attribute:ipaddress+' => '',
-
-
 	'Class:IPInterface/Attribute:macaddress' => 'MAC Adresse',
 	'Class:IPInterface/Attribute:macaddress+' => '',
 	'Class:IPInterface/Attribute:comment' => 'Kommentar',
@@ -1313,6 +1349,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:PhysicalInterface' => 'Fysiske interface',
 	'Class:PhysicalInterface+' => '',
+	'Class:PhysicalInterface/Name' => '%2$s %1$s~~',
 	'Class:PhysicalInterface/Attribute:connectableci_id' => 'Enhed',
 	'Class:PhysicalInterface/Attribute:connectableci_id+' => '',
 	'Class:PhysicalInterface/Attribute:connectableci_name' => 'Enhedsnavn',
@@ -1328,6 +1365,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:lnkPhysicalInterfaceToVLAN' => 'Link PhysicalInterface / VLAN~~',
 	'Class:lnkPhysicalInterfaceToVLAN+' => '~~',
+	'Class:lnkPhysicalInterfaceToVLAN/Name' => '%1$s %2$s / %3$s~~',
 	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_id' => 'Physical Interface~~',
 	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_id+' => '~~',
 	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_name' => 'Physical Interface Name~~',
@@ -1382,6 +1420,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:lnkConnectableCIToNetworkDevice' => 'Sammenhæng ConnectableCI/NetworkDevice',
 	'Class:lnkConnectableCIToNetworkDevice+' => '',
+	'Class:lnkConnectableCIToNetworkDevice/Name' => '%1$s / %2$s~~',
 	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id' => 'Netværks enhed',
 	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id+' => '',
 	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_name' => 'Netværksenhed navn',
@@ -1409,6 +1448,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:lnkApplicationSolutionToFunctionalCI' => 'Sammenhæng Applikationssuite/FunctionalCI',
 	'Class:lnkApplicationSolutionToFunctionalCI+' => '',
+	'Class:lnkApplicationSolutionToFunctionalCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_id' => 'Applikations løsning',
 	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_id+' => '',
 	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_name' => 'Applikations løsning navn',
@@ -1426,6 +1466,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:lnkApplicationSolutionToBusinessProcess' => 'Sammenhæng Applikationssuite/Forretningsproces',
 	'Class:lnkApplicationSolutionToBusinessProcess+' => '',
+	'Class:lnkApplicationSolutionToBusinessProcess/Name' => '%1$s / %2$s~~',
 	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_id' => 'Forretningsproces',
 	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_id+' => '',
 	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_name' => 'Forretningsproces navn',
@@ -1443,6 +1484,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:Group' => 'Gruppe',
 	'Class:Group+' => '',
+	'Class:Group/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Group/Attribute:name' => 'Navn',
 	'Class:Group/Attribute:name+' => '',
 	'Class:Group/Attribute:status' => 'Status',
@@ -1462,7 +1504,6 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:Group/Attribute:type' => 'Typ',
 	'Class:Group/Attribute:type+' => '',
 	'Class:Group/Attribute:parent_id' => 'Parent id',
-
 	'Class:Group/Attribute:parent_id+' => '',
 	'Class:Group/Attribute:parent_name' => 'Navn',
 	'Class:Group/Attribute:parent_name+' => '',
@@ -1479,6 +1520,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:lnkGroupToCI' => 'Gruppe/CI',
 	'Class:lnkGroupToCI+' => '',
+	'Class:lnkGroupToCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkGroupToCI/Attribute:group_id' => 'Gruppe',
 	'Class:lnkGroupToCI/Attribute:group_id+' => '',
 	'Class:lnkGroupToCI/Attribute:group_name' => 'Navn',
@@ -1500,6 +1542,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Server:otherinfo' => 'Øvrig Information',
 	'Server:power' => 'Power supply~~',
 	'Class:Subnet/Tab:IPUsage' => 'IP Brug',
+	'Class:Subnet/Tab:IPUsage+' => 'Which IP within this Subnet are used or not~~',
 	'Class:Subnet/Tab:IPUsage-explain' => 'Interfaces der har en IP i området: <em>%1$s</em> til <em>%2$s</em>',
 	'Class:Subnet/Tab:FreeIPs' => 'Ledige IP',
 	'Class:Subnet/Tab:FreeIPs-count' => 'Ledige IP: %1$s',
@@ -1515,6 +1558,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:lnkDocumentToFunctionalCI' => 'Sammenhæng Dokument/FunctionalCI',
 	'Class:lnkDocumentToFunctionalCI+' => '',
+	'Class:lnkDocumentToFunctionalCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id' => 'FunctionalCI',
 	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id+' => '',
 	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_name' => 'FunctionalCI navn',
diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/de.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/de.dict.itop-config-mgmt.php
index f61c649bd9..12aa22b6ad 100644
--- a/datamodels/2.x/itop-config-mgmt/dictionaries/de.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/de.dict.itop-config-mgmt.php
@@ -32,8 +32,9 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Relation:depends on/Description' => 'Elemente, von denen dieses Element abhängt.',
 	'Relation:depends on/DownStream' => 'Hängt ab von ...',
 	'Relation:depends on/UpStream' => 'Wirkt auf ...',
-	'Relation:impacts/LoadData'       => 'Load data~~',
-	'Relation:impacts/NoFilteredData' => 'please select objects in Graphical view tag~~',
+	'Relation:impacts/LoadData' => 'Daten laden',
+	'Relation:impacts/FilteredData' => 'Daten sind über den Tab "Grafische Ansicht" gefiltert',
+	'Relation:impacts/NoFilteredData' => 'Bitte wählen Sie Objekte im Tab "Grafische Ansicht"',
 ));
 
 
@@ -81,6 +82,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:lnkContactToFunctionalCI' => 'Verknüpfung Kontakt/FunctionalCI',
 	'Class:lnkContactToFunctionalCI+' => '',
+	'Class:lnkContactToFunctionalCI/Name' => '%1$s / %2$s',
 	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'FunctionalCI',
 	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
 	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'FunctionalCI-Name',
@@ -109,24 +111,25 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:FunctionalCI/Attribute:business_criticity' => 'Business-Kritikalität',
 	'Class:FunctionalCI/Attribute:business_criticity+' => '',
 	'Class:FunctionalCI/Attribute:business_criticity/Value:high' => 'hoch',
-	'Class:FunctionalCI/Attribute:business_criticity/Value:high+' => '',
+	'Class:FunctionalCI/Attribute:business_criticity/Value:high+' => 'hoch',
 	'Class:FunctionalCI/Attribute:business_criticity/Value:low' => 'niedrig',
-	'Class:FunctionalCI/Attribute:business_criticity/Value:low+' => '',
+	'Class:FunctionalCI/Attribute:business_criticity/Value:low+' => 'niedrig',
 	'Class:FunctionalCI/Attribute:business_criticity/Value:medium' => 'mittel',
-	'Class:FunctionalCI/Attribute:business_criticity/Value:medium+' => '',
+	'Class:FunctionalCI/Attribute:business_criticity/Value:medium+' => 'mittel',
 	'Class:FunctionalCI/Attribute:move2production' => 'Go-Live-Datum',
 	'Class:FunctionalCI/Attribute:move2production+' => 'Datum, an dem in Produktivbetrieb gegangen wird/wurde',
 	'Class:FunctionalCI/Attribute:contacts_list' => 'Kontakte',
-	'Class:FunctionalCI/Attribute:contacts_list+' => 'All the contacts for this configuration item~~',
+	'Class:FunctionalCI/Attribute:contacts_list+' => 'Alle Kontakte dieses CIs',
 	'Class:FunctionalCI/Attribute:documents_list' => 'Dokumente',
-	'Class:FunctionalCI/Attribute:documents_list+' => 'All the documents linked to this configuration item~~',
+	'Class:FunctionalCI/Attribute:documents_list+' => 'Alle Dokumente, die mit diesem CI verknüpft sind',
 	'Class:FunctionalCI/Attribute:applicationsolution_list' => 'Anwendungslösungen',
-	'Class:FunctionalCI/Attribute:applicationsolution_list+' => 'All the application solutions depending on this configuration item~~',
+	'Class:FunctionalCI/Attribute:applicationsolution_list+' => 'Alle Anwendungslösungen, die von diesem CI abhängen',
 	'Class:FunctionalCI/Attribute:softwares_list' => 'Software',
-	'Class:FunctionalCI/Attribute:softwares_list+' => 'All the softwares installed on this configuration item~~',
+	'Class:FunctionalCI/Attribute:softwares_list+' => 'Software, die auf diesem CI installiert ist',
 	'Class:FunctionalCI/Attribute:finalclass' => 'Typ',
-	'Class:FunctionalCI/Attribute:finalclass+' => '',
+	'Class:FunctionalCI/Attribute:finalclass+' => 'Name der instanziierbaren Klasse',
 	'Class:FunctionalCI/Tab:OpenedTickets' => 'Offene Tickets',
+	'Class:FunctionalCI/Tab:OpenedTickets+' => 'Offene Tickets, die sich auf dieses CI auswirken',
 ));
 
 //
@@ -136,6 +139,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:PhysicalDevice' => 'Physisches Gerät',
 	'Class:PhysicalDevice+' => '',
+	'Class:PhysicalDevice/ComplementaryName' => '%1$s - %2$s',
 	'Class:PhysicalDevice/Attribute:serialnumber' => 'Seriennummer',
 	'Class:PhysicalDevice/Attribute:serialnumber+' => '',
 	'Class:PhysicalDevice/Attribute:location_id' => 'Standort',
@@ -175,12 +179,13 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:Rack' => 'Rack',
 	'Class:Rack+' => '',
+	'Class:Rack/ComplementaryName' => '%1$s - %2$s',
 	'Class:Rack/Attribute:nb_u' => 'Höheneinheiten',
 	'Class:Rack/Attribute:nb_u+' => '',
 	'Class:Rack/Attribute:device_list' => 'Devices',
-	'Class:Rack/Attribute:device_list+' => 'All the physical devices racked into this rack~~',
+	'Class:Rack/Attribute:device_list+' => 'Alle physischen Geräte, die in dieses Rack eingebaut sind',
 	'Class:Rack/Attribute:enclosure_list' => 'Enclosures',
-	'Class:Rack/Attribute:enclosure_list+' => 'All the enclosures in this rack~~',
+	'Class:Rack/Attribute:enclosure_list+' => 'Alle Enclosures in diesem Rack',
 ));
 
 //
@@ -241,10 +246,11 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:ConnectableCI' => 'Verknüpfbares CI',
 	'Class:ConnectableCI+' => 'Physisches CI',
+	'Class:ConnectableCI/ComplementaryName' => '%1$s - %2$s',
 	'Class:ConnectableCI/Attribute:networkdevice_list' => 'Netzwerkgeräte',
-	'Class:ConnectableCI/Attribute:networkdevice_list+' => 'All network devices connected to this device~~',
+	'Class:ConnectableCI/Attribute:networkdevice_list+' => 'Alle Netzwerkgeräte, die mit diesem Gerät verbunden sind',
 	'Class:ConnectableCI/Attribute:physicalinterface_list' => 'Netzwerkinterfaces',
-	'Class:ConnectableCI/Attribute:physicalinterface_list+' => 'All the physical network interfaces~~',
+	'Class:ConnectableCI/Attribute:physicalinterface_list+' => 'Alle physischen Netzwerkinterfaces des Geräts',
 ));
 
 //
@@ -254,6 +260,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:DatacenterDevice' => 'Datacenter-Gerät',
 	'Class:DatacenterDevice+' => '',
+	'Class:DatacenterDevice/ComplementaryName' => '%1$s - %2$s',
 	'Class:DatacenterDevice/Attribute:rack_id' => 'Rack',
 	'Class:DatacenterDevice/Attribute:rack_id+' => '',
 	'Class:DatacenterDevice/Attribute:rack_name' => 'Rack-Name',
@@ -275,9 +282,9 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:DatacenterDevice/Attribute:powerB_name' => 'Strom-B-Quellenname',
 	'Class:DatacenterDevice/Attribute:powerB_name+' => '',
 	'Class:DatacenterDevice/Attribute:fiberinterfacelist_list' => 'FC-Ports',
-	'Class:DatacenterDevice/Attribute:fiberinterfacelist_list+' => 'All the fiber channel interfaces for this device~~',
+	'Class:DatacenterDevice/Attribute:fiberinterfacelist_list+' => 'Alle Fibre-Channel-Schnittstellen für dieses Gerät',
 	'Class:DatacenterDevice/Attribute:san_list' => 'SANs',
-	'Class:DatacenterDevice/Attribute:san_list+' => 'All the SAN switches connected to this device~~',
+	'Class:DatacenterDevice/Attribute:san_list+' => 'Alle mit diesem Gerät verbundenen SAN-Switches',
 	'Class:DatacenterDevice/Attribute:redundancy' => 'Redundanz',
 	'Class:DatacenterDevice/Attribute:redundancy/count' => 'Das Gerät läuft, wenn mindestens eine der Stromversorgungen (A oder B) läuft.',
 	// Unused yet
@@ -292,12 +299,13 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:NetworkDevice' => 'Netzwerk-Gerät',
 	'Class:NetworkDevice+' => '',
+	'Class:NetworkDevice/ComplementaryName' => '%1$s - %2$s',
 	'Class:NetworkDevice/Attribute:networkdevicetype_id' => 'Netzwerktyp',
 	'Class:NetworkDevice/Attribute:networkdevicetype_id+' => '',
 	'Class:NetworkDevice/Attribute:networkdevicetype_name' => 'Netzwerk-Typname',
 	'Class:NetworkDevice/Attribute:networkdevicetype_name+' => '',
 	'Class:NetworkDevice/Attribute:connectablecis_list' => 'Geräte',
-	'Class:NetworkDevice/Attribute:connectablecis_list+' => 'All the devices connected to this network device~~',
+	'Class:NetworkDevice/Attribute:connectablecis_list+' => 'Alle Geräte, die mit diesem Netzwerkgerät verbunden sind',
 	'Class:NetworkDevice/Attribute:iosversion_id' => 'IOS Version',
 	'Class:NetworkDevice/Attribute:iosversion_id+' => '',
 	'Class:NetworkDevice/Attribute:iosversion_name' => 'IOS-Versionsname',
@@ -313,6 +321,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:Server' => 'Server',
 	'Class:Server+' => '',
+	'Class:Server/ComplementaryName' => '%1$s - %2$s',
 	'Class:Server/Attribute:osfamily_id' => 'OS Familie',
 	'Class:Server/Attribute:osfamily_id+' => '',
 	'Class:Server/Attribute:osfamily_name' => 'OS-Familienname',
@@ -330,7 +339,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:Server/Attribute:ram' => 'RAM',
 	'Class:Server/Attribute:ram+' => '',
 	'Class:Server/Attribute:logicalvolumes_list' => 'Logische Volumes',
-	'Class:Server/Attribute:logicalvolumes_list+' => 'All the logical volumes connected to this server~~',
+	'Class:Server/Attribute:logicalvolumes_list+' => 'Alle mit diesem Server verbundenen logischen Volumes',
 ));
 
 //
@@ -340,8 +349,9 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:StorageSystem' => 'Storage-System',
 	'Class:StorageSystem+' => '',
+	'Class:StorageSystem/ComplementaryName' => '%1$s - %2$s',
 	'Class:StorageSystem/Attribute:logicalvolume_list' => 'Logische Volumes',
-	'Class:StorageSystem/Attribute:logicalvolume_list+' => 'All the logical volumes in this storage system~~',
+	'Class:StorageSystem/Attribute:logicalvolume_list+' => 'Alle logischen Volumes in diesem Storage-System',
 ));
 
 //
@@ -351,8 +361,9 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:SANSwitch' => 'SAN-Switch',
 	'Class:SANSwitch+' => '',
+	'Class:SANSwitch/ComplementaryName' => '%1$s - %2$s',
 	'Class:SANSwitch/Attribute:datacenterdevice_list' => 'Geräte',
-	'Class:SANSwitch/Attribute:datacenterdevice_list+' => 'All the devices connected to this SAN switch~~',
+	'Class:SANSwitch/Attribute:datacenterdevice_list+' => 'Alle Geräte, die mit diesem SAN-Switche verbundenen sind',
 ));
 
 //
@@ -362,8 +373,9 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:TapeLibrary' => 'Tape-Library',
 	'Class:TapeLibrary+' => '',
+	'Class:TapeLibrary/ComplementaryName' => '%1$s - %2$s',
 	'Class:TapeLibrary/Attribute:tapes_list' => 'Tapes',
-	'Class:TapeLibrary/Attribute:tapes_list+' => 'All the tapes in the tape library~~',
+	'Class:TapeLibrary/Attribute:tapes_list+' => 'Alle Tapes in der Tape-Library',
 ));
 
 //
@@ -373,8 +385,9 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:NAS' => 'NAS',
 	'Class:NAS+' => '',
+	'Class:NAS/ComplementaryName' => '%1$s - %2$s',
 	'Class:NAS/Attribute:nasfilesystem_list' => 'Dateisysteme',
-	'Class:NAS/Attribute:nasfilesystem_list+' => 'All the file systems in this NAS~~',
+	'Class:NAS/Attribute:nasfilesystem_list+' => 'Alle Dateisysteme in diesem NAS',
 ));
 
 //
@@ -384,6 +397,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:PC' => 'PC',
 	'Class:PC+' => '',
+	'Class:PC/ComplementaryName' => '%1$s - %2$s',
 	'Class:PC/Attribute:osfamily_id' => 'OS-Familie',
 	'Class:PC/Attribute:osfamily_id+' => '',
 	'Class:PC/Attribute:osfamily_name' => 'OS-Familienname',
@@ -399,9 +413,9 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:PC/Attribute:type' => 'Typ',
 	'Class:PC/Attribute:type+' => '',
 	'Class:PC/Attribute:type/Value:desktop' => 'Desktop',
-	'Class:PC/Attribute:type/Value:desktop+' => '',
+	'Class:PC/Attribute:type/Value:desktop+' => 'Desktop',
 	'Class:PC/Attribute:type/Value:laptop' => 'Laptop',
-	'Class:PC/Attribute:type/Value:laptop+' => '',
+	'Class:PC/Attribute:type/Value:laptop+' => 'Laptop',
 ));
 
 //
@@ -411,6 +425,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:Printer' => 'Drucker',
 	'Class:Printer+' => '',
+	'Class:Printer/ComplementaryName' => '%1$s - %2$s',
 ));
 
 //
@@ -420,6 +435,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:PowerConnection' => 'Stromverbindung',
 	'Class:PowerConnection+' => '',
+	'Class:PowerConnection/ComplementaryName' => '%1$s - %2$s',
 ));
 
 //
@@ -429,8 +445,9 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:PowerSource' => 'Stromquelle',
 	'Class:PowerSource+' => '',
+	'Class:PowerSource/ComplementaryName' => '%1$s - %2$s',
 	'Class:PowerSource/Attribute:pdus_list' => 'PDUs',
-	'Class:PowerSource/Attribute:pdus_list+' => 'All the PDUs using this power source~~',
+	'Class:PowerSource/Attribute:pdus_list+' => 'Alle PDUs, die diese Stromquelle nutzen',
 ));
 
 //
@@ -440,6 +457,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:PDU' => 'PDU',
 	'Class:PDU+' => '',
+	'Class:PDU/ComplementaryName' => '%1$s - %2$s - %3$s - %4$s',
 	'Class:PDU/Attribute:rack_id' => 'Rack',
 	'Class:PDU/Attribute:rack_id+' => '',
 	'Class:PDU/Attribute:rack_name' => 'Rack-Name',
@@ -457,6 +475,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:Peripheral' => 'Peripheriegerät',
 	'Class:Peripheral+' => '',
+	'Class:Peripheral/ComplementaryName' => '%1$s - %2$s',
 ));
 
 //
@@ -466,6 +485,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:Enclosure' => 'Enclosure',
 	'Class:Enclosure+' => '',
+	'Class:Enclosure/ComplementaryName' => '%1$s - %2$s - %3$s',
 	'Class:Enclosure/Attribute:rack_id' => 'Rack',
 	'Class:Enclosure/Attribute:rack_id+' => '',
 	'Class:Enclosure/Attribute:rack_name' => 'Rack-Name',
@@ -473,7 +493,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:Enclosure/Attribute:nb_u' => 'Höheneinheiten',
 	'Class:Enclosure/Attribute:nb_u+' => '',
 	'Class:Enclosure/Attribute:device_list' => 'Geräte',
-	'Class:Enclosure/Attribute:device_list+' => 'All the devices in this enclosure~~',
+	'Class:Enclosure/Attribute:device_list+' => 'Alle Geräte in diesem Enclosure',
 ));
 
 //
@@ -484,9 +504,9 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:ApplicationSolution' => 'Anwendungslösung',
 	'Class:ApplicationSolution+' => '',
 	'Class:ApplicationSolution/Attribute:functionalcis_list' => 'CIs',
-	'Class:ApplicationSolution/Attribute:functionalcis_list+' => 'All the configuration items that compose this application solution~~',
+	'Class:ApplicationSolution/Attribute:functionalcis_list+' => 'Alle CIs, aus denen diese Anwendungslösung besteht',
 	'Class:ApplicationSolution/Attribute:businessprocess_list' => 'Business-Prozesse',
-	'Class:ApplicationSolution/Attribute:businessprocess_list+' => 'All the business processes depending on this application solution~~',
+	'Class:ApplicationSolution/Attribute:businessprocess_list+' => 'Alle Geschäftsprozesse, die von dieser Anwendungslösung abhängen',
 	'Class:ApplicationSolution/Attribute:status' => 'Status',
 	'Class:ApplicationSolution/Attribute:status+' => '',
 	'Class:ApplicationSolution/Attribute:status/Value:active' => 'aktiv',
@@ -507,7 +527,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:BusinessProcess' => 'Business-Prozess',
 	'Class:BusinessProcess+' => '',
 	'Class:BusinessProcess/Attribute:applicationsolutions_list' => 'Anwendungslösungen',
-	'Class:BusinessProcess/Attribute:applicationsolutions_list+' => 'All the application solutions that impact this business process~~',
+	'Class:BusinessProcess/Attribute:applicationsolutions_list+' => 'Alle Anwendungslösungen, die sich auf diesen Geschäftsprozess auswirken',
 	'Class:BusinessProcess/Attribute:status' => 'Status',
 	'Class:BusinessProcess/Attribute:status+' => '',
 	'Class:BusinessProcess/Attribute:status/Value:active' => 'aktiv',
@@ -553,7 +573,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:Middleware' => 'Middleware',
 	'Class:Middleware+' => '',
 	'Class:Middleware/Attribute:middlewareinstance_list' => 'Middleware-Instanzen',
-	'Class:Middleware/Attribute:middlewareinstance_list+' => 'All the middleware instances provided by this middleware~~',
+	'Class:Middleware/Attribute:middlewareinstance_list+' => 'Alle Middleware-Instanzen, die von dieser Middleware bereitgestellt werden',
 ));
 
 //
@@ -564,7 +584,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:DBServer' => 'DB Server',
 	'Class:DBServer+' => '',
 	'Class:DBServer/Attribute:dbschema_list' => 'DB Schemata',
-	'Class:DBServer/Attribute:dbschema_list+' => 'All the database schemas for this DB server~~',
+	'Class:DBServer/Attribute:dbschema_list+' => 'Alle Datenbankschemata für diesen DB-Server',
 ));
 
 //
@@ -575,7 +595,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:WebServer' => 'Web Server',
 	'Class:WebServer+' => '',
 	'Class:WebServer/Attribute:webapp_list' => 'Webapplikationen',
-	'Class:WebServer/Attribute:webapp_list+' => 'All the web applications available on this web server~~',
+	'Class:WebServer/Attribute:webapp_list+' => 'Alle auf diesem Webserver verfügbaren Webanwendungen',
 ));
 
 //
@@ -603,6 +623,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:MiddlewareInstance' => 'Middleware-Instanz',
 	'Class:MiddlewareInstance+' => '',
+	'Class:MiddlewareInstance/ComplementaryName' => '%1$s - %2$s',
 	'Class:MiddlewareInstance/Attribute:middleware_id' => 'Middleware',
 	'Class:MiddlewareInstance/Attribute:middleware_id+' => '',
 	'Class:MiddlewareInstance/Attribute:middleware_name' => 'Middleware-Name',
@@ -616,6 +637,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:DatabaseSchema' => 'Datenbank-Schema',
 	'Class:DatabaseSchema+' => '',
+	'Class:DatabaseSchema/ComplementaryName' => '%1$s - %2$s',
 	'Class:DatabaseSchema/Attribute:dbserver_id' => 'DB-Server',
 	'Class:DatabaseSchema/Attribute:dbserver_id+' => '',
 	'Class:DatabaseSchema/Attribute:dbserver_name' => 'DB-Servername',
@@ -629,6 +651,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:WebApplication' => 'Webapplikation',
 	'Class:WebApplication+' => '',
+	'Class:WebApplication/ComplementaryName' => '%1$s - %2$s',
 	'Class:WebApplication/Attribute:webserver_id' => 'Webserver',
 	'Class:WebApplication/Attribute:webserver_id+' => '',
 	'Class:WebApplication/Attribute:webserver_name' => 'Webservername',
@@ -655,8 +678,8 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:VirtualDevice/Attribute:status/Value:production+' => '',
 	'Class:VirtualDevice/Attribute:status/Value:stock' => 'Lager',
 	'Class:VirtualDevice/Attribute:status/Value:stock+' => '',
-	'Class:VirtualDevice/Attribute:logicalvolumes_list' => 'Logical Volumes',
-	'Class:VirtualDevice/Attribute:logicalvolumes_list+' => 'All the logical volumes used by this device~~',
+	'Class:VirtualDevice/Attribute:logicalvolumes_list' => 'Logische Volumes',
+	'Class:VirtualDevice/Attribute:logicalvolumes_list+' => 'Alle von diesem Gerät verwendeten logischen Volumes',
 ));
 
 //
@@ -667,7 +690,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:VirtualHost' => 'Host',
 	'Class:VirtualHost+' => '',
 	'Class:VirtualHost/Attribute:virtualmachine_list' => 'Virtuelle Maschinen',
-	'Class:VirtualHost/Attribute:virtualmachine_list+' => 'All the virtual machines hosted by this host~~',
+	'Class:VirtualHost/Attribute:virtualmachine_list+' => 'Alle virtuellen Maschinen, die von diesem Host gehostet werden',
 ));
 
 //
@@ -695,7 +718,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:Farm' => 'Farm',
 	'Class:Farm+' => '',
 	'Class:Farm/Attribute:hypervisor_list' => 'Hypervisoren',
-	'Class:Farm/Attribute:hypervisor_list+' => 'All the hypervisors that compose this farm~~',
+	'Class:Farm/Attribute:hypervisor_list+' => 'Alle Hypervisoren, aus denen diese Farm besteht',
 	'Class:Farm/Attribute:redundancy' => 'Hochverfügbarkeit',
 	'Class:Farm/Attribute:redundancy/disabled' => 'Die Farm läuft, wenn alle Hypervisoren laufen.',
 	'Class:Farm/Attribute:redundancy/count' => 'Die Farm läuft, wenn mindestens %1$s Hypervisor(en) läuft/laufen.',
@@ -709,6 +732,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:VirtualMachine' => 'Virtuelle Maschine',
 	'Class:VirtualMachine+' => '',
+	'Class:VirtualMachine/ComplementaryName' => '%1$s - %2$s',
 	'Class:VirtualMachine/Attribute:virtualhost_id' => 'Host',
 	'Class:VirtualMachine/Attribute:virtualhost_id+' => '',
 	'Class:VirtualMachine/Attribute:virtualhost_name' => 'Hostname',
@@ -732,7 +756,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:VirtualMachine/Attribute:managementip' => 'Management-IP',
 	'Class:VirtualMachine/Attribute:managementip+' => '',
 	'Class:VirtualMachine/Attribute:logicalinterface_list' => 'Netzwerk-Interfaces',
-	'Class:VirtualMachine/Attribute:logicalinterface_list+' => 'All the logical network interfaces~~',
+	'Class:VirtualMachine/Attribute:logicalinterface_list+' => 'Alle logischen Netzwerk-Interfaces',
 ));
 
 //
@@ -757,9 +781,9 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:LogicalVolume/Attribute:storagesystem_name' => 'Storage-Systemname',
 	'Class:LogicalVolume/Attribute:storagesystem_name+' => '',
 	'Class:LogicalVolume/Attribute:servers_list' => 'Server',
-	'Class:LogicalVolume/Attribute:servers_list+' => 'All the servers using this volume~~',
+	'Class:LogicalVolume/Attribute:servers_list+' => 'Alle Server, die dieses Volume verwenden',
 	'Class:LogicalVolume/Attribute:virtualdevices_list' => 'Virtuelle Geräte',
-	'Class:LogicalVolume/Attribute:virtualdevices_list+' => 'All the virtual devices using this volume~~',
+	'Class:LogicalVolume/Attribute:virtualdevices_list+' => 'Alle virtuellen Maschinen, die dieses Volume verwenden',
 ));
 
 //
@@ -769,6 +793,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:lnkServerToVolume' => 'Verknüpfung Server/Volume',
 	'Class:lnkServerToVolume+' => '',
+	'Class:lnkServerToVolume/Name' => '%1$s / %2$s',
 	'Class:lnkServerToVolume/Attribute:volume_id' => 'Volume',
 	'Class:lnkServerToVolume/Attribute:volume_id+' => '',
 	'Class:lnkServerToVolume/Attribute:volume_name' => 'Volume-Name',
@@ -788,6 +813,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:lnkVirtualDeviceToVolume' => 'Verknüpfung Virtuelles Gerät/Volume',
 	'Class:lnkVirtualDeviceToVolume+' => '',
+	'Class:lnkVirtualDeviceToVolume/Name' => '%1$s / %2$s',
 	'Class:lnkVirtualDeviceToVolume/Attribute:volume_id' => 'Volume',
 	'Class:lnkVirtualDeviceToVolume/Attribute:volume_id+' => '',
 	'Class:lnkVirtualDeviceToVolume/Attribute:volume_name' => 'Volume-Name',
@@ -807,6 +833,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:lnkSanToDatacenterDevice' => 'Verknüpfung SAN/Datacenter-Gerät',
 	'Class:lnkSanToDatacenterDevice+' => '',
+	'Class:lnkSanToDatacenterDevice/Name' => '%1$s / %2$s',
 	'Class:lnkSanToDatacenterDevice/Attribute:san_id' => 'SAN-Switch',
 	'Class:lnkSanToDatacenterDevice/Attribute:san_id+' => '',
 	'Class:lnkSanToDatacenterDevice/Attribute:san_name' => 'SAN-Switch-Name',
@@ -868,6 +895,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:Software' => 'Software',
 	'Class:Software+' => '',
+	'Class:Software/ComplementaryName' => '%1$s - %2$s',
 	'Class:Software/Attribute:name' => 'Name',
 	'Class:Software/Attribute:name+' => '',
 	'Class:Software/Attribute:vendor' => 'Hersteller',
@@ -875,7 +903,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:Software/Attribute:version' => 'Version',
 	'Class:Software/Attribute:version+' => '',
 	'Class:Software/Attribute:documents_list' => 'Dokumente',
-	'Class:Software/Attribute:documents_list+' => 'All the documents linked to this software~~',
+	'Class:Software/Attribute:documents_list+' => 'Alle mit dieser Software verknüpften Dokumente',
 	'Class:Software/Attribute:type' => 'Typ',
 	'Class:Software/Attribute:type+' => '',
 	'Class:Software/Attribute:type/Value:DBServer' => 'DB-Server',
@@ -889,11 +917,11 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:Software/Attribute:type/Value:WebServer' => 'Webserver',
 	'Class:Software/Attribute:type/Value:WebServer+' => '',
 	'Class:Software/Attribute:softwareinstance_list' => 'Software-Instanzen',
-	'Class:Software/Attribute:softwareinstance_list+' => 'All the software instances for this software~~',
+	'Class:Software/Attribute:softwareinstance_list+' => 'Alle Software-Instanzen für diese Software',
 	'Class:Software/Attribute:softwarepatch_list' => 'Software-Patches',
-	'Class:Software/Attribute:softwarepatch_list+' => 'All the patchs for this software~~',
+	'Class:Software/Attribute:softwarepatch_list+' => 'Alle Software-Patches für diese Software',
 	'Class:Software/Attribute:softwarelicence_list' => 'Softwarelizenzen',
-	'Class:Software/Attribute:softwarelicence_list+' => 'All the licenses for this software~~',
+	'Class:Software/Attribute:softwarelicence_list+' => 'Alle Lizenzen für diese Software',
 ));
 
 //
@@ -906,7 +934,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:Patch/Attribute:name' => 'Name',
 	'Class:Patch/Attribute:name+' => '',
 	'Class:Patch/Attribute:documents_list' => 'Dokumente',
-	'Class:Patch/Attribute:documents_list+' => 'All the documents linked to this patch~~',
+	'Class:Patch/Attribute:documents_list+' => 'Alle Dokumente, die mit diesem Patch verknüpft sind',
 	'Class:Patch/Attribute:description' => 'Beschreibung',
 	'Class:Patch/Attribute:description+' => '',
 	'Class:Patch/Attribute:finalclass' => 'Typ',
@@ -921,7 +949,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:OSPatch' => 'OS-Patch',
 	'Class:OSPatch+' => '',
 	'Class:OSPatch/Attribute:functionalcis_list' => 'Geräte',
-	'Class:OSPatch/Attribute:functionalcis_list+' => 'All the systems where this patch is installed~~',
+	'Class:OSPatch/Attribute:functionalcis_list+' => 'Alle Systeme, auf denen dieser Patch installiert ist',
 	'Class:OSPatch/Attribute:osversion_id' => 'OS Version',
 	'Class:OSPatch/Attribute:osversion_id+' => '',
 	'Class:OSPatch/Attribute:osversion_name' => 'OS-Versionsname',
@@ -940,7 +968,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:SoftwarePatch/Attribute:software_name' => 'Software-Name',
 	'Class:SoftwarePatch/Attribute:software_name+' => '',
 	'Class:SoftwarePatch/Attribute:softwareinstances_list' => 'Software-Instanzen',
-	'Class:SoftwarePatch/Attribute:softwareinstances_list+' => 'All the systems where this software patch is installed~~',
+	'Class:SoftwarePatch/Attribute:softwareinstances_list+' => 'Alle Systeme, auf denen dieser Software-Patch installiert ist',
 ));
 
 //
@@ -953,7 +981,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:Licence/Attribute:name' => 'Name',
 	'Class:Licence/Attribute:name+' => '',
 	'Class:Licence/Attribute:documents_list' => 'Dokumente',
-	'Class:Licence/Attribute:documents_list+' => 'All the documents linked to this license~~',
+	'Class:Licence/Attribute:documents_list+' => 'Alle mit dieser Lizenz verknüpften Dokumente',
 	'Class:Licence/Attribute:org_id' => 'Besitzer',
 	'Class:Licence/Attribute:org_id+' => '',
 	'Class:Licence/Attribute:organization_name' => 'Organisationsname',
@@ -975,7 +1003,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:Licence/Attribute:perpetual/Value:yes' => 'ja',
 	'Class:Licence/Attribute:perpetual/Value:yes+' => 'ja',
 	'Class:Licence/Attribute:finalclass' => 'Typ',
-	'Class:Licence/Attribute:finalclass+' => '',
+	'Class:Licence/Attribute:finalclass+' => 'Name der instanziierbaren Klasse',
 ));
 
 //
@@ -985,14 +1013,15 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:OSLicence' => 'OS-Lizenz',
 	'Class:OSLicence+' => '',
+	'Class:OSLicence/ComplementaryName' => '%1$s - %2$s',
 	'Class:OSLicence/Attribute:osversion_id' => 'OS-Version',
 	'Class:OSLicence/Attribute:osversion_id+' => '',
 	'Class:OSLicence/Attribute:osversion_name' => 'OS-Versionsname',
 	'Class:OSLicence/Attribute:osversion_name+' => '',
 	'Class:OSLicence/Attribute:virtualmachines_list' => 'Virtuelle Maschinen',
-	'Class:OSLicence/Attribute:virtualmachines_list+' => 'All the virtual machines where this license is used~~',
+	'Class:OSLicence/Attribute:virtualmachines_list+' => 'Alle virtuellen Maschinen, auf denen diese Lizenz verwendet wird',
 	'Class:OSLicence/Attribute:servers_list' => 'Server',
-	'Class:OSLicence/Attribute:servers_list+' => 'All the servers where this license is used~~',
+	'Class:OSLicence/Attribute:servers_list+' => 'Alle Server, auf denen diese Lizenz verwendet wird',
 ));
 
 //
@@ -1002,12 +1031,13 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:SoftwareLicence' => 'Software-Lizenz',
 	'Class:SoftwareLicence+' => '',
+	'Class:SoftwareLicence/ComplementaryName' => '%1$s - %2$s',
 	'Class:SoftwareLicence/Attribute:software_id' => 'Software',
 	'Class:SoftwareLicence/Attribute:software_id+' => '',
 	'Class:SoftwareLicence/Attribute:software_name' => 'Software-Name',
 	'Class:SoftwareLicence/Attribute:software_name+' => '',
 	'Class:SoftwareLicence/Attribute:softwareinstance_list' => 'Software-Instanzen',
-	'Class:SoftwareLicence/Attribute:softwareinstance_list+' => 'All the systems where this license is used~~',
+	'Class:SoftwareLicence/Attribute:softwareinstance_list+' => 'Alle Systeme, in denen diese Lizenz verwendet wird',
 ));
 
 //
@@ -1017,6 +1047,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:lnkDocumentToLicence' => 'Verknüpfung Dokument/Lizenz',
 	'Class:lnkDocumentToLicence+' => '',
+	'Class:lnkDocumentToLicence/Name' => '%1$s / %2$s',
 	'Class:lnkDocumentToLicence/Attribute:licence_id' => 'Lizenz',
 	'Class:lnkDocumentToLicence/Attribute:licence_id+' => '',
 	'Class:lnkDocumentToLicence/Attribute:licence_name' => 'Lizenz-Name',
@@ -1057,7 +1088,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:Brand' => 'Marke',
 	'Class:Brand+' => '',
 	'Class:Brand/Attribute:physicaldevices_list' => 'Physische Geräte',
-	'Class:Brand/Attribute:physicaldevices_list+' => 'All the physical devices corresponding to this brand~~',
+	'Class:Brand/Attribute:physicaldevices_list+' => 'Alle physischen Geräte dieser Marke',
 	'Class:Brand/UniquenessRule:name+' => 'Der Name muss eindeutig sein',
 	'Class:Brand/UniquenessRule:name' => 'Diese Marke existiert bereits',
 ));
@@ -1069,6 +1100,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:Model' => 'Modell',
 	'Class:Model+' => '',
+	'Class:Model/ComplementaryName' => '%1$s - %2$s',
 	'Class:Model/Attribute:brand_id' => 'Marke',
 	'Class:Model/Attribute:brand_id+' => '',
 	'Class:Model/Attribute:brand_name' => 'Markenname',
@@ -1076,43 +1108,43 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:Model/Attribute:type' => 'Gerätetyp',
 	'Class:Model/Attribute:type+' => '',
 	'Class:Model/Attribute:type/Value:PowerSource' => 'Stromquelle',
-	'Class:Model/Attribute:type/Value:PowerSource+' => '',
+	'Class:Model/Attribute:type/Value:PowerSource+' => 'Stromquelle',
 	'Class:Model/Attribute:type/Value:DiskArray' => 'Plattenarray',
-	'Class:Model/Attribute:type/Value:DiskArray+' => '',
+	'Class:Model/Attribute:type/Value:DiskArray+' => 'Plattenarray',
 	'Class:Model/Attribute:type/Value:Enclosure' => 'Enclosure',
-	'Class:Model/Attribute:type/Value:Enclosure+' => '',
+	'Class:Model/Attribute:type/Value:Enclosure+' => 'Enclosure',
 	'Class:Model/Attribute:type/Value:IPPhone' => 'IP-Telefon',
-	'Class:Model/Attribute:type/Value:IPPhone+' => '',
+	'Class:Model/Attribute:type/Value:IPPhone+' => 'IP-Telefon',
 	'Class:Model/Attribute:type/Value:MobilePhone' => 'Mobiltelefon',
-	'Class:Model/Attribute:type/Value:MobilePhone+' => '',
+	'Class:Model/Attribute:type/Value:MobilePhone+' => 'Mobiltelefon',
 	'Class:Model/Attribute:type/Value:NAS' => 'NAS',
-	'Class:Model/Attribute:type/Value:NAS+' => '',
+	'Class:Model/Attribute:type/Value:NAS+' => 'NAS',
 	'Class:Model/Attribute:type/Value:NetworkDevice' => 'Netzwerkgerät',
-	'Class:Model/Attribute:type/Value:NetworkDevice+' => '',
+	'Class:Model/Attribute:type/Value:NetworkDevice+' => 'Netzwerkgerät',
 	'Class:Model/Attribute:type/Value:PC' => 'PC',
-	'Class:Model/Attribute:type/Value:PC+' => '',
+	'Class:Model/Attribute:type/Value:PC+' => 'PC',
 	'Class:Model/Attribute:type/Value:PDU' => 'PDU',
-	'Class:Model/Attribute:type/Value:PDU+' => '',
+	'Class:Model/Attribute:type/Value:PDU+' => 'PDU',
 	'Class:Model/Attribute:type/Value:Peripheral' => 'Peripheriegeräte',
-	'Class:Model/Attribute:type/Value:Peripheral+' => '',
+	'Class:Model/Attribute:type/Value:Peripheral+' => 'Peripheriegeräte',
 	'Class:Model/Attribute:type/Value:Printer' => 'Drucker',
-	'Class:Model/Attribute:type/Value:Printer+' => '',
+	'Class:Model/Attribute:type/Value:Printer+' => 'Drucker',
 	'Class:Model/Attribute:type/Value:Rack' => 'Rack',
-	'Class:Model/Attribute:type/Value:Rack+' => '',
+	'Class:Model/Attribute:type/Value:Rack+' => 'Rack',
 	'Class:Model/Attribute:type/Value:SANSwitch' => 'SAN-Switch',
-	'Class:Model/Attribute:type/Value:SANSwitch+' => '',
+	'Class:Model/Attribute:type/Value:SANSwitch+' => 'SAN-Switch',
 	'Class:Model/Attribute:type/Value:Server' => 'Server',
-	'Class:Model/Attribute:type/Value:Server+' => '',
+	'Class:Model/Attribute:type/Value:Server+' => 'Server',
 	'Class:Model/Attribute:type/Value:StorageSystem' => 'Storage-System',
-	'Class:Model/Attribute:type/Value:StorageSystem+' => '',
+	'Class:Model/Attribute:type/Value:StorageSystem+' => 'Storage-System',
 	'Class:Model/Attribute:type/Value:Tablet' => 'Tablet',
-	'Class:Model/Attribute:type/Value:Tablet+' => '',
+	'Class:Model/Attribute:type/Value:Tablet+' => 'Tablet',
 	'Class:Model/Attribute:type/Value:TapeLibrary' => 'Tape-Library',
-	'Class:Model/Attribute:type/Value:TapeLibrary+' => '',
+	'Class:Model/Attribute:type/Value:TapeLibrary+' => 'Tape-Library',
 	'Class:Model/Attribute:type/Value:Phone' => 'Telefon',
-	'Class:Model/Attribute:type/Value:Phone+' => '',
+	'Class:Model/Attribute:type/Value:Phone+' => 'Telefon',
 	'Class:Model/Attribute:physicaldevices_list' => 'Physische Geräte',
-	'Class:Model/Attribute:physicaldevices_list+' => 'All the physical devices corresponding to this model~~',
+	'Class:Model/Attribute:physicaldevices_list+' => 'Alle physischen Geräte, die diesem Modell entsprechen',
 	'Class:Model/UniquenessRule:name_brand+' => 'Der Modellname für eine Marke muss eindeutig sein',
 	'Class:Model/UniquenessRule:name_brand' => 'Es existiert bereits ein Modell mit diesem Namen für diese Marke',
 ));
@@ -1125,7 +1157,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:NetworkDeviceType' => 'Netzwerkgerätetyp',
 	'Class:NetworkDeviceType+' => '',
 	'Class:NetworkDeviceType/Attribute:networkdevicesdevices_list' => 'Netzwerkgeräte',
-	'Class:NetworkDeviceType/Attribute:networkdevicesdevices_list+' => 'All the network devices corresponding to this type~~',
+	'Class:NetworkDeviceType/Attribute:networkdevicesdevices_list+' => 'Alle Netzwerkgeräte, die diesem Typ entsprechen',
 ));
 
 //
@@ -1148,6 +1180,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:lnkDocumentToPatch' => 'Verknüpfung Dokument/Patch',
 	'Class:lnkDocumentToPatch+' => '',
+	'Class:lnkDocumentToPatch/Name' => '%1$s / %2$s',
 	'Class:lnkDocumentToPatch/Attribute:patch_id' => 'Patch',
 	'Class:lnkDocumentToPatch/Attribute:patch_id+' => '',
 	'Class:lnkDocumentToPatch/Attribute:patch_name' => 'Patch-Name',
@@ -1165,6 +1198,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:lnkSoftwareInstanceToSoftwarePatch' => 'Verknüpfung Software-Instanz/Softeware-Patch',
 	'Class:lnkSoftwareInstanceToSoftwarePatch+' => '',
+	'Class:lnkSoftwareInstanceToSoftwarePatch/Name' => '%1$s / %2$s',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id' => 'Software-Patch',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id+' => '',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_name' => 'Software-Patch-Name',
@@ -1182,6 +1216,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:lnkFunctionalCIToOSPatch' => 'Verknüpfung FunctionalCI/OS-Patch',
 	'Class:lnkFunctionalCIToOSPatch+' => '',
+	'Class:lnkFunctionalCIToOSPatch/Name' => '%1$s / %2$s',
 	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id' => 'OS-Patch',
 	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id+' => '',
 	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_name' => 'OS-Patch-Name',
@@ -1199,6 +1234,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:lnkDocumentToSoftware' => 'Verknüpfung Dokument/Software',
 	'Class:lnkDocumentToSoftware+' => '',
+	'Class:lnkDocumentToSoftware/Name' => '%1$s / %2$s',
 	'Class:lnkDocumentToSoftware/Attribute:software_id' => 'Software',
 	'Class:lnkDocumentToSoftware/Attribute:software_id+' => '',
 	'Class:lnkDocumentToSoftware/Attribute:software_name' => 'Software-Name',
@@ -1216,6 +1252,8 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:Subnet' => 'Subnetz',
 	'Class:Subnet+' => '',
+	'Class:Subnet/Name' => '%1$s/%2$s',
+	'Class:Subnet/ComplementaryName' => '%1$s - %2$s',
 	'Class:Subnet/Attribute:description' => 'Beschreibung',
 	'Class:Subnet/Attribute:description+' => '',
 	'Class:Subnet/Attribute:subnet_name' => 'Subnetzname',
@@ -1260,6 +1298,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:lnkSubnetToVLAN' => 'Verknüpfung Subnetz/VLAN',
 	'Class:lnkSubnetToVLAN+' => '',
+	'Class:lnkSubnetToVLAN/Name' => '%1$s / %2$s',
 	'Class:lnkSubnetToVLAN/Attribute:subnet_id' => 'Subnetz',
 	'Class:lnkSubnetToVLAN/Attribute:subnet_id+' => '',
 	'Class:lnkSubnetToVLAN/Attribute:subnet_ip' => 'Subnetz-IP',
@@ -1282,7 +1321,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:NetworkInterface/Attribute:name' => 'Name',
 	'Class:NetworkInterface/Attribute:name+' => '',
 	'Class:NetworkInterface/Attribute:finalclass' => 'Typ',
-	'Class:NetworkInterface/Attribute:finalclass+' => '',
+	'Class:NetworkInterface/Attribute:finalclass+' => 'Name der instanziierbaren Klasse',
 ));
 
 //
@@ -1294,8 +1333,6 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:IPInterface+' => '',
 	'Class:IPInterface/Attribute:ipaddress' => 'IP-Adresse',
 	'Class:IPInterface/Attribute:ipaddress+' => '',
-
-
 	'Class:IPInterface/Attribute:macaddress' => 'MAC-Adresse',
 	'Class:IPInterface/Attribute:macaddress+' => '',
 	'Class:IPInterface/Attribute:comment' => 'Kommentar',
@@ -1315,6 +1352,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:PhysicalInterface' => 'Physisches Interface',
 	'Class:PhysicalInterface+' => '',
+	'Class:PhysicalInterface/Name' => '%2$s %1$s',
 	'Class:PhysicalInterface/Attribute:connectableci_id' => 'Gerät',
 	'Class:PhysicalInterface/Attribute:connectableci_id+' => '',
 	'Class:PhysicalInterface/Attribute:connectableci_name' => 'Gerätename',
@@ -1330,6 +1368,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:lnkPhysicalInterfaceToVLAN' => 'Verknüpfung Physisches Interface / VLAN',
 	'Class:lnkPhysicalInterfaceToVLAN+' => '',
+	'Class:lnkPhysicalInterfaceToVLAN/Name' => '%1$s %2$s / %3$s',
 	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_id' => 'Physisches Interface',
 	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_id+' => '',
 	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_name' => 'Physisches Interface Name',
@@ -1384,6 +1423,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:lnkConnectableCIToNetworkDevice' => 'Verknüpfung ConnectableCI/NetworkDevice',
 	'Class:lnkConnectableCIToNetworkDevice+' => '',
+	'Class:lnkConnectableCIToNetworkDevice/Name' => '%1$s / %2$s',
 	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id' => 'Netzwerkgerät',
 	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id+' => '',
 	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_name' => 'Netzwerkgerät-Name',
@@ -1411,6 +1451,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:lnkApplicationSolutionToFunctionalCI' => 'Verknüpfung Anwendungslösung/FunctionalCI',
 	'Class:lnkApplicationSolutionToFunctionalCI+' => '',
+	'Class:lnkApplicationSolutionToFunctionalCI/Name' => '%1$s / %2$s',
 	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_id' => 'Anwendungslösung',
 	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_id+' => '',
 	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_name' => 'Anwendungslösungs-Name',
@@ -1428,6 +1469,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:lnkApplicationSolutionToBusinessProcess' => 'Verknüpfung Anwendungslösung/Business-Prozess',
 	'Class:lnkApplicationSolutionToBusinessProcess+' => '',
+	'Class:lnkApplicationSolutionToBusinessProcess/Name' => '%1$s / %2$s',
 	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_id' => 'Business-Prozess',
 	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_id+' => '',
 	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_name' => 'Business-Prozess-Name',
@@ -1445,6 +1487,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:Group' => 'Gruppe',
 	'Class:Group+' => '',
+	'Class:Group/ComplementaryName' => '%1$s - %2$s',
 	'Class:Group/Attribute:name' => 'Name',
 	'Class:Group/Attribute:name+' => '',
 	'Class:Group/Attribute:status' => 'Status',
@@ -1464,12 +1507,11 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:Group/Attribute:type' => 'Typ',
 	'Class:Group/Attribute:type+' => '',
 	'Class:Group/Attribute:parent_id' => 'Muttergruppe',
-
 	'Class:Group/Attribute:parent_id+' => '',
 	'Class:Group/Attribute:parent_name' => 'Name',
 	'Class:Group/Attribute:parent_name+' => '',
 	'Class:Group/Attribute:ci_list' => 'Verbundene CIs',
-	'Class:Group/Attribute:ci_list+' => 'All the configuration items linked to this group~~',
+	'Class:Group/Attribute:ci_list+' => 'Alle mit dieser Gruppe verknüpften CIs',
 	'Class:Group/Attribute:parent_id_friendlyname' => 'Parent-Gruppe',
 	'Class:Group/Attribute:parent_id_friendlyname+' => '',
 ));
@@ -1481,6 +1523,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:lnkGroupToCI' => 'Gruppe/CI',
 	'Class:lnkGroupToCI+' => '',
+	'Class:lnkGroupToCI/Name' => '%1$s / %2$s',
 	'Class:lnkGroupToCI/Attribute:group_id' => 'Gruppe',
 	'Class:lnkGroupToCI/Attribute:group_id+' => '',
 	'Class:lnkGroupToCI/Attribute:group_name' => 'Name',
@@ -1502,6 +1545,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Server:otherinfo' => 'Sonstige Informationen',
 	'Server:power' => 'Stromversorgung',
 	'Class:Subnet/Tab:IPUsage' => 'IP-Nutzung',
+	'Class:Subnet/Tab:IPUsage+' => 'Welche IPs innerhalb dieses Subnetzes verwendet werden oder nicht',
 	'Class:Subnet/Tab:IPUsage-explain' => 'Interfaces mit einer IP in der Range: <em>%1$s</em> bis <em>%2$s</em>',
 	'Class:Subnet/Tab:FreeIPs' => 'Freie IPs',
 	'Class:Subnet/Tab:FreeIPs-count' => 'Freie IPs: %1$s',
@@ -1517,6 +1561,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:lnkDocumentToFunctionalCI' => 'Verknüpfung Dokument/FunctionalCI',
 	'Class:lnkDocumentToFunctionalCI+' => '',
+	'Class:lnkDocumentToFunctionalCI/Name' => '%1$s / %2$s',
 	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id' => 'FunctionalCI',
 	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id+' => '',
 	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_name' => 'FunctionalCI-Name',
diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/es_cr.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/es_cr.dict.itop-config-mgmt.php
index 425237472d..1387356f9c 100644
--- a/datamodels/2.x/itop-config-mgmt/dictionaries/es_cr.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/es_cr.dict.itop-config-mgmt.php
@@ -36,7 +36,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Relation:depends on/Description' => 'Elementos de los cuales depende',
 	'Relation:depends on/DownStream' => 'Depende de...',
 	'Relation:depends on/UpStream' => 'Impactos...',
-	'Relation:impacts/LoadData'       => 'Load data~~',
+	'Relation:impacts/LoadData' => 'Load data~~',
 	'Relation:impacts/NoFilteredData' => 'please select objects in Graphical view tag~~',
 ));
 
@@ -85,6 +85,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkContactToFunctionalCI' => 'Relación Contacto y  EC Funcional',
 	'Class:lnkContactToFunctionalCI+' => 'Relación Contacto y  EC Funcional',
+	'Class:lnkContactToFunctionalCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'EC Funcional',
 	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => 'EC Funcional',
 	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'EC Funcional',
@@ -131,6 +132,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:FunctionalCI/Attribute:finalclass' => 'Clase',
 	'Class:FunctionalCI/Attribute:finalclass+' => 'Clase',
 	'Class:FunctionalCI/Tab:OpenedTickets' => 'Tickets Activos',
+	'Class:FunctionalCI/Tab:OpenedTickets+' => 'Active Tickets which are impacting this functional CI~~',
 ));
 
 //
@@ -140,6 +142,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:PhysicalDevice' => 'Dispositivo Físico',
 	'Class:PhysicalDevice+' => 'Dispositivo Físico',
+	'Class:PhysicalDevice/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:PhysicalDevice/Attribute:serialnumber' => 'Número de Serie',
 	'Class:PhysicalDevice/Attribute:serialnumber+' => 'Número de Serie',
 	'Class:PhysicalDevice/Attribute:location_id' => 'Localidad',
@@ -179,6 +182,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Rack' => 'Rack',
 	'Class:Rack+' => '',
+	'Class:Rack/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Rack/Attribute:nb_u' => 'Unidades de Rack',
 	'Class:Rack/Attribute:nb_u+' => 'Unidades de Rack',
 	'Class:Rack/Attribute:device_list' => 'Dispositivos',
@@ -245,6 +249,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:ConnectableCI' => 'EC Conectable',
 	'Class:ConnectableCI+' => 'EC Físico',
+	'Class:ConnectableCI/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:ConnectableCI/Attribute:networkdevice_list' => 'Dispositivos de Red',
 	'Class:ConnectableCI/Attribute:networkdevice_list+' => 'Dispositivos de Red',
 	'Class:ConnectableCI/Attribute:physicalinterface_list' => 'Interfases de Red',
@@ -258,6 +263,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:DatacenterDevice' => 'Dispositivos de Centro de Datos',
 	'Class:DatacenterDevice+' => 'Dispositivos de Centro de Datos',
+	'Class:DatacenterDevice/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:DatacenterDevice/Attribute:rack_id' => 'Rack',
 	'Class:DatacenterDevice/Attribute:rack_id+' => 'Rack',
 	'Class:DatacenterDevice/Attribute:rack_name' => 'Nombre Rack',
@@ -296,6 +302,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:NetworkDevice' => 'Dispositivo de Red',
 	'Class:NetworkDevice+' => 'Dispositivo de Red',
+	'Class:NetworkDevice/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:NetworkDevice/Attribute:networkdevicetype_id' => 'Tipo de Red',
 	'Class:NetworkDevice/Attribute:networkdevicetype_id+' => 'Tipo de Red',
 	'Class:NetworkDevice/Attribute:networkdevicetype_name' => 'Tipo de Red',
@@ -317,6 +324,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Server' => 'Servidor',
 	'Class:Server+' => 'Servidor',
+	'Class:Server/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Server/Attribute:osfamily_id' => 'Familia de SO',
 	'Class:Server/Attribute:osfamily_id+' => 'Familia de SO',
 	'Class:Server/Attribute:osfamily_name' => 'Familia de SO',
@@ -344,6 +352,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:StorageSystem' => 'Sistema de Almacenamiento',
 	'Class:StorageSystem+' => 'Sistema de Almacenamiento',
+	'Class:StorageSystem/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:StorageSystem/Attribute:logicalvolume_list' => 'Volumenes Lógicos',
 	'Class:StorageSystem/Attribute:logicalvolume_list+' => 'Volumenes Lógicos',
 ));
@@ -355,6 +364,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:SANSwitch' => 'Switch de SAN',
 	'Class:SANSwitch+' => 'Switch de SAN',
+	'Class:SANSwitch/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:SANSwitch/Attribute:datacenterdevice_list' => 'Dispositivos',
 	'Class:SANSwitch/Attribute:datacenterdevice_list+' => 'Dispositivos',
 ));
@@ -366,6 +376,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:TapeLibrary' => 'Libreria de Cintas',
 	'Class:TapeLibrary+' => 'Libreria de Cintas',
+	'Class:TapeLibrary/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:TapeLibrary/Attribute:tapes_list' => 'Cintas',
 	'Class:TapeLibrary/Attribute:tapes_list+' => 'Cintas',
 ));
@@ -377,6 +388,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:NAS' => 'NAS',
 	'Class:NAS+' => 'NAS',
+	'Class:NAS/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:NAS/Attribute:nasfilesystem_list' => 'Filesystems',
 	'Class:NAS/Attribute:nasfilesystem_list+' => 'Filesystems',
 ));
@@ -388,6 +400,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:PC' => 'PC/Laptop',
 	'Class:PC+' => 'PC/Laptop',
+	'Class:PC/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:PC/Attribute:osfamily_id' => 'Familia de SO',
 	'Class:PC/Attribute:osfamily_id+' => 'Familia de SO',
 	'Class:PC/Attribute:osfamily_name' => 'Familia de SO',
@@ -415,6 +428,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Printer' => 'Impresora',
 	'Class:Printer+' => 'Impresora',
+	'Class:Printer/ComplementaryName' => '%1$s - %2$s~~',
 ));
 
 //
@@ -424,6 +438,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:PowerConnection' => 'Conexión Eléctrica',
 	'Class:PowerConnection+' => 'Conexión Eléctrica',
+	'Class:PowerConnection/ComplementaryName' => '%1$s - %2$s~~',
 ));
 
 //
@@ -433,6 +448,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:PowerSource' => 'Fuente de Poder',
 	'Class:PowerSource+' => 'Fuente de Poder',
+	'Class:PowerSource/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:PowerSource/Attribute:pdus_list' => 'PDUs',
 	'Class:PowerSource/Attribute:pdus_list+' => 'PDUs',
 ));
@@ -444,6 +460,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:PDU' => 'PDU',
 	'Class:PDU+' => 'PDU',
+	'Class:PDU/ComplementaryName' => '%1$s - %2$s - %3$s - %4$s~~',
 	'Class:PDU/Attribute:rack_id' => 'Rack',
 	'Class:PDU/Attribute:rack_id+' => 'Rack',
 	'Class:PDU/Attribute:rack_name' => 'Nombre Rack',
@@ -461,6 +478,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Peripheral' => 'Periférico',
 	'Class:Peripheral+' => 'Periférico',
+	'Class:Peripheral/ComplementaryName' => '%1$s - %2$s~~',
 ));
 
 //
@@ -470,6 +488,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Enclosure' => 'Enclosure',
 	'Class:Enclosure+' => 'Enclosure',
+	'Class:Enclosure/ComplementaryName' => '%1$s - %2$s - %3$s~~',
 	'Class:Enclosure/Attribute:rack_id' => 'Rack',
 	'Class:Enclosure/Attribute:rack_id+' => 'Rack',
 	'Class:Enclosure/Attribute:rack_name' => 'Nombre Rack',
@@ -607,6 +626,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:MiddlewareInstance' => 'Instalación de Middleware',
 	'Class:MiddlewareInstance+' => 'Instalación de Middleware',
+	'Class:MiddlewareInstance/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:MiddlewareInstance/Attribute:middleware_id' => 'Middleware',
 	'Class:MiddlewareInstance/Attribute:middleware_id+' => 'Middleware',
 	'Class:MiddlewareInstance/Attribute:middleware_name' => 'Middleware',
@@ -620,6 +640,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:DatabaseSchema' => 'Esquema de Base de Datos',
 	'Class:DatabaseSchema+' => 'Esquema de Base de Datos',
+	'Class:DatabaseSchema/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:DatabaseSchema/Attribute:dbserver_id' => 'Servidor de Base de Datos',
 	'Class:DatabaseSchema/Attribute:dbserver_id+' => 'Servidor de Base de Datos',
 	'Class:DatabaseSchema/Attribute:dbserver_name' => 'Servidor de Base de Datos',
@@ -633,6 +654,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:WebApplication' => 'Aplicación Web',
 	'Class:WebApplication+' => 'Aplicación Web',
+	'Class:WebApplication/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:WebApplication/Attribute:webserver_id' => 'Servidor Web',
 	'Class:WebApplication/Attribute:webserver_id+' => 'Servidor Web',
 	'Class:WebApplication/Attribute:webserver_name' => 'Servidor Web',
@@ -713,6 +735,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:VirtualMachine' => 'Máquina Virtual',
 	'Class:VirtualMachine+' => 'Máquina Virtual',
+	'Class:VirtualMachine/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:VirtualMachine/Attribute:virtualhost_id' => 'Host Virtual',
 	'Class:VirtualMachine/Attribute:virtualhost_id+' => 'Host Virtual',
 	'Class:VirtualMachine/Attribute:virtualhost_name' => 'Host Virtual',
@@ -773,6 +796,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkServerToVolume' => 'Relación Servidor y Volumen',
 	'Class:lnkServerToVolume+' => 'Relación Servidor y Volumen',
+	'Class:lnkServerToVolume/Name' => '%1$s / %2$s~~',
 	'Class:lnkServerToVolume/Attribute:volume_id' => 'Volumen',
 	'Class:lnkServerToVolume/Attribute:volume_id+' => 'Volumen',
 	'Class:lnkServerToVolume/Attribute:volume_name' => 'Volume',
@@ -792,6 +816,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkVirtualDeviceToVolume' => 'Relación Dispositivo Virtual y Volumen',
 	'Class:lnkVirtualDeviceToVolume+' => 'Relación Dispositivo Virtual y Volumen',
+	'Class:lnkVirtualDeviceToVolume/Name' => '%1$s / %2$s~~',
 	'Class:lnkVirtualDeviceToVolume/Attribute:volume_id' => 'Volumen',
 	'Class:lnkVirtualDeviceToVolume/Attribute:volume_id+' => 'Volumen',
 	'Class:lnkVirtualDeviceToVolume/Attribute:volume_name' => 'Volumen',
@@ -811,6 +836,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkSanToDatacenterDevice' => 'Relación SAN y Dispositivo del Centro de Datos',
 	'Class:lnkSanToDatacenterDevice+' => 'Relación SAN y Dispositivo del Centro de Datos',
+	'Class:lnkSanToDatacenterDevice/Name' => '%1$s / %2$s~~',
 	'Class:lnkSanToDatacenterDevice/Attribute:san_id' => 'Switch de SAN',
 	'Class:lnkSanToDatacenterDevice/Attribute:san_id+' => 'Switch de SAN',
 	'Class:lnkSanToDatacenterDevice/Attribute:san_name' => 'Switch de SAN',
@@ -872,6 +898,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Software' => 'Software',
 	'Class:Software+' => 'Software',
+	'Class:Software/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Software/Attribute:name' => 'Nombre',
 	'Class:Software/Attribute:name+' => 'Nombre del Software',
 	'Class:Software/Attribute:vendor' => 'Proveedor',
@@ -989,6 +1016,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:OSLicence' => 'Licencia de SO',
 	'Class:OSLicence+' => 'Licencia de SO',
+	'Class:OSLicence/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:OSLicence/Attribute:osversion_id' => 'Versión de SO',
 	'Class:OSLicence/Attribute:osversion_id+' => 'Versión de SO',
 	'Class:OSLicence/Attribute:osversion_name' => 'Versión de SO',
@@ -1006,6 +1034,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:SoftwareLicence' => 'Licencia de Software',
 	'Class:SoftwareLicence+' => 'Licencia de Software',
+	'Class:SoftwareLicence/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:SoftwareLicence/Attribute:software_id' => 'Software',
 	'Class:SoftwareLicence/Attribute:software_id+' => 'Software',
 	'Class:SoftwareLicence/Attribute:software_name' => 'Software',
@@ -1021,6 +1050,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkDocumentToLicence' => 'Relación Documento y Licencia',
 	'Class:lnkDocumentToLicence+' => 'Relación Documento y Licencia',
+	'Class:lnkDocumentToLicence/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToLicence/Attribute:licence_id' => 'Licencia',
 	'Class:lnkDocumentToLicence/Attribute:licence_id+' => 'Licencia',
 	'Class:lnkDocumentToLicence/Attribute:licence_name' => 'Licencia',
@@ -1073,6 +1103,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Model' => 'Modelo',
 	'Class:Model+' => 'Modelo',
+	'Class:Model/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Model/Attribute:brand_id' => 'Marca',
 	'Class:Model/Attribute:brand_id+' => 'Marca',
 	'Class:Model/Attribute:brand_name' => 'Marca',
@@ -1152,6 +1183,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkDocumentToPatch' => 'Relación Documentos y Parche',
 	'Class:lnkDocumentToPatch+' => 'Relación Documentos y Parche',
+	'Class:lnkDocumentToPatch/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToPatch/Attribute:patch_id' => 'Parche',
 	'Class:lnkDocumentToPatch/Attribute:patch_id+' => 'Parche',
 	'Class:lnkDocumentToPatch/Attribute:patch_name' => 'Parche',
@@ -1169,6 +1201,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkSoftwareInstanceToSoftwarePatch' => 'Relación Instalación de Software y Parche de Software',
 	'Class:lnkSoftwareInstanceToSoftwarePatch+' => 'Relación Instalación de Software y Parche de Software',
+	'Class:lnkSoftwareInstanceToSoftwarePatch/Name' => '%1$s / %2$s~~',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id' => 'Parche de Software',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id+' => 'Parche de Software',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_name' => 'Parche de Software',
@@ -1186,6 +1219,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkFunctionalCIToOSPatch' => 'Relación EC Funcional y Parche de SO',
 	'Class:lnkFunctionalCIToOSPatch+' => 'Relación EC Funcional y Parche de SO',
+	'Class:lnkFunctionalCIToOSPatch/Name' => '%1$s / %2$s~~',
 	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id' => 'Parche de SO',
 	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id+' => 'Parche de SO',
 	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_name' => 'Parche de SO',
@@ -1203,6 +1237,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkDocumentToSoftware' => 'Relación Documento y Software',
 	'Class:lnkDocumentToSoftware+' => 'Relación Documento y Software',
+	'Class:lnkDocumentToSoftware/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToSoftware/Attribute:software_id' => 'Software',
 	'Class:lnkDocumentToSoftware/Attribute:software_id+' => 'Software',
 	'Class:lnkDocumentToSoftware/Attribute:software_name' => 'Software',
@@ -1220,6 +1255,8 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Subnet' => 'SubRed',
 	'Class:Subnet+' => 'SubRed',
+	'Class:Subnet/Name' => '%1$s/%2$s~~',
+	'Class:Subnet/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Subnet/Attribute:description' => 'Descripción',
 	'Class:Subnet/Attribute:description+' => '',
 	'Class:Subnet/Attribute:subnet_name' => 'Nombre de Subred',
@@ -1264,6 +1301,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkSubnetToVLAN' => 'Relación Subred / vLAN',
 	'Class:lnkSubnetToVLAN+' => 'Relación Subred / vLAN',
+	'Class:lnkSubnetToVLAN/Name' => '%1$s / %2$s~~',
 	'Class:lnkSubnetToVLAN/Attribute:subnet_id' => 'Subred',
 	'Class:lnkSubnetToVLAN/Attribute:subnet_id+' => 'Subred',
 	'Class:lnkSubnetToVLAN/Attribute:subnet_ip' => 'IP de Subred',
@@ -1298,8 +1336,6 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:IPInterface+' => 'Interfaz IP',
 	'Class:IPInterface/Attribute:ipaddress' => 'Dirección IP',
 	'Class:IPInterface/Attribute:ipaddress+' => 'Dirección IP',
-
-
 	'Class:IPInterface/Attribute:macaddress' => 'Dirección MAC',
 	'Class:IPInterface/Attribute:macaddress+' => 'Dirección MAC',
 	'Class:IPInterface/Attribute:comment' => 'Comentario',
@@ -1319,6 +1355,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:PhysicalInterface' => 'Interfaz Física',
 	'Class:PhysicalInterface+' => 'Interfaz Física',
+	'Class:PhysicalInterface/Name' => '%2$s %1$s~~',
 	'Class:PhysicalInterface/Attribute:connectableci_id' => 'Dispositivo',
 	'Class:PhysicalInterface/Attribute:connectableci_id+' => 'Dispositivo',
 	'Class:PhysicalInterface/Attribute:connectableci_name' => 'Dispositivo',
@@ -1334,6 +1371,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkPhysicalInterfaceToVLAN' => 'Relación Interfaz Física / VLAN',
 	'Class:lnkPhysicalInterfaceToVLAN+' => 'Relación Interfaz Física / VLAN',
+	'Class:lnkPhysicalInterfaceToVLAN/Name' => '%1$s %2$s / %3$s~~',
 	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_id' => 'Interfaz Física',
 	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_id+' => 'Interfaz Física',
 	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_name' => 'Nombre Interfaz Física',
@@ -1388,6 +1426,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkConnectableCIToNetworkDevice' => 'Relación EC Conectable y Dispositivo de Red',
 	'Class:lnkConnectableCIToNetworkDevice+' => 'Relación EC Conectable y Dispositivo de Red',
+	'Class:lnkConnectableCIToNetworkDevice/Name' => '%1$s / %2$s~~',
 	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id' => 'Dispositivo de Red',
 	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id+' => 'Dispositivo de Red',
 	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_name' => 'Dispositivo de Red',
@@ -1415,6 +1454,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkApplicationSolutionToFunctionalCI' => 'Relación Solución Aplicativa y EC Funcional',
 	'Class:lnkApplicationSolutionToFunctionalCI+' => 'Relación Solución Aplicativa y EC Funcional',
+	'Class:lnkApplicationSolutionToFunctionalCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_id' => 'Solución Aplicativa',
 	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_id+' => 'Solución Aplicativa',
 	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_name' => 'Solución Aplicativa',
@@ -1432,6 +1472,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkApplicationSolutionToBusinessProcess' => 'Relación Solución Aplicativa y Proceso de Negocio',
 	'Class:lnkApplicationSolutionToBusinessProcess+' => 'Relación Solución Aplicativa y Proceso de Negocio',
+	'Class:lnkApplicationSolutionToBusinessProcess/Name' => '%1$s / %2$s~~',
 	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_id' => 'Proceso de Negocio',
 	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_id+' => 'Proceso de Negocio',
 	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_name' => 'Proceso de Negocio',
@@ -1449,6 +1490,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Group' => 'Grupo',
 	'Class:Group+' => 'Grupo',
+	'Class:Group/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Group/Attribute:name' => 'Nombre',
 	'Class:Group/Attribute:name+' => 'Nombre del Grupo',
 	'Class:Group/Attribute:status' => 'Estatus',
@@ -1468,7 +1510,6 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Group/Attribute:type' => 'Tipo',
 	'Class:Group/Attribute:type+' => 'Tipo',
 	'Class:Group/Attribute:parent_id' => 'Grupo Padre',
-
 	'Class:Group/Attribute:parent_id+' => 'Grupo Padre',
 	'Class:Group/Attribute:parent_name' => 'Grupo Padre',
 	'Class:Group/Attribute:parent_name+' => 'Grupo Padre',
@@ -1485,6 +1526,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkGroupToCI' => 'Relación Grupo y EC',
 	'Class:lnkGroupToCI+' => 'Relación Grupo y EC',
+	'Class:lnkGroupToCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkGroupToCI/Attribute:group_id' => 'Grupo',
 	'Class:lnkGroupToCI/Attribute:group_id+' => 'Grupo',
 	'Class:lnkGroupToCI/Attribute:group_name' => 'Grupo',
@@ -1506,6 +1548,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Server:otherinfo' => 'Otra Información',
 	'Server:power' => 'Fuente de Poder',
 	'Class:Subnet/Tab:IPUsage' => 'Uso de IP',
+	'Class:Subnet/Tab:IPUsage+' => 'Which IP within this Subnet are used or not~~',
 	'Class:Subnet/Tab:IPUsage-explain' => 'Interfases con IP en el rango: <em>%1$s</em> a <em>%2$s</em>',
 	'Class:Subnet/Tab:FreeIPs' => 'IPs Libres',
 	'Class:Subnet/Tab:FreeIPs-count' => 'IPs Libres: %1$s',
@@ -1521,6 +1564,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkDocumentToFunctionalCI' => 'Relación Documento y EC Funcional',
 	'Class:lnkDocumentToFunctionalCI+' => 'Relación Documento y EC Funcional',
+	'Class:lnkDocumentToFunctionalCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id' => 'EC Funcional',
 	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id+' => 'EC Funcional',
 	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_name' => 'EC Funcional',
diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/fr.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/fr.dict.itop-config-mgmt.php
index f398c2c7cb..5b64885111 100644
--- a/datamodels/2.x/itop-config-mgmt/dictionaries/fr.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/fr.dict.itop-config-mgmt.php
@@ -32,7 +32,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Relation:depends on/Description' => 'Eléments dont dépend',
 	'Relation:depends on/DownStream' => 'Dépend de...',
 	'Relation:depends on/UpStream' => 'Impacte...',
-	'Relation:impacts/LoadData'       => 'Charger les données',
+	'Relation:impacts/LoadData' => 'Charger les données',
 	'Relation:impacts/NoFilteredData' => 'Veuillez sélectionner des objets dans l\'onglet Graph',
 ));
 
@@ -81,6 +81,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:lnkContactToFunctionalCI' => 'Lien Contact / CI Fonctionel',
 	'Class:lnkContactToFunctionalCI+' => '',
+	'Class:lnkContactToFunctionalCI/Name' => '%1$s / %2$s',
 	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'CI',
 	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
 	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Nom CI',
@@ -137,6 +138,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:PhysicalDevice' => 'Matériel physique',
 	'Class:PhysicalDevice+' => '',
+	'Class:PhysicalDevice/ComplementaryName' => '%1$s - %2$s',
 	'Class:PhysicalDevice/Attribute:serialnumber' => 'Numéro de série',
 	'Class:PhysicalDevice/Attribute:serialnumber+' => '',
 	'Class:PhysicalDevice/Attribute:location_id' => 'Site',
@@ -176,6 +178,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:Rack' => 'Rack',
 	'Class:Rack+' => '',
+	'Class:Rack/ComplementaryName' => '%1$s - %2$s',
 	'Class:Rack/Attribute:nb_u' => 'NB Unité',
 	'Class:Rack/Attribute:nb_u+' => '',
 	'Class:Rack/Attribute:device_list' => 'Matériels',
@@ -242,6 +245,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:ConnectableCI' => 'CI connecté',
 	'Class:ConnectableCI+' => '',
+	'Class:ConnectableCI/ComplementaryName' => '%1$s - %2$s',
 	'Class:ConnectableCI/Attribute:networkdevice_list' => 'Equipements réseaux',
 	'Class:ConnectableCI/Attribute:networkdevice_list+' => 'Tous les équipements réseaux connectés à ce matériel',
 	'Class:ConnectableCI/Attribute:physicalinterface_list' => 'Interfaces réseaux',
@@ -255,6 +259,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:DatacenterDevice' => 'Matériel Datacenter',
 	'Class:DatacenterDevice+' => '',
+	'Class:DatacenterDevice/ComplementaryName' => '%1$s - %2$s',
 	'Class:DatacenterDevice/Attribute:rack_id' => 'Rack',
 	'Class:DatacenterDevice/Attribute:rack_id+' => '',
 	'Class:DatacenterDevice/Attribute:rack_name' => 'Nom Rack',
@@ -293,6 +298,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:NetworkDevice' => 'Equipement réseau',
 	'Class:NetworkDevice+' => '',
+	'Class:NetworkDevice/ComplementaryName' => '%1$s - %2$s',
 	'Class:NetworkDevice/Attribute:networkdevicetype_id' => 'Type',
 	'Class:NetworkDevice/Attribute:networkdevicetype_id+' => '',
 	'Class:NetworkDevice/Attribute:networkdevicetype_name' => 'Nom Type',
@@ -314,6 +320,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:Server' => 'Serveur',
 	'Class:Server+' => '',
+	'Class:Server/ComplementaryName' => '%1$s - %2$s',
 	'Class:Server/Attribute:osfamily_id' => 'Famille OS',
 	'Class:Server/Attribute:osfamily_id+' => '',
 	'Class:Server/Attribute:osfamily_name' => 'Nom Famille OS',
@@ -341,6 +348,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:StorageSystem' => 'Système de stockage',
 	'Class:StorageSystem+' => '',
+	'Class:StorageSystem/ComplementaryName' => '%1$s - %2$s',
 	'Class:StorageSystem/Attribute:logicalvolume_list' => 'Volumes logiques',
 	'Class:StorageSystem/Attribute:logicalvolume_list+' => 'Tous les volumes logiques dans ce système de stockage',
 ));
@@ -352,6 +360,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:SANSwitch' => 'Switch SAN',
 	'Class:SANSwitch+' => '',
+	'Class:SANSwitch/ComplementaryName' => '%1$s - %2$s',
 	'Class:SANSwitch/Attribute:datacenterdevice_list' => 'Matériels connectés',
 	'Class:SANSwitch/Attribute:datacenterdevice_list+' => 'Tous les matériels connectés à ce switch SAN',
 ));
@@ -363,6 +372,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:TapeLibrary' => 'Bandothèque',
 	'Class:TapeLibrary+' => '',
+	'Class:TapeLibrary/ComplementaryName' => '%1$s - %2$s',
 	'Class:TapeLibrary/Attribute:tapes_list' => 'Bandes',
 	'Class:TapeLibrary/Attribute:tapes_list+' => 'Toutes les bandes dans cette bandothèque',
 ));
@@ -374,6 +384,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:NAS' => 'NAS',
 	'Class:NAS+' => '',
+	'Class:NAS/ComplementaryName' => '%1$s - %2$s',
 	'Class:NAS/Attribute:nasfilesystem_list' => 'Systèmes de fichier NAS',
 	'Class:NAS/Attribute:nasfilesystem_list+' => 'Tous les systèmes de fichier dans ce NAS',
 ));
@@ -385,6 +396,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:PC' => 'PC',
 	'Class:PC+' => '',
+	'Class:PC/ComplementaryName' => '%1$s - %2$s',
 	'Class:PC/Attribute:osfamily_id' => 'Famille OS',
 	'Class:PC/Attribute:osfamily_id+' => '',
 	'Class:PC/Attribute:osfamily_name' => 'Nom Famille OS',
@@ -412,6 +424,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:Printer' => 'Imprimante',
 	'Class:Printer+' => '',
+	'Class:Printer/ComplementaryName' => '%1$s - %2$s',
 ));
 
 //
@@ -421,6 +434,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:PowerConnection' => 'Connexion électrique',
 	'Class:PowerConnection+' => '',
+	'Class:PowerConnection/ComplementaryName' => '%1$s - %2$s',
 ));
 
 //
@@ -430,6 +444,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:PowerSource' => 'Arrivée électrique',
 	'Class:PowerSource+' => '',
+	'Class:PowerSource/ComplementaryName' => '%1$s - %2$s',
 	'Class:PowerSource/Attribute:pdus_list' => 'PDUs',
 	'Class:PowerSource/Attribute:pdus_list+' => 'Toutes les PDUs de cette arrivée électrique',
 ));
@@ -441,6 +456,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:PDU' => 'PDU',
 	'Class:PDU+' => '',
+	'Class:PDU/ComplementaryName' => '%1$s - %2$s - %3$s - %4$s',
 	'Class:PDU/Attribute:rack_id' => 'Rack',
 	'Class:PDU/Attribute:rack_id+' => '',
 	'Class:PDU/Attribute:rack_name' => 'Nom rack',
@@ -458,6 +474,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:Peripheral' => 'Périphérique',
 	'Class:Peripheral+' => '',
+	'Class:Peripheral/ComplementaryName' => '%1$s - %2$s',
 ));
 
 //
@@ -467,6 +484,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:Enclosure' => 'Chassis',
 	'Class:Enclosure+' => '',
+	'Class:Enclosure/ComplementaryName' => '%1$s - %2$s - %3$s',
 	'Class:Enclosure/Attribute:rack_id' => 'Rack',
 	'Class:Enclosure/Attribute:rack_id+' => '',
 	'Class:Enclosure/Attribute:rack_name' => 'Nom rack',
@@ -585,7 +603,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:PCSoftware' => 'Logiciel PC',
-	'Class:PCSoftware+' => '~~',
+	'Class:PCSoftware+' => 'Application logicielle sur PC',
 ));
 
 //
@@ -604,6 +622,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:MiddlewareInstance' => 'Instance Middleware',
 	'Class:MiddlewareInstance+' => '',
+	'Class:MiddlewareInstance/ComplementaryName' => '%1$s - %2$s',
 	'Class:MiddlewareInstance/Attribute:middleware_id' => 'Middleware',
 	'Class:MiddlewareInstance/Attribute:middleware_id+' => '',
 	'Class:MiddlewareInstance/Attribute:middleware_name' => 'Nom Middleware',
@@ -617,6 +636,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:DatabaseSchema' => 'Instance de base de données',
 	'Class:DatabaseSchema+' => '',
+	'Class:DatabaseSchema/ComplementaryName' => '%1$s - %2$s',
 	'Class:DatabaseSchema/Attribute:dbserver_id' => 'Serveur de base de données',
 	'Class:DatabaseSchema/Attribute:dbserver_id+' => '',
 	'Class:DatabaseSchema/Attribute:dbserver_name' => 'Nom Serveur de base de données',
@@ -630,6 +650,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:WebApplication' => 'Application Web',
 	'Class:WebApplication+' => '',
+	'Class:WebApplication/ComplementaryName' => '%1$s - %2$s',
 	'Class:WebApplication/Attribute:webserver_id' => 'Serveur Web',
 	'Class:WebApplication/Attribute:webserver_id+' => '',
 	'Class:WebApplication/Attribute:webserver_name' => 'Nom Serveur Web',
@@ -710,6 +731,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:VirtualMachine' => 'Machine virtuelle',
 	'Class:VirtualMachine+' => '',
+	'Class:VirtualMachine/ComplementaryName' => '%1$s - %2$s',
 	'Class:VirtualMachine/Attribute:virtualhost_id' => 'vCluster / Hyperviseur',
 	'Class:VirtualMachine/Attribute:virtualhost_id+' => '',
 	'Class:VirtualMachine/Attribute:virtualhost_name' => 'Nom Host',
@@ -770,6 +792,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:lnkServerToVolume' => 'Lien Serveur / Volume',
 	'Class:lnkServerToVolume+' => '',
+	'Class:lnkServerToVolume/Name' => '%1$s / %2$s',
 	'Class:lnkServerToVolume/Attribute:volume_id' => 'Volume logique',
 	'Class:lnkServerToVolume/Attribute:volume_id+' => '',
 	'Class:lnkServerToVolume/Attribute:volume_name' => 'Nom Volume logique',
@@ -789,6 +812,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:lnkVirtualDeviceToVolume' => 'Lien Device virtuel / Volume',
 	'Class:lnkVirtualDeviceToVolume+' => '',
+	'Class:lnkVirtualDeviceToVolume/Name' => '%1$s / %2$s',
 	'Class:lnkVirtualDeviceToVolume/Attribute:volume_id' => 'Volume logique',
 	'Class:lnkVirtualDeviceToVolume/Attribute:volume_id+' => '',
 	'Class:lnkVirtualDeviceToVolume/Attribute:volume_name' => 'Nom Volume logique',
@@ -808,6 +832,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:lnkSanToDatacenterDevice' => 'Lien San / Device',
 	'Class:lnkSanToDatacenterDevice+' => '',
+	'Class:lnkSanToDatacenterDevice/Name' => '%1$s / %2$s',
 	'Class:lnkSanToDatacenterDevice/Attribute:san_id' => 'Switch SAN',
 	'Class:lnkSanToDatacenterDevice/Attribute:san_id+' => '',
 	'Class:lnkSanToDatacenterDevice/Attribute:san_name' => 'Nom Switch SAN',
@@ -869,6 +894,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:Software' => 'Logiciel',
 	'Class:Software+' => '',
+	'Class:Software/ComplementaryName' => '%1$s - %2$s',
 	'Class:Software/Attribute:name' => 'Nom',
 	'Class:Software/Attribute:name+' => '',
 	'Class:Software/Attribute:vendor' => 'Vendeur',
@@ -986,6 +1012,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:OSLicence' => 'Licence OS',
 	'Class:OSLicence+' => '',
+	'Class:OSLicence/ComplementaryName' => '%1$s - %2$s',
 	'Class:OSLicence/Attribute:osversion_id' => 'Version OS',
 	'Class:OSLicence/Attribute:osversion_id+' => '',
 	'Class:OSLicence/Attribute:osversion_name' => 'Nom Version OS',
@@ -1003,6 +1030,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:SoftwareLicence' => 'Licence Logiciel',
 	'Class:SoftwareLicence+' => '',
+	'Class:SoftwareLicence/ComplementaryName' => '%1$s - %2$s',
 	'Class:SoftwareLicence/Attribute:software_id' => 'Logiciel',
 	'Class:SoftwareLicence/Attribute:software_id+' => '',
 	'Class:SoftwareLicence/Attribute:software_name' => 'Nom Logiciel',
@@ -1018,6 +1046,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:lnkDocumentToLicence' => 'Lien Document / Licence',
 	'Class:lnkDocumentToLicence+' => '',
+	'Class:lnkDocumentToLicence/Name' => '%1$s / %2$s',
 	'Class:lnkDocumentToLicence/Attribute:licence_id' => 'Licence',
 	'Class:lnkDocumentToLicence/Attribute:licence_id+' => '',
 	'Class:lnkDocumentToLicence/Attribute:licence_name' => 'Nom Licence',
@@ -1070,6 +1099,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:Model' => 'Modèle',
 	'Class:Model+' => '',
+	'Class:Model/ComplementaryName' => '%1$s - %2$s',
 	'Class:Model/Attribute:brand_id' => 'Marque',
 	'Class:Model/Attribute:brand_id+' => '',
 	'Class:Model/Attribute:brand_name' => 'Nom marque',
@@ -1149,6 +1179,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:lnkDocumentToPatch' => 'Lien Document / Patch',
 	'Class:lnkDocumentToPatch+' => '',
+	'Class:lnkDocumentToPatch/Name' => '%1$s / %2$s',
 	'Class:lnkDocumentToPatch/Attribute:patch_id' => 'Patch',
 	'Class:lnkDocumentToPatch/Attribute:patch_id+' => '',
 	'Class:lnkDocumentToPatch/Attribute:patch_name' => 'Nom patch',
@@ -1166,6 +1197,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:lnkSoftwareInstanceToSoftwarePatch' => 'Lien Instance logiciel / Patch logiciel',
 	'Class:lnkSoftwareInstanceToSoftwarePatch+' => '',
+	'Class:lnkSoftwareInstanceToSoftwarePatch/Name' => '%1$s / %2$s',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id' => 'Patch logiciel',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id+' => '',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_name' => 'Nom patch logiciel',
@@ -1183,6 +1215,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:lnkFunctionalCIToOSPatch' => 'Lien CI Fonctionel / Patch OS',
 	'Class:lnkFunctionalCIToOSPatch+' => '',
+	'Class:lnkFunctionalCIToOSPatch/Name' => '%1$s / %2$s',
 	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id' => 'Patch OS',
 	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id+' => '',
 	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_name' => 'Nom Patch OS',
@@ -1200,6 +1233,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:lnkDocumentToSoftware' => 'Lien Document / Logiciel',
 	'Class:lnkDocumentToSoftware+' => '',
+	'Class:lnkDocumentToSoftware/Name' => '%1$s / %2$s',
 	'Class:lnkDocumentToSoftware/Attribute:software_id' => 'Logiciel',
 	'Class:lnkDocumentToSoftware/Attribute:software_id+' => '',
 	'Class:lnkDocumentToSoftware/Attribute:software_name' => 'Nom logiciel',
@@ -1217,10 +1251,12 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:Subnet' => 'Subnet',
 	'Class:Subnet+' => '',
+	'Class:Subnet/Name' => '%1$s/%2$s',
+	'Class:Subnet/ComplementaryName' => '%1$s - %2$s',
 	'Class:Subnet/Attribute:description' => 'Description',
 	'Class:Subnet/Attribute:description+' => '',
 	'Class:Subnet/Attribute:subnet_name' => 'Nom de subnet',
-	'Class:Subnet/Attribute:subnet_name+' => '~~',
+	'Class:Subnet/Attribute:subnet_name+' => '',
 	'Class:Subnet/Attribute:org_id' => 'Organisation',
 	'Class:Subnet/Attribute:org_id+' => '',
 	'Class:Subnet/Attribute:org_name' => 'Nom organisation',
@@ -1261,6 +1297,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:lnkSubnetToVLAN' => 'Lien Subnet / VLAN',
 	'Class:lnkSubnetToVLAN+' => '',
+	'Class:lnkSubnetToVLAN/Name' => '%1$s / %2$s',
 	'Class:lnkSubnetToVLAN/Attribute:subnet_id' => 'Subnet',
 	'Class:lnkSubnetToVLAN/Attribute:subnet_id+' => '',
 	'Class:lnkSubnetToVLAN/Attribute:subnet_ip' => 'Subnet IP',
@@ -1295,8 +1332,6 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:IPInterface+' => '',
 	'Class:IPInterface/Attribute:ipaddress' => 'Adresse IP',
 	'Class:IPInterface/Attribute:ipaddress+' => '',
-
-
 	'Class:IPInterface/Attribute:macaddress' => 'Adresse MAC',
 	'Class:IPInterface/Attribute:macaddress+' => '',
 	'Class:IPInterface/Attribute:comment' => 'Commentaire',
@@ -1316,6 +1351,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:PhysicalInterface' => 'Interface physique',
 	'Class:PhysicalInterface+' => '',
+	'Class:PhysicalInterface/Name' => '%2$s %1$s',
 	'Class:PhysicalInterface/Attribute:connectableci_id' => 'Matériel',
 	'Class:PhysicalInterface/Attribute:connectableci_id+' => '',
 	'Class:PhysicalInterface/Attribute:connectableci_name' => 'Nom matériel',
@@ -1331,6 +1367,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:lnkPhysicalInterfaceToVLAN' => 'Lien Interface réseau / VLAN',
 	'Class:lnkPhysicalInterfaceToVLAN+' => '',
+	'Class:lnkPhysicalInterfaceToVLAN/Name' => '%1$s %2$s / %3$s',
 	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_id' => 'Interface réseau',
 	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_id+' => '',
 	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_name' => 'Nom interface réseau',
@@ -1385,6 +1422,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:lnkConnectableCIToNetworkDevice' => 'Lien Device / Equipement réseau',
 	'Class:lnkConnectableCIToNetworkDevice+' => '',
+	'Class:lnkConnectableCIToNetworkDevice/Name' => '%1$s / %2$s',
 	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id' => 'Equipement réseau',
 	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id+' => '',
 	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_name' => 'Nom Equipement réseau',
@@ -1412,6 +1450,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:lnkApplicationSolutionToFunctionalCI' => 'Lien Solution Applicative / CI Fonctionel',
 	'Class:lnkApplicationSolutionToFunctionalCI+' => '',
+	'Class:lnkApplicationSolutionToFunctionalCI/Name' => '%1$s / %2$s',
 	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_id' => 'Solution applicative',
 	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_id+' => '',
 	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_name' => 'Nom Solution applicative',
@@ -1429,6 +1468,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:lnkApplicationSolutionToBusinessProcess' => 'Lien Solution Applicative / Processus métier',
 	'Class:lnkApplicationSolutionToBusinessProcess+' => '',
+	'Class:lnkApplicationSolutionToBusinessProcess/Name' => '%1$s / %2$s',
 	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_id' => 'Processus métier',
 	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_id+' => '',
 	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_name' => 'Nom Processus métier',
@@ -1446,6 +1486,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:Group' => 'Groupe',
 	'Class:Group+' => '',
+	'Class:Group/ComplementaryName' => '%1$s - %2$s',
 	'Class:Group/Attribute:name' => 'Nom',
 	'Class:Group/Attribute:name+' => '',
 	'Class:Group/Attribute:status' => 'Etat',
@@ -1465,7 +1506,6 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:Group/Attribute:type' => 'Type',
 	'Class:Group/Attribute:type+' => '',
 	'Class:Group/Attribute:parent_id' => 'Groupe parent',
-
 	'Class:Group/Attribute:parent_id+' => '',
 	'Class:Group/Attribute:parent_name' => 'Nom groupe parent',
 	'Class:Group/Attribute:parent_name+' => '',
@@ -1482,6 +1522,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:lnkGroupToCI' => 'Lien Groupe / CI',
 	'Class:lnkGroupToCI+' => '',
+	'Class:lnkGroupToCI/Name' => '%1$s / %2$s',
 	'Class:lnkGroupToCI/Attribute:group_id' => 'Groupe',
 	'Class:lnkGroupToCI/Attribute:group_id+' => '',
 	'Class:lnkGroupToCI/Attribute:group_name' => 'Nom du groupe',
@@ -1519,6 +1560,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:lnkDocumentToFunctionalCI' => 'Lien Document / CI Fonctionel',
 	'Class:lnkDocumentToFunctionalCI+' => '',
+	'Class:lnkDocumentToFunctionalCI/Name' => '%1$s / %2$s',
 	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id' => 'CI',
 	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id+' => '',
 	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_name' => 'Nom CI',
@@ -1579,11 +1621,9 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Menu:Software' => 'Catalogue des logiciels de références',
 	'Menu:Software+' => 'Catalogue des logiciels de références',
 ));
-
 //
 // n:n relations custom labels : nom de class féminin
 //
-
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:BusinessProcess/Attribute:applicationsolutions_list/UI:Links:Add:Button+' => 'Ajouter une %4$s',
 	'Class:BusinessProcess/Attribute:applicationsolutions_list/UI:Links:Remove:Modal:Title' => 'Retirer une %4$s',
@@ -1600,9 +1640,8 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:VLAN/Attribute:physicalinterfaces_list/UI:Links:Add:Button+' => 'Ajouter une %4$s',
 	'Class:VLAN/Attribute:physicalinterfaces_list/UI:Links:Remove:Modal:Title' => 'Retirer une %4$s',
 	'Class:VLAN/Attribute:physicalinterfaces_list/UI:Links:Add:Modal:Title' => 'Ajouter une %4$s à %2$s',
-	'Class:VLAN/Attribute:physicalinterfaces_list/UI:Links:Remove:Button+' => 'Retirer cette %4$s',
+	'Class:VLAN/Attribute:physicalinterfaces_list/UI:Links:Remove:Button+' => 'Retirer cette %4$s'
 ));
-
 // 1:n relations custom labels for tooltip and pop-up title
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:Brand/Attribute:physicaldevices_list/UI:Links:Create:Button+' => 'Créer un %4$s',
@@ -1760,8 +1799,6 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:WebServer/Attribute:webapp_list/UI:Links:Remove:Button+' => 'Retirer cette %4$s',
 	'Class:WebServer/Attribute:webapp_list/UI:Links:Remove:Modal:Title' => 'Retirer cette %4$s de son %1$s',
 	'Class:WebServer/Attribute:webapp_list/UI:Links:Delete:Button+' => 'Supprimer cette %4$s',
-	'Class:WebServer/Attribute:webapp_list/UI:Links:Delete:Modal:Title' => 'Supprimer une %4$s',
+	'Class:WebServer/Attribute:webapp_list/UI:Links:Delete:Modal:Title' => 'Supprimer une %4$s'
 ));
-
-
 ?>
diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/hu.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/hu.dict.itop-config-mgmt.php
index cf42c76779..0fc49989ef 100644
--- a/datamodels/2.x/itop-config-mgmt/dictionaries/hu.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/hu.dict.itop-config-mgmt.php
@@ -20,17 +20,17 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Relation:impacts/Description' => 'Konfigurációs elem működését befolyásolják',
-    'Relation:impacts/DownStream' => 'Hatás',
-    'Relation:impacts/DownStream+' => 'Konfigurációs elem működését befolyásolják',
-    'Relation:impacts/UpStream' => 'Függőségek',
-    'Relation:impacts/UpStream+' => 'Konfigurációs elemtől függnek',
-    // Legacy entries
-    'Relation:depends on/Description' => 'Konfigurációs elemtől függnek',
-    'Relation:depends on/DownStream' => 'Függőségek',
-    'Relation:depends on/UpStream' => 'Hatások',
-    'Relation:impacts/LoadData'       => 'Adat betöltés',
-    'Relation:impacts/NoFilteredData' => 'kérjük, válassza ki az objektumokat a grafikus nézetben',
+	'Relation:impacts/Description' => 'Konfigurációs elem működését befolyásolják',
+	'Relation:impacts/DownStream' => 'Hatás',
+	'Relation:impacts/DownStream+' => 'Konfigurációs elem működését befolyásolják',
+	'Relation:impacts/UpStream' => 'Függőségek',
+	'Relation:impacts/UpStream+' => 'Konfigurációs elemtől függnek',
+	// Legacy entries
+	'Relation:depends on/Description' => 'Konfigurációs elemtől függnek',
+	'Relation:depends on/DownStream' => 'Függőségek',
+	'Relation:depends on/UpStream' => 'Hatások',
+	'Relation:impacts/LoadData' => 'Adat betöltés',
+	'Relation:impacts/NoFilteredData' => 'kérjük, válassza ki az objektumokat a grafikus nézetben',
 ));
 
 
@@ -76,16 +76,17 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:lnkContactToFunctionalCI' => 'Kapcsolattartó / Funkcionális CI',
-    'Class:lnkContactToFunctionalCI+' => '~~',
-    'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'Funkcionális CI',
-    'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '~~',
-    'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Funkcionális CI név',
-    'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '~~',
-    'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Kapcsolattartó',
-    'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '~~',
-    'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Kapcsolattartó név',
-    'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '~~',
+	'Class:lnkContactToFunctionalCI' => 'Kapcsolattartó / Funkcionális CI',
+	'Class:lnkContactToFunctionalCI+' => '~~',
+	'Class:lnkContactToFunctionalCI/Name' => '%1$s / %2$s~~',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'Funkcionális CI',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '~~',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Funkcionális CI név',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '~~',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Kapcsolattartó',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '~~',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Kapcsolattartó név',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '~~',
 ));
 
 //
@@ -93,37 +94,38 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:FunctionalCI' => 'Funkcionális CI',
-    'Class:FunctionalCI+' => '',
-    'Class:FunctionalCI/Attribute:name' => 'Név',
-    'Class:FunctionalCI/Attribute:name+' => '',
-    'Class:FunctionalCI/Attribute:description' => 'Leírás',
-    'Class:FunctionalCI/Attribute:description+' => '~~',
-    'Class:FunctionalCI/Attribute:org_id' => 'Tulajdonos szevezeti egység',
-    'Class:FunctionalCI/Attribute:org_id+' => '',
-    'Class:FunctionalCI/Attribute:organization_name' => 'Szervezeti egység név',
-    'Class:FunctionalCI/Attribute:organization_name+' => 'Általános név',
-    'Class:FunctionalCI/Attribute:business_criticity' => 'Üzlet kritikusság',
-    'Class:FunctionalCI/Attribute:business_criticity+' => '~~',
-    'Class:FunctionalCI/Attribute:business_criticity/Value:high' => 'magas',
-    'Class:FunctionalCI/Attribute:business_criticity/Value:high+' => 'high~~',
-    'Class:FunctionalCI/Attribute:business_criticity/Value:low' => 'alacsony',
-    'Class:FunctionalCI/Attribute:business_criticity/Value:low+' => 'low~~',
-    'Class:FunctionalCI/Attribute:business_criticity/Value:medium' => 'közepes',
-    'Class:FunctionalCI/Attribute:business_criticity/Value:medium+' => 'medium~~',
-    'Class:FunctionalCI/Attribute:move2production' => 'Használatba vétel dátuma',
-    'Class:FunctionalCI/Attribute:move2production+' => '~~',
-    'Class:FunctionalCI/Attribute:contacts_list' => 'Kapcsolattartók',
-    'Class:FunctionalCI/Attribute:contacts_list+' => 'Kapcsolattartók ehhez a konfigurációs elemhez',
-    'Class:FunctionalCI/Attribute:documents_list' => 'Dokumentumok',
-    'Class:FunctionalCI/Attribute:documents_list+' => 'Dokumentumok ehhez a konfigurációs elemhez',
-    'Class:FunctionalCI/Attribute:applicationsolution_list' => 'Alkalmazásmegoldások',
-    'Class:FunctionalCI/Attribute:applicationsolution_list+' => 'Alkalmazásmegoldások, melyek ettől a konfigurációs elemtől függenek',
-    'Class:FunctionalCI/Attribute:softwares_list' => 'Szoftverek',
-    'Class:FunctionalCI/Attribute:softwares_list+' => 'Szoftverek, melyek erre a konfigurációs elemre vannak telepítve',
-    'Class:FunctionalCI/Attribute:finalclass' => 'Típus',
-    'Class:FunctionalCI/Attribute:finalclass+' => '',
-    'Class:FunctionalCI/Tab:OpenedTickets' => 'Aktív hibajegyek',
+	'Class:FunctionalCI' => 'Funkcionális CI',
+	'Class:FunctionalCI+' => '',
+	'Class:FunctionalCI/Attribute:name' => 'Név',
+	'Class:FunctionalCI/Attribute:name+' => '',
+	'Class:FunctionalCI/Attribute:description' => 'Leírás',
+	'Class:FunctionalCI/Attribute:description+' => '~~',
+	'Class:FunctionalCI/Attribute:org_id' => 'Tulajdonos szevezeti egység',
+	'Class:FunctionalCI/Attribute:org_id+' => '',
+	'Class:FunctionalCI/Attribute:organization_name' => 'Szervezeti egység név',
+	'Class:FunctionalCI/Attribute:organization_name+' => 'Általános név',
+	'Class:FunctionalCI/Attribute:business_criticity' => 'Üzlet kritikusság',
+	'Class:FunctionalCI/Attribute:business_criticity+' => '~~',
+	'Class:FunctionalCI/Attribute:business_criticity/Value:high' => 'magas',
+	'Class:FunctionalCI/Attribute:business_criticity/Value:high+' => 'high~~',
+	'Class:FunctionalCI/Attribute:business_criticity/Value:low' => 'alacsony',
+	'Class:FunctionalCI/Attribute:business_criticity/Value:low+' => 'low~~',
+	'Class:FunctionalCI/Attribute:business_criticity/Value:medium' => 'közepes',
+	'Class:FunctionalCI/Attribute:business_criticity/Value:medium+' => 'medium~~',
+	'Class:FunctionalCI/Attribute:move2production' => 'Használatba vétel dátuma',
+	'Class:FunctionalCI/Attribute:move2production+' => '~~',
+	'Class:FunctionalCI/Attribute:contacts_list' => 'Kapcsolattartók',
+	'Class:FunctionalCI/Attribute:contacts_list+' => 'Kapcsolattartók ehhez a konfigurációs elemhez',
+	'Class:FunctionalCI/Attribute:documents_list' => 'Dokumentumok',
+	'Class:FunctionalCI/Attribute:documents_list+' => 'Dokumentumok ehhez a konfigurációs elemhez',
+	'Class:FunctionalCI/Attribute:applicationsolution_list' => 'Alkalmazásmegoldások',
+	'Class:FunctionalCI/Attribute:applicationsolution_list+' => 'Alkalmazásmegoldások, melyek ettől a konfigurációs elemtől függenek',
+	'Class:FunctionalCI/Attribute:softwares_list' => 'Szoftverek',
+	'Class:FunctionalCI/Attribute:softwares_list+' => 'Szoftverek, melyek erre a konfigurációs elemre vannak telepítve',
+	'Class:FunctionalCI/Attribute:finalclass' => 'Típus',
+	'Class:FunctionalCI/Attribute:finalclass+' => '',
+	'Class:FunctionalCI/Tab:OpenedTickets' => 'Aktív hibajegyek',
+	'Class:FunctionalCI/Tab:OpenedTickets+' => 'Active Tickets which are impacting this functional CI~~',
 ));
 
 //
@@ -131,38 +133,39 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:PhysicalDevice' => 'Fizikai eszköz',
-    'Class:PhysicalDevice+' => '~~',
-    'Class:PhysicalDevice/Attribute:serialnumber' => 'Sorozatszám',
-    'Class:PhysicalDevice/Attribute:serialnumber+' => '~~',
-    'Class:PhysicalDevice/Attribute:location_id' => 'Helyszín',
-    'Class:PhysicalDevice/Attribute:location_id+' => '~~',
-    'Class:PhysicalDevice/Attribute:location_name' => 'Helyszín név',
-    'Class:PhysicalDevice/Attribute:location_name+' => '~~',
-    'Class:PhysicalDevice/Attribute:status' => 'Állapot',
-    'Class:PhysicalDevice/Attribute:status+' => '~~',
-    'Class:PhysicalDevice/Attribute:status/Value:implementation' => 'Megvalósítás alatt',
-    'Class:PhysicalDevice/Attribute:status/Value:implementation+' => 'implementáció',
-    'Class:PhysicalDevice/Attribute:status/Value:obsolete' => 'Elavult',
-    'Class:PhysicalDevice/Attribute:status/Value:obsolete+' => 'obsolete~~',
-    'Class:PhysicalDevice/Attribute:status/Value:production' => 'Használatban',
-    'Class:PhysicalDevice/Attribute:status/Value:production+' => 'production~~',
-    'Class:PhysicalDevice/Attribute:status/Value:stock' => 'Készleten',
-    'Class:PhysicalDevice/Attribute:status/Value:stock+' => 'stock~~',
-    'Class:PhysicalDevice/Attribute:brand_id' => 'Gyártó',
-    'Class:PhysicalDevice/Attribute:brand_id+' => '~~',
-    'Class:PhysicalDevice/Attribute:brand_name' => 'Gyártó neve',
-    'Class:PhysicalDevice/Attribute:brand_name+' => '~~',
-    'Class:PhysicalDevice/Attribute:model_id' => 'Modell',
-    'Class:PhysicalDevice/Attribute:model_id+' => '~~',
-    'Class:PhysicalDevice/Attribute:model_name' => 'Modellnév',
-    'Class:PhysicalDevice/Attribute:model_name+' => '~~',
-    'Class:PhysicalDevice/Attribute:asset_number' => 'Leltári szám',
-    'Class:PhysicalDevice/Attribute:asset_number+' => '~~',
-    'Class:PhysicalDevice/Attribute:purchase_date' => 'Beszerzési dátum',
-    'Class:PhysicalDevice/Attribute:purchase_date+' => '~~',
-    'Class:PhysicalDevice/Attribute:end_of_warranty' => 'Garanciaidő vége',
-    'Class:PhysicalDevice/Attribute:end_of_warranty+' => '~~',
+	'Class:PhysicalDevice' => 'Fizikai eszköz',
+	'Class:PhysicalDevice+' => '~~',
+	'Class:PhysicalDevice/ComplementaryName' => '%1$s - %2$s~~',
+	'Class:PhysicalDevice/Attribute:serialnumber' => 'Sorozatszám',
+	'Class:PhysicalDevice/Attribute:serialnumber+' => '~~',
+	'Class:PhysicalDevice/Attribute:location_id' => 'Helyszín',
+	'Class:PhysicalDevice/Attribute:location_id+' => '~~',
+	'Class:PhysicalDevice/Attribute:location_name' => 'Helyszín név',
+	'Class:PhysicalDevice/Attribute:location_name+' => '~~',
+	'Class:PhysicalDevice/Attribute:status' => 'Állapot',
+	'Class:PhysicalDevice/Attribute:status+' => '~~',
+	'Class:PhysicalDevice/Attribute:status/Value:implementation' => 'Megvalósítás alatt',
+	'Class:PhysicalDevice/Attribute:status/Value:implementation+' => 'implementáció',
+	'Class:PhysicalDevice/Attribute:status/Value:obsolete' => 'Elavult',
+	'Class:PhysicalDevice/Attribute:status/Value:obsolete+' => 'obsolete~~',
+	'Class:PhysicalDevice/Attribute:status/Value:production' => 'Használatban',
+	'Class:PhysicalDevice/Attribute:status/Value:production+' => 'production~~',
+	'Class:PhysicalDevice/Attribute:status/Value:stock' => 'Készleten',
+	'Class:PhysicalDevice/Attribute:status/Value:stock+' => 'stock~~',
+	'Class:PhysicalDevice/Attribute:brand_id' => 'Gyártó',
+	'Class:PhysicalDevice/Attribute:brand_id+' => '~~',
+	'Class:PhysicalDevice/Attribute:brand_name' => 'Gyártó neve',
+	'Class:PhysicalDevice/Attribute:brand_name+' => '~~',
+	'Class:PhysicalDevice/Attribute:model_id' => 'Modell',
+	'Class:PhysicalDevice/Attribute:model_id+' => '~~',
+	'Class:PhysicalDevice/Attribute:model_name' => 'Modellnév',
+	'Class:PhysicalDevice/Attribute:model_name+' => '~~',
+	'Class:PhysicalDevice/Attribute:asset_number' => 'Leltári szám',
+	'Class:PhysicalDevice/Attribute:asset_number+' => '~~',
+	'Class:PhysicalDevice/Attribute:purchase_date' => 'Beszerzési dátum',
+	'Class:PhysicalDevice/Attribute:purchase_date+' => '~~',
+	'Class:PhysicalDevice/Attribute:end_of_warranty' => 'Garanciaidő vége',
+	'Class:PhysicalDevice/Attribute:end_of_warranty+' => '~~',
 ));
 
 //
@@ -170,14 +173,15 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:Rack' => 'Rack',
-    'Class:Rack+' => '~~',
-    'Class:Rack/Attribute:nb_u' => 'Unit magasság',
-    'Class:Rack/Attribute:nb_u+' => '~~',
-    'Class:Rack/Attribute:device_list' => 'Eszközök',
-    'Class:Rack/Attribute:device_list+' => 'Minden fizikai eszköz amely ebbe a rack-be lett beszerelve',
-    'Class:Rack/Attribute:enclosure_list' => 'Készülékházak',
-    'Class:Rack/Attribute:enclosure_list+' => 'Minden készülékház ebben a rack-ben',
+	'Class:Rack' => 'Rack',
+	'Class:Rack+' => '~~',
+	'Class:Rack/ComplementaryName' => '%1$s - %2$s~~',
+	'Class:Rack/Attribute:nb_u' => 'Unit magasság',
+	'Class:Rack/Attribute:nb_u+' => '~~',
+	'Class:Rack/Attribute:device_list' => 'Eszközök',
+	'Class:Rack/Attribute:device_list+' => 'Minden fizikai eszköz amely ebbe a rack-be lett beszerelve',
+	'Class:Rack/Attribute:enclosure_list' => 'Készülékházak',
+	'Class:Rack/Attribute:enclosure_list+' => 'Minden készülékház ebben a rack-ben',
 ));
 
 //
@@ -185,10 +189,10 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:TelephonyCI' => 'Telefónia CI',
-    'Class:TelephonyCI+' => '~~',
-    'Class:TelephonyCI/Attribute:phonenumber' => 'Telefonszám',
-    'Class:TelephonyCI/Attribute:phonenumber+' => '~~',
+	'Class:TelephonyCI' => 'Telefónia CI',
+	'Class:TelephonyCI+' => '~~',
+	'Class:TelephonyCI/Attribute:phonenumber' => 'Telefonszám',
+	'Class:TelephonyCI/Attribute:phonenumber+' => '~~',
 ));
 
 //
@@ -196,8 +200,8 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:Phone' => 'Telefon',
-    'Class:Phone+' => '~~',
+	'Class:Phone' => 'Telefon',
+	'Class:Phone+' => '~~',
 ));
 
 //
@@ -205,12 +209,12 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:MobilePhone' => 'Mobiltelefon',
-    'Class:MobilePhone+' => '',
-    'Class:MobilePhone/Attribute:imei' => 'IMEI',
-    'Class:MobilePhone/Attribute:imei+' => '',
-    'Class:MobilePhone/Attribute:hw_pin' => 'PIN',
-    'Class:MobilePhone/Attribute:hw_pin+' => '',
+	'Class:MobilePhone' => 'Mobiltelefon',
+	'Class:MobilePhone+' => '',
+	'Class:MobilePhone/Attribute:imei' => 'IMEI',
+	'Class:MobilePhone/Attribute:imei+' => '',
+	'Class:MobilePhone/Attribute:hw_pin' => 'PIN',
+	'Class:MobilePhone/Attribute:hw_pin+' => '',
 ));
 
 //
@@ -218,8 +222,8 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:IPPhone' => 'Egyéb eszköz',
-    'Class:IPPhone+' => '~~',
+	'Class:IPPhone' => 'Egyéb eszköz',
+	'Class:IPPhone+' => '~~',
 ));
 
 //
@@ -227,8 +231,8 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:Tablet' => 'Táblagép',
-    'Class:Tablet+' => '~~',
+	'Class:Tablet' => 'Táblagép',
+	'Class:Tablet+' => '~~',
 ));
 
 //
@@ -236,12 +240,13 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:ConnectableCI' => 'Kapcsolható CI',
-    'Class:ConnectableCI+' => '',
-    'Class:ConnectableCI/Attribute:networkdevice_list' => 'Hálózati eszközök',
-    'Class:ConnectableCI/Attribute:networkdevice_list+' => 'Hálózati eszközök, melyek ehhez a konfigurációs elemhez kapcsolódnak',
-    'Class:ConnectableCI/Attribute:physicalinterface_list' => 'Hálózati csatolók',
-    'Class:ConnectableCI/Attribute:physicalinterface_list+' => 'A konfigurációs elem fizikai hálózati csatolói',
+	'Class:ConnectableCI' => 'Kapcsolható CI',
+	'Class:ConnectableCI+' => '',
+	'Class:ConnectableCI/ComplementaryName' => '%1$s - %2$s~~',
+	'Class:ConnectableCI/Attribute:networkdevice_list' => 'Hálózati eszközök',
+	'Class:ConnectableCI/Attribute:networkdevice_list+' => 'Hálózati eszközök, melyek ehhez a konfigurációs elemhez kapcsolódnak',
+	'Class:ConnectableCI/Attribute:physicalinterface_list' => 'Hálózati csatolók',
+	'Class:ConnectableCI/Attribute:physicalinterface_list+' => 'A konfigurációs elem fizikai hálózati csatolói',
 ));
 
 //
@@ -249,37 +254,38 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:DatacenterDevice' => 'Adatközpont eszköz',
-    'Class:DatacenterDevice+' => '~~',
-    'Class:DatacenterDevice/Attribute:rack_id' => 'Rack',
-    'Class:DatacenterDevice/Attribute:rack_id+' => '~~',
-    'Class:DatacenterDevice/Attribute:rack_name' => 'Rack név',
-    'Class:DatacenterDevice/Attribute:rack_name+' => '~~',
-    'Class:DatacenterDevice/Attribute:enclosure_id' => 'Készülékház',
-    'Class:DatacenterDevice/Attribute:enclosure_id+' => '~~',
-    'Class:DatacenterDevice/Attribute:enclosure_name' => 'Készülékház név',
-    'Class:DatacenterDevice/Attribute:enclosure_name+' => '~~',
-    'Class:DatacenterDevice/Attribute:nb_u' => 'Unit magasság',
-    'Class:DatacenterDevice/Attribute:nb_u+' => '~~',
-    'Class:DatacenterDevice/Attribute:managementip' => 'Menedzsment IP cím',
-    'Class:DatacenterDevice/Attribute:managementip+' => '~~',
-    'Class:DatacenterDevice/Attribute:powerA_id' => 'PowerA áramforrás',
-    'Class:DatacenterDevice/Attribute:powerA_id+' => '~~',
-    'Class:DatacenterDevice/Attribute:powerA_name' => 'PowerA áramforrás név',
-    'Class:DatacenterDevice/Attribute:powerA_name+' => '~~',
-    'Class:DatacenterDevice/Attribute:powerB_id' => 'PowerB áramforrás',
-    'Class:DatacenterDevice/Attribute:powerB_id+' => '~~',
-    'Class:DatacenterDevice/Attribute:powerB_name' => 'PowerB áramforrás név',
-    'Class:DatacenterDevice/Attribute:powerB_name+' => '~~',
-    'Class:DatacenterDevice/Attribute:fiberinterfacelist_list' => 'FC portok',
-    'Class:DatacenterDevice/Attribute:fiberinterfacelist_list+' => 'A konfigurációs elem FC csatolói',
-    'Class:DatacenterDevice/Attribute:san_list' => 'SAN switch-ek',
-    'Class:DatacenterDevice/Attribute:san_list+' => 'Ehhez a konfigurációs elemhez csatlakozó SAN switch-ek',
-    'Class:DatacenterDevice/Attribute:redundancy' => 'Redundancia',
-    'Class:DatacenterDevice/Attribute:redundancy/count' => 'A készülék akkor működik, ha legalább az egyik tápcsatlakozás (A vagy B) működik.',
-    // Unused yet
-    'Class:DatacenterDevice/Attribute:redundancy/disabled' => 'A készülék akkor működik, ha az összes tápcsatlakozása működik.',
-    'Class:DatacenterDevice/Attribute:redundancy/percent' => 'Az eszköz akkor működik, ha legalább %1$s a %%-ből tápcsatlakozása működik.',
+	'Class:DatacenterDevice' => 'Adatközpont eszköz',
+	'Class:DatacenterDevice+' => '~~',
+	'Class:DatacenterDevice/ComplementaryName' => '%1$s - %2$s~~',
+	'Class:DatacenterDevice/Attribute:rack_id' => 'Rack',
+	'Class:DatacenterDevice/Attribute:rack_id+' => '~~',
+	'Class:DatacenterDevice/Attribute:rack_name' => 'Rack név',
+	'Class:DatacenterDevice/Attribute:rack_name+' => '~~',
+	'Class:DatacenterDevice/Attribute:enclosure_id' => 'Készülékház',
+	'Class:DatacenterDevice/Attribute:enclosure_id+' => '~~',
+	'Class:DatacenterDevice/Attribute:enclosure_name' => 'Készülékház név',
+	'Class:DatacenterDevice/Attribute:enclosure_name+' => '~~',
+	'Class:DatacenterDevice/Attribute:nb_u' => 'Unit magasság',
+	'Class:DatacenterDevice/Attribute:nb_u+' => '~~',
+	'Class:DatacenterDevice/Attribute:managementip' => 'Menedzsment IP cím',
+	'Class:DatacenterDevice/Attribute:managementip+' => '~~',
+	'Class:DatacenterDevice/Attribute:powerA_id' => 'PowerA áramforrás',
+	'Class:DatacenterDevice/Attribute:powerA_id+' => '~~',
+	'Class:DatacenterDevice/Attribute:powerA_name' => 'PowerA áramforrás név',
+	'Class:DatacenterDevice/Attribute:powerA_name+' => '~~',
+	'Class:DatacenterDevice/Attribute:powerB_id' => 'PowerB áramforrás',
+	'Class:DatacenterDevice/Attribute:powerB_id+' => '~~',
+	'Class:DatacenterDevice/Attribute:powerB_name' => 'PowerB áramforrás név',
+	'Class:DatacenterDevice/Attribute:powerB_name+' => '~~',
+	'Class:DatacenterDevice/Attribute:fiberinterfacelist_list' => 'FC portok',
+	'Class:DatacenterDevice/Attribute:fiberinterfacelist_list+' => 'A konfigurációs elem FC csatolói',
+	'Class:DatacenterDevice/Attribute:san_list' => 'SAN switch-ek',
+	'Class:DatacenterDevice/Attribute:san_list+' => 'Ehhez a konfigurációs elemhez csatlakozó SAN switch-ek',
+	'Class:DatacenterDevice/Attribute:redundancy' => 'Redundancia',
+	'Class:DatacenterDevice/Attribute:redundancy/count' => 'A készülék akkor működik, ha legalább az egyik tápcsatlakozás (A vagy B) működik.',
+	// Unused yet
+	'Class:DatacenterDevice/Attribute:redundancy/disabled' => 'A készülék akkor működik, ha az összes tápcsatlakozása működik.',
+	'Class:DatacenterDevice/Attribute:redundancy/percent' => 'Az eszköz akkor működik, ha legalább %1$s a %%-ből tápcsatlakozása működik.',
 ));
 
 //
@@ -287,20 +293,21 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:NetworkDevice' => 'Hálózati eszköz',
-    'Class:NetworkDevice+' => '',
-    'Class:NetworkDevice/Attribute:networkdevicetype_id' => 'Hálózati eszköz típus',
-    'Class:NetworkDevice/Attribute:networkdevicetype_id+' => '~~',
-    'Class:NetworkDevice/Attribute:networkdevicetype_name' => 'Hálózati eszköz típus név',
-    'Class:NetworkDevice/Attribute:networkdevicetype_name+' => '~~',
-    'Class:NetworkDevice/Attribute:connectablecis_list' => 'Kapcsolódó eszközök',
-    'Class:NetworkDevice/Attribute:connectablecis_list+' => 'Az összes eszköz, amely ehhez a hálózati eszközhöz csatlakozik',
-    'Class:NetworkDevice/Attribute:iosversion_id' => 'IOS verzió',
-    'Class:NetworkDevice/Attribute:iosversion_id+' => '~~',
-    'Class:NetworkDevice/Attribute:iosversion_name' => 'IOS verzió név',
-    'Class:NetworkDevice/Attribute:iosversion_name+' => '~~',
-    'Class:NetworkDevice/Attribute:ram' => 'RAM',
-    'Class:NetworkDevice/Attribute:ram+' => '',
+	'Class:NetworkDevice' => 'Hálózati eszköz',
+	'Class:NetworkDevice+' => '',
+	'Class:NetworkDevice/ComplementaryName' => '%1$s - %2$s~~',
+	'Class:NetworkDevice/Attribute:networkdevicetype_id' => 'Hálózati eszköz típus',
+	'Class:NetworkDevice/Attribute:networkdevicetype_id+' => '~~',
+	'Class:NetworkDevice/Attribute:networkdevicetype_name' => 'Hálózati eszköz típus név',
+	'Class:NetworkDevice/Attribute:networkdevicetype_name+' => '~~',
+	'Class:NetworkDevice/Attribute:connectablecis_list' => 'Kapcsolódó eszközök',
+	'Class:NetworkDevice/Attribute:connectablecis_list+' => 'Az összes eszköz, amely ehhez a hálózati eszközhöz csatlakozik',
+	'Class:NetworkDevice/Attribute:iosversion_id' => 'IOS verzió',
+	'Class:NetworkDevice/Attribute:iosversion_id+' => '~~',
+	'Class:NetworkDevice/Attribute:iosversion_name' => 'IOS verzió név',
+	'Class:NetworkDevice/Attribute:iosversion_name+' => '~~',
+	'Class:NetworkDevice/Attribute:ram' => 'RAM',
+	'Class:NetworkDevice/Attribute:ram+' => '',
 ));
 
 //
@@ -308,26 +315,27 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:Server' => 'Szerver',
-    'Class:Server+' => '',
-    'Class:Server/Attribute:osfamily_id' => 'OS család',
-    'Class:Server/Attribute:osfamily_id+' => '~~',
-    'Class:Server/Attribute:osfamily_name' => 'OS család név',
-    'Class:Server/Attribute:osfamily_name+' => '~~',
-    'Class:Server/Attribute:osversion_id' => 'OS verzió',
-    'Class:Server/Attribute:osversion_id+' => '~~',
-    'Class:Server/Attribute:osversion_name' => 'OS verzió név',
-    'Class:Server/Attribute:osversion_name+' => '~~',
-    'Class:Server/Attribute:oslicence_id' => 'OS licenc',
-    'Class:Server/Attribute:oslicence_id+' => '~~',
-    'Class:Server/Attribute:oslicence_name' => 'OS licenc név',
-    'Class:Server/Attribute:oslicence_name+' => '~~',
-    'Class:Server/Attribute:cpu' => 'CPU',
-    'Class:Server/Attribute:cpu+' => '',
-    'Class:Server/Attribute:ram' => 'RAM',
-    'Class:Server/Attribute:ram+' => '',
-    'Class:Server/Attribute:logicalvolumes_list' => 'Logikai kötetek',
-    'Class:Server/Attribute:logicalvolumes_list+' => 'Logikai kötetek, melyek ehhez a szerverhez kapcsolódnak',
+	'Class:Server' => 'Szerver',
+	'Class:Server+' => '',
+	'Class:Server/ComplementaryName' => '%1$s - %2$s~~',
+	'Class:Server/Attribute:osfamily_id' => 'OS család',
+	'Class:Server/Attribute:osfamily_id+' => '~~',
+	'Class:Server/Attribute:osfamily_name' => 'OS család név',
+	'Class:Server/Attribute:osfamily_name+' => '~~',
+	'Class:Server/Attribute:osversion_id' => 'OS verzió',
+	'Class:Server/Attribute:osversion_id+' => '~~',
+	'Class:Server/Attribute:osversion_name' => 'OS verzió név',
+	'Class:Server/Attribute:osversion_name+' => '~~',
+	'Class:Server/Attribute:oslicence_id' => 'OS licenc',
+	'Class:Server/Attribute:oslicence_id+' => '~~',
+	'Class:Server/Attribute:oslicence_name' => 'OS licenc név',
+	'Class:Server/Attribute:oslicence_name+' => '~~',
+	'Class:Server/Attribute:cpu' => 'CPU',
+	'Class:Server/Attribute:cpu+' => '',
+	'Class:Server/Attribute:ram' => 'RAM',
+	'Class:Server/Attribute:ram+' => '',
+	'Class:Server/Attribute:logicalvolumes_list' => 'Logikai kötetek',
+	'Class:Server/Attribute:logicalvolumes_list+' => 'Logikai kötetek, melyek ehhez a szerverhez kapcsolódnak',
 ));
 
 //
@@ -335,10 +343,11 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:StorageSystem' => 'Tárolórendszer',
-    'Class:StorageSystem+' => '~~',
-    'Class:StorageSystem/Attribute:logicalvolume_list' => 'Logikai kötetek',
-    'Class:StorageSystem/Attribute:logicalvolume_list+' => 'Logikai kötetek ebben a tárolórendszerben',
+	'Class:StorageSystem' => 'Tárolórendszer',
+	'Class:StorageSystem+' => '~~',
+	'Class:StorageSystem/ComplementaryName' => '%1$s - %2$s~~',
+	'Class:StorageSystem/Attribute:logicalvolume_list' => 'Logikai kötetek',
+	'Class:StorageSystem/Attribute:logicalvolume_list+' => 'Logikai kötetek ebben a tárolórendszerben',
 ));
 
 //
@@ -346,10 +355,11 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:SANSwitch' => 'SAN Switch',
-    'Class:SANSwitch+' => '~~',
-    'Class:SANSwitch/Attribute:datacenterdevice_list' => 'Kapcsolódó eszközök',
-    'Class:SANSwitch/Attribute:datacenterdevice_list+' => 'Ehhez a SAN-switch-hez csatlakozó konfigurációs elemek',
+	'Class:SANSwitch' => 'SAN Switch',
+	'Class:SANSwitch+' => '~~',
+	'Class:SANSwitch/ComplementaryName' => '%1$s - %2$s~~',
+	'Class:SANSwitch/Attribute:datacenterdevice_list' => 'Kapcsolódó eszközök',
+	'Class:SANSwitch/Attribute:datacenterdevice_list+' => 'Ehhez a SAN-switch-hez csatlakozó konfigurációs elemek',
 ));
 
 //
@@ -357,10 +367,11 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:TapeLibrary' => 'Szalagos tároló',
-    'Class:TapeLibrary+' => '~~',
-    'Class:TapeLibrary/Attribute:tapes_list' => 'Szalagok',
-    'Class:TapeLibrary/Attribute:tapes_list+' => 'Szalagok a szalagos tárolóhoz',
+	'Class:TapeLibrary' => 'Szalagos tároló',
+	'Class:TapeLibrary+' => '~~',
+	'Class:TapeLibrary/ComplementaryName' => '%1$s - %2$s~~',
+	'Class:TapeLibrary/Attribute:tapes_list' => 'Szalagok',
+	'Class:TapeLibrary/Attribute:tapes_list+' => 'Szalagok a szalagos tárolóhoz',
 ));
 
 //
@@ -368,10 +379,11 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:NAS' => 'NAS',
-    'Class:NAS+' => '~~',
-    'Class:NAS/Attribute:nasfilesystem_list' => 'Fájlrendszerek',
-    'Class:NAS/Attribute:nasfilesystem_list+' => 'A NAS fájlrendszerei',
+	'Class:NAS' => 'NAS',
+	'Class:NAS+' => '~~',
+	'Class:NAS/ComplementaryName' => '%1$s - %2$s~~',
+	'Class:NAS/Attribute:nasfilesystem_list' => 'Fájlrendszerek',
+	'Class:NAS/Attribute:nasfilesystem_list+' => 'A NAS fájlrendszerei',
 ));
 
 //
@@ -379,26 +391,27 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:PC' => 'PC',
-    'Class:PC+' => '',
-    'Class:PC/Attribute:osfamily_id' => 'OS család',
-    'Class:PC/Attribute:osfamily_id+' => '~~',
-    'Class:PC/Attribute:osfamily_name' => 'OS család név',
-    'Class:PC/Attribute:osfamily_name+' => '~~',
-    'Class:PC/Attribute:osversion_id' => 'OS verzió',
-    'Class:PC/Attribute:osversion_id+' => '~~',
-    'Class:PC/Attribute:osversion_name' => 'OS verzió név',
-    'Class:PC/Attribute:osversion_name+' => '~~',
-    'Class:PC/Attribute:cpu' => 'CPU',
-    'Class:PC/Attribute:cpu+' => '',
-    'Class:PC/Attribute:ram' => 'RAM',
-    'Class:PC/Attribute:ram+' => '',
-    'Class:PC/Attribute:type' => 'Típus',
-    'Class:PC/Attribute:type+' => '~~',
-    'Class:PC/Attribute:type/Value:desktop' => 'Desktop',
-    'Class:PC/Attribute:type/Value:desktop+' => 'desktop~~',
-    'Class:PC/Attribute:type/Value:laptop' => 'Laptop',
-    'Class:PC/Attribute:type/Value:laptop+' => 'laptop~~',
+	'Class:PC' => 'PC',
+	'Class:PC+' => '',
+	'Class:PC/ComplementaryName' => '%1$s - %2$s~~',
+	'Class:PC/Attribute:osfamily_id' => 'OS család',
+	'Class:PC/Attribute:osfamily_id+' => '~~',
+	'Class:PC/Attribute:osfamily_name' => 'OS család név',
+	'Class:PC/Attribute:osfamily_name+' => '~~',
+	'Class:PC/Attribute:osversion_id' => 'OS verzió',
+	'Class:PC/Attribute:osversion_id+' => '~~',
+	'Class:PC/Attribute:osversion_name' => 'OS verzió név',
+	'Class:PC/Attribute:osversion_name+' => '~~',
+	'Class:PC/Attribute:cpu' => 'CPU',
+	'Class:PC/Attribute:cpu+' => '',
+	'Class:PC/Attribute:ram' => 'RAM',
+	'Class:PC/Attribute:ram+' => '',
+	'Class:PC/Attribute:type' => 'Típus',
+	'Class:PC/Attribute:type+' => '~~',
+	'Class:PC/Attribute:type/Value:desktop' => 'Desktop',
+	'Class:PC/Attribute:type/Value:desktop+' => 'desktop~~',
+	'Class:PC/Attribute:type/Value:laptop' => 'Laptop',
+	'Class:PC/Attribute:type/Value:laptop+' => 'laptop~~',
 ));
 
 //
@@ -406,8 +419,9 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:Printer' => 'Nyomtató',
-    'Class:Printer+' => '',
+	'Class:Printer' => 'Nyomtató',
+	'Class:Printer+' => '',
+	'Class:Printer/ComplementaryName' => '%1$s - %2$s~~',
 ));
 
 //
@@ -415,8 +429,9 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:PowerConnection' => 'Tápellátás',
-    'Class:PowerConnection+' => '~~',
+	'Class:PowerConnection' => 'Tápellátás',
+	'Class:PowerConnection+' => '~~',
+	'Class:PowerConnection/ComplementaryName' => '%1$s - %2$s~~',
 ));
 
 //
@@ -424,10 +439,11 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:PowerSource' => 'Áramforrás',
-    'Class:PowerSource+' => '~~',
-    'Class:PowerSource/Attribute:pdus_list' => 'PDU-k',
-    'Class:PowerSource/Attribute:pdus_list+' => 'Tápelosztók amik ezt az áramforrást használják',
+	'Class:PowerSource' => 'Áramforrás',
+	'Class:PowerSource+' => '~~',
+	'Class:PowerSource/ComplementaryName' => '%1$s - %2$s~~',
+	'Class:PowerSource/Attribute:pdus_list' => 'PDU-k',
+	'Class:PowerSource/Attribute:pdus_list+' => 'Tápelosztók amik ezt az áramforrást használják',
 ));
 
 //
@@ -435,16 +451,17 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:PDU' => 'PDU',
-    'Class:PDU+' => '~~',
-    'Class:PDU/Attribute:rack_id' => 'Rack',
-    'Class:PDU/Attribute:rack_id+' => '~~',
-    'Class:PDU/Attribute:rack_name' => 'Rack név',
-    'Class:PDU/Attribute:rack_name+' => '~~',
-    'Class:PDU/Attribute:powerstart_id' => 'Betápláló',
-    'Class:PDU/Attribute:powerstart_id+' => '~~',
-    'Class:PDU/Attribute:powerstart_name' => 'Betápláló név',
-    'Class:PDU/Attribute:powerstart_name+' => '~~',
+	'Class:PDU' => 'PDU',
+	'Class:PDU+' => '~~',
+	'Class:PDU/ComplementaryName' => '%1$s - %2$s - %3$s - %4$s~~',
+	'Class:PDU/Attribute:rack_id' => 'Rack',
+	'Class:PDU/Attribute:rack_id+' => '~~',
+	'Class:PDU/Attribute:rack_name' => 'Rack név',
+	'Class:PDU/Attribute:rack_name+' => '~~',
+	'Class:PDU/Attribute:powerstart_id' => 'Betápláló',
+	'Class:PDU/Attribute:powerstart_id+' => '~~',
+	'Class:PDU/Attribute:powerstart_name' => 'Betápláló név',
+	'Class:PDU/Attribute:powerstart_name+' => '~~',
 ));
 
 //
@@ -452,8 +469,9 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:Peripheral' => 'Periféria',
-    'Class:Peripheral+' => '~~',
+	'Class:Peripheral' => 'Periféria',
+	'Class:Peripheral+' => '~~',
+	'Class:Peripheral/ComplementaryName' => '%1$s - %2$s~~',
 ));
 
 //
@@ -461,16 +479,17 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:Enclosure' => 'Készülékház',
-    'Class:Enclosure+' => '~~',
-    'Class:Enclosure/Attribute:rack_id' => 'Rack',
-    'Class:Enclosure/Attribute:rack_id+' => '~~',
-    'Class:Enclosure/Attribute:rack_name' => 'Rack név',
-    'Class:Enclosure/Attribute:rack_name+' => '~~',
-    'Class:Enclosure/Attribute:nb_u' => 'Unit magasság',
-    'Class:Enclosure/Attribute:nb_u+' => '~~',
-    'Class:Enclosure/Attribute:device_list' => 'Eszközök',
-    'Class:Enclosure/Attribute:device_list+' => '',
+	'Class:Enclosure' => 'Készülékház',
+	'Class:Enclosure+' => '~~',
+	'Class:Enclosure/ComplementaryName' => '%1$s - %2$s - %3$s~~',
+	'Class:Enclosure/Attribute:rack_id' => 'Rack',
+	'Class:Enclosure/Attribute:rack_id+' => '~~',
+	'Class:Enclosure/Attribute:rack_name' => 'Rack név',
+	'Class:Enclosure/Attribute:rack_name+' => '~~',
+	'Class:Enclosure/Attribute:nb_u' => 'Unit magasság',
+	'Class:Enclosure/Attribute:nb_u+' => '~~',
+	'Class:Enclosure/Attribute:device_list' => 'Eszközök',
+	'Class:Enclosure/Attribute:device_list+' => '',
 ));
 
 //
@@ -478,22 +497,22 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:ApplicationSolution' => 'Egyedi alkalmazás',
-    'Class:ApplicationSolution+' => '',
-    'Class:ApplicationSolution/Attribute:functionalcis_list' => 'CI-k',
-    'Class:ApplicationSolution/Attribute:functionalcis_list+' => 'Konfigurációs elemek, melyek ezt az alkalmazásmegoldást alkotják',
-    'Class:ApplicationSolution/Attribute:businessprocess_list' => 'Üzleti folyamatok',
-    'Class:ApplicationSolution/Attribute:businessprocess_list+' => 'Üzleti folyamatok, melyek ettől az alkalmazásmegoldástól függenek',
-    'Class:ApplicationSolution/Attribute:status' => 'Állapot',
-    'Class:ApplicationSolution/Attribute:status+' => '~~',
-    'Class:ApplicationSolution/Attribute:status/Value:active' => 'Aktív',
-    'Class:ApplicationSolution/Attribute:status/Value:active+' => 'active~~',
-    'Class:ApplicationSolution/Attribute:status/Value:inactive' => 'Inaktív',
-    'Class:ApplicationSolution/Attribute:status/Value:inactive+' => 'inactive~~',
-    'Class:ApplicationSolution/Attribute:redundancy' => 'Hatáselemzés: a redundancia konfigurációja',
-    'Class:ApplicationSolution/Attribute:redundancy/disabled' => 'A megoldás akkor működik, ha minden CI működik.',
-    'Class:ApplicationSolution/Attribute:redundancy/count' => 'A megoldás akkor működik, ha legalább %1$s CI működik',
-    'Class:ApplicationSolution/Attribute:redundancy/percent' => 'A megoldás akkor működik, ha legalább %1$s a %%-ből CI működik',
+	'Class:ApplicationSolution' => 'Egyedi alkalmazás',
+	'Class:ApplicationSolution+' => '',
+	'Class:ApplicationSolution/Attribute:functionalcis_list' => 'CI-k',
+	'Class:ApplicationSolution/Attribute:functionalcis_list+' => 'Konfigurációs elemek, melyek ezt az alkalmazásmegoldást alkotják',
+	'Class:ApplicationSolution/Attribute:businessprocess_list' => 'Üzleti folyamatok',
+	'Class:ApplicationSolution/Attribute:businessprocess_list+' => 'Üzleti folyamatok, melyek ettől az alkalmazásmegoldástól függenek',
+	'Class:ApplicationSolution/Attribute:status' => 'Állapot',
+	'Class:ApplicationSolution/Attribute:status+' => '~~',
+	'Class:ApplicationSolution/Attribute:status/Value:active' => 'Aktív',
+	'Class:ApplicationSolution/Attribute:status/Value:active+' => 'active~~',
+	'Class:ApplicationSolution/Attribute:status/Value:inactive' => 'Inaktív',
+	'Class:ApplicationSolution/Attribute:status/Value:inactive+' => 'inactive~~',
+	'Class:ApplicationSolution/Attribute:redundancy' => 'Hatáselemzés: a redundancia konfigurációja',
+	'Class:ApplicationSolution/Attribute:redundancy/disabled' => 'A megoldás akkor működik, ha minden CI működik.',
+	'Class:ApplicationSolution/Attribute:redundancy/count' => 'A megoldás akkor működik, ha legalább %1$s CI működik',
+	'Class:ApplicationSolution/Attribute:redundancy/percent' => 'A megoldás akkor működik, ha legalább %1$s a %%-ből CI működik',
 ));
 
 //
@@ -501,16 +520,16 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:BusinessProcess' => 'Üzleti folyamat',
-    'Class:BusinessProcess+' => '',
-    'Class:BusinessProcess/Attribute:applicationsolutions_list' => 'Alkalmazásmegoldások',
-    'Class:BusinessProcess/Attribute:applicationsolutions_list+' => 'Alkalmazásmegoldások melyek hatással vannak erre az üzleti folyamatra',
-    'Class:BusinessProcess/Attribute:status' => 'Állapot',
-    'Class:BusinessProcess/Attribute:status+' => '~~',
-    'Class:BusinessProcess/Attribute:status/Value:active' => 'Aktív',
-    'Class:BusinessProcess/Attribute:status/Value:active+' => 'active~~',
-    'Class:BusinessProcess/Attribute:status/Value:inactive' => 'Inaktív',
-    'Class:BusinessProcess/Attribute:status/Value:inactive+' => 'inactive~~',
+	'Class:BusinessProcess' => 'Üzleti folyamat',
+	'Class:BusinessProcess+' => '',
+	'Class:BusinessProcess/Attribute:applicationsolutions_list' => 'Alkalmazásmegoldások',
+	'Class:BusinessProcess/Attribute:applicationsolutions_list+' => 'Alkalmazásmegoldások melyek hatással vannak erre az üzleti folyamatra',
+	'Class:BusinessProcess/Attribute:status' => 'Állapot',
+	'Class:BusinessProcess/Attribute:status+' => '~~',
+	'Class:BusinessProcess/Attribute:status/Value:active' => 'Aktív',
+	'Class:BusinessProcess/Attribute:status/Value:active+' => 'active~~',
+	'Class:BusinessProcess/Attribute:status/Value:inactive' => 'Inaktív',
+	'Class:BusinessProcess/Attribute:status/Value:inactive+' => 'inactive~~',
 ));
 
 //
@@ -518,28 +537,28 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:SoftwareInstance' => 'Szoftverpéldány',
-    'Class:SoftwareInstance+' => '',
-    'Class:SoftwareInstance/Attribute:system_id' => 'Rendszer',
-    'Class:SoftwareInstance/Attribute:system_id+' => '~~',
-    'Class:SoftwareInstance/Attribute:system_name' => 'Rendszer név',
-    'Class:SoftwareInstance/Attribute:system_name+' => '~~',
-    'Class:SoftwareInstance/Attribute:software_id' => 'Szoftver',
-    'Class:SoftwareInstance/Attribute:software_id+' => '~~',
-    'Class:SoftwareInstance/Attribute:software_name' => 'Szoftvernév',
-    'Class:SoftwareInstance/Attribute:software_name+' => '',
-    'Class:SoftwareInstance/Attribute:softwarelicence_id' => 'Szoftver licenc',
-    'Class:SoftwareInstance/Attribute:softwarelicence_id+' => '~~',
-    'Class:SoftwareInstance/Attribute:softwarelicence_name' => 'Szoftver licenc név',
-    'Class:SoftwareInstance/Attribute:softwarelicence_name+' => '~~',
-    'Class:SoftwareInstance/Attribute:path' => 'Elérési út',
-    'Class:SoftwareInstance/Attribute:path+' => '~~',
-    'Class:SoftwareInstance/Attribute:status' => 'Állapot',
-    'Class:SoftwareInstance/Attribute:status+' => '~~',
-    'Class:SoftwareInstance/Attribute:status/Value:active' => 'Aktív',
-    'Class:SoftwareInstance/Attribute:status/Value:active+' => 'active~~',
-    'Class:SoftwareInstance/Attribute:status/Value:inactive' => 'Inaktív',
-    'Class:SoftwareInstance/Attribute:status/Value:inactive+' => 'inactive~~',
+	'Class:SoftwareInstance' => 'Szoftverpéldány',
+	'Class:SoftwareInstance+' => '',
+	'Class:SoftwareInstance/Attribute:system_id' => 'Rendszer',
+	'Class:SoftwareInstance/Attribute:system_id+' => '~~',
+	'Class:SoftwareInstance/Attribute:system_name' => 'Rendszer név',
+	'Class:SoftwareInstance/Attribute:system_name+' => '~~',
+	'Class:SoftwareInstance/Attribute:software_id' => 'Szoftver',
+	'Class:SoftwareInstance/Attribute:software_id+' => '~~',
+	'Class:SoftwareInstance/Attribute:software_name' => 'Szoftvernév',
+	'Class:SoftwareInstance/Attribute:software_name+' => '',
+	'Class:SoftwareInstance/Attribute:softwarelicence_id' => 'Szoftver licenc',
+	'Class:SoftwareInstance/Attribute:softwarelicence_id+' => '~~',
+	'Class:SoftwareInstance/Attribute:softwarelicence_name' => 'Szoftver licenc név',
+	'Class:SoftwareInstance/Attribute:softwarelicence_name+' => '~~',
+	'Class:SoftwareInstance/Attribute:path' => 'Elérési út',
+	'Class:SoftwareInstance/Attribute:path+' => '~~',
+	'Class:SoftwareInstance/Attribute:status' => 'Állapot',
+	'Class:SoftwareInstance/Attribute:status+' => '~~',
+	'Class:SoftwareInstance/Attribute:status/Value:active' => 'Aktív',
+	'Class:SoftwareInstance/Attribute:status/Value:active+' => 'active~~',
+	'Class:SoftwareInstance/Attribute:status/Value:inactive' => 'Inaktív',
+	'Class:SoftwareInstance/Attribute:status/Value:inactive+' => 'inactive~~',
 ));
 
 //
@@ -547,10 +566,10 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:Middleware' => 'Middleware',
-    'Class:Middleware+' => 'Köztes szoftver',
-    'Class:Middleware/Attribute:middlewareinstance_list' => 'Middleware példány',
-    'Class:Middleware/Attribute:middlewareinstance_list+' => 'Middleware példányok melyeket ez a middlaware biztosít',
+	'Class:Middleware' => 'Middleware',
+	'Class:Middleware+' => 'Köztes szoftver',
+	'Class:Middleware/Attribute:middlewareinstance_list' => 'Middleware példány',
+	'Class:Middleware/Attribute:middlewareinstance_list+' => 'Middleware példányok melyeket ez a middlaware biztosít',
 ));
 
 //
@@ -558,10 +577,10 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:DBServer' => 'Adatbázis',
-    'Class:DBServer+' => '',
-    'Class:DBServer/Attribute:dbschema_list' => 'DB sémák',
-    'Class:DBServer/Attribute:dbschema_list+' => 'A DB szerver adatbázis sémái',
+	'Class:DBServer' => 'Adatbázis',
+	'Class:DBServer+' => '',
+	'Class:DBServer/Attribute:dbschema_list' => 'DB sémák',
+	'Class:DBServer/Attribute:dbschema_list+' => 'A DB szerver adatbázis sémái',
 ));
 
 //
@@ -569,10 +588,10 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:WebServer' => 'Webszerver',
-    'Class:WebServer+' => '~~',
-    'Class:WebServer/Attribute:webapp_list' => 'Webalkalmazások',
-    'Class:WebServer/Attribute:webapp_list+' => 'Webalkalmazások, melyek elérhetőek ezen a webszerveren',
+	'Class:WebServer' => 'Webszerver',
+	'Class:WebServer+' => '~~',
+	'Class:WebServer/Attribute:webapp_list' => 'Webalkalmazások',
+	'Class:WebServer/Attribute:webapp_list+' => 'Webalkalmazások, melyek elérhetőek ezen a webszerveren',
 ));
 
 //
@@ -580,8 +599,8 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:PCSoftware' => 'PC Szoftver',
-    'Class:PCSoftware+' => '~~',
+	'Class:PCSoftware' => 'PC Szoftver',
+	'Class:PCSoftware+' => '~~',
 ));
 
 //
@@ -589,8 +608,8 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:OtherSoftware' => 'Egyéb szoftver',
-    'Class:OtherSoftware+' => '~~',
+	'Class:OtherSoftware' => 'Egyéb szoftver',
+	'Class:OtherSoftware+' => '~~',
 ));
 
 //
@@ -598,12 +617,13 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:MiddlewareInstance' => 'Middleware Példány',
-    'Class:MiddlewareInstance+' => '~~',
-    'Class:MiddlewareInstance/Attribute:middleware_id' => 'Middleware',
-    'Class:MiddlewareInstance/Attribute:middleware_id+' => '~~',
-    'Class:MiddlewareInstance/Attribute:middleware_name' => 'Middleware név',
-    'Class:MiddlewareInstance/Attribute:middleware_name+' => '~~',
+	'Class:MiddlewareInstance' => 'Middleware Példány',
+	'Class:MiddlewareInstance+' => '~~',
+	'Class:MiddlewareInstance/ComplementaryName' => '%1$s - %2$s~~',
+	'Class:MiddlewareInstance/Attribute:middleware_id' => 'Middleware',
+	'Class:MiddlewareInstance/Attribute:middleware_id+' => '~~',
+	'Class:MiddlewareInstance/Attribute:middleware_name' => 'Middleware név',
+	'Class:MiddlewareInstance/Attribute:middleware_name+' => '~~',
 ));
 
 //
@@ -611,12 +631,13 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:DatabaseSchema' => 'Adatbázis séma',
-    'Class:DatabaseSchema+' => '~~',
-    'Class:DatabaseSchema/Attribute:dbserver_id' => 'DB szerver',
-    'Class:DatabaseSchema/Attribute:dbserver_id+' => '~~',
-    'Class:DatabaseSchema/Attribute:dbserver_name' => 'DB szerver név',
-    'Class:DatabaseSchema/Attribute:dbserver_name+' => '~~',
+	'Class:DatabaseSchema' => 'Adatbázis séma',
+	'Class:DatabaseSchema+' => '~~',
+	'Class:DatabaseSchema/ComplementaryName' => '%1$s - %2$s~~',
+	'Class:DatabaseSchema/Attribute:dbserver_id' => 'DB szerver',
+	'Class:DatabaseSchema/Attribute:dbserver_id+' => '~~',
+	'Class:DatabaseSchema/Attribute:dbserver_name' => 'DB szerver név',
+	'Class:DatabaseSchema/Attribute:dbserver_name+' => '~~',
 ));
 
 //
@@ -624,14 +645,15 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:WebApplication' => 'Webalkalmazás',
-    'Class:WebApplication+' => '~~',
-    'Class:WebApplication/Attribute:webserver_id' => 'Webszerver',
-    'Class:WebApplication/Attribute:webserver_id+' => '~~',
-    'Class:WebApplication/Attribute:webserver_name' => 'Webszerver név',
-    'Class:WebApplication/Attribute:webserver_name+' => '~~',
-    'Class:WebApplication/Attribute:url' => 'URL~~',
-    'Class:WebApplication/Attribute:url+' => '~~',
+	'Class:WebApplication' => 'Webalkalmazás',
+	'Class:WebApplication+' => '~~',
+	'Class:WebApplication/ComplementaryName' => '%1$s - %2$s~~',
+	'Class:WebApplication/Attribute:webserver_id' => 'Webszerver',
+	'Class:WebApplication/Attribute:webserver_id+' => '~~',
+	'Class:WebApplication/Attribute:webserver_name' => 'Webszerver név',
+	'Class:WebApplication/Attribute:webserver_name+' => '~~',
+	'Class:WebApplication/Attribute:url' => 'URL~~',
+	'Class:WebApplication/Attribute:url+' => '~~',
 ));
 
 
@@ -640,20 +662,20 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:VirtualDevice' => 'Virtuális eszköz',
-    'Class:VirtualDevice+' => '~~',
-    'Class:VirtualDevice/Attribute:status' => 'Állapot',
-    'Class:VirtualDevice/Attribute:status+' => '~~',
-    'Class:VirtualDevice/Attribute:status/Value:implementation' => 'Megvalósítás alatt',
-    'Class:VirtualDevice/Attribute:status/Value:implementation+' => 'implementation~~',
-    'Class:VirtualDevice/Attribute:status/Value:obsolete' => 'Elavult',
-    'Class:VirtualDevice/Attribute:status/Value:obsolete+' => 'obsolete~~',
-    'Class:VirtualDevice/Attribute:status/Value:production' => 'Használatban',
-    'Class:VirtualDevice/Attribute:status/Value:production+' => 'production~~',
-    'Class:VirtualDevice/Attribute:status/Value:stock' => 'Készleten',
-    'Class:VirtualDevice/Attribute:status/Value:stock+' => 'stock~~',
-    'Class:VirtualDevice/Attribute:logicalvolumes_list' => 'Logikai kötetek',
-    'Class:VirtualDevice/Attribute:logicalvolumes_list+' => 'Logikai kötetek, amiket ez az eszköz használ',
+	'Class:VirtualDevice' => 'Virtuális eszköz',
+	'Class:VirtualDevice+' => '~~',
+	'Class:VirtualDevice/Attribute:status' => 'Állapot',
+	'Class:VirtualDevice/Attribute:status+' => '~~',
+	'Class:VirtualDevice/Attribute:status/Value:implementation' => 'Megvalósítás alatt',
+	'Class:VirtualDevice/Attribute:status/Value:implementation+' => 'implementation~~',
+	'Class:VirtualDevice/Attribute:status/Value:obsolete' => 'Elavult',
+	'Class:VirtualDevice/Attribute:status/Value:obsolete+' => 'obsolete~~',
+	'Class:VirtualDevice/Attribute:status/Value:production' => 'Használatban',
+	'Class:VirtualDevice/Attribute:status/Value:production+' => 'production~~',
+	'Class:VirtualDevice/Attribute:status/Value:stock' => 'Készleten',
+	'Class:VirtualDevice/Attribute:status/Value:stock+' => 'stock~~',
+	'Class:VirtualDevice/Attribute:logicalvolumes_list' => 'Logikai kötetek',
+	'Class:VirtualDevice/Attribute:logicalvolumes_list+' => 'Logikai kötetek, amiket ez az eszköz használ',
 ));
 
 //
@@ -661,10 +683,10 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:VirtualHost' => 'Virtuális gazdagép',
-    'Class:VirtualHost+' => '~~',
-    'Class:VirtualHost/Attribute:virtualmachine_list' => 'Virtuális gépek',
-    'Class:VirtualHost/Attribute:virtualmachine_list+' => 'Virtuális gépek, amelyeket ez a gazdagép futtat',
+	'Class:VirtualHost' => 'Virtuális gazdagép',
+	'Class:VirtualHost+' => '~~',
+	'Class:VirtualHost/Attribute:virtualmachine_list' => 'Virtuális gépek',
+	'Class:VirtualHost/Attribute:virtualmachine_list+' => 'Virtuális gépek, amelyeket ez a gazdagép futtat',
 ));
 
 //
@@ -672,16 +694,16 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:Hypervisor' => 'Hypervisor',
-    'Class:Hypervisor+' => '~~',
-    'Class:Hypervisor/Attribute:farm_id' => 'Szerverfarm',
-    'Class:Hypervisor/Attribute:farm_id+' => '~~',
-    'Class:Hypervisor/Attribute:farm_name' => 'Szerverfarm név',
-    'Class:Hypervisor/Attribute:farm_name+' => '~~',
-    'Class:Hypervisor/Attribute:server_id' => 'Szerver',
-    'Class:Hypervisor/Attribute:server_id+' => '~~',
-    'Class:Hypervisor/Attribute:server_name' => 'Szerver név',
-    'Class:Hypervisor/Attribute:server_name+' => '~~',
+	'Class:Hypervisor' => 'Hypervisor',
+	'Class:Hypervisor+' => '~~',
+	'Class:Hypervisor/Attribute:farm_id' => 'Szerverfarm',
+	'Class:Hypervisor/Attribute:farm_id+' => '~~',
+	'Class:Hypervisor/Attribute:farm_name' => 'Szerverfarm név',
+	'Class:Hypervisor/Attribute:farm_name+' => '~~',
+	'Class:Hypervisor/Attribute:server_id' => 'Szerver',
+	'Class:Hypervisor/Attribute:server_id+' => '~~',
+	'Class:Hypervisor/Attribute:server_name' => 'Szerver név',
+	'Class:Hypervisor/Attribute:server_name+' => '~~',
 ));
 
 //
@@ -689,14 +711,14 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:Farm' => 'Szerverfarm',
-    'Class:Farm+' => '~~',
-    'Class:Farm/Attribute:hypervisor_list' => 'Hypervisor-ok',
-    'Class:Farm/Attribute:hypervisor_list+' => 'All the hypervisors that compose this farm~~',
-    'Class:Farm/Attribute:redundancy' => 'Magas rendelkezésre állás',
-    'Class:Farm/Attribute:redundancy/disabled' => 'A farm működik, ha az összes hypervisor működik.',
-    'Class:Farm/Attribute:redundancy/count' => 'A farm működik, ha legalább %1$s hypervisor működik',
-    'Class:Farm/Attribute:redundancy/percent' => 'A farm működik, ha legalább %1$s a %%-ből hypervisor működik.',
+	'Class:Farm' => 'Szerverfarm',
+	'Class:Farm+' => '~~',
+	'Class:Farm/Attribute:hypervisor_list' => 'Hypervisor-ok',
+	'Class:Farm/Attribute:hypervisor_list+' => 'All the hypervisors that compose this farm~~',
+	'Class:Farm/Attribute:redundancy' => 'Magas rendelkezésre állás',
+	'Class:Farm/Attribute:redundancy/disabled' => 'A farm működik, ha az összes hypervisor működik.',
+	'Class:Farm/Attribute:redundancy/count' => 'A farm működik, ha legalább %1$s hypervisor működik',
+	'Class:Farm/Attribute:redundancy/percent' => 'A farm működik, ha legalább %1$s a %%-ből hypervisor működik.',
 ));
 
 //
@@ -704,32 +726,33 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:VirtualMachine' => 'Virtuális gép',
-    'Class:VirtualMachine+' => '~~',
-    'Class:VirtualMachine/Attribute:virtualhost_id' => 'Virtuális gazdagép',
-    'Class:VirtualMachine/Attribute:virtualhost_id+' => '~~',
-    'Class:VirtualMachine/Attribute:virtualhost_name' => 'Virtuális gazdagép név',
-    'Class:VirtualMachine/Attribute:virtualhost_name+' => '~~',
-    'Class:VirtualMachine/Attribute:osfamily_id' => 'OS család',
-    'Class:VirtualMachine/Attribute:osfamily_id+' => '~~',
-    'Class:VirtualMachine/Attribute:osfamily_name' => 'OS család név',
-    'Class:VirtualMachine/Attribute:osfamily_name+' => '~~',
-    'Class:VirtualMachine/Attribute:osversion_id' => 'OS verzió',
-    'Class:VirtualMachine/Attribute:osversion_id+' => '~~',
-    'Class:VirtualMachine/Attribute:osversion_name' => 'OS verzió név',
-    'Class:VirtualMachine/Attribute:osversion_name+' => '~~',
-    'Class:VirtualMachine/Attribute:oslicence_id' => 'OS licenc',
-    'Class:VirtualMachine/Attribute:oslicence_id+' => '~~',
-    'Class:VirtualMachine/Attribute:oslicence_name' => 'OS licenc név',
-    'Class:VirtualMachine/Attribute:oslicence_name+' => '~~',
-    'Class:VirtualMachine/Attribute:cpu' => 'CPU',
-    'Class:VirtualMachine/Attribute:cpu+' => '~~',
-    'Class:VirtualMachine/Attribute:ram' => 'RAM',
-    'Class:VirtualMachine/Attribute:ram+' => '~~',
-    'Class:VirtualMachine/Attribute:managementip' => 'IP cím',
-    'Class:VirtualMachine/Attribute:managementip+' => '~~',
-    'Class:VirtualMachine/Attribute:logicalinterface_list' => 'Hálózati csatolók',
-    'Class:VirtualMachine/Attribute:logicalinterface_list+' => 'Logikai hálózati csatolók',
+	'Class:VirtualMachine' => 'Virtuális gép',
+	'Class:VirtualMachine+' => '~~',
+	'Class:VirtualMachine/ComplementaryName' => '%1$s - %2$s~~',
+	'Class:VirtualMachine/Attribute:virtualhost_id' => 'Virtuális gazdagép',
+	'Class:VirtualMachine/Attribute:virtualhost_id+' => '~~',
+	'Class:VirtualMachine/Attribute:virtualhost_name' => 'Virtuális gazdagép név',
+	'Class:VirtualMachine/Attribute:virtualhost_name+' => '~~',
+	'Class:VirtualMachine/Attribute:osfamily_id' => 'OS család',
+	'Class:VirtualMachine/Attribute:osfamily_id+' => '~~',
+	'Class:VirtualMachine/Attribute:osfamily_name' => 'OS család név',
+	'Class:VirtualMachine/Attribute:osfamily_name+' => '~~',
+	'Class:VirtualMachine/Attribute:osversion_id' => 'OS verzió',
+	'Class:VirtualMachine/Attribute:osversion_id+' => '~~',
+	'Class:VirtualMachine/Attribute:osversion_name' => 'OS verzió név',
+	'Class:VirtualMachine/Attribute:osversion_name+' => '~~',
+	'Class:VirtualMachine/Attribute:oslicence_id' => 'OS licenc',
+	'Class:VirtualMachine/Attribute:oslicence_id+' => '~~',
+	'Class:VirtualMachine/Attribute:oslicence_name' => 'OS licenc név',
+	'Class:VirtualMachine/Attribute:oslicence_name+' => '~~',
+	'Class:VirtualMachine/Attribute:cpu' => 'CPU',
+	'Class:VirtualMachine/Attribute:cpu+' => '~~',
+	'Class:VirtualMachine/Attribute:ram' => 'RAM',
+	'Class:VirtualMachine/Attribute:ram+' => '~~',
+	'Class:VirtualMachine/Attribute:managementip' => 'IP cím',
+	'Class:VirtualMachine/Attribute:managementip+' => '~~',
+	'Class:VirtualMachine/Attribute:logicalinterface_list' => 'Hálózati csatolók',
+	'Class:VirtualMachine/Attribute:logicalinterface_list+' => 'Logikai hálózati csatolók',
 ));
 
 //
@@ -737,26 +760,26 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:LogicalVolume' => 'Logikai kötet',
-    'Class:LogicalVolume+' => '~~',
-    'Class:LogicalVolume/Attribute:name' => 'Név',
-    'Class:LogicalVolume/Attribute:name+' => '~~',
-    'Class:LogicalVolume/Attribute:lun_id' => 'LUN ID',
-    'Class:LogicalVolume/Attribute:lun_id+' => '~~',
-    'Class:LogicalVolume/Attribute:description' => 'Leírás',
-    'Class:LogicalVolume/Attribute:description+' => '~~',
-    'Class:LogicalVolume/Attribute:raid_level' => 'Raid szint',
-    'Class:LogicalVolume/Attribute:raid_level+' => '~~',
-    'Class:LogicalVolume/Attribute:size' => 'Méret',
-    'Class:LogicalVolume/Attribute:size+' => '~~',
-    'Class:LogicalVolume/Attribute:storagesystem_id' => 'Tárolórendszer',
-    'Class:LogicalVolume/Attribute:storagesystem_id+' => '~~',
-    'Class:LogicalVolume/Attribute:storagesystem_name' => 'Tárolórendszer név',
-    'Class:LogicalVolume/Attribute:storagesystem_name+' => '~~',
-    'Class:LogicalVolume/Attribute:servers_list' => 'Szerverek',
-    'Class:LogicalVolume/Attribute:servers_list+' => 'Szerverek, melyek ezt a kötetet használják',
-    'Class:LogicalVolume/Attribute:virtualdevices_list' => 'Virtuális eszközök',
-    'Class:LogicalVolume/Attribute:virtualdevices_list+' => 'Virtuális eszközök, melyek ezt a kötetet használják',
+	'Class:LogicalVolume' => 'Logikai kötet',
+	'Class:LogicalVolume+' => '~~',
+	'Class:LogicalVolume/Attribute:name' => 'Név',
+	'Class:LogicalVolume/Attribute:name+' => '~~',
+	'Class:LogicalVolume/Attribute:lun_id' => 'LUN ID',
+	'Class:LogicalVolume/Attribute:lun_id+' => '~~',
+	'Class:LogicalVolume/Attribute:description' => 'Leírás',
+	'Class:LogicalVolume/Attribute:description+' => '~~',
+	'Class:LogicalVolume/Attribute:raid_level' => 'Raid szint',
+	'Class:LogicalVolume/Attribute:raid_level+' => '~~',
+	'Class:LogicalVolume/Attribute:size' => 'Méret',
+	'Class:LogicalVolume/Attribute:size+' => '~~',
+	'Class:LogicalVolume/Attribute:storagesystem_id' => 'Tárolórendszer',
+	'Class:LogicalVolume/Attribute:storagesystem_id+' => '~~',
+	'Class:LogicalVolume/Attribute:storagesystem_name' => 'Tárolórendszer név',
+	'Class:LogicalVolume/Attribute:storagesystem_name+' => '~~',
+	'Class:LogicalVolume/Attribute:servers_list' => 'Szerverek',
+	'Class:LogicalVolume/Attribute:servers_list+' => 'Szerverek, melyek ezt a kötetet használják',
+	'Class:LogicalVolume/Attribute:virtualdevices_list' => 'Virtuális eszközök',
+	'Class:LogicalVolume/Attribute:virtualdevices_list+' => 'Virtuális eszközök, melyek ezt a kötetet használják',
 ));
 
 //
@@ -764,18 +787,19 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:lnkServerToVolume' => 'Szerver / Kötet',
-    'Class:lnkServerToVolume+' => '~~',
-    'Class:lnkServerToVolume/Attribute:volume_id' => 'Kötet',
-    'Class:lnkServerToVolume/Attribute:volume_id+' => '~~',
-    'Class:lnkServerToVolume/Attribute:volume_name' => 'Kötet név',
-    'Class:lnkServerToVolume/Attribute:volume_name+' => '~~',
-    'Class:lnkServerToVolume/Attribute:server_id' => 'Szerver',
-    'Class:lnkServerToVolume/Attribute:server_id+' => '~~',
-    'Class:lnkServerToVolume/Attribute:server_name' => 'Szerver név',
-    'Class:lnkServerToVolume/Attribute:server_name+' => '~~',
-    'Class:lnkServerToVolume/Attribute:size_used' => 'Felhasznált méret',
-    'Class:lnkServerToVolume/Attribute:size_used+' => '~~',
+	'Class:lnkServerToVolume' => 'Szerver / Kötet',
+	'Class:lnkServerToVolume+' => '~~',
+	'Class:lnkServerToVolume/Name' => '%1$s / %2$s~~',
+	'Class:lnkServerToVolume/Attribute:volume_id' => 'Kötet',
+	'Class:lnkServerToVolume/Attribute:volume_id+' => '~~',
+	'Class:lnkServerToVolume/Attribute:volume_name' => 'Kötet név',
+	'Class:lnkServerToVolume/Attribute:volume_name+' => '~~',
+	'Class:lnkServerToVolume/Attribute:server_id' => 'Szerver',
+	'Class:lnkServerToVolume/Attribute:server_id+' => '~~',
+	'Class:lnkServerToVolume/Attribute:server_name' => 'Szerver név',
+	'Class:lnkServerToVolume/Attribute:server_name+' => '~~',
+	'Class:lnkServerToVolume/Attribute:size_used' => 'Felhasznált méret',
+	'Class:lnkServerToVolume/Attribute:size_used+' => '~~',
 ));
 
 //
@@ -783,18 +807,19 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:lnkVirtualDeviceToVolume' => 'Virtuális eszköz / Kötet',
-    'Class:lnkVirtualDeviceToVolume+' => '~~',
-    'Class:lnkVirtualDeviceToVolume/Attribute:volume_id' => 'Kötet',
-    'Class:lnkVirtualDeviceToVolume/Attribute:volume_id+' => '~~',
-    'Class:lnkVirtualDeviceToVolume/Attribute:volume_name' => 'Kötet név',
-    'Class:lnkVirtualDeviceToVolume/Attribute:volume_name+' => '~~',
-    'Class:lnkVirtualDeviceToVolume/Attribute:virtualdevice_id' => 'Virtuális eszköz',
-    'Class:lnkVirtualDeviceToVolume/Attribute:virtualdevice_id+' => '~~',
-    'Class:lnkVirtualDeviceToVolume/Attribute:virtualdevice_name' => 'Virtuális eszköz név',
-    'Class:lnkVirtualDeviceToVolume/Attribute:virtualdevice_name+' => '~~',
-    'Class:lnkVirtualDeviceToVolume/Attribute:size_used' => 'Felhasznált méret',
-    'Class:lnkVirtualDeviceToVolume/Attribute:size_used+' => '~~',
+	'Class:lnkVirtualDeviceToVolume' => 'Virtuális eszköz / Kötet',
+	'Class:lnkVirtualDeviceToVolume+' => '~~',
+	'Class:lnkVirtualDeviceToVolume/Name' => '%1$s / %2$s~~',
+	'Class:lnkVirtualDeviceToVolume/Attribute:volume_id' => 'Kötet',
+	'Class:lnkVirtualDeviceToVolume/Attribute:volume_id+' => '~~',
+	'Class:lnkVirtualDeviceToVolume/Attribute:volume_name' => 'Kötet név',
+	'Class:lnkVirtualDeviceToVolume/Attribute:volume_name+' => '~~',
+	'Class:lnkVirtualDeviceToVolume/Attribute:virtualdevice_id' => 'Virtuális eszköz',
+	'Class:lnkVirtualDeviceToVolume/Attribute:virtualdevice_id+' => '~~',
+	'Class:lnkVirtualDeviceToVolume/Attribute:virtualdevice_name' => 'Virtuális eszköz név',
+	'Class:lnkVirtualDeviceToVolume/Attribute:virtualdevice_name+' => '~~',
+	'Class:lnkVirtualDeviceToVolume/Attribute:size_used' => 'Felhasznált méret',
+	'Class:lnkVirtualDeviceToVolume/Attribute:size_used+' => '~~',
 ));
 
 //
@@ -802,20 +827,21 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:lnkSanToDatacenterDevice' => 'SAN / Adatközpont eszköz',
-    'Class:lnkSanToDatacenterDevice+' => '~~',
-    'Class:lnkSanToDatacenterDevice/Attribute:san_id' => 'SAN switch',
-    'Class:lnkSanToDatacenterDevice/Attribute:san_id+' => '~~',
-    'Class:lnkSanToDatacenterDevice/Attribute:san_name' => 'SAN switch név',
-    'Class:lnkSanToDatacenterDevice/Attribute:san_name+' => '~~',
-    'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_id' => 'Eszköz',
-    'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_id+' => '~~',
-    'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_name' => 'Eszköz név',
-    'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_name+' => '~~',
-    'Class:lnkSanToDatacenterDevice/Attribute:san_port' => 'SAN FC port',
-    'Class:lnkSanToDatacenterDevice/Attribute:san_port+' => '~~',
-    'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_port' => 'Eszköz FC port',
-    'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_port+' => '~~',
+	'Class:lnkSanToDatacenterDevice' => 'SAN / Adatközpont eszköz',
+	'Class:lnkSanToDatacenterDevice+' => '~~',
+	'Class:lnkSanToDatacenterDevice/Name' => '%1$s / %2$s~~',
+	'Class:lnkSanToDatacenterDevice/Attribute:san_id' => 'SAN switch',
+	'Class:lnkSanToDatacenterDevice/Attribute:san_id+' => '~~',
+	'Class:lnkSanToDatacenterDevice/Attribute:san_name' => 'SAN switch név',
+	'Class:lnkSanToDatacenterDevice/Attribute:san_name+' => '~~',
+	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_id' => 'Eszköz',
+	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_id+' => '~~',
+	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_name' => 'Eszköz név',
+	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_name+' => '~~',
+	'Class:lnkSanToDatacenterDevice/Attribute:san_port' => 'SAN FC port',
+	'Class:lnkSanToDatacenterDevice/Attribute:san_port+' => '~~',
+	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_port' => 'Eszköz FC port',
+	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_port+' => '~~',
 ));
 
 //
@@ -823,18 +849,18 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:Tape' => 'Szalag',
-    'Class:Tape+' => '~~',
-    'Class:Tape/Attribute:name' => 'Név',
-    'Class:Tape/Attribute:name+' => '~~',
-    'Class:Tape/Attribute:description' => 'Leírás',
-    'Class:Tape/Attribute:description+' => '~~',
-    'Class:Tape/Attribute:size' => 'Méret',
-    'Class:Tape/Attribute:size+' => '~~',
-    'Class:Tape/Attribute:tapelibrary_id' => 'Szalagos tároló',
-    'Class:Tape/Attribute:tapelibrary_id+' => '~~',
-    'Class:Tape/Attribute:tapelibrary_name' => 'Szalagos tároló név',
-    'Class:Tape/Attribute:tapelibrary_name+' => '~~',
+	'Class:Tape' => 'Szalag',
+	'Class:Tape+' => '~~',
+	'Class:Tape/Attribute:name' => 'Név',
+	'Class:Tape/Attribute:name+' => '~~',
+	'Class:Tape/Attribute:description' => 'Leírás',
+	'Class:Tape/Attribute:description+' => '~~',
+	'Class:Tape/Attribute:size' => 'Méret',
+	'Class:Tape/Attribute:size+' => '~~',
+	'Class:Tape/Attribute:tapelibrary_id' => 'Szalagos tároló',
+	'Class:Tape/Attribute:tapelibrary_id+' => '~~',
+	'Class:Tape/Attribute:tapelibrary_name' => 'Szalagos tároló név',
+	'Class:Tape/Attribute:tapelibrary_name+' => '~~',
 ));
 
 //
@@ -842,20 +868,20 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:NASFileSystem' => 'NAS Fájlrendszer',
-    'Class:NASFileSystem+' => '~~',
-    'Class:NASFileSystem/Attribute:name' => 'Név',
-    'Class:NASFileSystem/Attribute:name+' => '~~',
-    'Class:NASFileSystem/Attribute:description' => 'Leírás',
-    'Class:NASFileSystem/Attribute:description+' => '~~',
-    'Class:NASFileSystem/Attribute:raid_level' => 'Raid szint',
-    'Class:NASFileSystem/Attribute:raid_level+' => '~~',
-    'Class:NASFileSystem/Attribute:size' => 'Méret',
-    'Class:NASFileSystem/Attribute:size+' => '~~',
-    'Class:NASFileSystem/Attribute:nas_id' => 'NAS',
-    'Class:NASFileSystem/Attribute:nas_id+' => '~~',
-    'Class:NASFileSystem/Attribute:nas_name' => 'NAS név',
-    'Class:NASFileSystem/Attribute:nas_name+' => '~~',
+	'Class:NASFileSystem' => 'NAS Fájlrendszer',
+	'Class:NASFileSystem+' => '~~',
+	'Class:NASFileSystem/Attribute:name' => 'Név',
+	'Class:NASFileSystem/Attribute:name+' => '~~',
+	'Class:NASFileSystem/Attribute:description' => 'Leírás',
+	'Class:NASFileSystem/Attribute:description+' => '~~',
+	'Class:NASFileSystem/Attribute:raid_level' => 'Raid szint',
+	'Class:NASFileSystem/Attribute:raid_level+' => '~~',
+	'Class:NASFileSystem/Attribute:size' => 'Méret',
+	'Class:NASFileSystem/Attribute:size+' => '~~',
+	'Class:NASFileSystem/Attribute:nas_id' => 'NAS',
+	'Class:NASFileSystem/Attribute:nas_id+' => '~~',
+	'Class:NASFileSystem/Attribute:nas_name' => 'NAS név',
+	'Class:NASFileSystem/Attribute:nas_name+' => '~~',
 ));
 
 //
@@ -863,34 +889,35 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:Software' => 'Szoftver',
-    'Class:Software+' => '',
-    'Class:Software/Attribute:name' => 'Név',
-    'Class:Software/Attribute:name+' => '',
-    'Class:Software/Attribute:vendor' => 'gyártó',
-    'Class:Software/Attribute:vendor+' => '~~',
-    'Class:Software/Attribute:version' => 'Verzió',
-    'Class:Software/Attribute:version+' => '~~',
-    'Class:Software/Attribute:documents_list' => 'Dokumentumok',
-    'Class:Software/Attribute:documents_list+' => 'A szoftver dokumentumai',
-    'Class:Software/Attribute:type' => 'Típus',
-    'Class:Software/Attribute:type+' => '~~',
-    'Class:Software/Attribute:type/Value:DBServer' => 'DB Szerver',
-    'Class:Software/Attribute:type/Value:DBServer+' => 'DB Server~~',
-    'Class:Software/Attribute:type/Value:Middleware' => 'Middleware',
-    'Class:Software/Attribute:type/Value:Middleware+' => 'Middleware~~',
-    'Class:Software/Attribute:type/Value:OtherSoftware' => 'Egyéb szoftver',
-    'Class:Software/Attribute:type/Value:OtherSoftware+' => 'Other Software~~',
-    'Class:Software/Attribute:type/Value:PCSoftware' => 'PC Szoftver',
-    'Class:Software/Attribute:type/Value:PCSoftware+' => 'PC Software~~',
-    'Class:Software/Attribute:type/Value:WebServer' => 'Webszerver',
-    'Class:Software/Attribute:type/Value:WebServer+' => 'Web Server~~',
-    'Class:Software/Attribute:softwareinstance_list' => 'Szoftverpéldányok',
-    'Class:Software/Attribute:softwareinstance_list+' => 'A szoftver telepített példányai',
-    'Class:Software/Attribute:softwarepatch_list' => 'Javítócsomagok',
-    'Class:Software/Attribute:softwarepatch_list+' => 'A szoftver javítócsomagjai',
-    'Class:Software/Attribute:softwarelicence_list' => 'Szoftver licencek',
-    'Class:Software/Attribute:softwarelicence_list+' => 'A szoftver licencei',
+	'Class:Software' => 'Szoftver',
+	'Class:Software+' => '',
+	'Class:Software/ComplementaryName' => '%1$s - %2$s~~',
+	'Class:Software/Attribute:name' => 'Név',
+	'Class:Software/Attribute:name+' => '',
+	'Class:Software/Attribute:vendor' => 'gyártó',
+	'Class:Software/Attribute:vendor+' => '~~',
+	'Class:Software/Attribute:version' => 'Verzió',
+	'Class:Software/Attribute:version+' => '~~',
+	'Class:Software/Attribute:documents_list' => 'Dokumentumok',
+	'Class:Software/Attribute:documents_list+' => 'A szoftver dokumentumai',
+	'Class:Software/Attribute:type' => 'Típus',
+	'Class:Software/Attribute:type+' => '~~',
+	'Class:Software/Attribute:type/Value:DBServer' => 'DB Szerver',
+	'Class:Software/Attribute:type/Value:DBServer+' => 'DB Server~~',
+	'Class:Software/Attribute:type/Value:Middleware' => 'Middleware',
+	'Class:Software/Attribute:type/Value:Middleware+' => 'Middleware~~',
+	'Class:Software/Attribute:type/Value:OtherSoftware' => 'Egyéb szoftver',
+	'Class:Software/Attribute:type/Value:OtherSoftware+' => 'Other Software~~',
+	'Class:Software/Attribute:type/Value:PCSoftware' => 'PC Szoftver',
+	'Class:Software/Attribute:type/Value:PCSoftware+' => 'PC Software~~',
+	'Class:Software/Attribute:type/Value:WebServer' => 'Webszerver',
+	'Class:Software/Attribute:type/Value:WebServer+' => 'Web Server~~',
+	'Class:Software/Attribute:softwareinstance_list' => 'Szoftverpéldányok',
+	'Class:Software/Attribute:softwareinstance_list+' => 'A szoftver telepített példányai',
+	'Class:Software/Attribute:softwarepatch_list' => 'Javítócsomagok',
+	'Class:Software/Attribute:softwarepatch_list+' => 'A szoftver javítócsomagjai',
+	'Class:Software/Attribute:softwarelicence_list' => 'Szoftver licencek',
+	'Class:Software/Attribute:softwarelicence_list+' => 'A szoftver licencei',
 ));
 
 //
@@ -898,16 +925,16 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:Patch' => 'Javítócsomag',
-    'Class:Patch+' => '',
-    'Class:Patch/Attribute:name' => 'Név',
-    'Class:Patch/Attribute:name+' => '',
-    'Class:Patch/Attribute:documents_list' => 'Dokumentumok',
-    'Class:Patch/Attribute:documents_list+' => 'A javítócsomag dokumentumai',
-    'Class:Patch/Attribute:description' => 'Leírás',
-    'Class:Patch/Attribute:description+' => '',
-    'Class:Patch/Attribute:finalclass' => 'Típus',
-    'Class:Patch/Attribute:finalclass+' => 'A végső osztály neve',
+	'Class:Patch' => 'Javítócsomag',
+	'Class:Patch+' => '',
+	'Class:Patch/Attribute:name' => 'Név',
+	'Class:Patch/Attribute:name+' => '',
+	'Class:Patch/Attribute:documents_list' => 'Dokumentumok',
+	'Class:Patch/Attribute:documents_list+' => 'A javítócsomag dokumentumai',
+	'Class:Patch/Attribute:description' => 'Leírás',
+	'Class:Patch/Attribute:description+' => '',
+	'Class:Patch/Attribute:finalclass' => 'Típus',
+	'Class:Patch/Attribute:finalclass+' => 'A végső osztály neve',
 ));
 
 //
@@ -915,14 +942,14 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:OSPatch' => 'OS javítócsomag',
-    'Class:OSPatch+' => '~~',
-    'Class:OSPatch/Attribute:functionalcis_list' => 'Eszközök',
-    'Class:OSPatch/Attribute:functionalcis_list+' => 'Rendszerek, amelyekre telepítve lett ez az OS javítócsomag',
-    'Class:OSPatch/Attribute:osversion_id' => 'OS verzió',
-    'Class:OSPatch/Attribute:osversion_id+' => '~~',
-    'Class:OSPatch/Attribute:osversion_name' => 'OS verzió név',
-    'Class:OSPatch/Attribute:osversion_name+' => '~~',
+	'Class:OSPatch' => 'OS javítócsomag',
+	'Class:OSPatch+' => '~~',
+	'Class:OSPatch/Attribute:functionalcis_list' => 'Eszközök',
+	'Class:OSPatch/Attribute:functionalcis_list+' => 'Rendszerek, amelyekre telepítve lett ez az OS javítócsomag',
+	'Class:OSPatch/Attribute:osversion_id' => 'OS verzió',
+	'Class:OSPatch/Attribute:osversion_id+' => '~~',
+	'Class:OSPatch/Attribute:osversion_name' => 'OS verzió név',
+	'Class:OSPatch/Attribute:osversion_name+' => '~~',
 ));
 
 //
@@ -930,14 +957,14 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:SoftwarePatch' => 'Szoftver javítócsomag',
-    'Class:SoftwarePatch+' => '~~',
-    'Class:SoftwarePatch/Attribute:software_id' => 'Szoftver',
-    'Class:SoftwarePatch/Attribute:software_id+' => '~~',
-    'Class:SoftwarePatch/Attribute:software_name' => 'Szoftver név',
-    'Class:SoftwarePatch/Attribute:software_name+' => '~~',
-    'Class:SoftwarePatch/Attribute:softwareinstances_list' => 'Szoftverpéldányok',
-    'Class:SoftwarePatch/Attribute:softwareinstances_list+' => 'Rendszerek, amelyekre telepítve van ez a szoftverjavítás',
+	'Class:SoftwarePatch' => 'Szoftver javítócsomag',
+	'Class:SoftwarePatch+' => '~~',
+	'Class:SoftwarePatch/Attribute:software_id' => 'Szoftver',
+	'Class:SoftwarePatch/Attribute:software_id+' => '~~',
+	'Class:SoftwarePatch/Attribute:software_name' => 'Szoftver név',
+	'Class:SoftwarePatch/Attribute:software_name+' => '~~',
+	'Class:SoftwarePatch/Attribute:softwareinstances_list' => 'Szoftverpéldányok',
+	'Class:SoftwarePatch/Attribute:softwareinstances_list+' => 'Rendszerek, amelyekre telepítve van ez a szoftverjavítás',
 ));
 
 //
@@ -945,34 +972,34 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:Licence' => 'Licensz',
-    'Class:Licence+' => '',
-    'Class:Licence/Attribute:name' => 'Név',
-    'Class:Licence/Attribute:name+' => '',
-    'Class:Licence/Attribute:documents_list' => 'Dokumentumok',
-    'Class:Licence/Attribute:documents_list+' => 'A licenc dokumentumai',
-    'Class:Licence/Attribute:org_id' => 'Tulajdonos szevezeti egység',
-    'Class:Licence/Attribute:org_id+' => '',
-    'Class:Licence/Attribute:organization_name' => 'Szervezeti egység név',
-    'Class:Licence/Attribute:organization_name+' => 'Általános név',
-    'Class:Licence/Attribute:usage_limit' => 'Felhasználási korlátok',
-    'Class:Licence/Attribute:usage_limit+' => '',
-    'Class:Licence/Attribute:description' => 'Leírás',
-    'Class:Licence/Attribute:description+' => '~~',
-    'Class:Licence/Attribute:start_date' => 'Kezdő dátum',
-    'Class:Licence/Attribute:start_date+' => '~~',
-    'Class:Licence/Attribute:end_date' => 'Befejező dátum',
-    'Class:Licence/Attribute:end_date+' => '~~',
-    'Class:Licence/Attribute:licence_key' => 'Licenckulcs',
-    'Class:Licence/Attribute:licence_key+' => '',
-    'Class:Licence/Attribute:perpetual' => 'Öröklicenc',
-    'Class:Licence/Attribute:perpetual+' => '~~',
-    'Class:Licence/Attribute:perpetual/Value:no' => 'nem',
-    'Class:Licence/Attribute:perpetual/Value:no+' => 'no~~',
-    'Class:Licence/Attribute:perpetual/Value:yes' => 'igen',
-    'Class:Licence/Attribute:perpetual/Value:yes+' => 'yes~~',
-    'Class:Licence/Attribute:finalclass' => 'Típus',
-    'Class:Licence/Attribute:finalclass+' => 'A végső osztály neve',
+	'Class:Licence' => 'Licensz',
+	'Class:Licence+' => '',
+	'Class:Licence/Attribute:name' => 'Név',
+	'Class:Licence/Attribute:name+' => '',
+	'Class:Licence/Attribute:documents_list' => 'Dokumentumok',
+	'Class:Licence/Attribute:documents_list+' => 'A licenc dokumentumai',
+	'Class:Licence/Attribute:org_id' => 'Tulajdonos szevezeti egység',
+	'Class:Licence/Attribute:org_id+' => '',
+	'Class:Licence/Attribute:organization_name' => 'Szervezeti egység név',
+	'Class:Licence/Attribute:organization_name+' => 'Általános név',
+	'Class:Licence/Attribute:usage_limit' => 'Felhasználási korlátok',
+	'Class:Licence/Attribute:usage_limit+' => '',
+	'Class:Licence/Attribute:description' => 'Leírás',
+	'Class:Licence/Attribute:description+' => '~~',
+	'Class:Licence/Attribute:start_date' => 'Kezdő dátum',
+	'Class:Licence/Attribute:start_date+' => '~~',
+	'Class:Licence/Attribute:end_date' => 'Befejező dátum',
+	'Class:Licence/Attribute:end_date+' => '~~',
+	'Class:Licence/Attribute:licence_key' => 'Licenckulcs',
+	'Class:Licence/Attribute:licence_key+' => '',
+	'Class:Licence/Attribute:perpetual' => 'Öröklicenc',
+	'Class:Licence/Attribute:perpetual+' => '~~',
+	'Class:Licence/Attribute:perpetual/Value:no' => 'nem',
+	'Class:Licence/Attribute:perpetual/Value:no+' => 'no~~',
+	'Class:Licence/Attribute:perpetual/Value:yes' => 'igen',
+	'Class:Licence/Attribute:perpetual/Value:yes+' => 'yes~~',
+	'Class:Licence/Attribute:finalclass' => 'Típus',
+	'Class:Licence/Attribute:finalclass+' => 'A végső osztály neve',
 ));
 
 //
@@ -980,16 +1007,17 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:OSLicence' => 'OS Licenc',
-    'Class:OSLicence+' => '~~',
-    'Class:OSLicence/Attribute:osversion_id' => 'OS verzió',
-    'Class:OSLicence/Attribute:osversion_id+' => '~~',
-    'Class:OSLicence/Attribute:osversion_name' => 'OS verzió név',
-    'Class:OSLicence/Attribute:osversion_name+' => '~~',
-    'Class:OSLicence/Attribute:virtualmachines_list' => 'Virtuális gépek',
-    'Class:OSLicence/Attribute:virtualmachines_list+' => 'Virtuális gépek, melyek ezt a licencet használják',
-    'Class:OSLicence/Attribute:servers_list' => 'Szerverek',
-    'Class:OSLicence/Attribute:servers_list+' => 'Szerverek, melyek ezt a licencet használják',
+	'Class:OSLicence' => 'OS Licenc',
+	'Class:OSLicence+' => '~~',
+	'Class:OSLicence/ComplementaryName' => '%1$s - %2$s~~',
+	'Class:OSLicence/Attribute:osversion_id' => 'OS verzió',
+	'Class:OSLicence/Attribute:osversion_id+' => '~~',
+	'Class:OSLicence/Attribute:osversion_name' => 'OS verzió név',
+	'Class:OSLicence/Attribute:osversion_name+' => '~~',
+	'Class:OSLicence/Attribute:virtualmachines_list' => 'Virtuális gépek',
+	'Class:OSLicence/Attribute:virtualmachines_list+' => 'Virtuális gépek, melyek ezt a licencet használják',
+	'Class:OSLicence/Attribute:servers_list' => 'Szerverek',
+	'Class:OSLicence/Attribute:servers_list+' => 'Szerverek, melyek ezt a licencet használják',
 ));
 
 //
@@ -997,14 +1025,15 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:SoftwareLicence' => 'Szoftver licenc',
-    'Class:SoftwareLicence+' => '~~',
-    'Class:SoftwareLicence/Attribute:software_id' => 'Szoftver',
-    'Class:SoftwareLicence/Attribute:software_id+' => '~~',
-    'Class:SoftwareLicence/Attribute:software_name' => 'Szoftver név',
-    'Class:SoftwareLicence/Attribute:software_name+' => '~~',
-    'Class:SoftwareLicence/Attribute:softwareinstance_list' => 'Szoftverpéldányok',
-    'Class:SoftwareLicence/Attribute:softwareinstance_list+' => 'Rendszerek, melyek ezt a licencet használják',
+	'Class:SoftwareLicence' => 'Szoftver licenc',
+	'Class:SoftwareLicence+' => '~~',
+	'Class:SoftwareLicence/ComplementaryName' => '%1$s - %2$s~~',
+	'Class:SoftwareLicence/Attribute:software_id' => 'Szoftver',
+	'Class:SoftwareLicence/Attribute:software_id+' => '~~',
+	'Class:SoftwareLicence/Attribute:software_name' => 'Szoftver név',
+	'Class:SoftwareLicence/Attribute:software_name+' => '~~',
+	'Class:SoftwareLicence/Attribute:softwareinstance_list' => 'Szoftverpéldányok',
+	'Class:SoftwareLicence/Attribute:softwareinstance_list+' => 'Rendszerek, melyek ezt a licencet használják',
 ));
 
 //
@@ -1012,16 +1041,17 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:lnkDocumentToLicence' => 'Dokumentum / Licenc',
-    'Class:lnkDocumentToLicence+' => '~~',
-    'Class:lnkDocumentToLicence/Attribute:licence_id' => 'Licenc',
-    'Class:lnkDocumentToLicence/Attribute:licence_id+' => '~~',
-    'Class:lnkDocumentToLicence/Attribute:licence_name' => 'Licenc név',
-    'Class:lnkDocumentToLicence/Attribute:licence_name+' => '~~',
-    'Class:lnkDocumentToLicence/Attribute:document_id' => 'Dokumentum',
-    'Class:lnkDocumentToLicence/Attribute:document_id+' => '~~',
-    'Class:lnkDocumentToLicence/Attribute:document_name' => 'Dokumentum név',
-    'Class:lnkDocumentToLicence/Attribute:document_name+' => '~~',
+	'Class:lnkDocumentToLicence' => 'Dokumentum / Licenc',
+	'Class:lnkDocumentToLicence+' => '~~',
+	'Class:lnkDocumentToLicence/Name' => '%1$s / %2$s~~',
+	'Class:lnkDocumentToLicence/Attribute:licence_id' => 'Licenc',
+	'Class:lnkDocumentToLicence/Attribute:licence_id+' => '~~',
+	'Class:lnkDocumentToLicence/Attribute:licence_name' => 'Licenc név',
+	'Class:lnkDocumentToLicence/Attribute:licence_name+' => '~~',
+	'Class:lnkDocumentToLicence/Attribute:document_id' => 'Dokumentum',
+	'Class:lnkDocumentToLicence/Attribute:document_id+' => '~~',
+	'Class:lnkDocumentToLicence/Attribute:document_name' => 'Dokumentum név',
+	'Class:lnkDocumentToLicence/Attribute:document_name+' => '~~',
 ));
 
 //
@@ -1029,12 +1059,12 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:OSVersion' => 'OS Verzió',
-    'Class:OSVersion+' => '~~',
-    'Class:OSVersion/Attribute:osfamily_id' => 'OS család',
-    'Class:OSVersion/Attribute:osfamily_id+' => '~~',
-    'Class:OSVersion/Attribute:osfamily_name' => 'OS család név',
-    'Class:OSVersion/Attribute:osfamily_name+' => '~~',
+	'Class:OSVersion' => 'OS Verzió',
+	'Class:OSVersion+' => '~~',
+	'Class:OSVersion/Attribute:osfamily_id' => 'OS család',
+	'Class:OSVersion/Attribute:osfamily_id+' => '~~',
+	'Class:OSVersion/Attribute:osfamily_name' => 'OS család név',
+	'Class:OSVersion/Attribute:osfamily_name+' => '~~',
 ));
 
 //
@@ -1042,8 +1072,8 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:OSFamily' => 'OS család',
-    'Class:OSFamily+' => '~~',
+	'Class:OSFamily' => 'OS család',
+	'Class:OSFamily+' => '~~',
 ));
 
 //
@@ -1051,12 +1081,12 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:Brand' => 'Gyártó',
-    'Class:Brand+' => '~~',
-    'Class:Brand/Attribute:physicaldevices_list' => 'Fizikai eszközök',
-    'Class:Brand/Attribute:physicaldevices_list+' => 'Ennek a gyártónak a fizikai eszközei',
-    'Class:Brand/UniquenessRule:name+' => '',
-    'Class:Brand/UniquenessRule:name' => 'Ez a gyártó már létezik',
+	'Class:Brand' => 'Gyártó',
+	'Class:Brand+' => '~~',
+	'Class:Brand/Attribute:physicaldevices_list' => 'Fizikai eszközök',
+	'Class:Brand/Attribute:physicaldevices_list+' => 'Ennek a gyártónak a fizikai eszközei',
+	'Class:Brand/UniquenessRule:name+' => '',
+	'Class:Brand/UniquenessRule:name' => 'Ez a gyártó már létezik',
 ));
 
 //
@@ -1064,54 +1094,55 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:Model' => 'Modell',
-    'Class:Model+' => '~~',
-    'Class:Model/Attribute:brand_id' => 'Gyártó',
-    'Class:Model/Attribute:brand_id+' => '~~',
-    'Class:Model/Attribute:brand_name' => 'Gyártó név',
-    'Class:Model/Attribute:brand_name+' => '~~',
-    'Class:Model/Attribute:type' => 'Eszköz típus',
-    'Class:Model/Attribute:type+' => '~~',
-    'Class:Model/Attribute:type/Value:PowerSource' => 'Áramforrás',
-    'Class:Model/Attribute:type/Value:PowerSource+' => 'Áramforrás',
-    'Class:Model/Attribute:type/Value:DiskArray' => 'Lemez tömb',
-    'Class:Model/Attribute:type/Value:DiskArray+' => '',
-    'Class:Model/Attribute:type/Value:Enclosure' => 'Készülékház',
-    'Class:Model/Attribute:type/Value:Enclosure+' => 'Enclosure~~',
-    'Class:Model/Attribute:type/Value:IPPhone' => 'Egyéb eszköz',
-    'Class:Model/Attribute:type/Value:IPPhone+' => 'IP Phone~~',
-    'Class:Model/Attribute:type/Value:MobilePhone' => 'Mobiltelefon',
-    'Class:Model/Attribute:type/Value:MobilePhone+' => 'Mobile Phone~~',
-    'Class:Model/Attribute:type/Value:NAS' => 'NAS',
-    'Class:Model/Attribute:type/Value:NAS+' => 'NAS~~',
-    'Class:Model/Attribute:type/Value:NetworkDevice' => 'Hálózati eszköz',
-    'Class:Model/Attribute:type/Value:NetworkDevice+' => 'Network Device~~',
-    'Class:Model/Attribute:type/Value:PC' => 'PC',
-    'Class:Model/Attribute:type/Value:PC+' => 'PC~~',
-    'Class:Model/Attribute:type/Value:PDU' => 'PDU',
-    'Class:Model/Attribute:type/Value:PDU+' => 'PDU~~',
-    'Class:Model/Attribute:type/Value:Peripheral' => 'Periféria',
-    'Class:Model/Attribute:type/Value:Peripheral+' => 'Peripheral~~',
-    'Class:Model/Attribute:type/Value:Printer' => 'Nyomtató',
-    'Class:Model/Attribute:type/Value:Printer+' => 'Printer~~',
-    'Class:Model/Attribute:type/Value:Rack' => 'Rack',
-    'Class:Model/Attribute:type/Value:Rack+' => 'Rack~~',
-    'Class:Model/Attribute:type/Value:SANSwitch' => 'SAN switch',
-    'Class:Model/Attribute:type/Value:SANSwitch+' => 'SAN switch~~',
-    'Class:Model/Attribute:type/Value:Server' => 'Szerver',
-    'Class:Model/Attribute:type/Value:Server+' => 'Server~~',
-    'Class:Model/Attribute:type/Value:StorageSystem' => 'Tárolórendszer',
-    'Class:Model/Attribute:type/Value:StorageSystem+' => 'Storage System~~',
-    'Class:Model/Attribute:type/Value:Tablet' => 'Táblagép',
-    'Class:Model/Attribute:type/Value:Tablet+' => 'Tablet~~',
-    'Class:Model/Attribute:type/Value:TapeLibrary' => 'Szalagos tároló',
-    'Class:Model/Attribute:type/Value:TapeLibrary+' => 'Tape Library~~',
-    'Class:Model/Attribute:type/Value:Phone' => 'Telefon',
-    'Class:Model/Attribute:type/Value:Phone+' => 'Telephone~~',
-    'Class:Model/Attribute:physicaldevices_list' => 'Fizikai eszközök',
-    'Class:Model/Attribute:physicaldevices_list+' => 'Fizikai eszközök melyek ehhez a modellszámhoz tartoznak',
-    'Class:Model/UniquenessRule:name_brand+' => 'A névnek egyedinek kell lennie a gyártón belül',
-    'Class:Model/UniquenessRule:name_brand' => 'a gyártó ezen modellje már létezik',
+	'Class:Model' => 'Modell',
+	'Class:Model+' => '~~',
+	'Class:Model/ComplementaryName' => '%1$s - %2$s~~',
+	'Class:Model/Attribute:brand_id' => 'Gyártó',
+	'Class:Model/Attribute:brand_id+' => '~~',
+	'Class:Model/Attribute:brand_name' => 'Gyártó név',
+	'Class:Model/Attribute:brand_name+' => '~~',
+	'Class:Model/Attribute:type' => 'Eszköz típus',
+	'Class:Model/Attribute:type+' => '~~',
+	'Class:Model/Attribute:type/Value:PowerSource' => 'Áramforrás',
+	'Class:Model/Attribute:type/Value:PowerSource+' => 'Áramforrás',
+	'Class:Model/Attribute:type/Value:DiskArray' => 'Lemez tömb',
+	'Class:Model/Attribute:type/Value:DiskArray+' => '',
+	'Class:Model/Attribute:type/Value:Enclosure' => 'Készülékház',
+	'Class:Model/Attribute:type/Value:Enclosure+' => 'Enclosure~~',
+	'Class:Model/Attribute:type/Value:IPPhone' => 'Egyéb eszköz',
+	'Class:Model/Attribute:type/Value:IPPhone+' => 'IP Phone~~',
+	'Class:Model/Attribute:type/Value:MobilePhone' => 'Mobiltelefon',
+	'Class:Model/Attribute:type/Value:MobilePhone+' => 'Mobile Phone~~',
+	'Class:Model/Attribute:type/Value:NAS' => 'NAS',
+	'Class:Model/Attribute:type/Value:NAS+' => 'NAS~~',
+	'Class:Model/Attribute:type/Value:NetworkDevice' => 'Hálózati eszköz',
+	'Class:Model/Attribute:type/Value:NetworkDevice+' => 'Network Device~~',
+	'Class:Model/Attribute:type/Value:PC' => 'PC',
+	'Class:Model/Attribute:type/Value:PC+' => 'PC~~',
+	'Class:Model/Attribute:type/Value:PDU' => 'PDU',
+	'Class:Model/Attribute:type/Value:PDU+' => 'PDU~~',
+	'Class:Model/Attribute:type/Value:Peripheral' => 'Periféria',
+	'Class:Model/Attribute:type/Value:Peripheral+' => 'Peripheral~~',
+	'Class:Model/Attribute:type/Value:Printer' => 'Nyomtató',
+	'Class:Model/Attribute:type/Value:Printer+' => 'Printer~~',
+	'Class:Model/Attribute:type/Value:Rack' => 'Rack',
+	'Class:Model/Attribute:type/Value:Rack+' => 'Rack~~',
+	'Class:Model/Attribute:type/Value:SANSwitch' => 'SAN switch',
+	'Class:Model/Attribute:type/Value:SANSwitch+' => 'SAN switch~~',
+	'Class:Model/Attribute:type/Value:Server' => 'Szerver',
+	'Class:Model/Attribute:type/Value:Server+' => 'Server~~',
+	'Class:Model/Attribute:type/Value:StorageSystem' => 'Tárolórendszer',
+	'Class:Model/Attribute:type/Value:StorageSystem+' => 'Storage System~~',
+	'Class:Model/Attribute:type/Value:Tablet' => 'Táblagép',
+	'Class:Model/Attribute:type/Value:Tablet+' => 'Tablet~~',
+	'Class:Model/Attribute:type/Value:TapeLibrary' => 'Szalagos tároló',
+	'Class:Model/Attribute:type/Value:TapeLibrary+' => 'Tape Library~~',
+	'Class:Model/Attribute:type/Value:Phone' => 'Telefon',
+	'Class:Model/Attribute:type/Value:Phone+' => 'Telephone~~',
+	'Class:Model/Attribute:physicaldevices_list' => 'Fizikai eszközök',
+	'Class:Model/Attribute:physicaldevices_list+' => 'Fizikai eszközök melyek ehhez a modellszámhoz tartoznak',
+	'Class:Model/UniquenessRule:name_brand+' => 'A névnek egyedinek kell lennie a gyártón belül',
+	'Class:Model/UniquenessRule:name_brand' => 'a gyártó ezen modellje már létezik',
 ));
 
 //
@@ -1119,10 +1150,10 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:NetworkDeviceType' => 'Hálózati eszköz típus',
-    'Class:NetworkDeviceType+' => '~~',
-    'Class:NetworkDeviceType/Attribute:networkdevicesdevices_list' => 'Hálózati eszközök',
-    'Class:NetworkDeviceType/Attribute:networkdevicesdevices_list+' => 'Ilyen típusú hálózati eszközök',
+	'Class:NetworkDeviceType' => 'Hálózati eszköz típus',
+	'Class:NetworkDeviceType+' => '~~',
+	'Class:NetworkDeviceType/Attribute:networkdevicesdevices_list' => 'Hálózati eszközök',
+	'Class:NetworkDeviceType/Attribute:networkdevicesdevices_list+' => 'Ilyen típusú hálózati eszközök',
 ));
 
 //
@@ -1130,12 +1161,12 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:IOSVersion' => 'IOS Verzió',
-    'Class:IOSVersion+' => '~~',
-    'Class:IOSVersion/Attribute:brand_id' => 'Gyártó',
-    'Class:IOSVersion/Attribute:brand_id+' => '~~',
-    'Class:IOSVersion/Attribute:brand_name' => 'Gyártó név',
-    'Class:IOSVersion/Attribute:brand_name+' => '~~',
+	'Class:IOSVersion' => 'IOS Verzió',
+	'Class:IOSVersion+' => '~~',
+	'Class:IOSVersion/Attribute:brand_id' => 'Gyártó',
+	'Class:IOSVersion/Attribute:brand_id+' => '~~',
+	'Class:IOSVersion/Attribute:brand_name' => 'Gyártó név',
+	'Class:IOSVersion/Attribute:brand_name+' => '~~',
 ));
 
 //
@@ -1143,16 +1174,17 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:lnkDocumentToPatch' => 'Dokumentum / Javítócsomag',
-    'Class:lnkDocumentToPatch+' => '~~',
-    'Class:lnkDocumentToPatch/Attribute:patch_id' => 'Javítócsomag',
-    'Class:lnkDocumentToPatch/Attribute:patch_id+' => '~~',
-    'Class:lnkDocumentToPatch/Attribute:patch_name' => 'Javítócsomag név',
-    'Class:lnkDocumentToPatch/Attribute:patch_name+' => '~~',
-    'Class:lnkDocumentToPatch/Attribute:document_id' => 'Dokumentum',
-    'Class:lnkDocumentToPatch/Attribute:document_id+' => '~~',
-    'Class:lnkDocumentToPatch/Attribute:document_name' => 'Dokumentum név',
-    'Class:lnkDocumentToPatch/Attribute:document_name+' => '~~',
+	'Class:lnkDocumentToPatch' => 'Dokumentum / Javítócsomag',
+	'Class:lnkDocumentToPatch+' => '~~',
+	'Class:lnkDocumentToPatch/Name' => '%1$s / %2$s~~',
+	'Class:lnkDocumentToPatch/Attribute:patch_id' => 'Javítócsomag',
+	'Class:lnkDocumentToPatch/Attribute:patch_id+' => '~~',
+	'Class:lnkDocumentToPatch/Attribute:patch_name' => 'Javítócsomag név',
+	'Class:lnkDocumentToPatch/Attribute:patch_name+' => '~~',
+	'Class:lnkDocumentToPatch/Attribute:document_id' => 'Dokumentum',
+	'Class:lnkDocumentToPatch/Attribute:document_id+' => '~~',
+	'Class:lnkDocumentToPatch/Attribute:document_name' => 'Dokumentum név',
+	'Class:lnkDocumentToPatch/Attribute:document_name+' => '~~',
 ));
 
 //
@@ -1160,16 +1192,17 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:lnkSoftwareInstanceToSoftwarePatch' => 'Szoftverpéldány / Szoftver javítócsomag',
-    'Class:lnkSoftwareInstanceToSoftwarePatch+' => '~~',
-    'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id' => 'Szoftver javítócsomag',
-    'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id+' => '~~',
-    'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_name' => 'Szoftver javítócsomag név',
-    'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_name+' => '~~',
-    'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_id' => 'Szoftverpéldány',
-    'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_id+' => '~~',
-    'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_name' => 'Szoftverpéldány név',
-    'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_name+' => '~~',
+	'Class:lnkSoftwareInstanceToSoftwarePatch' => 'Szoftverpéldány / Szoftver javítócsomag',
+	'Class:lnkSoftwareInstanceToSoftwarePatch+' => '~~',
+	'Class:lnkSoftwareInstanceToSoftwarePatch/Name' => '%1$s / %2$s~~',
+	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id' => 'Szoftver javítócsomag',
+	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id+' => '~~',
+	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_name' => 'Szoftver javítócsomag név',
+	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_name+' => '~~',
+	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_id' => 'Szoftverpéldány',
+	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_id+' => '~~',
+	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_name' => 'Szoftverpéldány név',
+	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_name+' => '~~',
 ));
 
 //
@@ -1177,16 +1210,17 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:lnkFunctionalCIToOSPatch' => 'Funkcionális CI / OS javítócsomag',
-    'Class:lnkFunctionalCIToOSPatch+' => '~~',
-    'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id' => 'OS javítócsomag',
-    'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id+' => '~~',
-    'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_name' => 'OS javítócsomag név',
-    'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_name+' => '~~',
-    'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_id' => 'Funkcionális CI',
-    'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_id+' => '~~',
-    'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_name' => 'Funkcionális CI név',
-    'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_name+' => '~~',
+	'Class:lnkFunctionalCIToOSPatch' => 'Funkcionális CI / OS javítócsomag',
+	'Class:lnkFunctionalCIToOSPatch+' => '~~',
+	'Class:lnkFunctionalCIToOSPatch/Name' => '%1$s / %2$s~~',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id' => 'OS javítócsomag',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id+' => '~~',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_name' => 'OS javítócsomag név',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_name+' => '~~',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_id' => 'Funkcionális CI',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_id+' => '~~',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_name' => 'Funkcionális CI név',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_name+' => '~~',
 ));
 
 //
@@ -1194,16 +1228,17 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:lnkDocumentToSoftware' => 'Dokumentum / Szoftver',
-    'Class:lnkDocumentToSoftware+' => '~~',
-    'Class:lnkDocumentToSoftware/Attribute:software_id' => 'Szoftver',
-    'Class:lnkDocumentToSoftware/Attribute:software_id+' => '~~',
-    'Class:lnkDocumentToSoftware/Attribute:software_name' => 'Szoftver név',
-    'Class:lnkDocumentToSoftware/Attribute:software_name+' => '~~',
-    'Class:lnkDocumentToSoftware/Attribute:document_id' => 'Dokumentum',
-    'Class:lnkDocumentToSoftware/Attribute:document_id+' => '~~',
-    'Class:lnkDocumentToSoftware/Attribute:document_name' => 'Dokumentum név',
-    'Class:lnkDocumentToSoftware/Attribute:document_name+' => '~~',
+	'Class:lnkDocumentToSoftware' => 'Dokumentum / Szoftver',
+	'Class:lnkDocumentToSoftware+' => '~~',
+	'Class:lnkDocumentToSoftware/Name' => '%1$s / %2$s~~',
+	'Class:lnkDocumentToSoftware/Attribute:software_id' => 'Szoftver',
+	'Class:lnkDocumentToSoftware/Attribute:software_id+' => '~~',
+	'Class:lnkDocumentToSoftware/Attribute:software_name' => 'Szoftver név',
+	'Class:lnkDocumentToSoftware/Attribute:software_name+' => '~~',
+	'Class:lnkDocumentToSoftware/Attribute:document_id' => 'Dokumentum',
+	'Class:lnkDocumentToSoftware/Attribute:document_id+' => '~~',
+	'Class:lnkDocumentToSoftware/Attribute:document_name' => 'Dokumentum név',
+	'Class:lnkDocumentToSoftware/Attribute:document_name+' => '~~',
 ));
 
 //
@@ -1211,22 +1246,24 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:Subnet' => 'Alhálózat',
-    'Class:Subnet+' => '',
-    'Class:Subnet/Attribute:description' => 'Leírás',
-    'Class:Subnet/Attribute:description+' => '',
-    'Class:Subnet/Attribute:subnet_name' => 'Alhálózat név',
-    'Class:Subnet/Attribute:subnet_name+' => '~~',
-    'Class:Subnet/Attribute:org_id' => 'Tulajdonos szevezeti egység',
-    'Class:Subnet/Attribute:org_id+' => '',
-    'Class:Subnet/Attribute:org_name' => 'Név',
-    'Class:Subnet/Attribute:org_name+' => 'Általános név',
-    'Class:Subnet/Attribute:ip' => 'IP cím',
-    'Class:Subnet/Attribute:ip+' => '',
-    'Class:Subnet/Attribute:ip_mask' => 'IP netmaszk',
-    'Class:Subnet/Attribute:ip_mask+' => '',
-    'Class:Subnet/Attribute:vlans_list' => 'VLAN-ok',
-    'Class:Subnet/Attribute:vlans_list+' => '~~',
+	'Class:Subnet' => 'Alhálózat',
+	'Class:Subnet+' => '',
+	'Class:Subnet/Name' => '%1$s/%2$s~~',
+	'Class:Subnet/ComplementaryName' => '%1$s - %2$s~~',
+	'Class:Subnet/Attribute:description' => 'Leírás',
+	'Class:Subnet/Attribute:description+' => '',
+	'Class:Subnet/Attribute:subnet_name' => 'Alhálózat név',
+	'Class:Subnet/Attribute:subnet_name+' => '~~',
+	'Class:Subnet/Attribute:org_id' => 'Tulajdonos szevezeti egység',
+	'Class:Subnet/Attribute:org_id+' => '',
+	'Class:Subnet/Attribute:org_name' => 'Név',
+	'Class:Subnet/Attribute:org_name+' => 'Általános név',
+	'Class:Subnet/Attribute:ip' => 'IP cím',
+	'Class:Subnet/Attribute:ip+' => '',
+	'Class:Subnet/Attribute:ip_mask' => 'IP netmaszk',
+	'Class:Subnet/Attribute:ip_mask+' => '',
+	'Class:Subnet/Attribute:vlans_list' => 'VLAN-ok',
+	'Class:Subnet/Attribute:vlans_list+' => '~~',
 ));
 
 //
@@ -1234,20 +1271,20 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:VLAN' => 'VLAN',
-    'Class:VLAN+' => '~~',
-    'Class:VLAN/Attribute:vlan_tag' => 'VLAN Tag',
-    'Class:VLAN/Attribute:vlan_tag+' => '~~',
-    'Class:VLAN/Attribute:description' => 'Leírás',
-    'Class:VLAN/Attribute:description+' => '~~',
-    'Class:VLAN/Attribute:org_id' => 'Szervezeti egység',
-    'Class:VLAN/Attribute:org_id+' => '~~',
-    'Class:VLAN/Attribute:org_name' => 'Szervezeti egység név',
-    'Class:VLAN/Attribute:org_name+' => 'Általános név',
-    'Class:VLAN/Attribute:subnets_list' => 'Alhálozatok',
-    'Class:VLAN/Attribute:subnets_list+' => '~~',
-    'Class:VLAN/Attribute:physicalinterfaces_list' => 'Fizikai hálózati csatolók',
-    'Class:VLAN/Attribute:physicalinterfaces_list+' => '~~',
+	'Class:VLAN' => 'VLAN',
+	'Class:VLAN+' => '~~',
+	'Class:VLAN/Attribute:vlan_tag' => 'VLAN Tag',
+	'Class:VLAN/Attribute:vlan_tag+' => '~~',
+	'Class:VLAN/Attribute:description' => 'Leírás',
+	'Class:VLAN/Attribute:description+' => '~~',
+	'Class:VLAN/Attribute:org_id' => 'Szervezeti egység',
+	'Class:VLAN/Attribute:org_id+' => '~~',
+	'Class:VLAN/Attribute:org_name' => 'Szervezeti egység név',
+	'Class:VLAN/Attribute:org_name+' => 'Általános név',
+	'Class:VLAN/Attribute:subnets_list' => 'Alhálozatok',
+	'Class:VLAN/Attribute:subnets_list+' => '~~',
+	'Class:VLAN/Attribute:physicalinterfaces_list' => 'Fizikai hálózati csatolók',
+	'Class:VLAN/Attribute:physicalinterfaces_list+' => '~~',
 ));
 
 //
@@ -1255,18 +1292,19 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:lnkSubnetToVLAN' => 'Alhálózat / VLAN',
-    'Class:lnkSubnetToVLAN+' => '~~',
-    'Class:lnkSubnetToVLAN/Attribute:subnet_id' => 'Alhálózat',
-    'Class:lnkSubnetToVLAN/Attribute:subnet_id+' => '~~',
-    'Class:lnkSubnetToVLAN/Attribute:subnet_ip' => 'Alhálózat IP cím',
-    'Class:lnkSubnetToVLAN/Attribute:subnet_ip+' => '~~',
-    'Class:lnkSubnetToVLAN/Attribute:subnet_name' => 'Alhálózat név',
-    'Class:lnkSubnetToVLAN/Attribute:subnet_name+' => '~~',
-    'Class:lnkSubnetToVLAN/Attribute:vlan_id' => 'VLAN',
-    'Class:lnkSubnetToVLAN/Attribute:vlan_id+' => '~~',
-    'Class:lnkSubnetToVLAN/Attribute:vlan_tag' => 'VLAN Tag',
-    'Class:lnkSubnetToVLAN/Attribute:vlan_tag+' => '~~',
+	'Class:lnkSubnetToVLAN' => 'Alhálózat / VLAN',
+	'Class:lnkSubnetToVLAN+' => '~~',
+	'Class:lnkSubnetToVLAN/Name' => '%1$s / %2$s~~',
+	'Class:lnkSubnetToVLAN/Attribute:subnet_id' => 'Alhálózat',
+	'Class:lnkSubnetToVLAN/Attribute:subnet_id+' => '~~',
+	'Class:lnkSubnetToVLAN/Attribute:subnet_ip' => 'Alhálózat IP cím',
+	'Class:lnkSubnetToVLAN/Attribute:subnet_ip+' => '~~',
+	'Class:lnkSubnetToVLAN/Attribute:subnet_name' => 'Alhálózat név',
+	'Class:lnkSubnetToVLAN/Attribute:subnet_name+' => '~~',
+	'Class:lnkSubnetToVLAN/Attribute:vlan_id' => 'VLAN',
+	'Class:lnkSubnetToVLAN/Attribute:vlan_id+' => '~~',
+	'Class:lnkSubnetToVLAN/Attribute:vlan_tag' => 'VLAN Tag',
+	'Class:lnkSubnetToVLAN/Attribute:vlan_tag+' => '~~',
 ));
 
 //
@@ -1274,12 +1312,12 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:NetworkInterface' => 'Hálózati csatoló',
-    'Class:NetworkInterface+' => '',
-    'Class:NetworkInterface/Attribute:name' => 'Név',
-    'Class:NetworkInterface/Attribute:name+' => '~~',
-    'Class:NetworkInterface/Attribute:finalclass' => 'Típus',
-    'Class:NetworkInterface/Attribute:finalclass+' => 'A végső osztály neve',
+	'Class:NetworkInterface' => 'Hálózati csatoló',
+	'Class:NetworkInterface+' => '',
+	'Class:NetworkInterface/Attribute:name' => 'Név',
+	'Class:NetworkInterface/Attribute:name+' => '~~',
+	'Class:NetworkInterface/Attribute:finalclass' => 'Típus',
+	'Class:NetworkInterface/Attribute:finalclass+' => 'A végső osztály neve',
 ));
 
 //
@@ -1287,22 +1325,20 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:IPInterface' => 'IP csatoló',
-    'Class:IPInterface+' => '~~',
-    'Class:IPInterface/Attribute:ipaddress' => 'IP cím',
-    'Class:IPInterface/Attribute:ipaddress+' => '~~',
-
-
-    'Class:IPInterface/Attribute:macaddress' => 'MAC cím',
-    'Class:IPInterface/Attribute:macaddress+' => '~~',
-    'Class:IPInterface/Attribute:comment' => 'Megjegyzés',
-    'Class:IPInterface/Attribute:coment+' => '~~',
-    'Class:IPInterface/Attribute:ipgateway' => 'IP átjáró',
-    'Class:IPInterface/Attribute:ipgateway+' => '~~',
-    'Class:IPInterface/Attribute:ipmask' => 'IP netmaszk',
-    'Class:IPInterface/Attribute:ipmask+' => '~~',
-    'Class:IPInterface/Attribute:speed' => 'Sebesség',
-    'Class:IPInterface/Attribute:speed+' => '~~',
+	'Class:IPInterface' => 'IP csatoló',
+	'Class:IPInterface+' => '~~',
+	'Class:IPInterface/Attribute:ipaddress' => 'IP cím',
+	'Class:IPInterface/Attribute:ipaddress+' => '~~',
+	'Class:IPInterface/Attribute:macaddress' => 'MAC cím',
+	'Class:IPInterface/Attribute:macaddress+' => '~~',
+	'Class:IPInterface/Attribute:comment' => 'Megjegyzés',
+	'Class:IPInterface/Attribute:coment+' => '~~',
+	'Class:IPInterface/Attribute:ipgateway' => 'IP átjáró',
+	'Class:IPInterface/Attribute:ipgateway+' => '~~',
+	'Class:IPInterface/Attribute:ipmask' => 'IP netmaszk',
+	'Class:IPInterface/Attribute:ipmask+' => '~~',
+	'Class:IPInterface/Attribute:speed' => 'Sebesség',
+	'Class:IPInterface/Attribute:speed+' => '~~',
 ));
 
 //
@@ -1310,14 +1346,15 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:PhysicalInterface' => 'Fizikai csatoló',
-    'Class:PhysicalInterface+' => '~~',
-    'Class:PhysicalInterface/Attribute:connectableci_id' => 'Eszköz',
-    'Class:PhysicalInterface/Attribute:connectableci_id+' => '~~',
-    'Class:PhysicalInterface/Attribute:connectableci_name' => 'Eszköz név',
-    'Class:PhysicalInterface/Attribute:connectableci_name+' => '~~',
-    'Class:PhysicalInterface/Attribute:vlans_list' => 'VLAN-ok',
-    'Class:PhysicalInterface/Attribute:vlans_list+' => '~~',
+	'Class:PhysicalInterface' => 'Fizikai csatoló',
+	'Class:PhysicalInterface+' => '~~',
+	'Class:PhysicalInterface/Name' => '%2$s %1$s~~',
+	'Class:PhysicalInterface/Attribute:connectableci_id' => 'Eszköz',
+	'Class:PhysicalInterface/Attribute:connectableci_id+' => '~~',
+	'Class:PhysicalInterface/Attribute:connectableci_name' => 'Eszköz név',
+	'Class:PhysicalInterface/Attribute:connectableci_name+' => '~~',
+	'Class:PhysicalInterface/Attribute:vlans_list' => 'VLAN-ok',
+	'Class:PhysicalInterface/Attribute:vlans_list+' => '~~',
 ));
 
 //
@@ -1325,20 +1362,21 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:lnkPhysicalInterfaceToVLAN' => 'Fizikai csatoló / VLAN',
-    'Class:lnkPhysicalInterfaceToVLAN+' => '~~',
-    'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_id' => 'Fizikai csatoló',
-    'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_id+' => '~~',
-    'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_name' => 'Fizikai csatoló név',
-    'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_name+' => '~~',
-    'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_device_id' => 'Eszköz',
-    'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_device_id+' => '~~',
-    'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_device_name' => 'Eszköz név',
-    'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_device_name+' => '~~',
-    'Class:lnkPhysicalInterfaceToVLAN/Attribute:vlan_id' => 'VLAN',
-    'Class:lnkPhysicalInterfaceToVLAN/Attribute:vlan_id+' => '~~',
-    'Class:lnkPhysicalInterfaceToVLAN/Attribute:vlan_tag' => 'VLAN Tag',
-    'Class:lnkPhysicalInterfaceToVLAN/Attribute:vlan_tag+' => '~~',
+	'Class:lnkPhysicalInterfaceToVLAN' => 'Fizikai csatoló / VLAN',
+	'Class:lnkPhysicalInterfaceToVLAN+' => '~~',
+	'Class:lnkPhysicalInterfaceToVLAN/Name' => '%1$s %2$s / %3$s~~',
+	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_id' => 'Fizikai csatoló',
+	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_id+' => '~~',
+	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_name' => 'Fizikai csatoló név',
+	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_name+' => '~~',
+	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_device_id' => 'Eszköz',
+	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_device_id+' => '~~',
+	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_device_name' => 'Eszköz név',
+	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_device_name+' => '~~',
+	'Class:lnkPhysicalInterfaceToVLAN/Attribute:vlan_id' => 'VLAN',
+	'Class:lnkPhysicalInterfaceToVLAN/Attribute:vlan_id+' => '~~',
+	'Class:lnkPhysicalInterfaceToVLAN/Attribute:vlan_tag' => 'VLAN Tag',
+	'Class:lnkPhysicalInterfaceToVLAN/Attribute:vlan_tag+' => '~~',
 ));
 
 
@@ -1347,12 +1385,12 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:LogicalInterface' => 'Logikai csatoló',
-    'Class:LogicalInterface+' => '~~',
-    'Class:LogicalInterface/Attribute:virtualmachine_id' => 'Virtuális gép',
-    'Class:LogicalInterface/Attribute:virtualmachine_id+' => '~~',
-    'Class:LogicalInterface/Attribute:virtualmachine_name' => 'Virtuális gép név',
-    'Class:LogicalInterface/Attribute:virtualmachine_name+' => '~~',
+	'Class:LogicalInterface' => 'Logikai csatoló',
+	'Class:LogicalInterface+' => '~~',
+	'Class:LogicalInterface/Attribute:virtualmachine_id' => 'Virtuális gép',
+	'Class:LogicalInterface/Attribute:virtualmachine_id+' => '~~',
+	'Class:LogicalInterface/Attribute:virtualmachine_name' => 'Virtuális gép név',
+	'Class:LogicalInterface/Attribute:virtualmachine_name+' => '~~',
 ));
 
 //
@@ -1360,18 +1398,18 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:FiberChannelInterface' => 'FC csatoló',
-    'Class:FiberChannelInterface+' => '~~',
-    'Class:FiberChannelInterface/Attribute:speed' => 'Sebesség',
-    'Class:FiberChannelInterface/Attribute:speed+' => '~~',
-    'Class:FiberChannelInterface/Attribute:topology' => 'Topológia',
-    'Class:FiberChannelInterface/Attribute:topology+' => '~~',
-    'Class:FiberChannelInterface/Attribute:wwn' => 'WWN',
-    'Class:FiberChannelInterface/Attribute:wwn+' => '~~',
-    'Class:FiberChannelInterface/Attribute:datacenterdevice_id' => 'Eszköz',
-    'Class:FiberChannelInterface/Attribute:datacenterdevice_id+' => '~~',
-    'Class:FiberChannelInterface/Attribute:datacenterdevice_name' => 'Eszköz név',
-    'Class:FiberChannelInterface/Attribute:datacenterdevice_name+' => '~~',
+	'Class:FiberChannelInterface' => 'FC csatoló',
+	'Class:FiberChannelInterface+' => '~~',
+	'Class:FiberChannelInterface/Attribute:speed' => 'Sebesség',
+	'Class:FiberChannelInterface/Attribute:speed+' => '~~',
+	'Class:FiberChannelInterface/Attribute:topology' => 'Topológia',
+	'Class:FiberChannelInterface/Attribute:topology+' => '~~',
+	'Class:FiberChannelInterface/Attribute:wwn' => 'WWN',
+	'Class:FiberChannelInterface/Attribute:wwn+' => '~~',
+	'Class:FiberChannelInterface/Attribute:datacenterdevice_id' => 'Eszköz',
+	'Class:FiberChannelInterface/Attribute:datacenterdevice_id+' => '~~',
+	'Class:FiberChannelInterface/Attribute:datacenterdevice_name' => 'Eszköz név',
+	'Class:FiberChannelInterface/Attribute:datacenterdevice_name+' => '~~',
 ));
 
 //
@@ -1379,26 +1417,27 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:lnkConnectableCIToNetworkDevice' => 'Kapcsolható CI / Hálózati eszköz',
-    'Class:lnkConnectableCIToNetworkDevice+' => '~~',
-    'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id' => 'Hálózati eszköz',
-    'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id+' => '~~',
-    'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_name' => 'Hálózati eszköz név',
-    'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_name+' => '~~',
-    'Class:lnkConnectableCIToNetworkDevice/Attribute:connectableci_id' => 'Csatlakoztatott eszköz',
-    'Class:lnkConnectableCIToNetworkDevice/Attribute:connectableci_id+' => '~~',
-    'Class:lnkConnectableCIToNetworkDevice/Attribute:connectableci_name' => 'Csatlakoztatott eszköz név',
-    'Class:lnkConnectableCIToNetworkDevice/Attribute:connectableci_name+' => '~~',
-    'Class:lnkConnectableCIToNetworkDevice/Attribute:network_port' => 'Hálózati port',
-    'Class:lnkConnectableCIToNetworkDevice/Attribute:network_port+' => '~~',
-    'Class:lnkConnectableCIToNetworkDevice/Attribute:device_port' => 'Eszköz port',
-    'Class:lnkConnectableCIToNetworkDevice/Attribute:device_port+' => '~~',
-    'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type' => 'Csatlakozás típus',
-    'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type+' => '~~',
-    'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type/Value:downlink' => 'down link',
-    'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type/Value:downlink+' => 'down link~~',
-    'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type/Value:uplink' => 'up link',
-    'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type/Value:uplink+' => 'up link~~',
+	'Class:lnkConnectableCIToNetworkDevice' => 'Kapcsolható CI / Hálózati eszköz',
+	'Class:lnkConnectableCIToNetworkDevice+' => '~~',
+	'Class:lnkConnectableCIToNetworkDevice/Name' => '%1$s / %2$s~~',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id' => 'Hálózati eszköz',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id+' => '~~',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_name' => 'Hálózati eszköz név',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_name+' => '~~',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:connectableci_id' => 'Csatlakoztatott eszköz',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:connectableci_id+' => '~~',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:connectableci_name' => 'Csatlakoztatott eszköz név',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:connectableci_name+' => '~~',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:network_port' => 'Hálózati port',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:network_port+' => '~~',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:device_port' => 'Eszköz port',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:device_port+' => '~~',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type' => 'Csatlakozás típus',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type+' => '~~',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type/Value:downlink' => 'down link',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type/Value:downlink+' => 'down link~~',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type/Value:uplink' => 'up link',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type/Value:uplink+' => 'up link~~',
 ));
 
 //
@@ -1406,16 +1445,17 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:lnkApplicationSolutionToFunctionalCI' => 'Alkalmazásmegoldás / Funkcionális CI',
-    'Class:lnkApplicationSolutionToFunctionalCI+' => '~~',
-    'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_id' => 'Alkalmazásmegoldás',
-    'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_id+' => '~~',
-    'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_name' => 'Alkalmazásmegoldás név',
-    'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_name+' => '~~',
-    'Class:lnkApplicationSolutionToFunctionalCI/Attribute:functionalci_id' => 'Funkcionális CI',
-    'Class:lnkApplicationSolutionToFunctionalCI/Attribute:functionalci_id+' => '~~',
-    'Class:lnkApplicationSolutionToFunctionalCI/Attribute:functionalci_name' => 'Funkcionális CI név',
-    'Class:lnkApplicationSolutionToFunctionalCI/Attribute:functionalci_name+' => '~~',
+	'Class:lnkApplicationSolutionToFunctionalCI' => 'Alkalmazásmegoldás / Funkcionális CI',
+	'Class:lnkApplicationSolutionToFunctionalCI+' => '~~',
+	'Class:lnkApplicationSolutionToFunctionalCI/Name' => '%1$s / %2$s~~',
+	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_id' => 'Alkalmazásmegoldás',
+	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_id+' => '~~',
+	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_name' => 'Alkalmazásmegoldás név',
+	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_name+' => '~~',
+	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:functionalci_id' => 'Funkcionális CI',
+	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:functionalci_id+' => '~~',
+	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:functionalci_name' => 'Funkcionális CI név',
+	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:functionalci_name+' => '~~',
 ));
 
 //
@@ -1423,16 +1463,17 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:lnkApplicationSolutionToBusinessProcess' => 'Alkalmazásmegoldás / Üzleti folyamat',
-    'Class:lnkApplicationSolutionToBusinessProcess+' => '~~',
-    'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_id' => 'Üzleti folyamat',
-    'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_id+' => '~~',
-    'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_name' => 'Üzleti folyamat név',
-    'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_name+' => '~~',
-    'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_id' => 'Alkalmazásmegoldás',
-    'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_id+' => '~~',
-    'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_name' => 'Alkalmazásmegoldás név',
-    'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_name+' => '~~',
+	'Class:lnkApplicationSolutionToBusinessProcess' => 'Alkalmazásmegoldás / Üzleti folyamat',
+	'Class:lnkApplicationSolutionToBusinessProcess+' => '~~',
+	'Class:lnkApplicationSolutionToBusinessProcess/Name' => '%1$s / %2$s~~',
+	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_id' => 'Üzleti folyamat',
+	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_id+' => '~~',
+	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_name' => 'Üzleti folyamat név',
+	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_name+' => '~~',
+	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_id' => 'Alkalmazásmegoldás',
+	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_id+' => '~~',
+	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_name' => 'Alkalmazásmegoldás név',
+	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_name+' => '~~',
 ));
 
 //
@@ -1440,35 +1481,35 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:Group' => 'Csoport',
-    'Class:Group+' => '',
-    'Class:Group/Attribute:name' => 'Név',
-    'Class:Group/Attribute:name+' => '',
-    'Class:Group/Attribute:status' => 'Állapot',
-    'Class:Group/Attribute:status+' => '',
-    'Class:Group/Attribute:status/Value:implementation' => 'Megvalósítás alatt',
-    'Class:Group/Attribute:status/Value:implementation+' => '',
-    'Class:Group/Attribute:status/Value:obsolete' => 'Elavult',
-    'Class:Group/Attribute:status/Value:obsolete+' => '',
-    'Class:Group/Attribute:status/Value:production' => 'Használatban',
-    'Class:Group/Attribute:status/Value:production+' => '',
-    'Class:Group/Attribute:org_id' => 'Szevezeti egység',
-    'Class:Group/Attribute:org_id+' => '',
-    'Class:Group/Attribute:owner_name' => 'Név',
-    'Class:Group/Attribute:owner_name+' => '',
-    'Class:Group/Attribute:description' => 'Leírás',
-    'Class:Group/Attribute:description+' => '',
-    'Class:Group/Attribute:type' => 'Típus',
-    'Class:Group/Attribute:type+' => '',
-    'Class:Group/Attribute:parent_id' => 'Fölérendelt csoport',
-
-    'Class:Group/Attribute:parent_id+' => '',
-    'Class:Group/Attribute:parent_name' => 'Név',
-    'Class:Group/Attribute:parent_name+' => '',
-    'Class:Group/Attribute:ci_list' => 'Kapcsolódó CI-k',
+	'Class:Group' => 'Csoport',
+	'Class:Group+' => '',
+	'Class:Group/ComplementaryName' => '%1$s - %2$s~~',
+	'Class:Group/Attribute:name' => 'Név',
+	'Class:Group/Attribute:name+' => '',
+	'Class:Group/Attribute:status' => 'Állapot',
+	'Class:Group/Attribute:status+' => '',
+	'Class:Group/Attribute:status/Value:implementation' => 'Megvalósítás alatt',
+	'Class:Group/Attribute:status/Value:implementation+' => '',
+	'Class:Group/Attribute:status/Value:obsolete' => 'Elavult',
+	'Class:Group/Attribute:status/Value:obsolete+' => '',
+	'Class:Group/Attribute:status/Value:production' => 'Használatban',
+	'Class:Group/Attribute:status/Value:production+' => '',
+	'Class:Group/Attribute:org_id' => 'Szevezeti egység',
+	'Class:Group/Attribute:org_id+' => '',
+	'Class:Group/Attribute:owner_name' => 'Név',
+	'Class:Group/Attribute:owner_name+' => '',
+	'Class:Group/Attribute:description' => 'Leírás',
+	'Class:Group/Attribute:description+' => '',
+	'Class:Group/Attribute:type' => 'Típus',
+	'Class:Group/Attribute:type+' => '',
+	'Class:Group/Attribute:parent_id' => 'Fölérendelt csoport',
+	'Class:Group/Attribute:parent_id+' => '',
+	'Class:Group/Attribute:parent_name' => 'Név',
+	'Class:Group/Attribute:parent_name+' => '',
+	'Class:Group/Attribute:ci_list' => 'Kapcsolódó CI-k',
 	'Class:Group/Attribute:ci_list+' => 'All the configuration items linked to this group~~',
-    'Class:Group/Attribute:parent_id_friendlyname' => 'Szülő csoport',
-    'Class:Group/Attribute:parent_id_friendlyname+' => '~~',
+	'Class:Group/Attribute:parent_id_friendlyname' => 'Szülő csoport',
+	'Class:Group/Attribute:parent_id_friendlyname+' => '~~',
 ));
 
 //
@@ -1476,34 +1517,36 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:lnkGroupToCI' => 'Csoport / CI',
-    'Class:lnkGroupToCI+' => '',
-    'Class:lnkGroupToCI/Attribute:group_id' => 'Csoport',
-    'Class:lnkGroupToCI/Attribute:group_id+' => '',
-    'Class:lnkGroupToCI/Attribute:group_name' => 'Név',
-    'Class:lnkGroupToCI/Attribute:group_name+' => '',
-    'Class:lnkGroupToCI/Attribute:ci_id' => 'CI',
-    'Class:lnkGroupToCI/Attribute:ci_id+' => '',
-    'Class:lnkGroupToCI/Attribute:ci_name' => 'Név',
-    'Class:lnkGroupToCI/Attribute:ci_name+' => '',
-    'Class:lnkGroupToCI/Attribute:reason' => 'Indoklás',
-    'Class:lnkGroupToCI/Attribute:reason+' => '',
+	'Class:lnkGroupToCI' => 'Csoport / CI',
+	'Class:lnkGroupToCI+' => '',
+	'Class:lnkGroupToCI/Name' => '%1$s / %2$s~~',
+	'Class:lnkGroupToCI/Attribute:group_id' => 'Csoport',
+	'Class:lnkGroupToCI/Attribute:group_id+' => '',
+	'Class:lnkGroupToCI/Attribute:group_name' => 'Név',
+	'Class:lnkGroupToCI/Attribute:group_name+' => '',
+	'Class:lnkGroupToCI/Attribute:ci_id' => 'CI',
+	'Class:lnkGroupToCI/Attribute:ci_id+' => '',
+	'Class:lnkGroupToCI/Attribute:ci_name' => 'Név',
+	'Class:lnkGroupToCI/Attribute:ci_name+' => '',
+	'Class:lnkGroupToCI/Attribute:reason' => 'Indoklás',
+	'Class:lnkGroupToCI/Attribute:reason+' => '',
 ));
 
 // Add translation for Fieldsets
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Server:baseinfo' => 'Általános információ',
-    'Server:Date' => 'Dátumok',
-    'Server:moreinfo' => 'További információ',
-    'Server:otherinfo' => 'Other information~~',
-    'Server:power' => 'Áramforrás',
-    'Class:Subnet/Tab:IPUsage' => 'IP felhasználás',
-    'Class:Subnet/Tab:IPUsage-explain' => 'A hálózati csatolók a következő tartományba esnek: <em>%1$s</em> - <em>%2$s</em>',
-    'Class:Subnet/Tab:FreeIPs' => 'Szabad IP címek',
-    'Class:Subnet/Tab:FreeIPs-count' => 'Szabad IP címek: %1$s',
-    'Class:Subnet/Tab:FreeIPs-explain' => '10 szabad IP cím kivonata',
-    'Class:Document:PreviewTab' => 'Előnézet',
+	'Server:baseinfo' => 'Általános információ',
+	'Server:Date' => 'Dátumok',
+	'Server:moreinfo' => 'További információ',
+	'Server:otherinfo' => 'Other information~~',
+	'Server:power' => 'Áramforrás',
+	'Class:Subnet/Tab:IPUsage' => 'IP felhasználás',
+	'Class:Subnet/Tab:IPUsage+' => 'Which IP within this Subnet are used or not~~',
+	'Class:Subnet/Tab:IPUsage-explain' => 'A hálózati csatolók a következő tartományba esnek: <em>%1$s</em> - <em>%2$s</em>',
+	'Class:Subnet/Tab:FreeIPs' => 'Szabad IP címek',
+	'Class:Subnet/Tab:FreeIPs-count' => 'Szabad IP címek: %1$s',
+	'Class:Subnet/Tab:FreeIPs-explain' => '10 szabad IP cím kivonata',
+	'Class:Document:PreviewTab' => 'Előnézet',
 ));
 
 
@@ -1512,16 +1555,17 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:lnkDocumentToFunctionalCI' => 'Dokumentum / Funkcionális CI',
-    'Class:lnkDocumentToFunctionalCI+' => '~~',
-    'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id' => 'Funkcionális CI',
-    'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id+' => '~~',
-    'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_name' => 'Funkcionális CI név',
-    'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_name+' => '~~',
-    'Class:lnkDocumentToFunctionalCI/Attribute:document_id' => 'Dokumentum',
-    'Class:lnkDocumentToFunctionalCI/Attribute:document_id+' => '~~',
-    'Class:lnkDocumentToFunctionalCI/Attribute:document_name' => 'Dokumentum név',
-    'Class:lnkDocumentToFunctionalCI/Attribute:document_name+' => '~~',
+	'Class:lnkDocumentToFunctionalCI' => 'Dokumentum / Funkcionális CI',
+	'Class:lnkDocumentToFunctionalCI+' => '~~',
+	'Class:lnkDocumentToFunctionalCI/Name' => '%1$s / %2$s~~',
+	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id' => 'Funkcionális CI',
+	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id+' => '~~',
+	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_name' => 'Funkcionális CI név',
+	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_name+' => '~~',
+	'Class:lnkDocumentToFunctionalCI/Attribute:document_id' => 'Dokumentum',
+	'Class:lnkDocumentToFunctionalCI/Attribute:document_id+' => '~~',
+	'Class:lnkDocumentToFunctionalCI/Attribute:document_name' => 'Dokumentum név',
+	'Class:lnkDocumentToFunctionalCI/Attribute:document_name+' => '~~',
 ));
 
 //
@@ -1529,49 +1573,49 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Menu:Application' => 'Alkalmazások',
-    'Menu:Application+' => '',
-    'Menu:DBServer' => 'Adatbázis szerverek',
-    'Menu:DBServer+' => '',
-    'Menu:BusinessProcess' => 'Üzleti folyamatok',
-    'Menu:BusinessProcess+' => '',
-    'Menu:ApplicationSolution' => 'Egyedi alkalmazások',
-    'Menu:ApplicationSolution+' => '',
-    'Menu:ConfigManagementSoftware' => 'Alkalmazás kezelés',
-    'Menu:Licence' => 'Licencek',
-    'Menu:Licence+' => '',
-    'Menu:Patch' => 'Frissítések',
-    'Menu:Patch+' => '',
-    'Menu:ApplicationInstance' => 'Telepített szoftverek',
-    'Menu:ApplicationInstance+' => '',
-    'Menu:ConfigManagementHardware' => 'Infrastruktúra kezelés',
-    'Menu:Subnet' => 'Alhálózatok',
-    'Menu:Subnet+' => '',
-    'Menu:NetworkDevice' => 'Hálózati eszközök',
-    'Menu:NetworkDevice+' => '',
-    'Menu:Server' => 'Szerverek',
-    'Menu:Server+' => '',
-    'Menu:Printer' => 'Nyomtatók',
-    'Menu:Printer+' => '',
-    'Menu:MobilePhone' => 'Mobiltelefonok',
-    'Menu:MobilePhone+' => '',
-    'Menu:PC' => 'PC-k',
-    'Menu:PC+' => '',
-    'Menu:NewCI' => 'Új CI',
-    'Menu:NewCI+' => '',
-    'Menu:SearchCIs' => 'CI keresés',
-    'Menu:SearchCIs+' => '',
-    'Menu:ConfigManagement:Devices' => 'Eszközök',
-    'Menu:ConfigManagement:AllDevices' => 'Infrastruktúra',
-    'Menu:ConfigManagement:virtualization' => 'Virtualizáció',
-    'Menu:ConfigManagement:EndUsers' => 'Végfelhasználói eszközök',
-    'Menu:ConfigManagement:SWAndApps' => 'Szoftverek és egyedi alkalmazások',
-    'Menu:ConfigManagement:Misc' => 'Egyéb',
-    'Menu:Group' => 'CI csoportok',
-    'Menu:Group+' => '',
-    'Menu:OSVersion' => 'OS verziók',
-    'Menu:OSVersion+' => '~~',
-    'Menu:Software' => 'Szoftverkatalógus',
-    'Menu:Software+' => 'Software catalog~~',
+	'Menu:Application' => 'Alkalmazások',
+	'Menu:Application+' => '',
+	'Menu:DBServer' => 'Adatbázis szerverek',
+	'Menu:DBServer+' => '',
+	'Menu:BusinessProcess' => 'Üzleti folyamatok',
+	'Menu:BusinessProcess+' => '',
+	'Menu:ApplicationSolution' => 'Egyedi alkalmazások',
+	'Menu:ApplicationSolution+' => '',
+	'Menu:ConfigManagementSoftware' => 'Alkalmazás kezelés',
+	'Menu:Licence' => 'Licencek',
+	'Menu:Licence+' => '',
+	'Menu:Patch' => 'Frissítések',
+	'Menu:Patch+' => '',
+	'Menu:ApplicationInstance' => 'Telepített szoftverek',
+	'Menu:ApplicationInstance+' => '',
+	'Menu:ConfigManagementHardware' => 'Infrastruktúra kezelés',
+	'Menu:Subnet' => 'Alhálózatok',
+	'Menu:Subnet+' => '',
+	'Menu:NetworkDevice' => 'Hálózati eszközök',
+	'Menu:NetworkDevice+' => '',
+	'Menu:Server' => 'Szerverek',
+	'Menu:Server+' => '',
+	'Menu:Printer' => 'Nyomtatók',
+	'Menu:Printer+' => '',
+	'Menu:MobilePhone' => 'Mobiltelefonok',
+	'Menu:MobilePhone+' => '',
+	'Menu:PC' => 'PC-k',
+	'Menu:PC+' => '',
+	'Menu:NewCI' => 'Új CI',
+	'Menu:NewCI+' => '',
+	'Menu:SearchCIs' => 'CI keresés',
+	'Menu:SearchCIs+' => '',
+	'Menu:ConfigManagement:Devices' => 'Eszközök',
+	'Menu:ConfigManagement:AllDevices' => 'Infrastruktúra',
+	'Menu:ConfigManagement:virtualization' => 'Virtualizáció',
+	'Menu:ConfigManagement:EndUsers' => 'Végfelhasználói eszközök',
+	'Menu:ConfigManagement:SWAndApps' => 'Szoftverek és egyedi alkalmazások',
+	'Menu:ConfigManagement:Misc' => 'Egyéb',
+	'Menu:Group' => 'CI csoportok',
+	'Menu:Group+' => '',
+	'Menu:OSVersion' => 'OS verziók',
+	'Menu:OSVersion+' => '~~',
+	'Menu:Software' => 'Szoftverkatalógus',
+	'Menu:Software+' => 'Software catalog~~',
 ));
 ?>
diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/it.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/it.dict.itop-config-mgmt.php
index 01b64fa473..6f0e94f776 100644
--- a/datamodels/2.x/itop-config-mgmt/dictionaries/it.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/it.dict.itop-config-mgmt.php
@@ -29,7 +29,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Relation:depends on/Description' => 'Elementi di questo elemento dipende da',
 	'Relation:depends on/DownStream' => 'Dipende da...',
 	'Relation:depends on/UpStream' => 'Impatto...',
-	'Relation:impacts/LoadData'       => 'Load data~~',
+	'Relation:impacts/LoadData' => 'Load data~~',
 	'Relation:impacts/NoFilteredData' => 'please select objects in Graphical view tag~~',
 ));
 
@@ -78,6 +78,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:lnkContactToFunctionalCI' => 'Link Contact / FunctionalCI~~',
 	'Class:lnkContactToFunctionalCI+' => '~~',
+	'Class:lnkContactToFunctionalCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'Functionalci~~',
 	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '~~',
 	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Functionalci name~~',
@@ -124,6 +125,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:FunctionalCI/Attribute:finalclass' => 'Tipo',
 	'Class:FunctionalCI/Attribute:finalclass+' => '',
 	'Class:FunctionalCI/Tab:OpenedTickets' => 'Active Tickets~~',
+	'Class:FunctionalCI/Tab:OpenedTickets+' => 'Active Tickets which are impacting this functional CI~~',
 ));
 
 //
@@ -133,6 +135,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:PhysicalDevice' => 'Physical Device~~',
 	'Class:PhysicalDevice+' => '~~',
+	'Class:PhysicalDevice/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:PhysicalDevice/Attribute:serialnumber' => 'Serial number~~',
 	'Class:PhysicalDevice/Attribute:serialnumber+' => '~~',
 	'Class:PhysicalDevice/Attribute:location_id' => 'Location~~',
@@ -172,6 +175,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:Rack' => 'Rack~~',
 	'Class:Rack+' => '~~',
+	'Class:Rack/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Rack/Attribute:nb_u' => 'Rack units~~',
 	'Class:Rack/Attribute:nb_u+' => '~~',
 	'Class:Rack/Attribute:device_list' => 'Devices~~',
@@ -238,6 +242,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:ConnectableCI' => 'CI collegabile',
 	'Class:ConnectableCI+' => 'CI fisico',
+	'Class:ConnectableCI/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:ConnectableCI/Attribute:networkdevice_list' => 'Network devices~~',
 	'Class:ConnectableCI/Attribute:networkdevice_list+' => 'All network devices connected to this device~~',
 	'Class:ConnectableCI/Attribute:physicalinterface_list' => 'Network interfaces~~',
@@ -251,6 +256,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:DatacenterDevice' => 'Datacenter Device~~',
 	'Class:DatacenterDevice+' => '~~',
+	'Class:DatacenterDevice/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:DatacenterDevice/Attribute:rack_id' => 'Rack~~',
 	'Class:DatacenterDevice/Attribute:rack_id+' => '~~',
 	'Class:DatacenterDevice/Attribute:rack_name' => 'Rack name~~',
@@ -289,6 +295,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:NetworkDevice' => 'Dispositivi di rete',
 	'Class:NetworkDevice+' => '',
+	'Class:NetworkDevice/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:NetworkDevice/Attribute:networkdevicetype_id' => 'Network type~~',
 	'Class:NetworkDevice/Attribute:networkdevicetype_id+' => '~~',
 	'Class:NetworkDevice/Attribute:networkdevicetype_name' => 'Network type name~~',
@@ -310,6 +317,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:Server' => 'Server',
 	'Class:Server+' => '',
+	'Class:Server/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Server/Attribute:osfamily_id' => 'OS family~~',
 	'Class:Server/Attribute:osfamily_id+' => '~~',
 	'Class:Server/Attribute:osfamily_name' => 'OS family name~~',
@@ -337,6 +345,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:StorageSystem' => 'Storage System~~',
 	'Class:StorageSystem+' => '~~',
+	'Class:StorageSystem/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:StorageSystem/Attribute:logicalvolume_list' => 'Logical volumes~~',
 	'Class:StorageSystem/Attribute:logicalvolume_list+' => 'All the logical volumes in this storage system~~',
 ));
@@ -348,6 +357,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:SANSwitch' => 'SAN Switch~~',
 	'Class:SANSwitch+' => '~~',
+	'Class:SANSwitch/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:SANSwitch/Attribute:datacenterdevice_list' => 'Devices~~',
 	'Class:SANSwitch/Attribute:datacenterdevice_list+' => 'All the devices connected to this SAN switch~~',
 ));
@@ -359,6 +369,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:TapeLibrary' => 'Tape Library~~',
 	'Class:TapeLibrary+' => '~~',
+	'Class:TapeLibrary/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:TapeLibrary/Attribute:tapes_list' => 'Tapes~~',
 	'Class:TapeLibrary/Attribute:tapes_list+' => 'All the tapes in the tape library~~',
 ));
@@ -370,6 +381,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:NAS' => 'NAS~~',
 	'Class:NAS+' => '~~',
+	'Class:NAS/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:NAS/Attribute:nasfilesystem_list' => 'Filesystems~~',
 	'Class:NAS/Attribute:nasfilesystem_list+' => 'All the file systems in this NAS~~',
 ));
@@ -381,6 +393,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:PC' => 'PC',
 	'Class:PC+' => '',
+	'Class:PC/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:PC/Attribute:osfamily_id' => 'OS family~~',
 	'Class:PC/Attribute:osfamily_id+' => '~~',
 	'Class:PC/Attribute:osfamily_name' => 'OS family name~~',
@@ -408,6 +421,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:Printer' => 'Stampante',
 	'Class:Printer+' => '',
+	'Class:Printer/ComplementaryName' => '%1$s - %2$s~~',
 ));
 
 //
@@ -417,6 +431,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:PowerConnection' => 'Power Connection~~',
 	'Class:PowerConnection+' => '~~',
+	'Class:PowerConnection/ComplementaryName' => '%1$s - %2$s~~',
 ));
 
 //
@@ -426,6 +441,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:PowerSource' => 'Power Source~~',
 	'Class:PowerSource+' => '~~',
+	'Class:PowerSource/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:PowerSource/Attribute:pdus_list' => 'PDUs~~',
 	'Class:PowerSource/Attribute:pdus_list+' => 'All the PDUs using this power source~~',
 ));
@@ -437,6 +453,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:PDU' => 'PDU~~',
 	'Class:PDU+' => '~~',
+	'Class:PDU/ComplementaryName' => '%1$s - %2$s - %3$s - %4$s~~',
 	'Class:PDU/Attribute:rack_id' => 'Rack~~',
 	'Class:PDU/Attribute:rack_id+' => '~~',
 	'Class:PDU/Attribute:rack_name' => 'Rack name~~',
@@ -454,6 +471,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:Peripheral' => 'Peripheral~~',
 	'Class:Peripheral+' => '~~',
+	'Class:Peripheral/ComplementaryName' => '%1$s - %2$s~~',
 ));
 
 //
@@ -463,6 +481,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:Enclosure' => 'Enclosure~~',
 	'Class:Enclosure+' => '~~',
+	'Class:Enclosure/ComplementaryName' => '%1$s - %2$s - %3$s~~',
 	'Class:Enclosure/Attribute:rack_id' => 'Rack~~',
 	'Class:Enclosure/Attribute:rack_id+' => '~~',
 	'Class:Enclosure/Attribute:rack_name' => 'Rack name~~',
@@ -600,6 +619,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:MiddlewareInstance' => 'Middleware Instance~~',
 	'Class:MiddlewareInstance+' => '~~',
+	'Class:MiddlewareInstance/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:MiddlewareInstance/Attribute:middleware_id' => 'Middleware~~',
 	'Class:MiddlewareInstance/Attribute:middleware_id+' => '~~',
 	'Class:MiddlewareInstance/Attribute:middleware_name' => 'Middleware name~~',
@@ -613,6 +633,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:DatabaseSchema' => 'Database Schema~~',
 	'Class:DatabaseSchema+' => '~~',
+	'Class:DatabaseSchema/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:DatabaseSchema/Attribute:dbserver_id' => 'DB server~~',
 	'Class:DatabaseSchema/Attribute:dbserver_id+' => '~~',
 	'Class:DatabaseSchema/Attribute:dbserver_name' => 'DB server name~~',
@@ -626,6 +647,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:WebApplication' => 'Web Application~~',
 	'Class:WebApplication+' => '~~',
+	'Class:WebApplication/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:WebApplication/Attribute:webserver_id' => 'Web server~~',
 	'Class:WebApplication/Attribute:webserver_id+' => '~~',
 	'Class:WebApplication/Attribute:webserver_name' => 'Web server name~~',
@@ -706,6 +728,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:VirtualMachine' => 'Virtual Machine~~',
 	'Class:VirtualMachine+' => '~~',
+	'Class:VirtualMachine/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:VirtualMachine/Attribute:virtualhost_id' => 'Virtual host~~',
 	'Class:VirtualMachine/Attribute:virtualhost_id+' => '~~',
 	'Class:VirtualMachine/Attribute:virtualhost_name' => 'Virtual host name~~',
@@ -766,6 +789,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:lnkServerToVolume' => 'Link Server / Volume~~',
 	'Class:lnkServerToVolume+' => '~~',
+	'Class:lnkServerToVolume/Name' => '%1$s / %2$s~~',
 	'Class:lnkServerToVolume/Attribute:volume_id' => 'Volume~~',
 	'Class:lnkServerToVolume/Attribute:volume_id+' => '~~',
 	'Class:lnkServerToVolume/Attribute:volume_name' => 'Volume name~~',
@@ -785,6 +809,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:lnkVirtualDeviceToVolume' => 'Link Virtual Device / Volume~~',
 	'Class:lnkVirtualDeviceToVolume+' => '~~',
+	'Class:lnkVirtualDeviceToVolume/Name' => '%1$s / %2$s~~',
 	'Class:lnkVirtualDeviceToVolume/Attribute:volume_id' => 'Volume~~',
 	'Class:lnkVirtualDeviceToVolume/Attribute:volume_id+' => '~~',
 	'Class:lnkVirtualDeviceToVolume/Attribute:volume_name' => 'Volume name~~',
@@ -804,6 +829,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:lnkSanToDatacenterDevice' => 'Link SAN / Datacenter Device~~',
 	'Class:lnkSanToDatacenterDevice+' => '~~',
+	'Class:lnkSanToDatacenterDevice/Name' => '%1$s / %2$s~~',
 	'Class:lnkSanToDatacenterDevice/Attribute:san_id' => 'SAN switch~~',
 	'Class:lnkSanToDatacenterDevice/Attribute:san_id+' => '~~',
 	'Class:lnkSanToDatacenterDevice/Attribute:san_name' => 'SAN switch name~~',
@@ -865,6 +891,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:Software' => 'Software',
 	'Class:Software+' => '',
+	'Class:Software/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Software/Attribute:name' => 'Nome',
 	'Class:Software/Attribute:name+' => '',
 	'Class:Software/Attribute:vendor' => 'vendor~~',
@@ -982,6 +1009,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:OSLicence' => 'OS Licence~~',
 	'Class:OSLicence+' => '~~',
+	'Class:OSLicence/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:OSLicence/Attribute:osversion_id' => 'OS version~~',
 	'Class:OSLicence/Attribute:osversion_id+' => '~~',
 	'Class:OSLicence/Attribute:osversion_name' => 'OS version name~~',
@@ -999,6 +1027,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:SoftwareLicence' => 'Software Licence~~',
 	'Class:SoftwareLicence+' => '~~',
+	'Class:SoftwareLicence/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:SoftwareLicence/Attribute:software_id' => 'Software~~',
 	'Class:SoftwareLicence/Attribute:software_id+' => '~~',
 	'Class:SoftwareLicence/Attribute:software_name' => 'Software name~~',
@@ -1014,6 +1043,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:lnkDocumentToLicence' => 'Link Document / Licence~~',
 	'Class:lnkDocumentToLicence+' => '~~',
+	'Class:lnkDocumentToLicence/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToLicence/Attribute:licence_id' => 'Licence~~',
 	'Class:lnkDocumentToLicence/Attribute:licence_id+' => '~~',
 	'Class:lnkDocumentToLicence/Attribute:licence_name' => 'Licence name~~',
@@ -1066,6 +1096,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:Model' => 'Model~~',
 	'Class:Model+' => '~~',
+	'Class:Model/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Model/Attribute:brand_id' => 'Brand~~',
 	'Class:Model/Attribute:brand_id+' => '~~',
 	'Class:Model/Attribute:brand_name' => 'Brand name~~',
@@ -1145,6 +1176,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:lnkDocumentToPatch' => 'Link Document / Patch~~',
 	'Class:lnkDocumentToPatch+' => '~~',
+	'Class:lnkDocumentToPatch/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToPatch/Attribute:patch_id' => 'Patch~~',
 	'Class:lnkDocumentToPatch/Attribute:patch_id+' => '~~',
 	'Class:lnkDocumentToPatch/Attribute:patch_name' => 'Patch name~~',
@@ -1162,6 +1194,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:lnkSoftwareInstanceToSoftwarePatch' => 'Link Software Instance / Software Patch~~',
 	'Class:lnkSoftwareInstanceToSoftwarePatch+' => '~~',
+	'Class:lnkSoftwareInstanceToSoftwarePatch/Name' => '%1$s / %2$s~~',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id' => 'Software patch~~',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id+' => '~~',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_name' => 'Software patch name~~',
@@ -1179,6 +1212,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:lnkFunctionalCIToOSPatch' => 'Link FunctionalCI / OS patch~~',
 	'Class:lnkFunctionalCIToOSPatch+' => '~~',
+	'Class:lnkFunctionalCIToOSPatch/Name' => '%1$s / %2$s~~',
 	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id' => 'OS patch~~',
 	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id+' => '~~',
 	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_name' => 'OS patch name~~',
@@ -1196,6 +1230,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:lnkDocumentToSoftware' => 'Link Document / Software~~',
 	'Class:lnkDocumentToSoftware+' => '~~',
+	'Class:lnkDocumentToSoftware/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToSoftware/Attribute:software_id' => 'Software~~',
 	'Class:lnkDocumentToSoftware/Attribute:software_id+' => '~~',
 	'Class:lnkDocumentToSoftware/Attribute:software_name' => 'Software name~~',
@@ -1213,6 +1248,8 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:Subnet' => 'Subnet',
 	'Class:Subnet+' => '',
+	'Class:Subnet/Name' => '%1$s/%2$s~~',
+	'Class:Subnet/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Subnet/Attribute:description' => 'Descrizione',
 	'Class:Subnet/Attribute:description+' => '',
 	'Class:Subnet/Attribute:subnet_name' => 'Subnet name~~',
@@ -1257,6 +1294,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:lnkSubnetToVLAN' => 'Link Subnet / VLAN~~',
 	'Class:lnkSubnetToVLAN+' => '~~',
+	'Class:lnkSubnetToVLAN/Name' => '%1$s / %2$s~~',
 	'Class:lnkSubnetToVLAN/Attribute:subnet_id' => 'Subnet~~',
 	'Class:lnkSubnetToVLAN/Attribute:subnet_id+' => '~~',
 	'Class:lnkSubnetToVLAN/Attribute:subnet_ip' => 'Subnet IP~~',
@@ -1291,8 +1329,6 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:IPInterface+' => '~~',
 	'Class:IPInterface/Attribute:ipaddress' => 'IP address~~',
 	'Class:IPInterface/Attribute:ipaddress+' => '~~',
-
-
 	'Class:IPInterface/Attribute:macaddress' => 'MAC address~~',
 	'Class:IPInterface/Attribute:macaddress+' => '~~',
 	'Class:IPInterface/Attribute:comment' => 'Comment~~',
@@ -1312,6 +1348,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:PhysicalInterface' => 'Physical Interface~~',
 	'Class:PhysicalInterface+' => '~~',
+	'Class:PhysicalInterface/Name' => '%2$s %1$s~~',
 	'Class:PhysicalInterface/Attribute:connectableci_id' => 'Device~~',
 	'Class:PhysicalInterface/Attribute:connectableci_id+' => '~~',
 	'Class:PhysicalInterface/Attribute:connectableci_name' => 'Device name~~',
@@ -1327,6 +1364,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:lnkPhysicalInterfaceToVLAN' => 'Link PhysicalInterface / VLAN~~',
 	'Class:lnkPhysicalInterfaceToVLAN+' => '~~',
+	'Class:lnkPhysicalInterfaceToVLAN/Name' => '%1$s %2$s / %3$s~~',
 	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_id' => 'Physical Interface~~',
 	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_id+' => '~~',
 	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_name' => 'Physical Interface Name~~',
@@ -1381,6 +1419,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:lnkConnectableCIToNetworkDevice' => 'Link ConnectableCI / NetworkDevice~~',
 	'Class:lnkConnectableCIToNetworkDevice+' => '~~',
+	'Class:lnkConnectableCIToNetworkDevice/Name' => '%1$s / %2$s~~',
 	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id' => 'Network device~~',
 	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id+' => '~~',
 	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_name' => 'Network device name~~',
@@ -1408,6 +1447,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:lnkApplicationSolutionToFunctionalCI' => 'Link ApplicationSolution / FunctionalCI~~',
 	'Class:lnkApplicationSolutionToFunctionalCI+' => '~~',
+	'Class:lnkApplicationSolutionToFunctionalCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_id' => 'Application solution~~',
 	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_id+' => '~~',
 	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_name' => 'Application solution name~~',
@@ -1425,6 +1465,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:lnkApplicationSolutionToBusinessProcess' => 'Link ApplicationSolution / BusinessProcess~~',
 	'Class:lnkApplicationSolutionToBusinessProcess+' => '~~',
+	'Class:lnkApplicationSolutionToBusinessProcess/Name' => '%1$s / %2$s~~',
 	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_id' => 'Business process~~',
 	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_id+' => '~~',
 	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_name' => 'Business process name~~',
@@ -1442,6 +1483,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:Group' => 'Groppo',
 	'Class:Group+' => '',
+	'Class:Group/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Group/Attribute:name' => 'Nome',
 	'Class:Group/Attribute:name+' => '',
 	'Class:Group/Attribute:status' => 'Stato',
@@ -1461,7 +1503,6 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:Group/Attribute:type' => 'Tipo',
 	'Class:Group/Attribute:type+' => '',
 	'Class:Group/Attribute:parent_id' => 'Parent Group',
-
 	'Class:Group/Attribute:parent_id+' => '',
 	'Class:Group/Attribute:parent_name' => 'Nome',
 	'Class:Group/Attribute:parent_name+' => '',
@@ -1478,6 +1519,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:lnkGroupToCI' => 'Groppo / CI',
 	'Class:lnkGroupToCI+' => '',
+	'Class:lnkGroupToCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkGroupToCI/Attribute:group_id' => 'Groppo',
 	'Class:lnkGroupToCI/Attribute:group_id+' => '',
 	'Class:lnkGroupToCI/Attribute:group_name' => 'Nome',
@@ -1499,6 +1541,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Server:otherinfo' => 'Other information~~',
 	'Server:power' => 'Power supply~~',
 	'Class:Subnet/Tab:IPUsage' => 'Utilizzo IP',
+	'Class:Subnet/Tab:IPUsage+' => 'Which IP within this Subnet are used or not~~',
 	'Class:Subnet/Tab:IPUsage-explain' => 'Iterfacce che hanno un IP nell\'intervallo: <em>%1$s</em> e <em>%2$s</em>',
 	'Class:Subnet/Tab:FreeIPs' => 'IP liberi',
 	'Class:Subnet/Tab:FreeIPs-count' => 'IP liberi: %1$s',
@@ -1514,6 +1557,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:lnkDocumentToFunctionalCI' => 'Link Document / FunctionalCI~~',
 	'Class:lnkDocumentToFunctionalCI+' => '~~',
+	'Class:lnkDocumentToFunctionalCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id' => 'Functionalci~~',
 	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id+' => '~~',
 	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_name' => 'Functionalci name~~',
diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/ja.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/ja.dict.itop-config-mgmt.php
index 384455ee88..404307fee0 100644
--- a/datamodels/2.x/itop-config-mgmt/dictionaries/ja.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/ja.dict.itop-config-mgmt.php
@@ -29,7 +29,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Relation:depends on/Description' => 'この要素が依存している要素',
 	'Relation:depends on/DownStream' => '依存...',
 	'Relation:depends on/UpStream' => 'インパクト...',
-	'Relation:impacts/LoadData'       => 'Load data~~',
+	'Relation:impacts/LoadData' => 'Load data~~',
 	'Relation:impacts/NoFilteredData' => 'please select objects in Graphical view tag~~',
 ));
 
@@ -78,6 +78,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:lnkContactToFunctionalCI' => 'リンク 連絡先/機能的CI',
 	'Class:lnkContactToFunctionalCI+' => '',
+	'Class:lnkContactToFunctionalCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => '機能的ci',
 	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
 	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => '機能的ci名',
@@ -124,6 +125,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:FunctionalCI/Attribute:finalclass' => 'CIタイプ',
 	'Class:FunctionalCI/Attribute:finalclass+' => '',
 	'Class:FunctionalCI/Tab:OpenedTickets' => 'Active Tickets~~',
+	'Class:FunctionalCI/Tab:OpenedTickets+' => 'Active Tickets which are impacting this functional CI~~',
 ));
 
 //
@@ -133,6 +135,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:PhysicalDevice' => '物理的デバイス',
 	'Class:PhysicalDevice+' => '',
+	'Class:PhysicalDevice/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:PhysicalDevice/Attribute:serialnumber' => 'シリアル番号',
 	'Class:PhysicalDevice/Attribute:serialnumber+' => '',
 	'Class:PhysicalDevice/Attribute:location_id' => '場所',
@@ -172,6 +175,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:Rack' => 'ラック',
 	'Class:Rack+' => '',
+	'Class:Rack/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Rack/Attribute:nb_u' => 'ユニット数',
 	'Class:Rack/Attribute:nb_u+' => '',
 	'Class:Rack/Attribute:device_list' => 'デバイス',
@@ -238,6 +242,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:ConnectableCI' => '接続可能なCI',
 	'Class:ConnectableCI+' => '物理的なCI',
+	'Class:ConnectableCI/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:ConnectableCI/Attribute:networkdevice_list' => 'ネットワークデバイス',
 	'Class:ConnectableCI/Attribute:networkdevice_list+' => 'All network devices connected to this device~~',
 	'Class:ConnectableCI/Attribute:physicalinterface_list' => 'ネットワークインターフェース',
@@ -251,6 +256,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:DatacenterDevice' => 'データセンターデバイス',
 	'Class:DatacenterDevice+' => '',
+	'Class:DatacenterDevice/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:DatacenterDevice/Attribute:rack_id' => 'ラック',
 	'Class:DatacenterDevice/Attribute:rack_id+' => '',
 	'Class:DatacenterDevice/Attribute:rack_name' => 'ラック名',
@@ -289,6 +295,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:NetworkDevice' => 'ネットワークデバイス',
 	'Class:NetworkDevice+' => '',
+	'Class:NetworkDevice/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:NetworkDevice/Attribute:networkdevicetype_id' => 'ネットワークタイプ',
 	'Class:NetworkDevice/Attribute:networkdevicetype_id+' => '',
 	'Class:NetworkDevice/Attribute:networkdevicetype_name' => 'ネットワークタイプ名',
@@ -310,6 +317,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:Server' => 'サーバ',
 	'Class:Server+' => '',
+	'Class:Server/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Server/Attribute:osfamily_id' => 'OSファミリ',
 	'Class:Server/Attribute:osfamily_id+' => '',
 	'Class:Server/Attribute:osfamily_name' => 'OSファミリ名',
@@ -337,6 +345,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:StorageSystem' => 'ストレージシステム',
 	'Class:StorageSystem+' => '',
+	'Class:StorageSystem/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:StorageSystem/Attribute:logicalvolume_list' => '論理ボリューム',
 	'Class:StorageSystem/Attribute:logicalvolume_list+' => 'All the logical volumes in this storage system~~',
 ));
@@ -348,6 +357,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:SANSwitch' => 'SANスイッチ',
 	'Class:SANSwitch+' => '',
+	'Class:SANSwitch/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:SANSwitch/Attribute:datacenterdevice_list' => 'デバイス',
 	'Class:SANSwitch/Attribute:datacenterdevice_list+' => 'All the devices connected to this SAN switch~~',
 ));
@@ -359,6 +369,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:TapeLibrary' => 'テープライブラリ',
 	'Class:TapeLibrary+' => '',
+	'Class:TapeLibrary/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:TapeLibrary/Attribute:tapes_list' => 'テープ',
 	'Class:TapeLibrary/Attribute:tapes_list+' => 'All the tapes in the tape library~~',
 ));
@@ -370,6 +381,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:NAS' => 'NAS',
 	'Class:NAS+' => '',
+	'Class:NAS/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:NAS/Attribute:nasfilesystem_list' => 'ファイルシステム',
 	'Class:NAS/Attribute:nasfilesystem_list+' => 'All the file systems in this NAS~~',
 ));
@@ -381,6 +393,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:PC' => 'PC',
 	'Class:PC+' => '',
+	'Class:PC/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:PC/Attribute:osfamily_id' => 'OSファミリ',
 	'Class:PC/Attribute:osfamily_id+' => '',
 	'Class:PC/Attribute:osfamily_name' => 'OSファミリ名',
@@ -408,6 +421,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:Printer' => 'プリンター',
 	'Class:Printer+' => '',
+	'Class:Printer/ComplementaryName' => '%1$s - %2$s~~',
 ));
 
 //
@@ -417,6 +431,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:PowerConnection' => '電源接続',
 	'Class:PowerConnection+' => '',
+	'Class:PowerConnection/ComplementaryName' => '%1$s - %2$s~~',
 ));
 
 //
@@ -426,6 +441,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:PowerSource' => '電源',
 	'Class:PowerSource+' => '',
+	'Class:PowerSource/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:PowerSource/Attribute:pdus_list' => 'PDU',
 	'Class:PowerSource/Attribute:pdus_list+' => 'All the PDUs using this power source~~',
 ));
@@ -437,6 +453,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:PDU' => 'PDU',
 	'Class:PDU+' => '',
+	'Class:PDU/ComplementaryName' => '%1$s - %2$s - %3$s - %4$s~~',
 	'Class:PDU/Attribute:rack_id' => 'ラック',
 	'Class:PDU/Attribute:rack_id+' => '',
 	'Class:PDU/Attribute:rack_name' => 'ラック名',
@@ -454,6 +471,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:Peripheral' => '周辺',
 	'Class:Peripheral+' => '',
+	'Class:Peripheral/ComplementaryName' => '%1$s - %2$s~~',
 ));
 
 //
@@ -463,6 +481,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:Enclosure' => 'エンクロージャ',
 	'Class:Enclosure+' => '',
+	'Class:Enclosure/ComplementaryName' => '%1$s - %2$s - %3$s~~',
 	'Class:Enclosure/Attribute:rack_id' => 'ラック',
 	'Class:Enclosure/Attribute:rack_id+' => '',
 	'Class:Enclosure/Attribute:rack_name' => 'ラック名',
@@ -600,6 +619,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:MiddlewareInstance' => 'ミドルウエアインスタンス',
 	'Class:MiddlewareInstance+' => '',
+	'Class:MiddlewareInstance/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:MiddlewareInstance/Attribute:middleware_id' => 'ミドルウエア',
 	'Class:MiddlewareInstance/Attribute:middleware_id+' => '',
 	'Class:MiddlewareInstance/Attribute:middleware_name' => 'ミドルウエア名',
@@ -613,6 +633,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:DatabaseSchema' => 'DBスキーマ',
 	'Class:DatabaseSchema+' => '',
+	'Class:DatabaseSchema/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:DatabaseSchema/Attribute:dbserver_id' => 'DBサーバ',
 	'Class:DatabaseSchema/Attribute:dbserver_id+' => '',
 	'Class:DatabaseSchema/Attribute:dbserver_name' => 'DBサーバ名',
@@ -626,6 +647,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:WebApplication' => 'Webアプリケーション',
 	'Class:WebApplication+' => '',
+	'Class:WebApplication/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:WebApplication/Attribute:webserver_id' => 'Webサーバ',
 	'Class:WebApplication/Attribute:webserver_id+' => '',
 	'Class:WebApplication/Attribute:webserver_name' => 'Webサーバ名',
@@ -706,6 +728,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:VirtualMachine' => '仮想マシン',
 	'Class:VirtualMachine+' => '',
+	'Class:VirtualMachine/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:VirtualMachine/Attribute:virtualhost_id' => '仮想ホスト',
 	'Class:VirtualMachine/Attribute:virtualhost_id+' => '',
 	'Class:VirtualMachine/Attribute:virtualhost_name' => '仮想ホスト名',
@@ -766,6 +789,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:lnkServerToVolume' => 'リンクサーバ/ボリューム',
 	'Class:lnkServerToVolume+' => '',
+	'Class:lnkServerToVolume/Name' => '%1$s / %2$s~~',
 	'Class:lnkServerToVolume/Attribute:volume_id' => 'ボリューム',
 	'Class:lnkServerToVolume/Attribute:volume_id+' => '',
 	'Class:lnkServerToVolume/Attribute:volume_name' => 'ボリューム名',
@@ -785,6 +809,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:lnkVirtualDeviceToVolume' => 'リンク 仮想デバイス/ボリューム',
 	'Class:lnkVirtualDeviceToVolume+' => '',
+	'Class:lnkVirtualDeviceToVolume/Name' => '%1$s / %2$s~~',
 	'Class:lnkVirtualDeviceToVolume/Attribute:volume_id' => 'ボリューム',
 	'Class:lnkVirtualDeviceToVolume/Attribute:volume_id+' => '',
 	'Class:lnkVirtualDeviceToVolume/Attribute:volume_name' => 'ボリューム名',
@@ -804,6 +829,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:lnkSanToDatacenterDevice' => 'リンク San/データセンターデバイス',
 	'Class:lnkSanToDatacenterDevice+' => '',
+	'Class:lnkSanToDatacenterDevice/Name' => '%1$s / %2$s~~',
 	'Class:lnkSanToDatacenterDevice/Attribute:san_id' => 'SANスイッチ',
 	'Class:lnkSanToDatacenterDevice/Attribute:san_id+' => '',
 	'Class:lnkSanToDatacenterDevice/Attribute:san_name' => 'SANスイッチ名',
@@ -865,6 +891,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:Software' => 'ソフトウエア',
 	'Class:Software+' => '',
+	'Class:Software/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Software/Attribute:name' => '名前',
 	'Class:Software/Attribute:name+' => '',
 	'Class:Software/Attribute:vendor' => 'ベンダー',
@@ -982,6 +1009,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:OSLicence' => 'OSライセンス',
 	'Class:OSLicence+' => '',
+	'Class:OSLicence/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:OSLicence/Attribute:osversion_id' => 'OSバージョン',
 	'Class:OSLicence/Attribute:osversion_id+' => '',
 	'Class:OSLicence/Attribute:osversion_name' => 'OSバージョン名',
@@ -999,6 +1027,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:SoftwareLicence' => 'ソフトウエアライセンス',
 	'Class:SoftwareLicence+' => '',
+	'Class:SoftwareLicence/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:SoftwareLicence/Attribute:software_id' => 'ソフトウエア',
 	'Class:SoftwareLicence/Attribute:software_id+' => '',
 	'Class:SoftwareLicence/Attribute:software_name' => 'ソフトウエア名',
@@ -1014,6 +1043,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:lnkDocumentToLicence' => 'リンク 文書/ライセンス',
 	'Class:lnkDocumentToLicence+' => '',
+	'Class:lnkDocumentToLicence/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToLicence/Attribute:licence_id' => 'ライセンス',
 	'Class:lnkDocumentToLicence/Attribute:licence_id+' => '',
 	'Class:lnkDocumentToLicence/Attribute:licence_name' => 'ライセンス名',
@@ -1066,6 +1096,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:Model' => 'モデル',
 	'Class:Model+' => '',
+	'Class:Model/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Model/Attribute:brand_id' => 'ブランド',
 	'Class:Model/Attribute:brand_id+' => '',
 	'Class:Model/Attribute:brand_name' => 'ブランド名',
@@ -1145,6 +1176,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:lnkDocumentToPatch' => 'リンク 文書/パッチ',
 	'Class:lnkDocumentToPatch+' => '',
+	'Class:lnkDocumentToPatch/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToPatch/Attribute:patch_id' => 'パッチ',
 	'Class:lnkDocumentToPatch/Attribute:patch_id+' => '',
 	'Class:lnkDocumentToPatch/Attribute:patch_name' => 'パッチ名',
@@ -1162,6 +1194,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:lnkSoftwareInstanceToSoftwarePatch' => 'リンク ソフトウエアインスタンス/ソフトウエアパッチ',
 	'Class:lnkSoftwareInstanceToSoftwarePatch+' => '',
+	'Class:lnkSoftwareInstanceToSoftwarePatch/Name' => '%1$s / %2$s~~',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id' => 'ソフトウエアパッチ',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id+' => '',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_name' => 'ソフトウエアパッチ名',
@@ -1179,6 +1212,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:lnkFunctionalCIToOSPatch' => 'リンク 機能的CI/OSパッチ',
 	'Class:lnkFunctionalCIToOSPatch+' => '',
+	'Class:lnkFunctionalCIToOSPatch/Name' => '%1$s / %2$s~~',
 	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id' => 'OSパッチ',
 	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id+' => '',
 	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_name' => 'OSパッチ名',
@@ -1196,6 +1230,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:lnkDocumentToSoftware' => 'リンク 文書/ソフトウエア',
 	'Class:lnkDocumentToSoftware+' => '',
+	'Class:lnkDocumentToSoftware/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToSoftware/Attribute:software_id' => 'ソフトウエア',
 	'Class:lnkDocumentToSoftware/Attribute:software_id+' => '',
 	'Class:lnkDocumentToSoftware/Attribute:software_name' => 'ソフトウエア名',
@@ -1213,6 +1248,8 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:Subnet' => 'サブネット',
 	'Class:Subnet+' => '',
+	'Class:Subnet/Name' => '%1$s/%2$s~~',
+	'Class:Subnet/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Subnet/Attribute:description' => '説明',
 	'Class:Subnet/Attribute:description+' => '',
 	'Class:Subnet/Attribute:subnet_name' => 'Subnet name~~',
@@ -1257,6 +1294,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:lnkSubnetToVLAN' => 'Link Subnet / VLAN~~',
 	'Class:lnkSubnetToVLAN+' => '~~',
+	'Class:lnkSubnetToVLAN/Name' => '%1$s / %2$s~~',
 	'Class:lnkSubnetToVLAN/Attribute:subnet_id' => 'Subnet~~',
 	'Class:lnkSubnetToVLAN/Attribute:subnet_id+' => '~~',
 	'Class:lnkSubnetToVLAN/Attribute:subnet_ip' => 'Subnet IP~~',
@@ -1291,8 +1329,6 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:IPInterface+' => '',
 	'Class:IPInterface/Attribute:ipaddress' => 'IPアドレス',
 	'Class:IPInterface/Attribute:ipaddress+' => '',
-
-
 	'Class:IPInterface/Attribute:macaddress' => 'MACアドレス',
 	'Class:IPInterface/Attribute:macaddress+' => '',
 	'Class:IPInterface/Attribute:comment' => 'コメント',
@@ -1312,6 +1348,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:PhysicalInterface' => '物理インターフェース',
 	'Class:PhysicalInterface+' => '',
+	'Class:PhysicalInterface/Name' => '%2$s %1$s~~',
 	'Class:PhysicalInterface/Attribute:connectableci_id' => 'デバイス',
 	'Class:PhysicalInterface/Attribute:connectableci_id+' => '',
 	'Class:PhysicalInterface/Attribute:connectableci_name' => 'デバイス名',
@@ -1327,6 +1364,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:lnkPhysicalInterfaceToVLAN' => 'Link PhysicalInterface / VLAN~~',
 	'Class:lnkPhysicalInterfaceToVLAN+' => '~~',
+	'Class:lnkPhysicalInterfaceToVLAN/Name' => '%1$s %2$s / %3$s~~',
 	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_id' => 'Physical Interface~~',
 	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_id+' => '~~',
 	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_name' => 'Physical Interface Name~~',
@@ -1381,6 +1419,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:lnkConnectableCIToNetworkDevice' => 'リンク 接続可能CI/ネットワークデバイス',
 	'Class:lnkConnectableCIToNetworkDevice+' => '',
+	'Class:lnkConnectableCIToNetworkDevice/Name' => '%1$s / %2$s~~',
 	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id' => 'ネットァークデバイス',
 	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id+' => '',
 	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_name' => 'ネットァークデバイス名',
@@ -1408,6 +1447,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:lnkApplicationSolutionToFunctionalCI' => 'リンク アプリケーションソリューション/機能的CI',
 	'Class:lnkApplicationSolutionToFunctionalCI+' => '',
+	'Class:lnkApplicationSolutionToFunctionalCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_id' => 'アプリケーションソリューション',
 	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_id+' => '',
 	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_name' => 'アプリケーションソリューション名',
@@ -1425,6 +1465,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:lnkApplicationSolutionToBusinessProcess' => 'リンク アプリケーション/ビジネスプロセス',
 	'Class:lnkApplicationSolutionToBusinessProcess+' => '',
+	'Class:lnkApplicationSolutionToBusinessProcess/Name' => '%1$s / %2$s~~',
 	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_id' => 'ビジネスプロセス',
 	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_id+' => '',
 	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_name' => 'ビジネスプロセス名',
@@ -1442,6 +1483,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:Group' => 'グループ',
 	'Class:Group+' => '',
+	'Class:Group/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Group/Attribute:name' => '名前',
 	'Class:Group/Attribute:name+' => '',
 	'Class:Group/Attribute:status' => '状態',
@@ -1461,7 +1503,6 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:Group/Attribute:type' => 'タイプ',
 	'Class:Group/Attribute:type+' => '',
 	'Class:Group/Attribute:parent_id' => '親グループ',
-
 	'Class:Group/Attribute:parent_id+' => '',
 	'Class:Group/Attribute:parent_name' => '名前',
 	'Class:Group/Attribute:parent_name+' => '',
@@ -1478,6 +1519,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:lnkGroupToCI' => 'リンク グループ/CI',
 	'Class:lnkGroupToCI+' => '',
+	'Class:lnkGroupToCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkGroupToCI/Attribute:group_id' => 'グループ',
 	'Class:lnkGroupToCI/Attribute:group_id+' => '',
 	'Class:lnkGroupToCI/Attribute:group_name' => '名前名',
@@ -1499,6 +1541,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Server:otherinfo' => '他の情報',
 	'Server:power' => 'Power supply~~',
 	'Class:Subnet/Tab:IPUsage' => 'IP 利用',
+	'Class:Subnet/Tab:IPUsage+' => 'Which IP within this Subnet are used or not~~',
 	'Class:Subnet/Tab:IPUsage-explain' => 'インターフェースは、レンジ: <em>%1$s</em> から <em>%2$s</em>の中のIPを持っています。',
 	'Class:Subnet/Tab:FreeIPs' => 'フリーなIP',
 	'Class:Subnet/Tab:FreeIPs-count' => 'フリーIP: %1$s',
@@ -1514,6 +1557,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:lnkDocumentToFunctionalCI' => 'リンク 文書/機能的CI',
 	'Class:lnkDocumentToFunctionalCI+' => '',
+	'Class:lnkDocumentToFunctionalCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id' => '機能的ci',
 	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id+' => '',
 	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_name' => '機能的ci名',
diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/nl.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/nl.dict.itop-config-mgmt.php
index 71350eaa52..dd5e96f5c0 100644
--- a/datamodels/2.x/itop-config-mgmt/dictionaries/nl.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/nl.dict.itop-config-mgmt.php
@@ -21,7 +21,7 @@
  * Linux & Open Source Professionals
  * http://www.linprofs.com
  *
- * @author Hipska (2018, 2019)
+ * @author Thomas Casteleyn <info@super-visions.com>
  * @author Jeffrey Bostoen <info@jeffreybostoen.be> (2018 - 2022)
  *
  * @copyright   Copyright (C) 2010-2023 Combodo SARL
@@ -32,16 +32,16 @@
 //////////////////////////////////////////////////////////////////////
 //
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Relation:impacts/Description' => 'Elementen hebben impact op',
+	'Relation:impacts/Description' => 'Elementen met impact van',
 	'Relation:impacts/DownStream' => 'Impact op...',
-	'Relation:impacts/DownStream+' => 'Elementen hebben impact op',
+	'Relation:impacts/DownStream+' => 'Elementen geïmpacteerd door',
 	'Relation:impacts/UpStream' => 'Is afhankelijk van...',
-	'Relation:impacts/UpStream+' => 'Elementen waar dit object impact op heeft',
+	'Relation:impacts/UpStream+' => 'Elementen met impact op',
 	// Legacy entries
-	'Relation:depends on/Description' => 'Elementen waarvan dit object afhankelijk van is',
+	'Relation:depends on/Description' => 'Elementen afhankelijk van',
 	'Relation:depends on/DownStream' => 'Is afhankelijk van...',
 	'Relation:depends on/UpStream' => 'Impact op...',
-	'Relation:impacts/LoadData'       => 'Load data~~',
+	'Relation:impacts/LoadData' => 'Load data~~',
 	'Relation:impacts/NoFilteredData' => 'please select objects in Graphical view tag~~',
 ));
 
@@ -90,6 +90,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:lnkContactToFunctionalCI' => 'Link Contact / Functioneel CI',
 	'Class:lnkContactToFunctionalCI+' => '',
+	'Class:lnkContactToFunctionalCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'Functioneel CI',
 	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
 	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Naam functioneel CI',
@@ -136,6 +137,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:FunctionalCI/Attribute:finalclass' => 'Subklasse CI',
 	'Class:FunctionalCI/Attribute:finalclass+' => '',
 	'Class:FunctionalCI/Tab:OpenedTickets' => 'Actieve tickets',
+	'Class:FunctionalCI/Tab:OpenedTickets+' => 'Active Tickets which are impacting this functional CI~~',
 ));
 
 //
@@ -145,6 +147,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:PhysicalDevice' => 'Fysieke Apparaat',
 	'Class:PhysicalDevice+' => '',
+	'Class:PhysicalDevice/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:PhysicalDevice/Attribute:serialnumber' => 'Serienummer',
 	'Class:PhysicalDevice/Attribute:serialnumber+' => '',
 	'Class:PhysicalDevice/Attribute:location_id' => 'Locatie',
@@ -184,6 +187,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:Rack' => 'Rack',
 	'Class:Rack+' => '',
+	'Class:Rack/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Rack/Attribute:nb_u' => 'Rackeenheden',
 	'Class:Rack/Attribute:nb_u+' => '',
 	'Class:Rack/Attribute:device_list' => 'Apparaten',
@@ -250,6 +254,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:ConnectableCI' => 'Aansluitbaar CI',
 	'Class:ConnectableCI+' => 'Fysiek CI',
+	'Class:ConnectableCI/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:ConnectableCI/Attribute:networkdevice_list' => 'Netwerkapparaten',
 	'Class:ConnectableCI/Attribute:networkdevice_list+' => 'Alle netwerkapparaten die verbonden zijn met dit apparaat',
 	'Class:ConnectableCI/Attribute:physicalinterface_list' => 'Netwerkinterfaces',
@@ -263,6 +268,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:DatacenterDevice' => 'Datacenterapparaat',
 	'Class:DatacenterDevice+' => '',
+	'Class:DatacenterDevice/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:DatacenterDevice/Attribute:rack_id' => 'Rack',
 	'Class:DatacenterDevice/Attribute:rack_id+' => '',
 	'Class:DatacenterDevice/Attribute:rack_name' => 'Naam rack',
@@ -301,6 +307,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:NetworkDevice' => 'Netwerkapparaat',
 	'Class:NetworkDevice+' => '',
+	'Class:NetworkDevice/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:NetworkDevice/Attribute:networkdevicetype_id' => 'Soort netwerkapparaat',
 	'Class:NetworkDevice/Attribute:networkdevicetype_id+' => '',
 	'Class:NetworkDevice/Attribute:networkdevicetype_name' => 'Soort van dit netwerkapparaat',
@@ -322,6 +329,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:Server' => 'Server',
 	'Class:Server+' => '',
+	'Class:Server/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Server/Attribute:osfamily_id' => 'Soort besturingssysteem',
 	'Class:Server/Attribute:osfamily_id+' => '',
 	'Class:Server/Attribute:osfamily_name' => 'Naam soort besturingssysteem',
@@ -349,6 +357,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:StorageSystem' => 'Opslagsysteem',
 	'Class:StorageSystem+' => '',
+	'Class:StorageSystem/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:StorageSystem/Attribute:logicalvolume_list' => 'Logische volumes',
 	'Class:StorageSystem/Attribute:logicalvolume_list+' => 'Alle logische volumes in dit opslagsysteem',
 ));
@@ -360,6 +369,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:SANSwitch' => 'SAN-switch',
 	'Class:SANSwitch+' => '',
+	'Class:SANSwitch/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:SANSwitch/Attribute:datacenterdevice_list' => 'Apparaten',
 	'Class:SANSwitch/Attribute:datacenterdevice_list+' => 'Alle apparaten verbonden met deze SAN-switch',
 ));
@@ -371,6 +381,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:TapeLibrary' => 'Tapebibliotheek',
 	'Class:TapeLibrary+' => '',
+	'Class:TapeLibrary/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:TapeLibrary/Attribute:tapes_list' => 'Tapes',
 	'Class:TapeLibrary/Attribute:tapes_list+' => 'Alle tapes in de tapebibliotheek',
 ));
@@ -382,6 +393,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:NAS' => 'NAS',
 	'Class:NAS+' => '',
+	'Class:NAS/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:NAS/Attribute:nasfilesystem_list' => 'Bestandssysteem',
 	'Class:NAS/Attribute:nasfilesystem_list+' => 'Alle bestandsystemen in deze NAS',
 ));
@@ -393,6 +405,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:PC' => 'PC',
 	'Class:PC+' => '',
+	'Class:PC/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:PC/Attribute:osfamily_id' => 'Soort besturingssysteem',
 	'Class:PC/Attribute:osfamily_id+' => '',
 	'Class:PC/Attribute:osfamily_name' => 'Naam soort besturingssysteem',
@@ -420,6 +433,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:Printer' => 'Printer',
 	'Class:Printer+' => '',
+	'Class:Printer/ComplementaryName' => '%1$s - %2$s~~',
 ));
 
 //
@@ -429,6 +443,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:PowerConnection' => 'Stroomverbinding',
 	'Class:PowerConnection+' => '',
+	'Class:PowerConnection/ComplementaryName' => '%1$s - %2$s~~',
 ));
 
 //
@@ -438,6 +453,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:PowerSource' => 'Stroombron',
 	'Class:PowerSource+' => '',
+	'Class:PowerSource/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:PowerSource/Attribute:pdus_list' => 'PDU\'s',
 	'Class:PowerSource/Attribute:pdus_list+' => 'Alle PDU\'s die gebruik maken van deze stroombron',
 ));
@@ -449,6 +465,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:PDU' => 'PDU',
 	'Class:PDU+' => '',
+	'Class:PDU/ComplementaryName' => '%1$s - %2$s - %3$s - %4$s~~',
 	'Class:PDU/Attribute:rack_id' => 'Rack',
 	'Class:PDU/Attribute:rack_id+' => '',
 	'Class:PDU/Attribute:rack_name' => 'Naam rack',
@@ -466,6 +483,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:Peripheral' => 'Randapparatuur',
 	'Class:Peripheral+' => '',
+	'Class:Peripheral/ComplementaryName' => '%1$s - %2$s~~',
 ));
 
 //
@@ -475,6 +493,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:Enclosure' => 'Enclosure',
 	'Class:Enclosure+' => '',
+	'Class:Enclosure/ComplementaryName' => '%1$s - %2$s - %3$s~~',
 	'Class:Enclosure/Attribute:rack_id' => 'Rack',
 	'Class:Enclosure/Attribute:rack_id+' => '',
 	'Class:Enclosure/Attribute:rack_name' => 'Naam rack',
@@ -612,6 +631,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:MiddlewareInstance' => 'Middleware-instantie',
 	'Class:MiddlewareInstance+' => '',
+	'Class:MiddlewareInstance/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:MiddlewareInstance/Attribute:middleware_id' => 'Middleware',
 	'Class:MiddlewareInstance/Attribute:middleware_id+' => '',
 	'Class:MiddlewareInstance/Attribute:middleware_name' => 'Naam middleware',
@@ -625,6 +645,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:DatabaseSchema' => 'Databaseschema',
 	'Class:DatabaseSchema+' => '',
+	'Class:DatabaseSchema/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:DatabaseSchema/Attribute:dbserver_id' => 'Databaseserver',
 	'Class:DatabaseSchema/Attribute:dbserver_id+' => '',
 	'Class:DatabaseSchema/Attribute:dbserver_name' => 'Naam databaseserver',
@@ -638,6 +659,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:WebApplication' => 'Webapplicatie',
 	'Class:WebApplication+' => '',
+	'Class:WebApplication/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:WebApplication/Attribute:webserver_id' => 'Webserver',
 	'Class:WebApplication/Attribute:webserver_id+' => '',
 	'Class:WebApplication/Attribute:webserver_name' => 'Naam webserver',
@@ -718,6 +740,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:VirtualMachine' => 'Virtuele machine',
 	'Class:VirtualMachine+' => '',
+	'Class:VirtualMachine/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:VirtualMachine/Attribute:virtualhost_id' => 'Virtuele host',
 	'Class:VirtualMachine/Attribute:virtualhost_id+' => '',
 	'Class:VirtualMachine/Attribute:virtualhost_name' => 'Naam virtuele host',
@@ -778,6 +801,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:lnkServerToVolume' => 'Link Server / Volume',
 	'Class:lnkServerToVolume+' => '',
+	'Class:lnkServerToVolume/Name' => '%1$s / %2$s~~',
 	'Class:lnkServerToVolume/Attribute:volume_id' => 'Volume',
 	'Class:lnkServerToVolume/Attribute:volume_id+' => '',
 	'Class:lnkServerToVolume/Attribute:volume_name' => 'Naam volume',
@@ -797,6 +821,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:lnkVirtualDeviceToVolume' => 'Link Virtueel apparaat / Volume',
 	'Class:lnkVirtualDeviceToVolume+' => '',
+	'Class:lnkVirtualDeviceToVolume/Name' => '%1$s / %2$s~~',
 	'Class:lnkVirtualDeviceToVolume/Attribute:volume_id' => 'Volume',
 	'Class:lnkVirtualDeviceToVolume/Attribute:volume_id+' => '',
 	'Class:lnkVirtualDeviceToVolume/Attribute:volume_name' => 'Naam volume',
@@ -816,6 +841,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:lnkSanToDatacenterDevice' => 'Link SAN / Datacenterapparaat',
 	'Class:lnkSanToDatacenterDevice+' => '',
+	'Class:lnkSanToDatacenterDevice/Name' => '%1$s / %2$s~~',
 	'Class:lnkSanToDatacenterDevice/Attribute:san_id' => 'SAN-switch',
 	'Class:lnkSanToDatacenterDevice/Attribute:san_id+' => '',
 	'Class:lnkSanToDatacenterDevice/Attribute:san_name' => 'Naam SAN-switch',
@@ -877,6 +903,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:Software' => 'Software',
 	'Class:Software+' => '',
+	'Class:Software/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Software/Attribute:name' => 'Naam',
 	'Class:Software/Attribute:name+' => '',
 	'Class:Software/Attribute:vendor' => 'Leverancier',
@@ -994,6 +1021,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:OSLicence' => 'Besturingssysteemlicentie',
 	'Class:OSLicence+' => '',
+	'Class:OSLicence/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:OSLicence/Attribute:osversion_id' => 'Versie besturingssysteem',
 	'Class:OSLicence/Attribute:osversion_id+' => '',
 	'Class:OSLicence/Attribute:osversion_name' => 'Naam versie bestandssysteem',
@@ -1011,6 +1039,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:SoftwareLicence' => 'Softwarelicentie',
 	'Class:SoftwareLicence+' => '',
+	'Class:SoftwareLicence/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:SoftwareLicence/Attribute:software_id' => 'Software',
 	'Class:SoftwareLicence/Attribute:software_id+' => '',
 	'Class:SoftwareLicence/Attribute:software_name' => 'Naam software',
@@ -1026,6 +1055,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:lnkDocumentToLicence' => 'Link Document / Licentie',
 	'Class:lnkDocumentToLicence+' => '',
+	'Class:lnkDocumentToLicence/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToLicence/Attribute:licence_id' => 'Licentie',
 	'Class:lnkDocumentToLicence/Attribute:licence_id+' => '',
 	'Class:lnkDocumentToLicence/Attribute:licence_name' => 'Naam licentie',
@@ -1078,6 +1108,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:Model' => 'Model',
 	'Class:Model+' => '',
+	'Class:Model/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Model/Attribute:brand_id' => 'Merk',
 	'Class:Model/Attribute:brand_id+' => '',
 	'Class:Model/Attribute:brand_name' => 'Naam merk',
@@ -1157,6 +1188,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:lnkDocumentToPatch' => 'Link Document / Patch',
 	'Class:lnkDocumentToPatch+' => '',
+	'Class:lnkDocumentToPatch/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToPatch/Attribute:patch_id' => 'Patch',
 	'Class:lnkDocumentToPatch/Attribute:patch_id+' => '',
 	'Class:lnkDocumentToPatch/Attribute:patch_name' => 'Naam patch',
@@ -1174,6 +1206,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:lnkSoftwareInstanceToSoftwarePatch' => 'Link Software-instantie / Softwarepatch',
 	'Class:lnkSoftwareInstanceToSoftwarePatch+' => '',
+	'Class:lnkSoftwareInstanceToSoftwarePatch/Name' => '%1$s / %2$s~~',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id' => 'Softwarepatch',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id+' => '',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_name' => 'Naam softwarepatch',
@@ -1191,6 +1224,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:lnkFunctionalCIToOSPatch' => 'Link Functioneel CI / Besturingssysteempatch',
 	'Class:lnkFunctionalCIToOSPatch+' => '',
+	'Class:lnkFunctionalCIToOSPatch/Name' => '%1$s / %2$s~~',
 	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id' => 'Besturingssysteempatch',
 	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id+' => '',
 	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_name' => 'Naam besturingssysteempatch',
@@ -1208,6 +1242,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:lnkDocumentToSoftware' => 'Link Document / Software',
 	'Class:lnkDocumentToSoftware+' => '',
+	'Class:lnkDocumentToSoftware/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToSoftware/Attribute:software_id' => 'Software',
 	'Class:lnkDocumentToSoftware/Attribute:software_id+' => '',
 	'Class:lnkDocumentToSoftware/Attribute:software_name' => 'Naam software',
@@ -1225,6 +1260,8 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:Subnet' => 'Subnet',
 	'Class:Subnet+' => '',
+	'Class:Subnet/Name' => '%1$s/%2$s~~',
+	'Class:Subnet/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Subnet/Attribute:description' => 'Omschrijving',
 	'Class:Subnet/Attribute:description+' => '',
 	'Class:Subnet/Attribute:subnet_name' => 'Naam subnet',
@@ -1269,6 +1306,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:lnkSubnetToVLAN' => 'Link Subnet / VLAN',
 	'Class:lnkSubnetToVLAN+' => '',
+	'Class:lnkSubnetToVLAN/Name' => '%1$s / %2$s~~',
 	'Class:lnkSubnetToVLAN/Attribute:subnet_id' => 'Subnet',
 	'Class:lnkSubnetToVLAN/Attribute:subnet_id+' => '',
 	'Class:lnkSubnetToVLAN/Attribute:subnet_ip' => 'IP subnet',
@@ -1303,8 +1341,6 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:IPInterface+' => '',
 	'Class:IPInterface/Attribute:ipaddress' => 'IP-adres',
 	'Class:IPInterface/Attribute:ipaddress+' => '',
-
-
 	'Class:IPInterface/Attribute:macaddress' => 'MAC-adres',
 	'Class:IPInterface/Attribute:macaddress+' => '',
 	'Class:IPInterface/Attribute:comment' => 'Commentaar',
@@ -1324,6 +1360,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:PhysicalInterface' => 'Fysieke interface',
 	'Class:PhysicalInterface+' => '',
+	'Class:PhysicalInterface/Name' => '%2$s %1$s~~',
 	'Class:PhysicalInterface/Attribute:connectableci_id' => 'Apparaat',
 	'Class:PhysicalInterface/Attribute:connectableci_id+' => '',
 	'Class:PhysicalInterface/Attribute:connectableci_name' => 'Naam apparaat',
@@ -1339,6 +1376,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:lnkPhysicalInterfaceToVLAN' => 'Link Fysieke interface / VLAN',
 	'Class:lnkPhysicalInterfaceToVLAN+' => '',
+	'Class:lnkPhysicalInterfaceToVLAN/Name' => '%1$s %2$s / %3$s~~',
 	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_id' => 'Fysieke interface',
 	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_id+' => '',
 	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_name' => 'Naam fysieke interface',
@@ -1393,6 +1431,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:lnkConnectableCIToNetworkDevice' => 'Link ConnectableCI / Netwerkapparaat',
 	'Class:lnkConnectableCIToNetworkDevice+' => '',
+	'Class:lnkConnectableCIToNetworkDevice/Name' => '%1$s / %2$s~~',
 	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id' => 'Netwerkapparaat',
 	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id+' => '',
 	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_name' => 'Naam netwerkapparaat',
@@ -1420,6 +1459,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:lnkApplicationSolutionToFunctionalCI' => 'Link Applicatie-oplossing / Functioneel CI',
 	'Class:lnkApplicationSolutionToFunctionalCI+' => '',
+	'Class:lnkApplicationSolutionToFunctionalCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_id' => 'Applicatie-oplossing',
 	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_id+' => '',
 	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_name' => 'Naam applicatie-oplossing',
@@ -1437,6 +1477,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:lnkApplicationSolutionToBusinessProcess' => 'Link ApplicationSolution / Bedrijfsproces',
 	'Class:lnkApplicationSolutionToBusinessProcess+' => '',
+	'Class:lnkApplicationSolutionToBusinessProcess/Name' => '%1$s / %2$s~~',
 	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_id' => 'Bedrijfsproces',
 	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_id+' => '',
 	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_name' => 'Naam bedrijfsproces',
@@ -1454,6 +1495,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:Group' => 'Groep',
 	'Class:Group+' => '',
+	'Class:Group/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Group/Attribute:name' => 'Naam',
 	'Class:Group/Attribute:name+' => '',
 	'Class:Group/Attribute:status' => 'Status',
@@ -1473,7 +1515,6 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:Group/Attribute:type' => 'Soort',
 	'Class:Group/Attribute:type+' => '',
 	'Class:Group/Attribute:parent_id' => 'Hoofdgroep',
-
 	'Class:Group/Attribute:parent_id+' => '',
 	'Class:Group/Attribute:parent_name' => 'Naam',
 	'Class:Group/Attribute:parent_name+' => '',
@@ -1490,6 +1531,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:lnkGroupToCI' => 'Link Groep / CI',
 	'Class:lnkGroupToCI+' => '',
+	'Class:lnkGroupToCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkGroupToCI/Attribute:group_id' => 'Groep',
 	'Class:lnkGroupToCI/Attribute:group_id+' => '',
 	'Class:lnkGroupToCI/Attribute:group_name' => 'Naam',
@@ -1511,6 +1553,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Server:otherinfo' => 'Andere informatie',
 	'Server:power' => 'Stroomtoevoer',
 	'Class:Subnet/Tab:IPUsage' => 'IP-gebruik',
+	'Class:Subnet/Tab:IPUsage+' => 'Which IP within this Subnet are used or not~~',
 	'Class:Subnet/Tab:IPUsage-explain' => 'Interfaces met een IP-adres in de reeks: <em>%1$s</em> tot en met <em>%2$s</em>',
 	'Class:Subnet/Tab:FreeIPs' => 'Beschikbare IP-adressen',
 	'Class:Subnet/Tab:FreeIPs-count' => 'Beschikbare IP-adressen: %1$s',
@@ -1526,6 +1569,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:lnkDocumentToFunctionalCI' => 'Link Document / Functioneel CI',
 	'Class:lnkDocumentToFunctionalCI+' => '',
+	'Class:lnkDocumentToFunctionalCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id' => 'Functioneel CI',
 	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id+' => '',
 	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_name' => 'Naam Functioneel CI',
diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/pl.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/pl.dict.itop-config-mgmt.php
index 3bc6a43b0e..57c4beef96 100644
--- a/datamodels/2.x/itop-config-mgmt/dictionaries/pl.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/pl.dict.itop-config-mgmt.php
@@ -34,7 +34,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Relation:depends on/Description' => 'Elementy wpływające',
 	'Relation:depends on/DownStream' => 'Zależy od...',
 	'Relation:depends on/UpStream' => 'Wpływa na...',
-	'Relation:impacts/LoadData'       => 'Załaduj dane',
+	'Relation:impacts/LoadData' => 'Załaduj dane',
 	'Relation:impacts/NoFilteredData' => 'proszę wybrać obiekty w widoku graficznym',
 ));
 
@@ -83,6 +83,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:lnkContactToFunctionalCI' => 'Połączenie Kontakt / Konfiguracja',
 	'Class:lnkContactToFunctionalCI+' => '',
+	'Class:lnkContactToFunctionalCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'Konfiguracja',
 	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
 	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Nazwa konfiguracji',
@@ -129,6 +130,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:FunctionalCI/Attribute:finalclass' => 'Podklasa konfiguracji',
 	'Class:FunctionalCI/Attribute:finalclass+' => 'Nazwa ostatniej klasy',
 	'Class:FunctionalCI/Tab:OpenedTickets' => 'Aktywne zgłoszenia',
+	'Class:FunctionalCI/Tab:OpenedTickets+' => 'Active Tickets which are impacting this functional CI~~',
 ));
 
 //
@@ -138,6 +140,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:PhysicalDevice' => 'Urządzenie fizyczne',
 	'Class:PhysicalDevice+' => '',
+	'Class:PhysicalDevice/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:PhysicalDevice/Attribute:serialnumber' => 'Numer seryjny',
 	'Class:PhysicalDevice/Attribute:serialnumber+' => '',
 	'Class:PhysicalDevice/Attribute:location_id' => 'Lokalizacja',
@@ -177,6 +180,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:Rack' => 'Szafa',
 	'Class:Rack+' => '',
+	'Class:Rack/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Rack/Attribute:nb_u' => 'Półki szafy',
 	'Class:Rack/Attribute:nb_u+' => '',
 	'Class:Rack/Attribute:device_list' => 'Urządzenia',
@@ -243,6 +247,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:ConnectableCI' => 'Konfiguracje podłączeń',
 	'Class:ConnectableCI+' => 'Konfiguracje fizyczne',
+	'Class:ConnectableCI/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:ConnectableCI/Attribute:networkdevice_list' => 'Urządzenia sieciowe',
 	'Class:ConnectableCI/Attribute:networkdevice_list+' => 'Wszystkie urządzenia sieciowe podłączone do tego urządzenia',
 	'Class:ConnectableCI/Attribute:physicalinterface_list' => 'Interfejsy sieciowe',
@@ -256,6 +261,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:DatacenterDevice' => 'Urządzenie Datacenter',
 	'Class:DatacenterDevice+' => '',
+	'Class:DatacenterDevice/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:DatacenterDevice/Attribute:rack_id' => 'Szafa',
 	'Class:DatacenterDevice/Attribute:rack_id+' => '',
 	'Class:DatacenterDevice/Attribute:rack_name' => 'Nazwa szafy',
@@ -294,6 +300,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:NetworkDevice' => 'Urządzenie sieciowe',
 	'Class:NetworkDevice+' => '',
+	'Class:NetworkDevice/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:NetworkDevice/Attribute:networkdevicetype_id' => 'Typ urządzenia sieciowego',
 	'Class:NetworkDevice/Attribute:networkdevicetype_id+' => '',
 	'Class:NetworkDevice/Attribute:networkdevicetype_name' => 'Nazwa typu urządzenia sieciowego',
@@ -315,6 +322,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:Server' => 'Serwer',
 	'Class:Server+' => '',
+	'Class:Server/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Server/Attribute:osfamily_id' => 'Rodzina OS',
 	'Class:Server/Attribute:osfamily_id+' => '',
 	'Class:Server/Attribute:osfamily_name' => 'Nazwa rodziny OS',
@@ -342,6 +350,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:StorageSystem' => 'System pamięci masowej',
 	'Class:StorageSystem+' => '',
+	'Class:StorageSystem/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:StorageSystem/Attribute:logicalvolume_list' => 'Woluminy logiczne',
 	'Class:StorageSystem/Attribute:logicalvolume_list+' => 'Wszystkie woluminy logiczne w tym systemie pamięci masowej',
 ));
@@ -353,6 +362,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:SANSwitch' => 'Przełącznik SAN',
 	'Class:SANSwitch+' => '',
+	'Class:SANSwitch/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:SANSwitch/Attribute:datacenterdevice_list' => 'Urządzenia Datacenter',
 	'Class:SANSwitch/Attribute:datacenterdevice_list+' => 'Wszystkie urządzenia Datacenter podłączone do tego przełącznika SAN',
 ));
@@ -364,6 +374,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:TapeLibrary' => 'Biblioteka taśm',
 	'Class:TapeLibrary+' => '',
+	'Class:TapeLibrary/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:TapeLibrary/Attribute:tapes_list' => 'Taśmy',
 	'Class:TapeLibrary/Attribute:tapes_list+' => 'Wszystkie taśmy w bibliotece taśm',
 ));
@@ -375,6 +386,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:NAS' => 'NAS',
 	'Class:NAS+' => '',
+	'Class:NAS/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:NAS/Attribute:nasfilesystem_list' => 'Systemy plików',
 	'Class:NAS/Attribute:nasfilesystem_list+' => 'Wszystkie systemy plików na tym serwerze NAS',
 ));
@@ -386,6 +398,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:PC' => 'Komputer PC',
 	'Class:PC+' => '',
+	'Class:PC/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:PC/Attribute:osfamily_id' => 'Rodzina OS',
 	'Class:PC/Attribute:osfamily_id+' => '',
 	'Class:PC/Attribute:osfamily_name' => 'Nazwa rodziny OS',
@@ -413,6 +426,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:Printer' => 'Drukarka',
 	'Class:Printer+' => '',
+	'Class:Printer/ComplementaryName' => '%1$s - %2$s~~',
 ));
 
 //
@@ -422,6 +436,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:PowerConnection' => 'Podłączenie zasilania',
 	'Class:PowerConnection+' => '',
+	'Class:PowerConnection/ComplementaryName' => '%1$s - %2$s~~',
 ));
 
 //
@@ -431,6 +446,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:PowerSource' => 'Źródło zasilania',
 	'Class:PowerSource+' => '',
+	'Class:PowerSource/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:PowerSource/Attribute:pdus_list' => 'PDU',
 	'Class:PowerSource/Attribute:pdus_list+' => 'Wszystkie PDU korzystające z tego źródła zasilania',
 ));
@@ -442,6 +458,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:PDU' => 'PDU',
 	'Class:PDU+' => '',
+	'Class:PDU/ComplementaryName' => '%1$s - %2$s - %3$s - %4$s~~',
 	'Class:PDU/Attribute:rack_id' => 'Szafa',
 	'Class:PDU/Attribute:rack_id+' => '',
 	'Class:PDU/Attribute:rack_name' => 'Nazwa szafy',
@@ -459,6 +476,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:Peripheral' => 'Peryferia',
 	'Class:Peripheral+' => '',
+	'Class:Peripheral/ComplementaryName' => '%1$s - %2$s~~',
 ));
 
 //
@@ -468,6 +486,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:Enclosure' => 'Obudowa',
 	'Class:Enclosure+' => '',
+	'Class:Enclosure/ComplementaryName' => '%1$s - %2$s - %3$s~~',
 	'Class:Enclosure/Attribute:rack_id' => 'Szafa',
 	'Class:Enclosure/Attribute:rack_id+' => '',
 	'Class:Enclosure/Attribute:rack_name' => 'Nazwa szafy',
@@ -605,6 +624,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:MiddlewareInstance' => 'Instancja oprogramowania pośredniczącego',
 	'Class:MiddlewareInstance+' => '',
+	'Class:MiddlewareInstance/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:MiddlewareInstance/Attribute:middleware_id' => 'Oprogramowanie pośredniczące',
 	'Class:MiddlewareInstance/Attribute:middleware_id+' => '',
 	'Class:MiddlewareInstance/Attribute:middleware_name' => 'Nazwa oprogramowania pośredniczącego',
@@ -618,6 +638,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:DatabaseSchema' => 'Schemat bazy danych',
 	'Class:DatabaseSchema+' => '',
+	'Class:DatabaseSchema/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:DatabaseSchema/Attribute:dbserver_id' => 'Serwer bazy danych',
 	'Class:DatabaseSchema/Attribute:dbserver_id+' => '',
 	'Class:DatabaseSchema/Attribute:dbserver_name' => 'Nazwa serwera bazy danych',
@@ -631,6 +652,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:WebApplication' => 'Aplikacja WWW',
 	'Class:WebApplication+' => '',
+	'Class:WebApplication/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:WebApplication/Attribute:webserver_id' => 'Serwer WWW',
 	'Class:WebApplication/Attribute:webserver_id+' => '',
 	'Class:WebApplication/Attribute:webserver_name' => 'Nazwa serwera WWW',
@@ -711,6 +733,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:VirtualMachine' => 'Maszyna wirtualna',
 	'Class:VirtualMachine+' => '',
+	'Class:VirtualMachine/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:VirtualMachine/Attribute:virtualhost_id' => 'Host wirtualny',
 	'Class:VirtualMachine/Attribute:virtualhost_id+' => '',
 	'Class:VirtualMachine/Attribute:virtualhost_name' => 'Nazwa hosta wirtualnego',
@@ -771,6 +794,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:lnkServerToVolume' => 'Połączenie serwer / wolumin',
 	'Class:lnkServerToVolume+' => '',
+	'Class:lnkServerToVolume/Name' => '%1$s / %2$s~~',
 	'Class:lnkServerToVolume/Attribute:volume_id' => 'Wolumin',
 	'Class:lnkServerToVolume/Attribute:volume_id+' => '',
 	'Class:lnkServerToVolume/Attribute:volume_name' => 'Nazwa woluminu',
@@ -790,6 +814,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:lnkVirtualDeviceToVolume' => 'Połączenie urządzenie wirtualne / wolumin',
 	'Class:lnkVirtualDeviceToVolume+' => '',
+	'Class:lnkVirtualDeviceToVolume/Name' => '%1$s / %2$s~~',
 	'Class:lnkVirtualDeviceToVolume/Attribute:volume_id' => 'Wolumin',
 	'Class:lnkVirtualDeviceToVolume/Attribute:volume_id+' => '',
 	'Class:lnkVirtualDeviceToVolume/Attribute:volume_name' => 'Nazwa woluminu',
@@ -809,6 +834,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:lnkSanToDatacenterDevice' => 'Połączenie przełącznik SAN / Datacenter',
 	'Class:lnkSanToDatacenterDevice+' => '',
+	'Class:lnkSanToDatacenterDevice/Name' => '%1$s / %2$s~~',
 	'Class:lnkSanToDatacenterDevice/Attribute:san_id' => 'Przełącznik SAN',
 	'Class:lnkSanToDatacenterDevice/Attribute:san_id+' => '',
 	'Class:lnkSanToDatacenterDevice/Attribute:san_name' => 'Nazwa przełącznika SAN',
@@ -870,6 +896,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:Software' => 'Oprogramowanie',
 	'Class:Software+' => '',
+	'Class:Software/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Software/Attribute:name' => 'Nazwa',
 	'Class:Software/Attribute:name+' => '',
 	'Class:Software/Attribute:vendor' => 'Wydawca',
@@ -987,6 +1014,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:OSLicence' => 'Licencja OS',
 	'Class:OSLicence+' => '',
+	'Class:OSLicence/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:OSLicence/Attribute:osversion_id' => 'Wersja OS',
 	'Class:OSLicence/Attribute:osversion_id+' => '',
 	'Class:OSLicence/Attribute:osversion_name' => 'Nazwa wersji OS',
@@ -1004,6 +1032,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:SoftwareLicence' => 'Licencja oprogramowania',
 	'Class:SoftwareLicence+' => '',
+	'Class:SoftwareLicence/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:SoftwareLicence/Attribute:software_id' => 'Oprogramowanie',
 	'Class:SoftwareLicence/Attribute:software_id+' => '',
 	'Class:SoftwareLicence/Attribute:software_name' => 'Nazwa oprogramowania',
@@ -1019,6 +1048,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:lnkDocumentToLicence' => 'Połączenie dokument / licencjia',
 	'Class:lnkDocumentToLicence+' => '',
+	'Class:lnkDocumentToLicence/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToLicence/Attribute:licence_id' => 'Licencja',
 	'Class:lnkDocumentToLicence/Attribute:licence_id+' => '',
 	'Class:lnkDocumentToLicence/Attribute:licence_name' => 'Nazwa licencji',
@@ -1071,6 +1101,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:Model' => 'Model',
 	'Class:Model+' => '',
+	'Class:Model/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Model/Attribute:brand_id' => 'Marka',
 	'Class:Model/Attribute:brand_id+' => '',
 	'Class:Model/Attribute:brand_name' => 'Nazwa marki',
@@ -1150,6 +1181,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:lnkDocumentToPatch' => 'Połączenie dokument / poprawka',
 	'Class:lnkDocumentToPatch+' => '',
+	'Class:lnkDocumentToPatch/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToPatch/Attribute:patch_id' => 'Poprawka',
 	'Class:lnkDocumentToPatch/Attribute:patch_id+' => '',
 	'Class:lnkDocumentToPatch/Attribute:patch_name' => 'Nazwa poprawki',
@@ -1167,6 +1199,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:lnkSoftwareInstanceToSoftwarePatch' => 'Połączenie instancja oprogramowania / poprawkę oprogramowania',
 	'Class:lnkSoftwareInstanceToSoftwarePatch+' => '',
+	'Class:lnkSoftwareInstanceToSoftwarePatch/Name' => '%1$s / %2$s~~',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id' => 'Poprawka oprogramowania',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id+' => '',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_name' => 'Nazwa poprawki oprogramowania',
@@ -1184,6 +1217,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:lnkFunctionalCIToOSPatch' => 'Połączenie Konfiguracja / Poprawka OS',
 	'Class:lnkFunctionalCIToOSPatch+' => '',
+	'Class:lnkFunctionalCIToOSPatch/Name' => '%1$s / %2$s~~',
 	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id' => 'Poprawka OS',
 	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id+' => '',
 	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_name' => 'Nazwa poprawki OS',
@@ -1201,6 +1235,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:lnkDocumentToSoftware' => 'Połączenie dokument / oprogramowanie',
 	'Class:lnkDocumentToSoftware+' => '',
+	'Class:lnkDocumentToSoftware/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToSoftware/Attribute:software_id' => 'Oprogramowanie',
 	'Class:lnkDocumentToSoftware/Attribute:software_id+' => '',
 	'Class:lnkDocumentToSoftware/Attribute:software_name' => 'Nazwa oprogramowania',
@@ -1218,6 +1253,8 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:Subnet' => 'Podsieć',
 	'Class:Subnet+' => '',
+	'Class:Subnet/Name' => '%1$s/%2$s~~',
+	'Class:Subnet/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Subnet/Attribute:description' => 'Opis',
 	'Class:Subnet/Attribute:description+' => '',
 	'Class:Subnet/Attribute:subnet_name' => 'Nazwa podsieci',
@@ -1262,6 +1299,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:lnkSubnetToVLAN' => 'Połączenie podsieć / sieć VLAN',
 	'Class:lnkSubnetToVLAN+' => '',
+	'Class:lnkSubnetToVLAN/Name' => '%1$s / %2$s~~',
 	'Class:lnkSubnetToVLAN/Attribute:subnet_id' => 'Podsieć',
 	'Class:lnkSubnetToVLAN/Attribute:subnet_id+' => '',
 	'Class:lnkSubnetToVLAN/Attribute:subnet_ip' => 'IP podsieci',
@@ -1296,8 +1334,6 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:IPInterface+' => '',
 	'Class:IPInterface/Attribute:ipaddress' => 'Adres IP',
 	'Class:IPInterface/Attribute:ipaddress+' => '',
-
-
 	'Class:IPInterface/Attribute:macaddress' => 'Adres MAC',
 	'Class:IPInterface/Attribute:macaddress+' => '',
 	'Class:IPInterface/Attribute:comment' => 'Komentarz',
@@ -1317,6 +1353,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:PhysicalInterface' => 'Interfejs fizyczny',
 	'Class:PhysicalInterface+' => '',
+	'Class:PhysicalInterface/Name' => '%2$s %1$s~~',
 	'Class:PhysicalInterface/Attribute:connectableci_id' => 'Urządzenie',
 	'Class:PhysicalInterface/Attribute:connectableci_id+' => '',
 	'Class:PhysicalInterface/Attribute:connectableci_name' => 'Nazwa urządzenia',
@@ -1332,6 +1369,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:lnkPhysicalInterfaceToVLAN' => 'Połączenie interfejs fizyczny / sieć VLAN',
 	'Class:lnkPhysicalInterfaceToVLAN+' => '',
+	'Class:lnkPhysicalInterfaceToVLAN/Name' => '%1$s %2$s / %3$s~~',
 	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_id' => 'Interfejs fizyczny',
 	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_id+' => '',
 	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_name' => 'Nazwa interfejsu fizycznego',
@@ -1386,6 +1424,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:lnkConnectableCIToNetworkDevice' => 'Połączenie Konfiguracja podłączeń / Urządzenie sieciowe',
 	'Class:lnkConnectableCIToNetworkDevice+' => '',
+	'Class:lnkConnectableCIToNetworkDevice/Name' => '%1$s / %2$s~~',
 	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id' => 'Urządzenie sieciowe',
 	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id+' => '',
 	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_name' => 'Nazwa urządzenia sieciowego',
@@ -1413,6 +1452,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:lnkApplicationSolutionToFunctionalCI' => 'Połączenie Zastosowane rozwiązanie / Konfiguracja',
 	'Class:lnkApplicationSolutionToFunctionalCI+' => '',
+	'Class:lnkApplicationSolutionToFunctionalCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_id' => 'Zastosowane rozwiązanie',
 	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_id+' => '',
 	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_name' => 'Nazwa zastosowanego rozwiązania',
@@ -1430,6 +1470,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:lnkApplicationSolutionToBusinessProcess' => 'Połączenie Zastosowane rozwiązanie / proces biznesowy',
 	'Class:lnkApplicationSolutionToBusinessProcess+' => '',
+	'Class:lnkApplicationSolutionToBusinessProcess/Name' => '%1$s / %2$s~~',
 	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_id' => 'Proces biznesowy',
 	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_id+' => '',
 	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_name' => 'Nazwa procesu biznesowego',
@@ -1447,6 +1488,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:Group' => 'Grupa',
 	'Class:Group+' => '',
+	'Class:Group/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Group/Attribute:name' => 'Nazwa',
 	'Class:Group/Attribute:name+' => '',
 	'Class:Group/Attribute:status' => 'Status',
@@ -1466,7 +1508,6 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:Group/Attribute:type' => 'Typ',
 	'Class:Group/Attribute:type+' => '',
 	'Class:Group/Attribute:parent_id' => 'Grupa nadrzędna',
-
 	'Class:Group/Attribute:parent_id+' => '',
 	'Class:Group/Attribute:parent_name' => 'Nazwa',
 	'Class:Group/Attribute:parent_name+' => '',
@@ -1483,6 +1524,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:lnkGroupToCI' => 'Połączenie Grupa / Konfiguracja',
 	'Class:lnkGroupToCI+' => '',
+	'Class:lnkGroupToCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkGroupToCI/Attribute:group_id' => 'Grupa',
 	'Class:lnkGroupToCI/Attribute:group_id+' => '',
 	'Class:lnkGroupToCI/Attribute:group_name' => 'Nazwa',
@@ -1504,6 +1546,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Server:otherinfo' => 'Inne informacje',
 	'Server:power' => 'Zasilanie',
 	'Class:Subnet/Tab:IPUsage' => 'Wykorzystanie adresu IP',
+	'Class:Subnet/Tab:IPUsage+' => 'Which IP within this Subnet are used or not~~',
 	'Class:Subnet/Tab:IPUsage-explain' => 'Interfejsy z adresem IP w zakresie: <em>%1$s</em> do <em>%2$s</em>',
 	'Class:Subnet/Tab:FreeIPs' => 'Wolne adresy IP',
 	'Class:Subnet/Tab:FreeIPs-count' => 'Wolne adresy IP: %1$s',
@@ -1519,6 +1562,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:lnkDocumentToFunctionalCI' => 'Połączenie Dokument / Konfiguracja',
 	'Class:lnkDocumentToFunctionalCI+' => '',
+	'Class:lnkDocumentToFunctionalCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id' => 'Konfiguracja',
 	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id+' => '',
 	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_name' => 'Nazwa konfiguracji',
diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/pt_br.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/pt_br.dict.itop-config-mgmt.php
index a4ea4f9c03..fd3640461d 100644
--- a/datamodels/2.x/itop-config-mgmt/dictionaries/pt_br.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/pt_br.dict.itop-config-mgmt.php
@@ -35,7 +35,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Relation:depends on/Description' => 'Elementos estes, que dependem deste elemento',
 	'Relation:depends on/DownStream' => 'Depende de...',
 	'Relation:depends on/UpStream' => 'Impactos...',
-	'Relation:impacts/LoadData'       => 'Load data~~',
+	'Relation:impacts/LoadData' => 'Load data~~',
 	'Relation:impacts/NoFilteredData' => 'please select objects in Graphical view tag~~',
 ));
 
@@ -84,6 +84,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:lnkContactToFunctionalCI' => 'Link Contato / IC',
 	'Class:lnkContactToFunctionalCI+' => '',
+	'Class:lnkContactToFunctionalCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'ICs',
 	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
 	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Nome do IC',
@@ -130,6 +131,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:FunctionalCI/Attribute:finalclass' => 'Tipo de IC',
 	'Class:FunctionalCI/Attribute:finalclass+' => '',
 	'Class:FunctionalCI/Tab:OpenedTickets' => 'Solicitações Ativas',
+	'Class:FunctionalCI/Tab:OpenedTickets+' => 'Active Tickets which are impacting this functional CI~~',
 ));
 
 //
@@ -139,6 +141,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:PhysicalDevice' => 'Dispositivo Físico',
 	'Class:PhysicalDevice+' => 'Lista de Dispositivos Físicos',
+	'Class:PhysicalDevice/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:PhysicalDevice/Attribute:serialnumber' => 'Número serial',
 	'Class:PhysicalDevice/Attribute:serialnumber+' => '',
 	'Class:PhysicalDevice/Attribute:location_id' => 'Localização',
@@ -178,6 +181,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:Rack' => 'Rack',
 	'Class:Rack+' => '',
+	'Class:Rack/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Rack/Attribute:nb_u' => 'Unidades',
 	'Class:Rack/Attribute:nb_u+' => '',
 	'Class:Rack/Attribute:device_list' => 'Dispositivos',
@@ -244,6 +248,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:ConnectableCI' => 'Conectividade',
 	'Class:ConnectableCI+' => 'Físico',
+	'Class:ConnectableCI/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:ConnectableCI/Attribute:networkdevice_list' => 'Dispositivo de rede',
 	'Class:ConnectableCI/Attribute:networkdevice_list+' => 'Todos os dispositivos de rede conectados neste dispositivo',
 	'Class:ConnectableCI/Attribute:physicalinterface_list' => 'Interface de rede',
@@ -257,6 +262,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:DatacenterDevice' => 'Dispositivo de Datacenter',
 	'Class:DatacenterDevice+' => '',
+	'Class:DatacenterDevice/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:DatacenterDevice/Attribute:rack_id' => 'Rack',
 	'Class:DatacenterDevice/Attribute:rack_id+' => '',
 	'Class:DatacenterDevice/Attribute:rack_name' => 'Nome do rack',
@@ -295,6 +301,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:NetworkDevice' => 'Dispositivo de Rede',
 	'Class:NetworkDevice+' => '',
+	'Class:NetworkDevice/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:NetworkDevice/Attribute:networkdevicetype_id' => 'Tipo de rede',
 	'Class:NetworkDevice/Attribute:networkdevicetype_id+' => '',
 	'Class:NetworkDevice/Attribute:networkdevicetype_name' => 'Nome do tipo de rede',
@@ -316,6 +323,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:Server' => 'Servidor',
 	'Class:Server+' => '',
+	'Class:Server/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Server/Attribute:osfamily_id' => 'Família do SO',
 	'Class:Server/Attribute:osfamily_id+' => '',
 	'Class:Server/Attribute:osfamily_name' => 'Nome da família do SO',
@@ -343,6 +351,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:StorageSystem' => 'Sistema de Storage',
 	'Class:StorageSystem+' => '',
+	'Class:StorageSystem/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:StorageSystem/Attribute:logicalvolume_list' => 'Volumes lógicos',
 	'Class:StorageSystem/Attribute:logicalvolume_list+' => 'Todos os volumes lógicos neste sistema storage',
 ));
@@ -354,6 +363,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:SANSwitch' => 'Switch SAN',
 	'Class:SANSwitch+' => '',
+	'Class:SANSwitch/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:SANSwitch/Attribute:datacenterdevice_list' => 'Dispositivos',
 	'Class:SANSwitch/Attribute:datacenterdevice_list+' => 'Todos os dispositivos associados a este switch SAN',
 ));
@@ -365,6 +375,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:TapeLibrary' => 'Biblioteca de Fitas',
 	'Class:TapeLibrary+' => '',
+	'Class:TapeLibrary/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:TapeLibrary/Attribute:tapes_list' => 'Fitas',
 	'Class:TapeLibrary/Attribute:tapes_list+' => 'Todas as fitas associadas à esta biblioteca de fitas',
 ));
@@ -376,6 +387,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:NAS' => 'NAS',
 	'Class:NAS+' => '',
+	'Class:NAS/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:NAS/Attribute:nasfilesystem_list' => 'Sistemas de arquivos',
 	'Class:NAS/Attribute:nasfilesystem_list+' => 'Todos os sistemas de arquivos para esse NAS',
 ));
@@ -387,6 +399,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:PC' => 'PC',
 	'Class:PC+' => '',
+	'Class:PC/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:PC/Attribute:osfamily_id' => 'Família do SO',
 	'Class:PC/Attribute:osfamily_id+' => '',
 	'Class:PC/Attribute:osfamily_name' => 'Nome da família do SO',
@@ -414,6 +427,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:Printer' => 'Impressora',
 	'Class:Printer+' => '',
+	'Class:Printer/ComplementaryName' => '%1$s - %2$s~~',
 ));
 
 //
@@ -423,6 +437,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:PowerConnection' => 'Conexão de Energia',
 	'Class:PowerConnection+' => '',
+	'Class:PowerConnection/ComplementaryName' => '%1$s - %2$s~~',
 ));
 
 //
@@ -432,6 +447,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:PowerSource' => 'Fonte de Energia',
 	'Class:PowerSource+' => '',
+	'Class:PowerSource/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:PowerSource/Attribute:pdus_list' => 'PDUs',
 	'Class:PowerSource/Attribute:pdus_list+' => 'Todos os PDUs utilizando essa fonte de energia',
 ));
@@ -443,6 +459,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:PDU' => 'PDU',
 	'Class:PDU+' => '',
+	'Class:PDU/ComplementaryName' => '%1$s - %2$s - %3$s - %4$s~~',
 	'Class:PDU/Attribute:rack_id' => 'Rack',
 	'Class:PDU/Attribute:rack_id+' => '',
 	'Class:PDU/Attribute:rack_name' => 'Nome do rack',
@@ -460,6 +477,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:Peripheral' => 'Periférico',
 	'Class:Peripheral+' => '',
+	'Class:Peripheral/ComplementaryName' => '%1$s - %2$s~~',
 ));
 
 //
@@ -469,6 +487,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:Enclosure' => 'Gaveta',
 	'Class:Enclosure+' => '',
+	'Class:Enclosure/ComplementaryName' => '%1$s - %2$s - %3$s~~',
 	'Class:Enclosure/Attribute:rack_id' => 'Rack',
 	'Class:Enclosure/Attribute:rack_id+' => '',
 	'Class:Enclosure/Attribute:rack_name' => 'Nome do rack',
@@ -606,6 +625,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:MiddlewareInstance' => 'Instância Middleware',
 	'Class:MiddlewareInstance+' => '',
+	'Class:MiddlewareInstance/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:MiddlewareInstance/Attribute:middleware_id' => 'Middleware',
 	'Class:MiddlewareInstance/Attribute:middleware_id+' => '',
 	'Class:MiddlewareInstance/Attribute:middleware_name' => 'Nome do middleware',
@@ -619,6 +639,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:DatabaseSchema' => 'Esquema de DB',
 	'Class:DatabaseSchema+' => '',
+	'Class:DatabaseSchema/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:DatabaseSchema/Attribute:dbserver_id' => 'Servidor de DB',
 	'Class:DatabaseSchema/Attribute:dbserver_id+' => '',
 	'Class:DatabaseSchema/Attribute:dbserver_name' => 'Nome do servidor de DB',
@@ -632,6 +653,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:WebApplication' => 'Aplicação Web',
 	'Class:WebApplication+' => '',
+	'Class:WebApplication/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:WebApplication/Attribute:webserver_id' => 'Servidor Web',
 	'Class:WebApplication/Attribute:webserver_id+' => '',
 	'Class:WebApplication/Attribute:webserver_name' => 'Nome do servidor Web',
@@ -712,6 +734,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:VirtualMachine' => 'Máquina Virtual',
 	'Class:VirtualMachine+' => '',
+	'Class:VirtualMachine/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:VirtualMachine/Attribute:virtualhost_id' => 'Host virtual',
 	'Class:VirtualMachine/Attribute:virtualhost_id+' => '',
 	'Class:VirtualMachine/Attribute:virtualhost_name' => 'Nome do host virtual',
@@ -772,6 +795,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:lnkServerToVolume' => 'Link Servidor / Volume',
 	'Class:lnkServerToVolume+' => '',
+	'Class:lnkServerToVolume/Name' => '%1$s / %2$s~~',
 	'Class:lnkServerToVolume/Attribute:volume_id' => 'Volume',
 	'Class:lnkServerToVolume/Attribute:volume_id+' => '',
 	'Class:lnkServerToVolume/Attribute:volume_name' => 'Nome do volume',
@@ -791,6 +815,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:lnkVirtualDeviceToVolume' => 'Link Dispositivo Virtual / Volume',
 	'Class:lnkVirtualDeviceToVolume+' => '',
+	'Class:lnkVirtualDeviceToVolume/Name' => '%1$s / %2$s~~',
 	'Class:lnkVirtualDeviceToVolume/Attribute:volume_id' => 'Volume',
 	'Class:lnkVirtualDeviceToVolume/Attribute:volume_id+' => '',
 	'Class:lnkVirtualDeviceToVolume/Attribute:volume_name' => 'Nome do volume',
@@ -810,6 +835,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:lnkSanToDatacenterDevice' => 'Link SAN / Dispositivo Datacenter',
 	'Class:lnkSanToDatacenterDevice+' => '',
+	'Class:lnkSanToDatacenterDevice/Name' => '%1$s / %2$s~~',
 	'Class:lnkSanToDatacenterDevice/Attribute:san_id' => 'Switch SAN',
 	'Class:lnkSanToDatacenterDevice/Attribute:san_id+' => '',
 	'Class:lnkSanToDatacenterDevice/Attribute:san_name' => 'Nome do switch SAN',
@@ -871,6 +897,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:Software' => 'Software',
 	'Class:Software+' => '',
+	'Class:Software/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Software/Attribute:name' => 'Nome',
 	'Class:Software/Attribute:name+' => '',
 	'Class:Software/Attribute:vendor' => 'Fabricante',
@@ -988,6 +1015,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:OSLicence' => 'Licença de SO',
 	'Class:OSLicence+' => '',
+	'Class:OSLicence/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:OSLicence/Attribute:osversion_id' => 'Versão do SO',
 	'Class:OSLicence/Attribute:osversion_id+' => '',
 	'Class:OSLicence/Attribute:osversion_name' => 'Nome da versão do SO',
@@ -1005,6 +1033,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:SoftwareLicence' => 'Licença de software',
 	'Class:SoftwareLicence+' => '',
+	'Class:SoftwareLicence/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:SoftwareLicence/Attribute:software_id' => 'Software',
 	'Class:SoftwareLicence/Attribute:software_id+' => '',
 	'Class:SoftwareLicence/Attribute:software_name' => 'Nome do software',
@@ -1020,6 +1049,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:lnkDocumentToLicence' => 'Link Documento / Licença',
 	'Class:lnkDocumentToLicence+' => '',
+	'Class:lnkDocumentToLicence/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToLicence/Attribute:licence_id' => 'Licença',
 	'Class:lnkDocumentToLicence/Attribute:licence_id+' => '',
 	'Class:lnkDocumentToLicence/Attribute:licence_name' => 'Nome da licença',
@@ -1072,6 +1102,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:Model' => 'Modelo',
 	'Class:Model+' => '',
+	'Class:Model/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Model/Attribute:brand_id' => 'Fabricante',
 	'Class:Model/Attribute:brand_id+' => '',
 	'Class:Model/Attribute:brand_name' => 'Nome do fabricante',
@@ -1151,6 +1182,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:lnkDocumentToPatch' => 'Link Documento / Atualização',
 	'Class:lnkDocumentToPatch+' => '',
+	'Class:lnkDocumentToPatch/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToPatch/Attribute:patch_id' => 'Atualização',
 	'Class:lnkDocumentToPatch/Attribute:patch_id+' => '',
 	'Class:lnkDocumentToPatch/Attribute:patch_name' => 'Nome da atualização',
@@ -1168,6 +1200,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:lnkSoftwareInstanceToSoftwarePatch' => 'Link Instância de Software / Atualização de Software',
 	'Class:lnkSoftwareInstanceToSoftwarePatch+' => '',
+	'Class:lnkSoftwareInstanceToSoftwarePatch/Name' => '%1$s / %2$s~~',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id' => 'Atualização de software',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id+' => '',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_name' => 'Nome da atualização de software',
@@ -1185,6 +1218,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:lnkFunctionalCIToOSPatch' => 'Link IC / Atualização de SO',
 	'Class:lnkFunctionalCIToOSPatch+' => '',
+	'Class:lnkFunctionalCIToOSPatch/Name' => '%1$s / %2$s~~',
 	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id' => 'Atualização de SO',
 	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id+' => '',
 	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_name' => 'Nome da atualização de SO',
@@ -1202,6 +1236,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:lnkDocumentToSoftware' => 'Link Documento / Software',
 	'Class:lnkDocumentToSoftware+' => '',
+	'Class:lnkDocumentToSoftware/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToSoftware/Attribute:software_id' => 'Software',
 	'Class:lnkDocumentToSoftware/Attribute:software_id+' => '',
 	'Class:lnkDocumentToSoftware/Attribute:software_name' => 'Nome do software',
@@ -1219,6 +1254,8 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:Subnet' => 'Sub-rede',
 	'Class:Subnet+' => '',
+	'Class:Subnet/Name' => '%1$s/%2$s~~',
+	'Class:Subnet/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Subnet/Attribute:description' => 'Descrição',
 	'Class:Subnet/Attribute:description+' => '',
 	'Class:Subnet/Attribute:subnet_name' => 'Nome da sub-rede',
@@ -1263,6 +1300,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:lnkSubnetToVLAN' => 'Link Sub-rede / VLAN',
 	'Class:lnkSubnetToVLAN+' => '',
+	'Class:lnkSubnetToVLAN/Name' => '%1$s / %2$s~~',
 	'Class:lnkSubnetToVLAN/Attribute:subnet_id' => 'Sub-rede',
 	'Class:lnkSubnetToVLAN/Attribute:subnet_id+' => '',
 	'Class:lnkSubnetToVLAN/Attribute:subnet_ip' => 'IP da sub-rede',
@@ -1297,8 +1335,6 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:IPInterface+' => '',
 	'Class:IPInterface/Attribute:ipaddress' => 'Endereço IP',
 	'Class:IPInterface/Attribute:ipaddress+' => '',
-
-
 	'Class:IPInterface/Attribute:macaddress' => 'Endereço MAC',
 	'Class:IPInterface/Attribute:macaddress+' => '',
 	'Class:IPInterface/Attribute:comment' => 'Comentário',
@@ -1318,6 +1354,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:PhysicalInterface' => 'Placa física',
 	'Class:PhysicalInterface+' => '',
+	'Class:PhysicalInterface/Name' => '%2$s %1$s~~',
 	'Class:PhysicalInterface/Attribute:connectableci_id' => 'Dispositivo',
 	'Class:PhysicalInterface/Attribute:connectableci_id+' => '',
 	'Class:PhysicalInterface/Attribute:connectableci_name' => 'Nome do dispositivo',
@@ -1333,6 +1370,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:lnkPhysicalInterfaceToVLAN' => 'Link Interfaces físicas / VLAN',
 	'Class:lnkPhysicalInterfaceToVLAN+' => '',
+	'Class:lnkPhysicalInterfaceToVLAN/Name' => '%1$s %2$s / %3$s~~',
 	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_id' => 'Interface física',
 	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_id+' => '',
 	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_name' => 'Nome da interface física',
@@ -1387,6 +1425,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:lnkConnectableCIToNetworkDevice' => 'Link ConnectableCI / NetworkDevice',
 	'Class:lnkConnectableCIToNetworkDevice+' => '',
+	'Class:lnkConnectableCIToNetworkDevice/Name' => '%1$s / %2$s~~',
 	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id' => 'Dispositivo de rede',
 	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id+' => '',
 	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_name' => 'Nome do dispositivo rede',
@@ -1414,6 +1453,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:lnkApplicationSolutionToFunctionalCI' => 'Link Solução de Aplicação / IC',
 	'Class:lnkApplicationSolutionToFunctionalCI+' => '',
+	'Class:lnkApplicationSolutionToFunctionalCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_id' => 'Solução de aplicação',
 	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_id+' => '',
 	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_name' => 'Nome da solução de aplicação',
@@ -1431,6 +1471,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:lnkApplicationSolutionToBusinessProcess' => 'Link ApplicationSolution / BusinessProcess',
 	'Class:lnkApplicationSolutionToBusinessProcess+' => '',
+	'Class:lnkApplicationSolutionToBusinessProcess/Name' => '%1$s / %2$s~~',
 	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_id' => 'Processo de negócio',
 	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_id+' => '',
 	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_name' => 'Nome do processo de negócio',
@@ -1448,6 +1489,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:Group' => 'Grupo',
 	'Class:Group+' => '',
+	'Class:Group/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Group/Attribute:name' => 'Nome',
 	'Class:Group/Attribute:name+' => '',
 	'Class:Group/Attribute:status' => 'Status',
@@ -1467,7 +1509,6 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:Group/Attribute:type' => 'Tipo',
 	'Class:Group/Attribute:type+' => '',
 	'Class:Group/Attribute:parent_id' => 'Grupo pai',
-
 	'Class:Group/Attribute:parent_id+' => '',
 	'Class:Group/Attribute:parent_name' => 'Nome',
 	'Class:Group/Attribute:parent_name+' => '',
@@ -1484,6 +1525,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:lnkGroupToCI' => 'Link Grupo / IC',
 	'Class:lnkGroupToCI+' => '',
+	'Class:lnkGroupToCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkGroupToCI/Attribute:group_id' => 'Grupo',
 	'Class:lnkGroupToCI/Attribute:group_id+' => '',
 	'Class:lnkGroupToCI/Attribute:group_name' => 'Nome do grupo',
@@ -1505,6 +1547,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Server:otherinfo' => 'Outras informações',
 	'Server:power' => 'Fonte de alimentação',
 	'Class:Subnet/Tab:IPUsage' => 'IP usado',
+	'Class:Subnet/Tab:IPUsage+' => 'Which IP within this Subnet are used or not~~',
 	'Class:Subnet/Tab:IPUsage-explain' => 'Placas de rede contendo IP na faixa: <em>%1$s</em> para <em>%2$s</em>',
 	'Class:Subnet/Tab:FreeIPs' => 'IPs livres',
 	'Class:Subnet/Tab:FreeIPs-count' => 'IPs livres: %1$s',
@@ -1520,6 +1563,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:lnkDocumentToFunctionalCI' => 'Link de Documento / IC',
 	'Class:lnkDocumentToFunctionalCI+' => '',
+	'Class:lnkDocumentToFunctionalCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id' => 'ICs',
 	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id+' => '',
 	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_name' => 'Nome do IC',
diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/ru.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/ru.dict.itop-config-mgmt.php
index cb7e9daabc..72bc2074aa 100644
--- a/datamodels/2.x/itop-config-mgmt/dictionaries/ru.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/ru.dict.itop-config-mgmt.php
@@ -22,7 +22,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Relation:depends on/Description' => 'Элементы, от которых зависит',
 	'Relation:depends on/DownStream' => 'Зависит от...',
 	'Relation:depends on/UpStream' => 'Влияет на...',
-	'Relation:impacts/LoadData'       => 'Load data~~',
+	'Relation:impacts/LoadData' => 'Load data~~',
 	'Relation:impacts/NoFilteredData' => 'please select objects in Graphical view tag~~',
 ));
 
@@ -71,6 +71,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:lnkContactToFunctionalCI' => 'Связь Контакт/Функциональная КЕ',
 	'Class:lnkContactToFunctionalCI+' => '',
+	'Class:lnkContactToFunctionalCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'Функциональная КЕ',
 	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
 	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Функциональная КЕ',
@@ -117,6 +118,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:FunctionalCI/Attribute:finalclass' => 'Тип',
 	'Class:FunctionalCI/Attribute:finalclass+' => '',
 	'Class:FunctionalCI/Tab:OpenedTickets' => 'Активные тикеты',
+	'Class:FunctionalCI/Tab:OpenedTickets+' => 'Active Tickets which are impacting this functional CI~~',
 ));
 
 //
@@ -126,6 +128,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:PhysicalDevice' => 'Физические устройства',
 	'Class:PhysicalDevice+' => '',
+	'Class:PhysicalDevice/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:PhysicalDevice/Attribute:serialnumber' => 'Серийный номер',
 	'Class:PhysicalDevice/Attribute:serialnumber+' => '',
 	'Class:PhysicalDevice/Attribute:location_id' => 'Расположение',
@@ -165,6 +168,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:Rack' => 'Стойка',
 	'Class:Rack+' => '',
+	'Class:Rack/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Rack/Attribute:nb_u' => 'Высота (U)',
 	'Class:Rack/Attribute:nb_u+' => 'Количество юнитов',
 	'Class:Rack/Attribute:device_list' => 'Устройства',
@@ -231,6 +235,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:ConnectableCI' => 'Подключаемые КЕ',
 	'Class:ConnectableCI+' => 'Подключаемые КЕ',
+	'Class:ConnectableCI/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:ConnectableCI/Attribute:networkdevice_list' => 'Сетевые устройства',
 	'Class:ConnectableCI/Attribute:networkdevice_list+' => 'Связанные сетевые устройства',
 	'Class:ConnectableCI/Attribute:physicalinterface_list' => 'Сетевые интерфейсы',
@@ -244,6 +249,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:DatacenterDevice' => 'Устройства дата-центра',
 	'Class:DatacenterDevice+' => 'Устройства дата-центра',
+	'Class:DatacenterDevice/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:DatacenterDevice/Attribute:rack_id' => 'Стойка',
 	'Class:DatacenterDevice/Attribute:rack_id+' => '',
 	'Class:DatacenterDevice/Attribute:rack_name' => 'Стойка',
@@ -282,6 +288,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:NetworkDevice' => 'Сетевое устройство',
 	'Class:NetworkDevice+' => 'Сетевое устройство',
+	'Class:NetworkDevice/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:NetworkDevice/Attribute:networkdevicetype_id' => 'Тип устройства',
 	'Class:NetworkDevice/Attribute:networkdevicetype_id+' => '',
 	'Class:NetworkDevice/Attribute:networkdevicetype_name' => 'Тип устройства',
@@ -303,6 +310,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:Server' => 'Сервер',
 	'Class:Server+' => 'Сервер',
+	'Class:Server/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Server/Attribute:osfamily_id' => 'Семейство ОС',
 	'Class:Server/Attribute:osfamily_id+' => 'Семейство операционной системы',
 	'Class:Server/Attribute:osfamily_name' => 'Семейство ОС',
@@ -330,6 +338,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:StorageSystem' => 'Система хранения',
 	'Class:StorageSystem+' => 'Система хранения',
+	'Class:StorageSystem/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:StorageSystem/Attribute:logicalvolume_list' => 'Логические тома',
 	'Class:StorageSystem/Attribute:logicalvolume_list+' => 'Логические тома',
 ));
@@ -341,6 +350,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:SANSwitch' => 'SAN коммутатор',
 	'Class:SANSwitch+' => 'SAN коммутатор',
+	'Class:SANSwitch/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:SANSwitch/Attribute:datacenterdevice_list' => 'Устройства',
 	'Class:SANSwitch/Attribute:datacenterdevice_list+' => 'Подключенные устройства',
 ));
@@ -352,6 +362,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:TapeLibrary' => 'Ленточная библиотека',
 	'Class:TapeLibrary+' => 'Ленточная библиотека',
+	'Class:TapeLibrary/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:TapeLibrary/Attribute:tapes_list' => 'Ленты',
 	'Class:TapeLibrary/Attribute:tapes_list+' => 'Ленты',
 ));
@@ -363,6 +374,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:NAS' => 'Сетевое хранилище',
 	'Class:NAS+' => 'Сетевое хранилище',
+	'Class:NAS/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:NAS/Attribute:nasfilesystem_list' => 'Файловые системы',
 	'Class:NAS/Attribute:nasfilesystem_list+' => 'Файловые системы',
 ));
@@ -374,6 +386,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:PC' => 'Персональный компьютер',
 	'Class:PC+' => 'Персональный компьютер',
+	'Class:PC/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:PC/Attribute:osfamily_id' => 'Семейство ОС',
 	'Class:PC/Attribute:osfamily_id+' => 'Семейство операционной системы',
 	'Class:PC/Attribute:osfamily_name' => 'Семейство ОС',
@@ -401,6 +414,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:Printer' => 'Принтер',
 	'Class:Printer+' => 'Принтер',
+	'Class:Printer/ComplementaryName' => '%1$s - %2$s~~',
 ));
 
 //
@@ -410,6 +424,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:PowerConnection' => 'Электропитание',
 	'Class:PowerConnection+' => 'Подключения электропитания',
+	'Class:PowerConnection/ComplementaryName' => '%1$s - %2$s~~',
 ));
 
 //
@@ -419,6 +434,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:PowerSource' => 'Источник электропитания',
 	'Class:PowerSource+' => 'Источник электропитания',
+	'Class:PowerSource/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:PowerSource/Attribute:pdus_list' => 'Распределители',
 	'Class:PowerSource/Attribute:pdus_list+' => 'Распределители электропитания (PDU)',
 ));
@@ -430,6 +446,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:PDU' => 'Распределитель ЭП',
 	'Class:PDU+' => 'Распределитель электропитания',
+	'Class:PDU/ComplementaryName' => '%1$s - %2$s - %3$s - %4$s~~',
 	'Class:PDU/Attribute:rack_id' => 'Стойка',
 	'Class:PDU/Attribute:rack_id+' => '',
 	'Class:PDU/Attribute:rack_name' => 'Стойка',
@@ -447,6 +464,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:Peripheral' => 'Периферийное устройство',
 	'Class:Peripheral+' => 'Периферийное устройство',
+	'Class:Peripheral/ComplementaryName' => '%1$s - %2$s~~',
 ));
 
 //
@@ -456,6 +474,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:Enclosure' => 'Крейт',
 	'Class:Enclosure+' => 'Крейт, шасси и т.п.',
+	'Class:Enclosure/ComplementaryName' => '%1$s - %2$s - %3$s~~',
 	'Class:Enclosure/Attribute:rack_id' => 'Стойка',
 	'Class:Enclosure/Attribute:rack_id+' => '',
 	'Class:Enclosure/Attribute:rack_name' => 'Стойка',
@@ -593,6 +612,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:MiddlewareInstance' => 'Экземпляр промежуточного ПО',
 	'Class:MiddlewareInstance+' => 'Экземпляр промежуточного ПО',
+	'Class:MiddlewareInstance/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:MiddlewareInstance/Attribute:middleware_id' => 'Промежуточное ПО',
 	'Class:MiddlewareInstance/Attribute:middleware_id+' => '',
 	'Class:MiddlewareInstance/Attribute:middleware_name' => 'Промежуточное ПО',
@@ -606,6 +626,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:DatabaseSchema' => 'Схема базы данных',
 	'Class:DatabaseSchema+' => 'Схема базы данных',
+	'Class:DatabaseSchema/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:DatabaseSchema/Attribute:dbserver_id' => 'Сервер БД',
 	'Class:DatabaseSchema/Attribute:dbserver_id+' => '',
 	'Class:DatabaseSchema/Attribute:dbserver_name' => 'Сервер БД',
@@ -619,6 +640,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:WebApplication' => 'Веб-приложение',
 	'Class:WebApplication+' => 'Веб-приложение',
+	'Class:WebApplication/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:WebApplication/Attribute:webserver_id' => 'Веб-сервер',
 	'Class:WebApplication/Attribute:webserver_id+' => '',
 	'Class:WebApplication/Attribute:webserver_name' => 'Веб-сервер',
@@ -699,6 +721,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:VirtualMachine' => 'Виртуальная машина',
 	'Class:VirtualMachine+' => 'Виртуальная машина',
+	'Class:VirtualMachine/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:VirtualMachine/Attribute:virtualhost_id' => 'Виртуальный хост',
 	'Class:VirtualMachine/Attribute:virtualhost_id+' => '',
 	'Class:VirtualMachine/Attribute:virtualhost_name' => 'Виртуальный хост',
@@ -759,6 +782,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:lnkServerToVolume' => 'Связь Сервер/Том',
 	'Class:lnkServerToVolume+' => 'Связь Сервер/Том',
+	'Class:lnkServerToVolume/Name' => '%1$s / %2$s~~',
 	'Class:lnkServerToVolume/Attribute:volume_id' => 'Том',
 	'Class:lnkServerToVolume/Attribute:volume_id+' => '',
 	'Class:lnkServerToVolume/Attribute:volume_name' => 'Том',
@@ -778,6 +802,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:lnkVirtualDeviceToVolume' => 'Связь Виртуальное устройство/Том',
 	'Class:lnkVirtualDeviceToVolume+' => 'Связь Виртуальное устройство/Том',
+	'Class:lnkVirtualDeviceToVolume/Name' => '%1$s / %2$s~~',
 	'Class:lnkVirtualDeviceToVolume/Attribute:volume_id' => 'Том',
 	'Class:lnkVirtualDeviceToVolume/Attribute:volume_id+' => '',
 	'Class:lnkVirtualDeviceToVolume/Attribute:volume_name' => 'Том',
@@ -797,6 +822,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:lnkSanToDatacenterDevice' => 'Связь SAN коммутатор/Устройство дата-центра',
 	'Class:lnkSanToDatacenterDevice+' => 'Связь SAN коммутатор/Устройство дата-центра',
+	'Class:lnkSanToDatacenterDevice/Name' => '%1$s / %2$s~~',
 	'Class:lnkSanToDatacenterDevice/Attribute:san_id' => 'SAN коммутатор',
 	'Class:lnkSanToDatacenterDevice/Attribute:san_id+' => '',
 	'Class:lnkSanToDatacenterDevice/Attribute:san_name' => 'SAN коммутатор',
@@ -858,6 +884,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:Software' => 'Программное обеспечение',
 	'Class:Software+' => 'Программное обеспечение',
+	'Class:Software/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Software/Attribute:name' => 'Название',
 	'Class:Software/Attribute:name+' => '',
 	'Class:Software/Attribute:vendor' => 'Вендор',
@@ -975,6 +1002,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:OSLicence' => 'Лицензия ОС',
 	'Class:OSLicence+' => 'Лицензия ОС',
+	'Class:OSLicence/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:OSLicence/Attribute:osversion_id' => 'Версия ОС',
 	'Class:OSLicence/Attribute:osversion_id+' => '',
 	'Class:OSLicence/Attribute:osversion_name' => 'Версия ОС',
@@ -992,6 +1020,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:SoftwareLicence' => 'Лицензия ПО',
 	'Class:SoftwareLicence+' => 'Лицензия ПО',
+	'Class:SoftwareLicence/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:SoftwareLicence/Attribute:software_id' => 'ПО',
 	'Class:SoftwareLicence/Attribute:software_id+' => '',
 	'Class:SoftwareLicence/Attribute:software_name' => 'ПО',
@@ -1007,6 +1036,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:lnkDocumentToLicence' => 'Связь Документ/Лицензия',
 	'Class:lnkDocumentToLicence+' => '',
+	'Class:lnkDocumentToLicence/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToLicence/Attribute:licence_id' => 'Лицензия',
 	'Class:lnkDocumentToLicence/Attribute:licence_id+' => '',
 	'Class:lnkDocumentToLicence/Attribute:licence_name' => 'Лицензия',
@@ -1059,6 +1089,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:Model' => 'Модель',
 	'Class:Model+' => '',
+	'Class:Model/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Model/Attribute:brand_id' => 'Бренд',
 	'Class:Model/Attribute:brand_id+' => '',
 	'Class:Model/Attribute:brand_name' => 'Бренд',
@@ -1138,6 +1169,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:lnkDocumentToPatch' => 'Связь Документ/Патч',
 	'Class:lnkDocumentToPatch+' => '',
+	'Class:lnkDocumentToPatch/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToPatch/Attribute:patch_id' => 'Патч',
 	'Class:lnkDocumentToPatch/Attribute:patch_id+' => '',
 	'Class:lnkDocumentToPatch/Attribute:patch_name' => 'Патч',
@@ -1155,6 +1187,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:lnkSoftwareInstanceToSoftwarePatch' => 'Связь Экземпляр ПО/Патч ПО',
 	'Class:lnkSoftwareInstanceToSoftwarePatch+' => '',
+	'Class:lnkSoftwareInstanceToSoftwarePatch/Name' => '%1$s / %2$s~~',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id' => 'Патч ПО',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id+' => '',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_name' => 'Патч ПО',
@@ -1172,6 +1205,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:lnkFunctionalCIToOSPatch' => 'Связь Функциональная КЕ/Патч ОС',
 	'Class:lnkFunctionalCIToOSPatch+' => '',
+	'Class:lnkFunctionalCIToOSPatch/Name' => '%1$s / %2$s~~',
 	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id' => 'Патч ОС',
 	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id+' => '',
 	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_name' => 'Патч ОС',
@@ -1189,6 +1223,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:lnkDocumentToSoftware' => 'Связь Документ/ПО',
 	'Class:lnkDocumentToSoftware+' => '',
+	'Class:lnkDocumentToSoftware/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToSoftware/Attribute:software_id' => 'ПО',
 	'Class:lnkDocumentToSoftware/Attribute:software_id+' => '',
 	'Class:lnkDocumentToSoftware/Attribute:software_name' => 'ПО',
@@ -1206,6 +1241,8 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:Subnet' => 'Подсеть',
 	'Class:Subnet+' => '',
+	'Class:Subnet/Name' => '%1$s/%2$s~~',
+	'Class:Subnet/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Subnet/Attribute:description' => 'Описание',
 	'Class:Subnet/Attribute:description+' => '',
 	'Class:Subnet/Attribute:subnet_name' => 'Имя подсети',
@@ -1250,6 +1287,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:lnkSubnetToVLAN' => 'Связь Подсеть/VLAN',
 	'Class:lnkSubnetToVLAN+' => '',
+	'Class:lnkSubnetToVLAN/Name' => '%1$s / %2$s~~',
 	'Class:lnkSubnetToVLAN/Attribute:subnet_id' => 'Подсеть',
 	'Class:lnkSubnetToVLAN/Attribute:subnet_id+' => '',
 	'Class:lnkSubnetToVLAN/Attribute:subnet_ip' => 'IP-адрес подсети',
@@ -1284,8 +1322,6 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:IPInterface+' => '',
 	'Class:IPInterface/Attribute:ipaddress' => 'IP-адрес',
 	'Class:IPInterface/Attribute:ipaddress+' => '',
-
-
 	'Class:IPInterface/Attribute:macaddress' => 'MAC-адрес',
 	'Class:IPInterface/Attribute:macaddress+' => '',
 	'Class:IPInterface/Attribute:comment' => 'Комментарий',
@@ -1305,6 +1341,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:PhysicalInterface' => 'Физический интерфейс',
 	'Class:PhysicalInterface+' => '',
+	'Class:PhysicalInterface/Name' => '%2$s %1$s~~',
 	'Class:PhysicalInterface/Attribute:connectableci_id' => 'Устройства',
 	'Class:PhysicalInterface/Attribute:connectableci_id+' => '',
 	'Class:PhysicalInterface/Attribute:connectableci_name' => 'Устройства',
@@ -1320,6 +1357,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:lnkPhysicalInterfaceToVLAN' => 'Связь Физический интерфейс/VLAN',
 	'Class:lnkPhysicalInterfaceToVLAN+' => '',
+	'Class:lnkPhysicalInterfaceToVLAN/Name' => '%1$s %2$s / %3$s~~',
 	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_id' => 'Физический интерфейс',
 	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_id+' => '',
 	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_name' => 'Физический интерфейс',
@@ -1374,6 +1412,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:lnkConnectableCIToNetworkDevice' => 'Связь Подключаемая КЕ/Сетевое устройство',
 	'Class:lnkConnectableCIToNetworkDevice+' => '',
+	'Class:lnkConnectableCIToNetworkDevice/Name' => '%1$s / %2$s~~',
 	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id' => 'Сетевое устройство',
 	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id+' => '',
 	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_name' => 'Сетевое устройство',
@@ -1401,6 +1440,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:lnkApplicationSolutionToFunctionalCI' => 'Связь Прикладное решение/Функциональная КЕ',
 	'Class:lnkApplicationSolutionToFunctionalCI+' => '',
+	'Class:lnkApplicationSolutionToFunctionalCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_id' => 'Прикладное решение',
 	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_id+' => '',
 	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_name' => 'Прикладное решение',
@@ -1418,6 +1458,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:lnkApplicationSolutionToBusinessProcess' => 'Связь Прикладное решение/Бизнес-процесс',
 	'Class:lnkApplicationSolutionToBusinessProcess+' => '',
+	'Class:lnkApplicationSolutionToBusinessProcess/Name' => '%1$s / %2$s~~',
 	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_id' => 'Бизнес-процесс',
 	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_id+' => '',
 	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_name' => 'Бизнес-процесс',
@@ -1435,6 +1476,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:Group' => 'Группа',
 	'Class:Group+' => '',
+	'Class:Group/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Group/Attribute:name' => 'Название',
 	'Class:Group/Attribute:name+' => '',
 	'Class:Group/Attribute:status' => 'Статус',
@@ -1454,7 +1496,6 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:Group/Attribute:type' => 'Тип',
 	'Class:Group/Attribute:type+' => '',
 	'Class:Group/Attribute:parent_id' => 'Родительская группа',
-
 	'Class:Group/Attribute:parent_id+' => '',
 	'Class:Group/Attribute:parent_name' => 'Родительская группа',
 	'Class:Group/Attribute:parent_name+' => '',
@@ -1471,6 +1512,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:lnkGroupToCI' => 'Связь Группа/КЕ',
 	'Class:lnkGroupToCI+' => '',
+	'Class:lnkGroupToCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkGroupToCI/Attribute:group_id' => 'Группа',
 	'Class:lnkGroupToCI/Attribute:group_id+' => '',
 	'Class:lnkGroupToCI/Attribute:group_name' => 'Группа',
@@ -1492,6 +1534,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Server:otherinfo' => 'Дополнительно',
 	'Server:power' => 'Электропитание',
 	'Class:Subnet/Tab:IPUsage' => 'Использование IP-адресов',
+	'Class:Subnet/Tab:IPUsage+' => 'Which IP within this Subnet are used or not~~',
 	'Class:Subnet/Tab:IPUsage-explain' => 'Интерфейсы с IP-адресом в диапазоне: <em>%1$s</em> - <em>%2$s</em>',
 	'Class:Subnet/Tab:FreeIPs' => 'Свободные IP-адреса',
 	'Class:Subnet/Tab:FreeIPs-count' => 'Свободных IP-адресов: %1$s',
@@ -1507,6 +1550,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:lnkDocumentToFunctionalCI' => 'Связь Документ/Функциональная КЕ',
 	'Class:lnkDocumentToFunctionalCI+' => '',
+	'Class:lnkDocumentToFunctionalCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id' => 'Функциональная КЕ',
 	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id+' => '',
 	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_name' => 'Функциональная КЕ',
diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/sk.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/sk.dict.itop-config-mgmt.php
index 015f8ea2ec..3f3b74d83a 100644
--- a/datamodels/2.x/itop-config-mgmt/dictionaries/sk.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/sk.dict.itop-config-mgmt.php
@@ -34,7 +34,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Relation:depends on/Description' => 'Prvky, od ktorých závisí tento prvok',
 	'Relation:depends on/DownStream' => 'Depends on...~~',
 	'Relation:depends on/UpStream' => 'Impacts...~~',
-	'Relation:impacts/LoadData'       => 'Load data~~',
+	'Relation:impacts/LoadData' => 'Load data~~',
 	'Relation:impacts/NoFilteredData' => 'please select objects in Graphical view tag~~',
 ));
 
@@ -83,6 +83,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:lnkContactToFunctionalCI' => 'väzba - Kontakt / Komponent',
 	'Class:lnkContactToFunctionalCI+' => '',
+	'Class:lnkContactToFunctionalCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'Komponent',
 	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
 	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Názov funkčných CI',
@@ -129,6 +130,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:FunctionalCI/Attribute:finalclass' => 'Typ komponentu',
 	'Class:FunctionalCI/Attribute:finalclass+' => '',
 	'Class:FunctionalCI/Tab:OpenedTickets' => 'Active Tickets~~',
+	'Class:FunctionalCI/Tab:OpenedTickets+' => 'Active Tickets which are impacting this functional CI~~',
 ));
 
 //
@@ -138,6 +140,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:PhysicalDevice' => 'Fyzické zariadenie',
 	'Class:PhysicalDevice+' => '',
+	'Class:PhysicalDevice/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:PhysicalDevice/Attribute:serialnumber' => 'Sériové číslo',
 	'Class:PhysicalDevice/Attribute:serialnumber+' => '',
 	'Class:PhysicalDevice/Attribute:location_id' => 'Lokalita',
@@ -177,6 +180,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:Rack' => 'stojan (Rack)',
 	'Class:Rack+' => '',
+	'Class:Rack/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Rack/Attribute:nb_u' => 'NB U',
 	'Class:Rack/Attribute:nb_u+' => '',
 	'Class:Rack/Attribute:device_list' => 'Zariadenia',
@@ -243,6 +247,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:ConnectableCI' => 'Pripojiteľné zariadenie',
 	'Class:ConnectableCI+' => '',
+	'Class:ConnectableCI/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:ConnectableCI/Attribute:networkdevice_list' => 'Sieťové zariadenia',
 	'Class:ConnectableCI/Attribute:networkdevice_list+' => 'All network devices connected to this device~~',
 	'Class:ConnectableCI/Attribute:physicalinterface_list' => 'Sieťové rozhrania',
@@ -256,6 +261,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:DatacenterDevice' => 'Zariadenie dátového centra',
 	'Class:DatacenterDevice+' => '',
+	'Class:DatacenterDevice/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:DatacenterDevice/Attribute:rack_id' => 'stojan (Rack)',
 	'Class:DatacenterDevice/Attribute:rack_id+' => '',
 	'Class:DatacenterDevice/Attribute:rack_name' => 'Názov stojanu',
@@ -294,6 +300,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:NetworkDevice' => 'Sieťové zariadenie',
 	'Class:NetworkDevice+' => '',
+	'Class:NetworkDevice/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:NetworkDevice/Attribute:networkdevicetype_id' => 'Typ sieťového zariadenia',
 	'Class:NetworkDevice/Attribute:networkdevicetype_id+' => '',
 	'Class:NetworkDevice/Attribute:networkdevicetype_name' => 'Názov typu sieťového zariadenia',
@@ -315,6 +322,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:Server' => 'Server',
 	'Class:Server+' => '',
+	'Class:Server/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Server/Attribute:osfamily_id' => 'Kategória OS',
 	'Class:Server/Attribute:osfamily_id+' => '',
 	'Class:Server/Attribute:osfamily_name' => 'Názov kategórie OS',
@@ -342,6 +350,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:StorageSystem' => 'Úložiskový systém',
 	'Class:StorageSystem+' => '',
+	'Class:StorageSystem/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:StorageSystem/Attribute:logicalvolume_list' => 'Logické disky',
 	'Class:StorageSystem/Attribute:logicalvolume_list+' => 'All the logical volumes in this storage system~~',
 ));
@@ -353,6 +362,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:SANSwitch' => 'SAN prepínač',
 	'Class:SANSwitch+' => '',
+	'Class:SANSwitch/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:SANSwitch/Attribute:datacenterdevice_list' => 'Zariadenia',
 	'Class:SANSwitch/Attribute:datacenterdevice_list+' => 'All the devices connected to this SAN switch~~',
 ));
@@ -364,6 +374,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:TapeLibrary' => 'Pásková knižnica',
 	'Class:TapeLibrary+' => '',
+	'Class:TapeLibrary/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:TapeLibrary/Attribute:tapes_list' => 'Pásky',
 	'Class:TapeLibrary/Attribute:tapes_list+' => 'All the tapes in the tape library~~',
 ));
@@ -375,6 +386,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:NAS' => 'NAS',
 	'Class:NAS+' => '',
+	'Class:NAS/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:NAS/Attribute:nasfilesystem_list' => 'Súborové systémy',
 	'Class:NAS/Attribute:nasfilesystem_list+' => 'All the file systems in this NAS~~',
 ));
@@ -386,6 +398,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:PC' => 'PC',
 	'Class:PC+' => '',
+	'Class:PC/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:PC/Attribute:osfamily_id' => 'Kategória OS',
 	'Class:PC/Attribute:osfamily_id+' => '',
 	'Class:PC/Attribute:osfamily_name' => 'Názov kategórie OS',
@@ -413,6 +426,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:Printer' => 'Tlačiareň',
 	'Class:Printer+' => '',
+	'Class:Printer/ComplementaryName' => '%1$s - %2$s~~',
 ));
 
 //
@@ -422,6 +436,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:PowerConnection' => 'Elektrická prípojka',
 	'Class:PowerConnection+' => '',
+	'Class:PowerConnection/ComplementaryName' => '%1$s - %2$s~~',
 ));
 
 //
@@ -431,6 +446,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:PowerSource' => 'Napájací zdroj',
 	'Class:PowerSource+' => '',
+	'Class:PowerSource/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:PowerSource/Attribute:pdus_list' => 'Napäťové distribučné jednotky (PDU)',
 	'Class:PowerSource/Attribute:pdus_list+' => 'All the PDUs using this power source~~',
 ));
@@ -442,6 +458,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:PDU' => 'Napäťová distribučná jednotka (PDU)',
 	'Class:PDU+' => '',
+	'Class:PDU/ComplementaryName' => '%1$s - %2$s - %3$s - %4$s~~',
 	'Class:PDU/Attribute:rack_id' => 'stojan (Rack)',
 	'Class:PDU/Attribute:rack_id+' => '',
 	'Class:PDU/Attribute:rack_name' => 'Názov stojanu (rack)',
@@ -459,6 +476,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:Peripheral' => 'Periférie',
 	'Class:Peripheral+' => '',
+	'Class:Peripheral/ComplementaryName' => '%1$s - %2$s~~',
 ));
 
 //
@@ -468,6 +486,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:Enclosure' => 'Kryt (enclosure)',
 	'Class:Enclosure+' => '',
+	'Class:Enclosure/ComplementaryName' => '%1$s - %2$s - %3$s~~',
 	'Class:Enclosure/Attribute:rack_id' => 'stojan (Rack)',
 	'Class:Enclosure/Attribute:rack_id+' => '',
 	'Class:Enclosure/Attribute:rack_name' => 'Názov stojanu (rack)',
@@ -605,6 +624,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:MiddlewareInstance' => 'Middleware inštancia',
 	'Class:MiddlewareInstance+' => '',
+	'Class:MiddlewareInstance/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:MiddlewareInstance/Attribute:middleware_id' => 'Middleware',
 	'Class:MiddlewareInstance/Attribute:middleware_id+' => '',
 	'Class:MiddlewareInstance/Attribute:middleware_name' => 'Názov Middleware-u',
@@ -618,6 +638,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:DatabaseSchema' => 'Databázová schéma',
 	'Class:DatabaseSchema+' => '',
+	'Class:DatabaseSchema/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:DatabaseSchema/Attribute:dbserver_id' => 'DB server',
 	'Class:DatabaseSchema/Attribute:dbserver_id+' => '',
 	'Class:DatabaseSchema/Attribute:dbserver_name' => 'Názov DB serveru',
@@ -631,6 +652,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:WebApplication' => 'Webová Aplikácia',
 	'Class:WebApplication+' => '',
+	'Class:WebApplication/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:WebApplication/Attribute:webserver_id' => 'Web server',
 	'Class:WebApplication/Attribute:webserver_id+' => '',
 	'Class:WebApplication/Attribute:webserver_name' => 'Názov Web serveru',
@@ -711,6 +733,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:VirtualMachine' => 'Virtuálne zariadenie',
 	'Class:VirtualMachine+' => '',
+	'Class:VirtualMachine/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:VirtualMachine/Attribute:virtualhost_id' => 'Virtuálny host',
 	'Class:VirtualMachine/Attribute:virtualhost_id+' => '',
 	'Class:VirtualMachine/Attribute:virtualhost_name' => 'Názov virtuálneho hosta',
@@ -771,6 +794,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:lnkServerToVolume' => 'väzba - Server / Logický Disk',
 	'Class:lnkServerToVolume+' => '',
+	'Class:lnkServerToVolume/Name' => '%1$s / %2$s~~',
 	'Class:lnkServerToVolume/Attribute:volume_id' => 'Logický Disk',
 	'Class:lnkServerToVolume/Attribute:volume_id+' => '',
 	'Class:lnkServerToVolume/Attribute:volume_name' => 'Názov dielu',
@@ -790,6 +814,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:lnkVirtualDeviceToVolume' => 'väzba Virtuálne zariadenie / Logický disk',
 	'Class:lnkVirtualDeviceToVolume+' => '',
+	'Class:lnkVirtualDeviceToVolume/Name' => '%1$s / %2$s~~',
 	'Class:lnkVirtualDeviceToVolume/Attribute:volume_id' => 'Logický disk',
 	'Class:lnkVirtualDeviceToVolume/Attribute:volume_id+' => '',
 	'Class:lnkVirtualDeviceToVolume/Attribute:volume_name' => 'Názov dielu',
@@ -809,6 +834,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:lnkSanToDatacenterDevice' => 'väzba - SAN / Zariadenie',
 	'Class:lnkSanToDatacenterDevice+' => '',
+	'Class:lnkSanToDatacenterDevice/Name' => '%1$s / %2$s~~',
 	'Class:lnkSanToDatacenterDevice/Attribute:san_id' => 'SAN prepínač',
 	'Class:lnkSanToDatacenterDevice/Attribute:san_id+' => '',
 	'Class:lnkSanToDatacenterDevice/Attribute:san_name' => 'Názov SAN prepínaču',
@@ -870,6 +896,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:Software' => 'Softvér',
 	'Class:Software+' => '',
+	'Class:Software/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Software/Attribute:name' => 'Názov',
 	'Class:Software/Attribute:name+' => '',
 	'Class:Software/Attribute:vendor' => 'Dodávateľ',
@@ -987,6 +1014,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:OSLicence' => 'Licencia OS',
 	'Class:OSLicence+' => '',
+	'Class:OSLicence/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:OSLicence/Attribute:osversion_id' => 'Verzia OS',
 	'Class:OSLicence/Attribute:osversion_id+' => '',
 	'Class:OSLicence/Attribute:osversion_name' => 'Názov OS verzie',
@@ -1004,6 +1032,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:SoftwareLicence' => 'Softvérová licencia',
 	'Class:SoftwareLicence+' => '',
+	'Class:SoftwareLicence/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:SoftwareLicence/Attribute:software_id' => 'Softvér',
 	'Class:SoftwareLicence/Attribute:software_id+' => '',
 	'Class:SoftwareLicence/Attribute:software_name' => 'Názov softvéru',
@@ -1019,6 +1048,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:lnkDocumentToLicence' => 'väzba Dokument/Licencia',
 	'Class:lnkDocumentToLicence+' => '',
+	'Class:lnkDocumentToLicence/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToLicence/Attribute:licence_id' => 'Licencia',
 	'Class:lnkDocumentToLicence/Attribute:licence_id+' => '',
 	'Class:lnkDocumentToLicence/Attribute:licence_name' => 'Názov licence',
@@ -1071,6 +1101,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:Model' => 'Model',
 	'Class:Model+' => '',
+	'Class:Model/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Model/Attribute:brand_id' => 'Značka',
 	'Class:Model/Attribute:brand_id+' => '',
 	'Class:Model/Attribute:brand_name' => 'Názov značky',
@@ -1150,6 +1181,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:lnkDocumentToPatch' => 'väzba - Dokument / Záplata',
 	'Class:lnkDocumentToPatch+' => '',
+	'Class:lnkDocumentToPatch/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToPatch/Attribute:patch_id' => 'Záplata',
 	'Class:lnkDocumentToPatch/Attribute:patch_id+' => '',
 	'Class:lnkDocumentToPatch/Attribute:patch_name' => 'Názov záplaty',
@@ -1167,6 +1199,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:lnkSoftwareInstanceToSoftwarePatch' => 'väzba - Softvérová inštancia / Softvérová záplata',
 	'Class:lnkSoftwareInstanceToSoftwarePatch+' => '',
+	'Class:lnkSoftwareInstanceToSoftwarePatch/Name' => '%1$s / %2$s~~',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id' => 'Softvérová záplata',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id+' => '',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_name' => 'Názov softvérovej záplaty',
@@ -1184,6 +1217,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:lnkFunctionalCIToOSPatch' => 'väzba - Komponent / Záplata OS',
 	'Class:lnkFunctionalCIToOSPatch+' => '',
+	'Class:lnkFunctionalCIToOSPatch/Name' => '%1$s / %2$s~~',
 	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id' => 'Záplata OS',
 	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id+' => '',
 	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_name' => 'Názov OS záplaty',
@@ -1201,6 +1235,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:lnkDocumentToSoftware' => 'väzba Dokument / Softvér',
 	'Class:lnkDocumentToSoftware+' => '',
+	'Class:lnkDocumentToSoftware/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToSoftware/Attribute:software_id' => 'Softvér',
 	'Class:lnkDocumentToSoftware/Attribute:software_id+' => '',
 	'Class:lnkDocumentToSoftware/Attribute:software_name' => 'Názov softvéru',
@@ -1218,6 +1253,8 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:Subnet' => 'Podsieť',
 	'Class:Subnet+' => '',
+	'Class:Subnet/Name' => '%1$s/%2$s~~',
+	'Class:Subnet/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Subnet/Attribute:description' => 'Popis',
 	'Class:Subnet/Attribute:description+' => '',
 	'Class:Subnet/Attribute:subnet_name' => 'Subnet name~~',
@@ -1262,6 +1299,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:lnkSubnetToVLAN' => 'Link Subnet / VLAN~~',
 	'Class:lnkSubnetToVLAN+' => '~~',
+	'Class:lnkSubnetToVLAN/Name' => '%1$s / %2$s~~',
 	'Class:lnkSubnetToVLAN/Attribute:subnet_id' => 'Subnet~~',
 	'Class:lnkSubnetToVLAN/Attribute:subnet_id+' => '~~',
 	'Class:lnkSubnetToVLAN/Attribute:subnet_ip' => 'Subnet IP~~',
@@ -1296,8 +1334,6 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:IPInterface+' => '',
 	'Class:IPInterface/Attribute:ipaddress' => 'IP Adresa',
 	'Class:IPInterface/Attribute:ipaddress+' => '',
-
-
 	'Class:IPInterface/Attribute:macaddress' => 'MAC Adresa',
 	'Class:IPInterface/Attribute:macaddress+' => '',
 	'Class:IPInterface/Attribute:comment' => 'Komentár',
@@ -1317,6 +1353,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:PhysicalInterface' => 'Fyzické rozhranie',
 	'Class:PhysicalInterface+' => '',
+	'Class:PhysicalInterface/Name' => '%2$s %1$s~~',
 	'Class:PhysicalInterface/Attribute:connectableci_id' => 'Pripojitelné Zariadenie',
 	'Class:PhysicalInterface/Attribute:connectableci_id+' => '',
 	'Class:PhysicalInterface/Attribute:connectableci_name' => 'Názov zariadenia',
@@ -1332,6 +1369,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:lnkPhysicalInterfaceToVLAN' => 'Link PhysicalInterface / VLAN~~',
 	'Class:lnkPhysicalInterfaceToVLAN+' => '~~',
+	'Class:lnkPhysicalInterfaceToVLAN/Name' => '%1$s %2$s / %3$s~~',
 	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_id' => 'Physical Interface~~',
 	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_id+' => '~~',
 	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_name' => 'Physical Interface Name~~',
@@ -1386,6 +1424,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:lnkConnectableCIToNetworkDevice' => 'väzba - Komponent / Sieťové zariadenie',
 	'Class:lnkConnectableCIToNetworkDevice+' => '',
+	'Class:lnkConnectableCIToNetworkDevice/Name' => '%1$s / %2$s~~',
 	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id' => 'Sieťové zariadenie',
 	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id+' => '',
 	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_name' => 'Názov sieťového zariadenia',
@@ -1413,6 +1452,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:lnkApplicationSolutionToFunctionalCI' => 'väzba - Aplikačné riešenie / Komponent',
 	'Class:lnkApplicationSolutionToFunctionalCI+' => '',
+	'Class:lnkApplicationSolutionToFunctionalCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_id' => 'Aplikačné riešenie',
 	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_id+' => '',
 	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_name' => 'Názov aplikačného riešenia',
@@ -1430,6 +1470,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:lnkApplicationSolutionToBusinessProcess' => 'väzba - Aplikačné riešenie / Biznis proces',
 	'Class:lnkApplicationSolutionToBusinessProcess+' => '',
+	'Class:lnkApplicationSolutionToBusinessProcess/Name' => '%1$s / %2$s~~',
 	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_id' => 'Biznis proces',
 	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_id+' => '',
 	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_name' => 'Názov biznisových procesov',
@@ -1447,6 +1488,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:Group' => 'Skupina',
 	'Class:Group+' => '',
+	'Class:Group/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Group/Attribute:name' => 'Názov',
 	'Class:Group/Attribute:name+' => '',
 	'Class:Group/Attribute:status' => 'Stav',
@@ -1466,7 +1508,6 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:Group/Attribute:type' => 'Typ',
 	'Class:Group/Attribute:type+' => '',
 	'Class:Group/Attribute:parent_id' => 'Nadradená skupina',
-
 	'Class:Group/Attribute:parent_id+' => '',
 	'Class:Group/Attribute:parent_name' => 'Meno rodiča',
 	'Class:Group/Attribute:parent_name+' => '',
@@ -1483,6 +1524,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:lnkGroupToCI' => 'väzba - Skupina / Zariadenie',
 	'Class:lnkGroupToCI+' => '',
+	'Class:lnkGroupToCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkGroupToCI/Attribute:group_id' => 'Skupina',
 	'Class:lnkGroupToCI/Attribute:group_id+' => '',
 	'Class:lnkGroupToCI/Attribute:group_name' => 'Názov',
@@ -1504,6 +1546,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Server:otherinfo' => 'Iné informácie',
 	'Server:power' => 'Power supply~~',
 	'Class:Subnet/Tab:IPUsage' => 'Využívanosť IP adries',
+	'Class:Subnet/Tab:IPUsage+' => 'Which IP within this Subnet are used or not~~',
 	'Class:Subnet/Tab:IPUsage-explain' => 'Rozhrania majúce IP adresu v rozsahu: <em>%1$s</em> do <em>%2$s</em>',
 	'Class:Subnet/Tab:FreeIPs' => 'Voľné IP adresy',
 	'Class:Subnet/Tab:FreeIPs-count' => 'Voľných IP adries: %1$s',
@@ -1519,6 +1562,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:lnkDocumentToFunctionalCI' => 'väzba - Dokument / Komponent',
 	'Class:lnkDocumentToFunctionalCI+' => '',
+	'Class:lnkDocumentToFunctionalCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id' => 'Komponent',
 	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id+' => '',
 	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_name' => 'Názov funkčných CI',
diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/tr.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/tr.dict.itop-config-mgmt.php
index 1144832447..a2b0431674 100644
--- a/datamodels/2.x/itop-config-mgmt/dictionaries/tr.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/tr.dict.itop-config-mgmt.php
@@ -36,7 +36,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Relation:depends on/Description' => 'Bu kaleme bağımlı olan kalemler',
 	'Relation:depends on/DownStream' => 'Bağımlı olanlar...',
 	'Relation:depends on/UpStream' => 'Etkiledikleri...',
-	'Relation:impacts/LoadData'       => 'Load data~~',
+	'Relation:impacts/LoadData' => 'Load data~~',
 	'Relation:impacts/NoFilteredData' => 'please select objects in Graphical view tag~~',
 ));
 
@@ -85,6 +85,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:lnkContactToFunctionalCI' => 'Kişi / İşlevsel CI bağla',
 	'Class:lnkContactToFunctionalCI+' => '~~',
+	'Class:lnkContactToFunctionalCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'İşlevsel CI',
 	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '~~',
 	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'İşlevsel CI Adı',
@@ -131,6 +132,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:FunctionalCI/Attribute:finalclass' => 'Tip',
 	'Class:FunctionalCI/Attribute:finalclass+' => '',
 	'Class:FunctionalCI/Tab:OpenedTickets' => 'Aktif Çağrı Kayıtları',
+	'Class:FunctionalCI/Tab:OpenedTickets+' => 'Active Tickets which are impacting this functional CI~~',
 ));
 
 //
@@ -140,6 +142,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:PhysicalDevice' => 'Fiziksel cihaz',
 	'Class:PhysicalDevice+' => '~~',
+	'Class:PhysicalDevice/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:PhysicalDevice/Attribute:serialnumber' => 'Seri numarası',
 	'Class:PhysicalDevice/Attribute:serialnumber+' => '~~',
 	'Class:PhysicalDevice/Attribute:location_id' => 'Konum',
@@ -179,6 +182,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:Rack' => 'Raf',
 	'Class:Rack+' => '~~',
+	'Class:Rack/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Rack/Attribute:nb_u' => 'Raf birimleri',
 	'Class:Rack/Attribute:nb_u+' => '~~',
 	'Class:Rack/Attribute:device_list' => 'Cihazlar',
@@ -245,6 +249,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:ConnectableCI' => 'Bağlanabilir KK',
 	'Class:ConnectableCI+' => 'Fiziksel KK',
+	'Class:ConnectableCI/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:ConnectableCI/Attribute:networkdevice_list' => 'Ağ Aygıtları',
 	'Class:ConnectableCI/Attribute:networkdevice_list+' => 'Bu cihaza bağlı tüm ağ cihazları',
 	'Class:ConnectableCI/Attribute:physicalinterface_list' => 'Ağ arayüzleri',
@@ -258,6 +263,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:DatacenterDevice' => 'Veri merkezi cihazı',
 	'Class:DatacenterDevice+' => '~~',
+	'Class:DatacenterDevice/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:DatacenterDevice/Attribute:rack_id' => 'Raf',
 	'Class:DatacenterDevice/Attribute:rack_id+' => '~~',
 	'Class:DatacenterDevice/Attribute:rack_name' => 'Raf Adı',
@@ -296,6 +302,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:NetworkDevice' => 'Ağ Cihazı',
 	'Class:NetworkDevice+' => '',
+	'Class:NetworkDevice/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:NetworkDevice/Attribute:networkdevicetype_id' => 'Ağ tipi',
 	'Class:NetworkDevice/Attribute:networkdevicetype_id+' => '~~',
 	'Class:NetworkDevice/Attribute:networkdevicetype_name' => 'Ağ tipi adı',
@@ -317,6 +324,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:Server' => 'Sunucu',
 	'Class:Server+' => '',
+	'Class:Server/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Server/Attribute:osfamily_id' => 'OS ailesi',
 	'Class:Server/Attribute:osfamily_id+' => '~~',
 	'Class:Server/Attribute:osfamily_name' => 'OS Aile Adı',
@@ -344,6 +352,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:StorageSystem' => 'Depolama sistemi',
 	'Class:StorageSystem+' => '~~',
+	'Class:StorageSystem/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:StorageSystem/Attribute:logicalvolume_list' => 'Mantıksal depolama alanları',
 	'Class:StorageSystem/Attribute:logicalvolume_list+' => 'Bu depolama sistemindeki tüm mantıksal depolama alanları',
 ));
@@ -355,6 +364,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:SANSwitch' => 'SAN Anahtarı',
 	'Class:SANSwitch+' => '~~',
+	'Class:SANSwitch/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:SANSwitch/Attribute:datacenterdevice_list' => 'Cihazlar',
 	'Class:SANSwitch/Attribute:datacenterdevice_list+' => 'Bu SAN anahtarına bağlı tüm cihazlar',
 ));
@@ -366,6 +376,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:TapeLibrary' => 'Teyp Kütüphanesi',
 	'Class:TapeLibrary+' => '~~',
+	'Class:TapeLibrary/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:TapeLibrary/Attribute:tapes_list' => 'Teypler',
 	'Class:TapeLibrary/Attribute:tapes_list+' => 'Teyp kitaplığındaki tüm teypler',
 ));
@@ -377,6 +388,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:NAS' => 'NAS',
 	'Class:NAS+' => '~~',
+	'Class:NAS/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:NAS/Attribute:nasfilesystem_list' => 'Dosya sistemleri',
 	'Class:NAS/Attribute:nasfilesystem_list+' => 'Bu NAS\'daki tüm dosya sistemleri',
 ));
@@ -388,6 +400,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:PC' => 'PC',
 	'Class:PC+' => '',
+	'Class:PC/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:PC/Attribute:osfamily_id' => 'OS ailesi',
 	'Class:PC/Attribute:osfamily_id+' => '~~',
 	'Class:PC/Attribute:osfamily_name' => 'OS Aile Adı',
@@ -415,6 +428,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:Printer' => 'Yazıcı',
 	'Class:Printer+' => '',
+	'Class:Printer/ComplementaryName' => '%1$s - %2$s~~',
 ));
 
 //
@@ -424,6 +438,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:PowerConnection' => 'Güç Bağlantısı',
 	'Class:PowerConnection+' => '~~',
+	'Class:PowerConnection/ComplementaryName' => '%1$s - %2$s~~',
 ));
 
 //
@@ -433,6 +448,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:PowerSource' => 'Güç Kaynağı',
 	'Class:PowerSource+' => '~~',
+	'Class:PowerSource/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:PowerSource/Attribute:pdus_list' => 'PDU\'lar',
 	'Class:PowerSource/Attribute:pdus_list+' => 'Bu güç kaynağını kullanan tüm PDU\'lar',
 ));
@@ -444,6 +460,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:PDU' => 'PDU',
 	'Class:PDU+' => '~~',
+	'Class:PDU/ComplementaryName' => '%1$s - %2$s - %3$s - %4$s~~',
 	'Class:PDU/Attribute:rack_id' => 'Raf',
 	'Class:PDU/Attribute:rack_id+' => '~~',
 	'Class:PDU/Attribute:rack_name' => 'Raf Adı',
@@ -461,6 +478,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:Peripheral' => 'Çevresel Birim',
 	'Class:Peripheral+' => '~~',
+	'Class:Peripheral/ComplementaryName' => '%1$s - %2$s~~',
 ));
 
 //
@@ -470,6 +488,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:Enclosure' => 'Muhafaza',
 	'Class:Enclosure+' => '~~',
+	'Class:Enclosure/ComplementaryName' => '%1$s - %2$s - %3$s~~',
 	'Class:Enclosure/Attribute:rack_id' => 'Raf',
 	'Class:Enclosure/Attribute:rack_id+' => '~~',
 	'Class:Enclosure/Attribute:rack_name' => 'Raf Adı',
@@ -607,6 +626,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:MiddlewareInstance' => 'Ara katman yazılımı olayı',
 	'Class:MiddlewareInstance+' => '~~',
+	'Class:MiddlewareInstance/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:MiddlewareInstance/Attribute:middleware_id' => 'Ara katman yazılımı',
 	'Class:MiddlewareInstance/Attribute:middleware_id+' => '~~',
 	'Class:MiddlewareInstance/Attribute:middleware_name' => 'Ara katman yazılımı adı',
@@ -620,6 +640,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:DatabaseSchema' => 'Veritabanı Şeması',
 	'Class:DatabaseSchema+' => '~~',
+	'Class:DatabaseSchema/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:DatabaseSchema/Attribute:dbserver_id' => 'Veritabanı Sunucusu',
 	'Class:DatabaseSchema/Attribute:dbserver_id+' => '~~',
 	'Class:DatabaseSchema/Attribute:dbserver_name' => 'Veritabanı sunucu adı',
@@ -633,6 +654,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:WebApplication' => 'Web Uygulaması',
 	'Class:WebApplication+' => '~~',
+	'Class:WebApplication/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:WebApplication/Attribute:webserver_id' => 'Web Sunucusu',
 	'Class:WebApplication/Attribute:webserver_id+' => '~~',
 	'Class:WebApplication/Attribute:webserver_name' => 'Web Sunucusu Adı',
@@ -713,6 +735,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:VirtualMachine' => 'Sanal makine',
 	'Class:VirtualMachine+' => '~~',
+	'Class:VirtualMachine/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:VirtualMachine/Attribute:virtualhost_id' => 'Sanal Ana Makine',
 	'Class:VirtualMachine/Attribute:virtualhost_id+' => '~~',
 	'Class:VirtualMachine/Attribute:virtualhost_name' => 'Sanal Ana Makine Adı',
@@ -773,6 +796,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:lnkServerToVolume' => 'Bağlantılı sunucu / Depolama alanı',
 	'Class:lnkServerToVolume+' => '~~',
+	'Class:lnkServerToVolume/Name' => '%1$s / %2$s~~',
 	'Class:lnkServerToVolume/Attribute:volume_id' => 'Depolama alanı',
 	'Class:lnkServerToVolume/Attribute:volume_id+' => '~~',
 	'Class:lnkServerToVolume/Attribute:volume_name' => 'Depolama alanı adı',
@@ -792,6 +816,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:lnkVirtualDeviceToVolume' => 'Sanal cihaz / Depolama alanı bağla',
 	'Class:lnkVirtualDeviceToVolume+' => '~~',
+	'Class:lnkVirtualDeviceToVolume/Name' => '%1$s / %2$s~~',
 	'Class:lnkVirtualDeviceToVolume/Attribute:volume_id' => 'Depolama alanı',
 	'Class:lnkVirtualDeviceToVolume/Attribute:volume_id+' => '~~',
 	'Class:lnkVirtualDeviceToVolume/Attribute:volume_name' => 'Depolama alanı adı',
@@ -811,6 +836,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:lnkSanToDatacenterDevice' => 'SAN/ Veri merkezi cihazı bağla',
 	'Class:lnkSanToDatacenterDevice+' => '~~',
+	'Class:lnkSanToDatacenterDevice/Name' => '%1$s / %2$s~~',
 	'Class:lnkSanToDatacenterDevice/Attribute:san_id' => 'SAN Anahtarı',
 	'Class:lnkSanToDatacenterDevice/Attribute:san_id+' => '~~',
 	'Class:lnkSanToDatacenterDevice/Attribute:san_name' => 'SAN Anahtarı Adı',
@@ -872,6 +898,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:Software' => 'Yazılım',
 	'Class:Software+' => '',
+	'Class:Software/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Software/Attribute:name' => 'Adı',
 	'Class:Software/Attribute:name+' => '',
 	'Class:Software/Attribute:vendor' => 'satıcı',
@@ -989,6 +1016,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:OSLicence' => 'OS Lisansı',
 	'Class:OSLicence+' => '~~',
+	'Class:OSLicence/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:OSLicence/Attribute:osversion_id' => 'OS Sürümü',
 	'Class:OSLicence/Attribute:osversion_id+' => '~~',
 	'Class:OSLicence/Attribute:osversion_name' => 'OS Sürüm Adı',
@@ -1006,6 +1034,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:SoftwareLicence' => 'Yazılım Lisansı',
 	'Class:SoftwareLicence+' => '~~',
+	'Class:SoftwareLicence/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:SoftwareLicence/Attribute:software_id' => 'Yazılım',
 	'Class:SoftwareLicence/Attribute:software_id+' => '~~',
 	'Class:SoftwareLicence/Attribute:software_name' => 'Yazılım adı',
@@ -1021,6 +1050,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:lnkDocumentToLicence' => 'Belge / lisans bağla',
 	'Class:lnkDocumentToLicence+' => '~~',
+	'Class:lnkDocumentToLicence/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToLicence/Attribute:licence_id' => 'Lisans',
 	'Class:lnkDocumentToLicence/Attribute:licence_id+' => '~~',
 	'Class:lnkDocumentToLicence/Attribute:licence_name' => 'Lisans adı',
@@ -1073,6 +1103,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:Model' => 'Model',
 	'Class:Model+' => '~~',
+	'Class:Model/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Model/Attribute:brand_id' => 'Marka',
 	'Class:Model/Attribute:brand_id+' => '~~',
 	'Class:Model/Attribute:brand_name' => 'Marka Adı',
@@ -1152,6 +1183,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:lnkDocumentToPatch' => 'Bağlantılı belge / yama',
 	'Class:lnkDocumentToPatch+' => '~~',
+	'Class:lnkDocumentToPatch/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToPatch/Attribute:patch_id' => 'Yama',
 	'Class:lnkDocumentToPatch/Attribute:patch_id+' => '~~',
 	'Class:lnkDocumentToPatch/Attribute:patch_name' => 'Yama adı',
@@ -1169,6 +1201,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:lnkSoftwareInstanceToSoftwarePatch' => 'Yazılımı olayı / Yazılım yaması bağla',
 	'Class:lnkSoftwareInstanceToSoftwarePatch+' => '~~',
+	'Class:lnkSoftwareInstanceToSoftwarePatch/Name' => '%1$s / %2$s~~',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id' => 'Yazılım yaması',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id+' => '~~',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_name' => 'Yazılım yama adı',
@@ -1186,6 +1219,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:lnkFunctionalCIToOSPatch' => 'İşlevsel CI / OS Yaması bağla',
 	'Class:lnkFunctionalCIToOSPatch+' => '~~',
+	'Class:lnkFunctionalCIToOSPatch/Name' => '%1$s / %2$s~~',
 	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id' => 'İşletim sistemi yaması',
 	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id+' => '~~',
 	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_name' => 'İşletim sistemi yama adı',
@@ -1203,6 +1237,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:lnkDocumentToSoftware' => 'Belge / yazılım bağla',
 	'Class:lnkDocumentToSoftware+' => '~~',
+	'Class:lnkDocumentToSoftware/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToSoftware/Attribute:software_id' => 'Yazılım',
 	'Class:lnkDocumentToSoftware/Attribute:software_id+' => '~~',
 	'Class:lnkDocumentToSoftware/Attribute:software_name' => 'Yazılım adı',
@@ -1220,6 +1255,8 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:Subnet' => 'Subnet',
 	'Class:Subnet+' => '',
+	'Class:Subnet/Name' => '%1$s/%2$s~~',
+	'Class:Subnet/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Subnet/Attribute:description' => 'Tanımlama',
 	'Class:Subnet/Attribute:description+' => '',
 	'Class:Subnet/Attribute:subnet_name' => 'Alt ağ adı',
@@ -1264,6 +1301,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:lnkSubnetToVLAN' => 'Alt Ağ / VLAN  bağla',
 	'Class:lnkSubnetToVLAN+' => '~~',
+	'Class:lnkSubnetToVLAN/Name' => '%1$s / %2$s~~',
 	'Class:lnkSubnetToVLAN/Attribute:subnet_id' => 'Alt Ağ',
 	'Class:lnkSubnetToVLAN/Attribute:subnet_id+' => '~~',
 	'Class:lnkSubnetToVLAN/Attribute:subnet_ip' => 'Alt Ağ IP \'si',
@@ -1298,8 +1336,6 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:IPInterface+' => '~~',
 	'Class:IPInterface/Attribute:ipaddress' => 'IP adresi',
 	'Class:IPInterface/Attribute:ipaddress+' => '~~',
-
-
 	'Class:IPInterface/Attribute:macaddress' => 'MAC adresi',
 	'Class:IPInterface/Attribute:macaddress+' => '~~',
 	'Class:IPInterface/Attribute:comment' => 'Yorum',
@@ -1319,6 +1355,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:PhysicalInterface' => 'Fiziksel arayüz',
 	'Class:PhysicalInterface+' => '~~',
+	'Class:PhysicalInterface/Name' => '%2$s %1$s~~',
 	'Class:PhysicalInterface/Attribute:connectableci_id' => 'Cihaz',
 	'Class:PhysicalInterface/Attribute:connectableci_id+' => '~~',
 	'Class:PhysicalInterface/Attribute:connectableci_name' => 'Cihaz adı',
@@ -1334,6 +1371,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:lnkPhysicalInterfaceToVLAN' => 'Fiziksel Arabirim / VLAN bağla',
 	'Class:lnkPhysicalInterfaceToVLAN+' => '~~',
+	'Class:lnkPhysicalInterfaceToVLAN/Name' => '%1$s %2$s / %3$s~~',
 	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_id' => 'Fiziksel arabirim',
 	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_id+' => '~~',
 	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_name' => 'Fiziksel Arabirim Adı',
@@ -1388,6 +1426,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:lnkConnectableCIToNetworkDevice' => 'İlişkilendirilebilir CI / Ağ cihazı bağla',
 	'Class:lnkConnectableCIToNetworkDevice+' => '~~',
+	'Class:lnkConnectableCIToNetworkDevice/Name' => '%1$s / %2$s~~',
 	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id' => 'Ağ cihazı',
 	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id+' => '~~',
 	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_name' => 'Ağ Aygıtı Adı',
@@ -1415,6 +1454,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:lnkApplicationSolutionToFunctionalCI' => 'Uygulama Çözümü / İşlevsel CI bağla',
 	'Class:lnkApplicationSolutionToFunctionalCI+' => '~~',
+	'Class:lnkApplicationSolutionToFunctionalCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_id' => 'Uygulama çözümü',
 	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_id+' => '~~',
 	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_name' => 'Uygulama çözümü Adı',
@@ -1432,6 +1472,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:lnkApplicationSolutionToBusinessProcess' => 'Uygulama Çözümü / İş Süreci bağla',
 	'Class:lnkApplicationSolutionToBusinessProcess+' => '~~',
+	'Class:lnkApplicationSolutionToBusinessProcess/Name' => '%1$s / %2$s~~',
 	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_id' => 'İş süreci',
 	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_id+' => '~~',
 	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_name' => 'İş Süreci Adı',
@@ -1449,6 +1490,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:Group' => 'Grup',
 	'Class:Group+' => '',
+	'Class:Group/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Group/Attribute:name' => 'Adı',
 	'Class:Group/Attribute:name+' => '',
 	'Class:Group/Attribute:status' => 'Surumu',
@@ -1468,7 +1510,6 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:Group/Attribute:type' => 'Tip',
 	'Class:Group/Attribute:type+' => '',
 	'Class:Group/Attribute:parent_id' => 'Bağlı olduğu grup',
-
 	'Class:Group/Attribute:parent_id+' => '',
 	'Class:Group/Attribute:parent_name' => 'Adı',
 	'Class:Group/Attribute:parent_name+' => '',
@@ -1485,6 +1526,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:lnkGroupToCI' => 'Grup / KK',
 	'Class:lnkGroupToCI+' => '',
+	'Class:lnkGroupToCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkGroupToCI/Attribute:group_id' => 'Grup',
 	'Class:lnkGroupToCI/Attribute:group_id+' => '',
 	'Class:lnkGroupToCI/Attribute:group_name' => 'Adı',
@@ -1506,6 +1548,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Server:otherinfo' => 'Diğer bilgiler',
 	'Server:power' => 'Güç kaynağı',
 	'Class:Subnet/Tab:IPUsage' => 'IP Kullanımı',
+	'Class:Subnet/Tab:IPUsage+' => 'Which IP within this Subnet are used or not~~',
 	'Class:Subnet/Tab:IPUsage-explain' => '<em>%1$s</em> - <em>%2$s</em> aralığındaki IPye sahip arayüzler',
 	'Class:Subnet/Tab:FreeIPs' => 'Boş IPler',
 	'Class:Subnet/Tab:FreeIPs-count' => 'Boş IPler: %1$s',
@@ -1521,6 +1564,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:lnkDocumentToFunctionalCI' => 'Belge / İşlevsel CI bağla',
 	'Class:lnkDocumentToFunctionalCI+' => '~~',
+	'Class:lnkDocumentToFunctionalCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id' => 'İşlevsel CI',
 	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id+' => '~~',
 	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_name' => 'İşlevsel CI Adı',
diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/zh_cn.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/zh_cn.dict.itop-config-mgmt.php
index 05dec2a010..60942d643a 100644
--- a/datamodels/2.x/itop-config-mgmt/dictionaries/zh_cn.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/zh_cn.dict.itop-config-mgmt.php
@@ -34,7 +34,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Relation:depends on/Description' => '此元素依赖的元素...',
 	'Relation:depends on/DownStream' => '依赖于...',
 	'Relation:depends on/UpStream' => '影响...',
-	'Relation:impacts/LoadData'       => '加载数据',
+	'Relation:impacts/LoadData' => '加载数据',
 	'Relation:impacts/NoFilteredData' => 'please select objects in Graphical view tag~~',
 ));
 
@@ -83,6 +83,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:lnkContactToFunctionalCI' => '关联 联系人/功能项',
 	'Class:lnkContactToFunctionalCI+' => '',
+	'Class:lnkContactToFunctionalCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => '功能项',
 	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
 	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => '功能项名称',
@@ -126,9 +127,10 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:FunctionalCI/Attribute:applicationsolution_list+' => '此配置项依赖的所有应用方案',
 	'Class:FunctionalCI/Attribute:softwares_list' => '软件',
 	'Class:FunctionalCI/Attribute:softwares_list+' => '此配置项上已安装的所有软件',
-	'Class:FunctionalCI/Attribute:finalclass' => '二级配置项',
-	'Class:FunctionalCI/Attribute:finalclass+' => 'Name of the final class',
+	'Class:FunctionalCI/Attribute:finalclass' => '类型',
+	'Class:FunctionalCI/Attribute:finalclass+' => '根本属性的名称',
 	'Class:FunctionalCI/Tab:OpenedTickets' => '活跃的工单',
+	'Class:FunctionalCI/Tab:OpenedTickets+' => 'Active Tickets which are impacting this functional CI~~',
 ));
 
 //
@@ -138,16 +140,17 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:PhysicalDevice' => '物理设备',
 	'Class:PhysicalDevice+' => '',
+	'Class:PhysicalDevice/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:PhysicalDevice/Attribute:serialnumber' => '序列号',
 	'Class:PhysicalDevice/Attribute:serialnumber+' => '',
-	'Class:PhysicalDevice/Attribute:location_id' => '地理位置',
+	'Class:PhysicalDevice/Attribute:location_id' => '地点',
 	'Class:PhysicalDevice/Attribute:location_id+' => '',
 	'Class:PhysicalDevice/Attribute:location_name' => '名称',
 	'Class:PhysicalDevice/Attribute:location_name+' => '',
 	'Class:PhysicalDevice/Attribute:status' => '状态',
 	'Class:PhysicalDevice/Attribute:status+' => '',
-	'Class:PhysicalDevice/Attribute:status/Value:implementation' => '上线',
-	'Class:PhysicalDevice/Attribute:status/Value:implementation+' => '上线',
+	'Class:PhysicalDevice/Attribute:status/Value:implementation' => '生效',
+	'Class:PhysicalDevice/Attribute:status/Value:implementation+' => '生效',
 	'Class:PhysicalDevice/Attribute:status/Value:obsolete' => '废弃',
 	'Class:PhysicalDevice/Attribute:status/Value:obsolete+' => '废弃',
 	'Class:PhysicalDevice/Attribute:status/Value:production' => '生产',
@@ -175,14 +178,15 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 //
 
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:Rack' => '机柜',
+	'Class:Rack' => '机架',
 	'Class:Rack+' => '',
-	'Class:Rack/Attribute:nb_u' => '机柜高度',
+	'Class:Rack/ComplementaryName' => '%1$s - %2$s~~',
+	'Class:Rack/Attribute:nb_u' => '机架高度',
 	'Class:Rack/Attribute:nb_u+' => '',
 	'Class:Rack/Attribute:device_list' => '设备',
-	'Class:Rack/Attribute:device_list+' => '此机柜托管的所有物理设备',
-	'Class:Rack/Attribute:enclosure_list' => '机位',
-	'Class:Rack/Attribute:enclosure_list+' => '此机柜上的所有机位',
+	'Class:Rack/Attribute:device_list+' => '此机架托管的所有物理设备',
+	'Class:Rack/Attribute:enclosure_list' => '机柜',
+	'Class:Rack/Attribute:enclosure_list+' => '此机架上的所有机柜',
 ));
 
 //
@@ -190,7 +194,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 //
 
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:TelephonyCI' => '电讯配置项',
+	'Class:TelephonyCI' => '通讯项',
 	'Class:TelephonyCI+' => '',
 	'Class:TelephonyCI/Attribute:phonenumber' => '电话号码',
 	'Class:TelephonyCI/Attribute:phonenumber+' => '',
@@ -210,7 +214,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 //
 
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:MobilePhone' => '移动电话',
+	'Class:MobilePhone' => '手机',
 	'Class:MobilePhone+' => '',
 	'Class:MobilePhone/Attribute:imei' => 'IMEI',
 	'Class:MobilePhone/Attribute:imei+' => '',
@@ -243,6 +247,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:ConnectableCI' => '可连接的配置项',
 	'Class:ConnectableCI+' => '物理配置项',
+	'Class:ConnectableCI/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:ConnectableCI/Attribute:networkdevice_list' => '网络设备',
 	'Class:ConnectableCI/Attribute:networkdevice_list+' => '所有连接到这台设备的网络设备',
 	'Class:ConnectableCI/Attribute:physicalinterface_list' => '网卡',
@@ -256,13 +261,14 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:DatacenterDevice' => '数据中心设备',
 	'Class:DatacenterDevice+' => '',
-	'Class:DatacenterDevice/Attribute:rack_id' => '机柜',
+	'Class:DatacenterDevice/ComplementaryName' => '%1$s - %2$s~~',
+	'Class:DatacenterDevice/Attribute:rack_id' => '机架',
 	'Class:DatacenterDevice/Attribute:rack_id+' => '',
-	'Class:DatacenterDevice/Attribute:rack_name' => '机柜名称',
+	'Class:DatacenterDevice/Attribute:rack_name' => '机架名称',
 	'Class:DatacenterDevice/Attribute:rack_name+' => '',
-	'Class:DatacenterDevice/Attribute:enclosure_id' => '机位',
+	'Class:DatacenterDevice/Attribute:enclosure_id' => '机柜',
 	'Class:DatacenterDevice/Attribute:enclosure_id+' => '',
-	'Class:DatacenterDevice/Attribute:enclosure_name' => '机位名称',
+	'Class:DatacenterDevice/Attribute:enclosure_name' => '机柜名称',
 	'Class:DatacenterDevice/Attribute:enclosure_name+' => '',
 	'Class:DatacenterDevice/Attribute:nb_u' => '高度',
 	'Class:DatacenterDevice/Attribute:nb_u+' => '',
@@ -276,9 +282,9 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:DatacenterDevice/Attribute:powerB_id+' => '',
 	'Class:DatacenterDevice/Attribute:powerB_name' => '电源B名称',
 	'Class:DatacenterDevice/Attribute:powerB_name+' => '',
-	'Class:DatacenterDevice/Attribute:fiberinterfacelist_list' => '光纤端口',
-	'Class:DatacenterDevice/Attribute:fiberinterfacelist_list+' => '此设备的所有光纤端口',
-	'Class:DatacenterDevice/Attribute:san_list' => 'SANs',
+	'Class:DatacenterDevice/Attribute:fiberinterfacelist_list' => '光纤接口',
+	'Class:DatacenterDevice/Attribute:fiberinterfacelist_list+' => '此设备的所有光纤接口',
+	'Class:DatacenterDevice/Attribute:san_list' => 'SAN',
 	'Class:DatacenterDevice/Attribute:san_list+' => '所有连接到这台设备的SAN交换机',
 	'Class:DatacenterDevice/Attribute:redundancy' => '冗余',
 	'Class:DatacenterDevice/Attribute:redundancy/count' => '此设备运行正常至少需要一路电源 (A 或 B)',
@@ -294,6 +300,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:NetworkDevice' => '网络设备',
 	'Class:NetworkDevice+' => '',
+	'Class:NetworkDevice/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:NetworkDevice/Attribute:networkdevicetype_id' => '网络设备类型',
 	'Class:NetworkDevice/Attribute:networkdevicetype_id+' => '',
 	'Class:NetworkDevice/Attribute:networkdevicetype_name' => '网络设备类型名称',
@@ -315,6 +322,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:Server' => '服务器',
 	'Class:Server+' => '',
+	'Class:Server/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Server/Attribute:osfamily_id' => '操作系统家族',
 	'Class:Server/Attribute:osfamily_id+' => '',
 	'Class:Server/Attribute:osfamily_name' => '操作系统家族名称',
@@ -342,6 +350,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:StorageSystem' => '存储系统',
 	'Class:StorageSystem+' => '',
+	'Class:StorageSystem/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:StorageSystem/Attribute:logicalvolume_list' => '逻辑卷',
 	'Class:StorageSystem/Attribute:logicalvolume_list+' => '此存储系统包含的所有逻辑卷',
 ));
@@ -353,6 +362,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:SANSwitch' => 'SAN交换机',
 	'Class:SANSwitch+' => '',
+	'Class:SANSwitch/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:SANSwitch/Attribute:datacenterdevice_list' => '设备',
 	'Class:SANSwitch/Attribute:datacenterdevice_list+' => '连接到此SAN交换机的所有设备',
 ));
@@ -364,6 +374,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:TapeLibrary' => '磁带库',
 	'Class:TapeLibrary+' => '',
+	'Class:TapeLibrary/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:TapeLibrary/Attribute:tapes_list' => '磁带',
 	'Class:TapeLibrary/Attribute:tapes_list+' => '此磁带库里的所有磁带',
 ));
@@ -375,6 +386,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:NAS' => 'NAS',
 	'Class:NAS+' => '',
+	'Class:NAS/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:NAS/Attribute:nasfilesystem_list' => '文件系统',
 	'Class:NAS/Attribute:nasfilesystem_list+' => '此NAS里的所有文件系统',
 ));
@@ -386,6 +398,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:PC' => 'PC',
 	'Class:PC+' => '',
+	'Class:PC/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:PC/Attribute:osfamily_id' => '操作系统家族',
 	'Class:PC/Attribute:osfamily_id+' => '',
 	'Class:PC/Attribute:osfamily_name' => '操作系统家族名称',
@@ -413,6 +426,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:Printer' => '打印机',
 	'Class:Printer+' => '',
+	'Class:Printer/ComplementaryName' => '%1$s - %2$s~~',
 ));
 
 //
@@ -420,8 +434,9 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 //
 
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:PowerConnection' => '电源连接',
+	'Class:PowerConnection' => '供电线路',
 	'Class:PowerConnection+' => '',
+	'Class:PowerConnection/ComplementaryName' => '%1$s - %2$s~~',
 ));
 
 //
@@ -431,6 +446,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:PowerSource' => '电源',
 	'Class:PowerSource+' => '',
+	'Class:PowerSource/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:PowerSource/Attribute:pdus_list' => 'PDU',
 	'Class:PowerSource/Attribute:pdus_list+' => '使用此电源的所有PDU',
 ));
@@ -442,9 +458,10 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:PDU' => 'PDU',
 	'Class:PDU+' => '',
-	'Class:PDU/Attribute:rack_id' => '机柜',
+	'Class:PDU/ComplementaryName' => '%1$s - %2$s - %3$s - %4$s~~',
+	'Class:PDU/Attribute:rack_id' => '机架',
 	'Class:PDU/Attribute:rack_id+' => '',
-	'Class:PDU/Attribute:rack_name' => '机柜名称',
+	'Class:PDU/Attribute:rack_name' => '机架名称',
 	'Class:PDU/Attribute:rack_name+' => '',
 	'Class:PDU/Attribute:powerstart_id' => '上级电源',
 	'Class:PDU/Attribute:powerstart_id+' => '',
@@ -459,6 +476,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:Peripheral' => '配件',
 	'Class:Peripheral+' => '',
+	'Class:Peripheral/ComplementaryName' => '%1$s - %2$s~~',
 ));
 
 //
@@ -466,16 +484,17 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 //
 
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:Enclosure' => '机位',
+	'Class:Enclosure' => '机柜',
 	'Class:Enclosure+' => '',
-	'Class:Enclosure/Attribute:rack_id' => '机柜',
+	'Class:Enclosure/ComplementaryName' => '%1$s - %2$s - %3$s~~',
+	'Class:Enclosure/Attribute:rack_id' => '机架',
 	'Class:Enclosure/Attribute:rack_id+' => '',
-	'Class:Enclosure/Attribute:rack_name' => '机柜名称',
+	'Class:Enclosure/Attribute:rack_name' => '机架名称',
 	'Class:Enclosure/Attribute:rack_name+' => '',
 	'Class:Enclosure/Attribute:nb_u' => '高度',
 	'Class:Enclosure/Attribute:nb_u+' => '',
 	'Class:Enclosure/Attribute:device_list' => '设备',
-	'Class:Enclosure/Attribute:device_list+' => '此机位的所有设备',
+	'Class:Enclosure/Attribute:device_list+' => '此机柜的所有设备',
 ));
 
 //
@@ -605,6 +624,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:MiddlewareInstance' => '中间件实例',
 	'Class:MiddlewareInstance+' => '',
+	'Class:MiddlewareInstance/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:MiddlewareInstance/Attribute:middleware_id' => '中间件',
 	'Class:MiddlewareInstance/Attribute:middleware_id+' => '',
 	'Class:MiddlewareInstance/Attribute:middleware_name' => '名称',
@@ -618,6 +638,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:DatabaseSchema' => '数据库',
 	'Class:DatabaseSchema+' => '',
+	'Class:DatabaseSchema/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:DatabaseSchema/Attribute:dbserver_id' => '数据库服务器',
 	'Class:DatabaseSchema/Attribute:dbserver_id+' => '',
 	'Class:DatabaseSchema/Attribute:dbserver_name' => '名称',
@@ -631,6 +652,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:WebApplication' => 'Web 应用',
 	'Class:WebApplication+' => '',
+	'Class:WebApplication/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:WebApplication/Attribute:webserver_id' => 'Web 服务器',
 	'Class:WebApplication/Attribute:webserver_id+' => '',
 	'Class:WebApplication/Attribute:webserver_name' => '名称',
@@ -649,8 +671,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:VirtualDevice+' => '',
 	'Class:VirtualDevice/Attribute:status' => '状态',
 	'Class:VirtualDevice/Attribute:status+' => '',
-	'Class:VirtualDevice/Attribute:status/Value:implementation' => '上线',
-	'Class:VirtualDevice/Attribute:status/Value:implementation+' => '上线',
+	'Class:VirtualDevice/Attribute:status/Value:implementation' => '生效',
+	'Class:VirtualDevice/Attribute:status/Value:implementation+' => '生效',
 	'Class:VirtualDevice/Attribute:status/Value:obsolete' => '废弃',
 	'Class:VirtualDevice/Attribute:status/Value:obsolete+' => '废弃',
 	'Class:VirtualDevice/Attribute:status/Value:production' => '生产',
@@ -677,7 +699,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 //
 
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:Hypervisor' => 'Hypervisor',
+	'Class:Hypervisor' => '虚拟机管理器',
 	'Class:Hypervisor+' => '',
 	'Class:Hypervisor/Attribute:farm_id' => '集群',
 	'Class:Hypervisor/Attribute:farm_id+' => '',
@@ -696,12 +718,12 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:Farm' => '集群',
 	'Class:Farm+' => '',
-	'Class:Farm/Attribute:hypervisor_list' => 'Hypervisor',
-	'Class:Farm/Attribute:hypervisor_list+' => '集群由哪些Hypervisor 组成',
+	'Class:Farm/Attribute:hypervisor_list' => '虚拟机管理器',
+	'Class:Farm/Attribute:hypervisor_list+' => '集群由哪些虚拟机管理器组成',
 	'Class:Farm/Attribute:redundancy' => '高可用性',
-	'Class:Farm/Attribute:redundancy/disabled' => '所有Hypervisor 正常,集群才正常',
-	'Class:Farm/Attribute:redundancy/count' => '至少 %1$s 个Hypervisor 是正常的,集群才是正常的',
-	'Class:Farm/Attribute:redundancy/percent' => '至少 %1$s %% 的Hypervisor 是正常的,集群才正常',
+	'Class:Farm/Attribute:redundancy/disabled' => '所有虚拟机管理器正常,集群才正常',
+	'Class:Farm/Attribute:redundancy/count' => '至少 %1$s 个虚拟机管理器是正常的,集群才是正常的',
+	'Class:Farm/Attribute:redundancy/percent' => '至少 %1$s %% 的虚拟机管理器是正常的,集群才正常',
 ));
 
 //
@@ -711,6 +733,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:VirtualMachine' => '虚拟机',
 	'Class:VirtualMachine+' => '',
+	'Class:VirtualMachine/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:VirtualMachine/Attribute:virtualhost_id' => '宿主机',
 	'Class:VirtualMachine/Attribute:virtualhost_id+' => '',
 	'Class:VirtualMachine/Attribute:virtualhost_name' => '名称',
@@ -771,6 +794,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:lnkServerToVolume' => '关联 服务器/逻辑卷',
 	'Class:lnkServerToVolume+' => '',
+	'Class:lnkServerToVolume/Name' => '%1$s / %2$s~~',
 	'Class:lnkServerToVolume/Attribute:volume_id' => '逻辑卷',
 	'Class:lnkServerToVolume/Attribute:volume_id+' => '',
 	'Class:lnkServerToVolume/Attribute:volume_name' => '逻辑卷名称',
@@ -790,6 +814,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:lnkVirtualDeviceToVolume' => '关联 虚拟设备/逻辑卷',
 	'Class:lnkVirtualDeviceToVolume+' => '',
+	'Class:lnkVirtualDeviceToVolume/Name' => '%1$s / %2$s~~',
 	'Class:lnkVirtualDeviceToVolume/Attribute:volume_id' => '逻辑卷',
 	'Class:lnkVirtualDeviceToVolume/Attribute:volume_id+' => '',
 	'Class:lnkVirtualDeviceToVolume/Attribute:volume_name' => '名称',
@@ -809,6 +834,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:lnkSanToDatacenterDevice' => '关联 SAN/数据中心设备',
 	'Class:lnkSanToDatacenterDevice+' => '',
+	'Class:lnkSanToDatacenterDevice/Name' => '%1$s / %2$s~~',
 	'Class:lnkSanToDatacenterDevice/Attribute:san_id' => 'SAN 交换机',
 	'Class:lnkSanToDatacenterDevice/Attribute:san_id+' => '',
 	'Class:lnkSanToDatacenterDevice/Attribute:san_name' => '名称',
@@ -870,6 +896,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:Software' => '软件',
 	'Class:Software+' => '',
+	'Class:Software/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Software/Attribute:name' => '名称',
 	'Class:Software/Attribute:name+' => '',
 	'Class:Software/Attribute:vendor' => '厂商',
@@ -911,8 +938,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:Patch/Attribute:documents_list+' => '此补丁关联的所有文档',
 	'Class:Patch/Attribute:description' => '描述',
 	'Class:Patch/Attribute:description+' => '',
-	'Class:Patch/Attribute:finalclass' => '补丁子类别',
-	'Class:Patch/Attribute:finalclass+' => 'Name of the final class',
+	'Class:Patch/Attribute:finalclass' => '补丁类型',
+	'Class:Patch/Attribute:finalclass+' => '根本属性的名称',
 ));
 
 //
@@ -976,8 +1003,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:Licence/Attribute:perpetual/Value:no+' => '否',
 	'Class:Licence/Attribute:perpetual/Value:yes' => '是',
 	'Class:Licence/Attribute:perpetual/Value:yes+' => '是',
-	'Class:Licence/Attribute:finalclass' => '许可证子类别',
-	'Class:Licence/Attribute:finalclass+' => 'Name of the final class',
+	'Class:Licence/Attribute:finalclass' => '许可证类型',
+	'Class:Licence/Attribute:finalclass+' => '根本属性的名称',
 ));
 
 //
@@ -987,6 +1014,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:OSLicence' => '操作系统许可证',
 	'Class:OSLicence+' => '',
+	'Class:OSLicence/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:OSLicence/Attribute:osversion_id' => '操作系统版本',
 	'Class:OSLicence/Attribute:osversion_id+' => '',
 	'Class:OSLicence/Attribute:osversion_name' => '名称',
@@ -1004,6 +1032,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:SoftwareLicence' => '软件许可证',
 	'Class:SoftwareLicence+' => '',
+	'Class:SoftwareLicence/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:SoftwareLicence/Attribute:software_id' => '软件',
 	'Class:SoftwareLicence/Attribute:software_id+' => '',
 	'Class:SoftwareLicence/Attribute:software_name' => '名称',
@@ -1019,6 +1048,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:lnkDocumentToLicence' => '关联 文档/许可证',
 	'Class:lnkDocumentToLicence+' => '',
+	'Class:lnkDocumentToLicence/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToLicence/Attribute:licence_id' => '许可证',
 	'Class:lnkDocumentToLicence/Attribute:licence_id+' => '',
 	'Class:lnkDocumentToLicence/Attribute:licence_name' => '名称',
@@ -1071,6 +1101,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:Model' => '型号',
 	'Class:Model+' => '',
+	'Class:Model/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Model/Attribute:brand_id' => '品牌',
 	'Class:Model/Attribute:brand_id+' => '',
 	'Class:Model/Attribute:brand_name' => '品牌名称',
@@ -1081,12 +1112,12 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:Model/Attribute:type/Value:PowerSource+' => '电源',
 	'Class:Model/Attribute:type/Value:DiskArray' => '磁盘阵列',
 	'Class:Model/Attribute:type/Value:DiskArray+' => '磁盘阵列',
-	'Class:Model/Attribute:type/Value:Enclosure' => '机位',
-	'Class:Model/Attribute:type/Value:Enclosure+' => '机位',
+	'Class:Model/Attribute:type/Value:Enclosure' => '机柜',
+	'Class:Model/Attribute:type/Value:Enclosure+' => '机柜',
 	'Class:Model/Attribute:type/Value:IPPhone' => 'IP电话',
 	'Class:Model/Attribute:type/Value:IPPhone+' => 'IP电话',
-	'Class:Model/Attribute:type/Value:MobilePhone' => '移动电话',
-	'Class:Model/Attribute:type/Value:MobilePhone+' => '移动电话',
+	'Class:Model/Attribute:type/Value:MobilePhone' => '手机',
+	'Class:Model/Attribute:type/Value:MobilePhone+' => '手机',
 	'Class:Model/Attribute:type/Value:NAS' => 'NAS',
 	'Class:Model/Attribute:type/Value:NAS+' => 'NAS',
 	'Class:Model/Attribute:type/Value:NetworkDevice' => '网络设备',
@@ -1099,8 +1130,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:Model/Attribute:type/Value:Peripheral+' => '配件',
 	'Class:Model/Attribute:type/Value:Printer' => '打印机',
 	'Class:Model/Attribute:type/Value:Printer+' => '打印机',
-	'Class:Model/Attribute:type/Value:Rack' => '机柜',
-	'Class:Model/Attribute:type/Value:Rack+' => '机柜',
+	'Class:Model/Attribute:type/Value:Rack' => '机架',
+	'Class:Model/Attribute:type/Value:Rack+' => '机架',
 	'Class:Model/Attribute:type/Value:SANSwitch' => 'SAN交换机',
 	'Class:Model/Attribute:type/Value:SANSwitch+' => 'SAN交换机',
 	'Class:Model/Attribute:type/Value:Server' => '服务器',
@@ -1150,6 +1181,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:lnkDocumentToPatch' => '关联 文档/补丁',
 	'Class:lnkDocumentToPatch+' => '',
+	'Class:lnkDocumentToPatch/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToPatch/Attribute:patch_id' => '补丁',
 	'Class:lnkDocumentToPatch/Attribute:patch_id+' => '',
 	'Class:lnkDocumentToPatch/Attribute:patch_name' => '补丁名称',
@@ -1167,6 +1199,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:lnkSoftwareInstanceToSoftwarePatch' => ' 关联 软件实例/软件补丁',
 	'Class:lnkSoftwareInstanceToSoftwarePatch+' => '',
+	'Class:lnkSoftwareInstanceToSoftwarePatch/Name' => '%1$s / %2$s~~',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id' => '软件补丁',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id+' => '',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_name' => '软件补丁名称',
@@ -1184,6 +1217,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:lnkFunctionalCIToOSPatch' => '关联 功能项/操作系统补丁',
 	'Class:lnkFunctionalCIToOSPatch+' => '',
+	'Class:lnkFunctionalCIToOSPatch/Name' => '%1$s / %2$s~~',
 	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id' => '操作系统补丁',
 	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id+' => '',
 	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_name' => '操作系统补丁名称',
@@ -1201,6 +1235,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:lnkDocumentToSoftware' => '关联 文档/软件',
 	'Class:lnkDocumentToSoftware+' => '',
+	'Class:lnkDocumentToSoftware/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToSoftware/Attribute:software_id' => '软件',
 	'Class:lnkDocumentToSoftware/Attribute:software_id+' => '',
 	'Class:lnkDocumentToSoftware/Attribute:software_name' => '软件名称',
@@ -1218,6 +1253,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:Subnet' => '子网',
 	'Class:Subnet+' => '',
+	'Class:Subnet/Name' => '%1$s/%2$s~~',
+	'Class:Subnet/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Subnet/Attribute:description' => '描述',
 	'Class:Subnet/Attribute:description+' => '',
 	'Class:Subnet/Attribute:subnet_name' => '子网名称',
@@ -1262,6 +1299,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:lnkSubnetToVLAN' => '关联 子网/VLAN',
 	'Class:lnkSubnetToVLAN+' => '',
+	'Class:lnkSubnetToVLAN/Name' => '%1$s / %2$s~~',
 	'Class:lnkSubnetToVLAN/Attribute:subnet_id' => '子网',
 	'Class:lnkSubnetToVLAN/Attribute:subnet_id+' => '',
 	'Class:lnkSubnetToVLAN/Attribute:subnet_ip' => '子网IP',
@@ -1283,8 +1321,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:NetworkInterface+' => '',
 	'Class:NetworkInterface/Attribute:name' => '名称',
 	'Class:NetworkInterface/Attribute:name+' => '',
-	'Class:NetworkInterface/Attribute:finalclass' => '网卡子类别',
-	'Class:NetworkInterface/Attribute:finalclass+' => 'Name of the final class',
+	'Class:NetworkInterface/Attribute:finalclass' => '网卡类型',
+	'Class:NetworkInterface/Attribute:finalclass+' => '根本属性的名称',
 ));
 
 //
@@ -1296,11 +1334,9 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:IPInterface+' => '',
 	'Class:IPInterface/Attribute:ipaddress' => 'IP地址',
 	'Class:IPInterface/Attribute:ipaddress+' => '',
-
-
 	'Class:IPInterface/Attribute:macaddress' => 'MAC地址',
 	'Class:IPInterface/Attribute:macaddress+' => '',
-	'Class:IPInterface/Attribute:comment' => '注释',
+	'Class:IPInterface/Attribute:comment' => '备注',
 	'Class:IPInterface/Attribute:coment+' => '',
 	'Class:IPInterface/Attribute:ipgateway' => '网关',
 	'Class:IPInterface/Attribute:ipgateway+' => '',
@@ -1317,6 +1353,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:PhysicalInterface' => '物理网卡',
 	'Class:PhysicalInterface+' => '',
+	'Class:PhysicalInterface/Name' => '%2$s %1$s~~',
 	'Class:PhysicalInterface/Attribute:connectableci_id' => '设备',
 	'Class:PhysicalInterface/Attribute:connectableci_id+' => '',
 	'Class:PhysicalInterface/Attribute:connectableci_name' => '设备名称',
@@ -1332,6 +1369,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:lnkPhysicalInterfaceToVLAN' => '关联 物理网卡/VLAN',
 	'Class:lnkPhysicalInterfaceToVLAN+' => '',
+	'Class:lnkPhysicalInterfaceToVLAN/Name' => '%1$s %2$s / %3$s~~',
 	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_id' => '物理网卡',
 	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_id+' => '',
 	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_name' => '物理网卡名称',
@@ -1365,7 +1403,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 //
 
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:FiberChannelInterface' => '光纤通道接口',
+	'Class:FiberChannelInterface' => '光纤接口',
 	'Class:FiberChannelInterface+' => '',
 	'Class:FiberChannelInterface/Attribute:speed' => '速率',
 	'Class:FiberChannelInterface/Attribute:speed+' => '',
@@ -1386,6 +1424,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:lnkConnectableCIToNetworkDevice' => '关联 可连接项/网络设备',
 	'Class:lnkConnectableCIToNetworkDevice+' => '',
+	'Class:lnkConnectableCIToNetworkDevice/Name' => '%1$s / %2$s~~',
 	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id' => '网络设备',
 	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id+' => '',
 	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_name' => '网络设备名称',
@@ -1413,6 +1452,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:lnkApplicationSolutionToFunctionalCI' => '关联 应用方案/功能项',
 	'Class:lnkApplicationSolutionToFunctionalCI+' => '',
+	'Class:lnkApplicationSolutionToFunctionalCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_id' => '应用方案',
 	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_id+' => '',
 	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_name' => '应用方案名称',
@@ -1430,6 +1470,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:lnkApplicationSolutionToBusinessProcess' => '关联 应用方案/业务流程',
 	'Class:lnkApplicationSolutionToBusinessProcess+' => '',
+	'Class:lnkApplicationSolutionToBusinessProcess/Name' => '%1$s / %2$s~~',
 	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_id' => '业务流程',
 	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_id+' => '',
 	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_name' => '业务流程名称',
@@ -1447,12 +1488,13 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:Group' => '配置组',
 	'Class:Group+' => '',
+	'Class:Group/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Group/Attribute:name' => '名称',
 	'Class:Group/Attribute:name+' => '',
 	'Class:Group/Attribute:status' => '状态',
 	'Class:Group/Attribute:status+' => '',
-	'Class:Group/Attribute:status/Value:implementation' => '上线',
-	'Class:Group/Attribute:status/Value:implementation+' => '上线',
+	'Class:Group/Attribute:status/Value:implementation' => '生效',
+	'Class:Group/Attribute:status/Value:implementation+' => '生效',
 	'Class:Group/Attribute:status/Value:obsolete' => '废弃',
 	'Class:Group/Attribute:status/Value:obsolete+' => '废弃',
 	'Class:Group/Attribute:status/Value:production' => '生产',
@@ -1466,7 +1508,6 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:Group/Attribute:type' => '类型',
 	'Class:Group/Attribute:type+' => '',
 	'Class:Group/Attribute:parent_id' => '上级组',
-
 	'Class:Group/Attribute:parent_id+' => '',
 	'Class:Group/Attribute:parent_name' => '名称',
 	'Class:Group/Attribute:parent_name+' => '',
@@ -1483,6 +1524,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:lnkGroupToCI' => '关联 配置组/配置项',
 	'Class:lnkGroupToCI+' => '',
+	'Class:lnkGroupToCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkGroupToCI/Attribute:group_id' => '组',
 	'Class:lnkGroupToCI/Attribute:group_id+' => '',
 	'Class:lnkGroupToCI/Attribute:group_name' => '名称',
@@ -1504,6 +1546,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Server:otherinfo' => '其它信息',
 	'Server:power' => '电力供应',
 	'Class:Subnet/Tab:IPUsage' => 'IP 使用率',
+	'Class:Subnet/Tab:IPUsage+' => 'Which IP within this Subnet are used or not~~',
 	'Class:Subnet/Tab:IPUsage-explain' => '网卡IP范围: <em>%1$s</em> 到 <em>%2$s</em>',
 	'Class:Subnet/Tab:FreeIPs' => '空闲IP',
 	'Class:Subnet/Tab:FreeIPs-count' => '空闲IP: %1$s',
@@ -1519,6 +1562,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:lnkDocumentToFunctionalCI' => '关联 文档/功能项',
 	'Class:lnkDocumentToFunctionalCI+' => '',
+	'Class:lnkDocumentToFunctionalCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id' => '功能项',
 	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id+' => '',
 	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_name' => '功能项名称',
@@ -1558,8 +1602,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Menu:Server+' => '所有服务器',
 	'Menu:Printer' => '打印机',
 	'Menu:Printer+' => '所有打印机',
-	'Menu:MobilePhone' => '移动电话',
-	'Menu:MobilePhone+' => '所有移动电话',
+	'Menu:MobilePhone' => '手机',
+	'Menu:MobilePhone+' => '所有手机',
 	'Menu:PC' => '个人电脑',
 	'Menu:PC+' => '所有个人电脑',
 	'Menu:NewCI' => '新建配置项',
diff --git a/datamodels/2.x/itop-config/dictionaries/cs.dict.itop-config.php b/datamodels/2.x/itop-config/dictionaries/cs.dict.itop-config.php
index 39b0029091..2ccb687e0e 100644
--- a/datamodels/2.x/itop-config/dictionaries/cs.dict.itop-config.php
+++ b/datamodels/2.x/itop-config/dictionaries/cs.dict.itop-config.php
@@ -8,7 +8,6 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
-
 	'Menu:ConfigEditor' => 'Konfigurace',
 	'config-edit-title' => 'Editor konfiguračního souboru',
 	'config-edit-intro' => 'Při úpravách konfiguračního souboru buďte velice opatrní. Nesprávné nastavení může vést k nedostupnosti '.ITOP_APPLICATION_SHORT,
@@ -22,4 +21,8 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'config-parse-error' => 'Řádek %2$d: %1$s.<br/>Soubor nebyl uložen.',
 	'config-current-line' => 'Řádek: %1$s',
 	'config-saved-warning-db-password' => 'Successfully recorded, but the backup won\'t work due to unsupported characters in the database password.~~',
+	'config-error-transaction' => 'Error: invalid Transaction ID. The configuration was <b>NOT</b> modified.~~',
+	'config-error-file-changed' => 'Error: The Configuration file has changed since you opened it and cannot be saved. Refresh and apply your changes again.~~',
+	'config-not-allowed-in-demo' => 'Sorry, '.ITOP_APPLICATION_SHORT.' is in <b>demonstration mode</b>: the configuration file cannot be edited.~~',
+	'config-interactive-not-allowed' => ITOP_APPLICATION_SHORT.' interactive edition of the configuration as been disabled. See <code>\'config_editor\' => \'disabled\'</code> in the configuration file.~~',
 ));
diff --git a/datamodels/2.x/itop-config/dictionaries/da.dict.itop-config.php b/datamodels/2.x/itop-config/dictionaries/da.dict.itop-config.php
index 57fb402ef3..0e3581b280 100644
--- a/datamodels/2.x/itop-config/dictionaries/da.dict.itop-config.php
+++ b/datamodels/2.x/itop-config/dictionaries/da.dict.itop-config.php
@@ -21,7 +21,6 @@
  * along with iTop. If not, see <http://www.gnu.org/licenses/>
  */
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
-
 	'Menu:ConfigEditor' => 'Configuration~~',
 	'config-edit-title' => 'Configuration File Editor~~',
 	'config-edit-intro' => 'Be very cautious when editing the configuration file.~~',
@@ -35,4 +34,8 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'config-parse-error' => 'Line %2$d: %1$s.<br/>The file has NOT been updated.~~',
 	'config-current-line' => 'Editing line: %1$s~~',
 	'config-saved-warning-db-password' => 'Successfully recorded, but the backup won\'t work due to unsupported characters in the database password.~~',
+	'config-error-transaction' => 'Error: invalid Transaction ID. The configuration was <b>NOT</b> modified.~~',
+	'config-error-file-changed' => 'Error: The Configuration file has changed since you opened it and cannot be saved. Refresh and apply your changes again.~~',
+	'config-not-allowed-in-demo' => 'Sorry, '.ITOP_APPLICATION_SHORT.' is in <b>demonstration mode</b>: the configuration file cannot be edited.~~',
+	'config-interactive-not-allowed' => ITOP_APPLICATION_SHORT.' interactive edition of the configuration as been disabled. See <code>\'config_editor\' => \'disabled\'</code> in the configuration file.~~',
 ));
diff --git a/datamodels/2.x/itop-config/dictionaries/de.dict.itop-config.php b/datamodels/2.x/itop-config/dictionaries/de.dict.itop-config.php
index b8227ae352..6aff3c05a5 100644
--- a/datamodels/2.x/itop-config/dictionaries/de.dict.itop-config.php
+++ b/datamodels/2.x/itop-config/dictionaries/de.dict.itop-config.php
@@ -23,10 +23,9 @@
 *		
 */
 Dict::Add('DE DE', 'German', 'Deutsch', array(
-
 	'Menu:ConfigEditor' => 'Konfiguration',
 	'config-edit-title' => 'Konfigurations-Editor',
-	'config-edit-intro' => 'Seien sie bei der Bearbeitung der Konfigurationsdatei sehr vorsichtig.',
+	'config-edit-intro' => 'Achtung: Eine falsche Konfiguration kann dazu führen, dass '.ITOP_APPLICATION_SHORT.' für alle Benutzer unbenutzbar ist!',
 	'config-apply' => 'Anwenden (Ctrl+S)',
 	'config-apply-title' => 'Anwenden (Ctrl+S)',
 	'config-cancel' => 'Zurücksetzen',
@@ -37,4 +36,8 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'config-parse-error' => 'Zeile %2$d: %1$s.<br/>Die Datei wurde nicht aktualisiert.',
 	'config-current-line' => 'Editiere Zeile: %1$s',
 	'config-saved-warning-db-password' => 'Die Konfiguration wurde gespeichert. Das Backup wird NICHT funktionieren, im Datenbankpasswort sind unzulässige Zeichen enthalten.',
+	'config-error-transaction' => 'Fehler: Ungültige Transaction ID. Die Konfiguration wurde <b>NICHT</b> modifiziert.',
+	'config-error-file-changed' => 'Fehler: Die Konfigurationsdatei hat sich seit dem Öffnen geändert und kann nicht gespeichert werden. Aktualisieren Sie die Datei und wenden Sie Ihre Änderungen erneut an.',
+	'config-not-allowed-in-demo' => 'Entschuldigung, '.ITOP_APPLICATION_SHORT.' befindet sich im <b>Demo-Modus</b>: Die Konfigurationsdatei kann nicht bearbeitet werden.',
+	'config-interactive-not-allowed' => 'Die interaktive Bearbeitung der '.ITOP_APPLICATION_SHORT.' Konfiguration wurde deaktiviert. Siehe <code>\'config_editor\' => \'disabled\'</code> in der Konfigurationsdatei.',
 ));
diff --git a/datamodels/2.x/itop-config/dictionaries/es_cr.dict.itop-config.php b/datamodels/2.x/itop-config/dictionaries/es_cr.dict.itop-config.php
index 65b5790160..127bd342e7 100644
--- a/datamodels/2.x/itop-config/dictionaries/es_cr.dict.itop-config.php
+++ b/datamodels/2.x/itop-config/dictionaries/es_cr.dict.itop-config.php
@@ -22,7 +22,6 @@
  * along with iTop. If not, see <http://www.gnu.org/licenses/>
  */
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
-
 	'Menu:ConfigEditor' => 'Configuración',
 	'config-edit-title' => 'Editor de Archivo de Configuración',
 	'config-edit-intro' => 'Sea muy cuidadoso cuando edite el archivo de configuración. En particular, sólo los elementos superiores (ejem.: the global configuration y modules settings) deberian ser editados.',
@@ -36,4 +35,8 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'config-parse-error' => 'Línea %2$d: %1$s.<br/>El archivo NO ha sido actualizado.',
 	'config-current-line' => 'Editando línea: %1$s',
 	'config-saved-warning-db-password' => 'Registrado correctamente, pero el respaldo NO funcionará debido a caracteres no admitidos en la contraseña de la base de datos.',
+	'config-error-transaction' => 'Error: invalid Transaction ID. The configuration was <b>NOT</b> modified.~~',
+	'config-error-file-changed' => 'Error: The Configuration file has changed since you opened it and cannot be saved. Refresh and apply your changes again.~~',
+	'config-not-allowed-in-demo' => 'Sorry, '.ITOP_APPLICATION_SHORT.' is in <b>demonstration mode</b>: the configuration file cannot be edited.~~',
+	'config-interactive-not-allowed' => ITOP_APPLICATION_SHORT.' interactive edition of the configuration as been disabled. See <code>\'config_editor\' => \'disabled\'</code> in the configuration file.~~',
 ));
diff --git a/datamodels/2.x/itop-config/dictionaries/fr.dict.itop-config.php b/datamodels/2.x/itop-config/dictionaries/fr.dict.itop-config.php
index b21969e99b..63b052f259 100644
--- a/datamodels/2.x/itop-config/dictionaries/fr.dict.itop-config.php
+++ b/datamodels/2.x/itop-config/dictionaries/fr.dict.itop-config.php
@@ -6,7 +6,6 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 Dict::Add('FR FR', 'French', 'Français', array(
-
 	'Menu:ConfigEditor' => 'Configuration générale',
 	'config-edit-title' => 'Éditeur du Fichier de Configuration',
 	'config-edit-intro' => 'Attention: une configuration incorrecte peut rendre '.ITOP_APPLICATION_SHORT.' inopérant pour tous les utilisateurs!',
@@ -21,7 +20,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'config-current-line' => 'Ligne en édition : %1$s',
 	'config-saved-warning-db-password' => 'Configuration enregistrée. Les sauvegardes ne fonctionneront pas à cause du format du mot de passe de la base.',
 	'config-error-transaction' => "Erreur : La transaction n'est plus valide. Les modifications n'ont <b>PAS</b> été enregistrées.",
-	'config-error-file-changed' => "Erreur : La configuration a été modifiée depuis que vous l\'avez ouvert. Vos modifications ne peuvent <b>PAS</b> être enregistrées. Rechargez la page et recommencez.",
+	'config-error-file-changed' => "Erreur : La configuration a été modifiée depuis que vous l'avez ouvert. Vos modifications ne peuvent <b>PAS</b> être enregistrées. Rechargez la page et recommencez.",
 	'config-not-allowed-in-demo' => 'Désolé, '.ITOP_APPLICATION_SHORT.' est en <b>mode démonstration</b> : la configuration ne peut pas être modifiée.',
 	'config-interactive-not-allowed' => "La modification interactive de la configuration n'est pas autorisée. Voir le paramètre <code>'config_editor' => 'disabled'</code> dans le fichier de configuration.",
 ));
diff --git a/datamodels/2.x/itop-config/dictionaries/hu.dict.itop-config.php b/datamodels/2.x/itop-config/dictionaries/hu.dict.itop-config.php
index a538c91285..5f9e7b7bd3 100644
--- a/datamodels/2.x/itop-config/dictionaries/hu.dict.itop-config.php
+++ b/datamodels/2.x/itop-config/dictionaries/hu.dict.itop-config.php
@@ -21,8 +21,7 @@
  * along with iTop. If not, see <http://www.gnu.org/licenses/>
  */
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-
-    'Menu:ConfigEditor' => 'Konfiguráció szerkesztő',
+	'Menu:ConfigEditor' => 'Konfiguráció szerkesztő',
 	'config-edit-title' => 'Konfigurációs fájl szerkesztő',
 	'config-edit-intro' => 'Legyen nagyon óvatos a konfiguráció szerkesztésénél!',
 	'config-apply' => 'Alkalmaz',
@@ -35,4 +34,8 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'config-parse-error' => '%2$d sor: %1$s.<br/>A fájl NEM frissült',
 	'config-current-line' => 'Szerkesztett sor: %1$s',
 	'config-saved-warning-db-password' => 'Sikeresen elmentve, de a biztonsági mentés nem fog működni az adatbázis jelszavában szereplő nem támogatott karakterek miatt.',
+	'config-error-transaction' => 'Error: invalid Transaction ID. The configuration was <b>NOT</b> modified.~~',
+	'config-error-file-changed' => 'Error: The Configuration file has changed since you opened it and cannot be saved. Refresh and apply your changes again.~~',
+	'config-not-allowed-in-demo' => 'Sorry, '.ITOP_APPLICATION_SHORT.' is in <b>demonstration mode</b>: the configuration file cannot be edited.~~',
+	'config-interactive-not-allowed' => ITOP_APPLICATION_SHORT.' interactive edition of the configuration as been disabled. See <code>\'config_editor\' => \'disabled\'</code> in the configuration file.~~',
 ));
diff --git a/datamodels/2.x/itop-config/dictionaries/it.dict.itop-config.php b/datamodels/2.x/itop-config/dictionaries/it.dict.itop-config.php
index b4e72dd061..86658e3ce7 100644
--- a/datamodels/2.x/itop-config/dictionaries/it.dict.itop-config.php
+++ b/datamodels/2.x/itop-config/dictionaries/it.dict.itop-config.php
@@ -21,7 +21,6 @@
  * along with iTop. If not, see <http://www.gnu.org/licenses/>
  */
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
-
 	'Menu:ConfigEditor' => 'Configuration~~',
 	'config-edit-title' => 'Configuration File Editor~~',
 	'config-edit-intro' => 'Be very cautious when editing the configuration file.~~',
@@ -35,4 +34,8 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'config-parse-error' => 'Line %2$d: %1$s.<br/>The file has NOT been updated.~~',
 	'config-current-line' => 'Editing line: %1$s~~',
 	'config-saved-warning-db-password' => 'Successfully recorded, but the backup won\'t work due to unsupported characters in the database password.~~',
+	'config-error-transaction' => 'Error: invalid Transaction ID. The configuration was <b>NOT</b> modified.~~',
+	'config-error-file-changed' => 'Error: The Configuration file has changed since you opened it and cannot be saved. Refresh and apply your changes again.~~',
+	'config-not-allowed-in-demo' => 'Sorry, '.ITOP_APPLICATION_SHORT.' is in <b>demonstration mode</b>: the configuration file cannot be edited.~~',
+	'config-interactive-not-allowed' => ITOP_APPLICATION_SHORT.' interactive edition of the configuration as been disabled. See <code>\'config_editor\' => \'disabled\'</code> in the configuration file.~~',
 ));
diff --git a/datamodels/2.x/itop-config/dictionaries/ja.dict.itop-config.php b/datamodels/2.x/itop-config/dictionaries/ja.dict.itop-config.php
index 16c4e728ad..0df3678354 100644
--- a/datamodels/2.x/itop-config/dictionaries/ja.dict.itop-config.php
+++ b/datamodels/2.x/itop-config/dictionaries/ja.dict.itop-config.php
@@ -21,7 +21,6 @@
  * along with iTop. If not, see <http://www.gnu.org/licenses/>
  */
 Dict::Add('JA JP', 'Japanese', '日本語', array(
-
 	'Menu:ConfigEditor' => 'Configuration~~',
 	'config-edit-title' => 'Configuration File Editor~~',
 	'config-edit-intro' => 'Be very cautious when editing the configuration file.~~',
@@ -35,4 +34,8 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'config-parse-error' => 'Line %2$d: %1$s.<br/>The file has NOT been updated.~~',
 	'config-current-line' => 'Editing line: %1$s~~',
 	'config-saved-warning-db-password' => 'Successfully recorded, but the backup won\'t work due to unsupported characters in the database password.~~',
+	'config-error-transaction' => 'Error: invalid Transaction ID. The configuration was <b>NOT</b> modified.~~',
+	'config-error-file-changed' => 'Error: The Configuration file has changed since you opened it and cannot be saved. Refresh and apply your changes again.~~',
+	'config-not-allowed-in-demo' => 'Sorry, '.ITOP_APPLICATION_SHORT.' is in <b>demonstration mode</b>: the configuration file cannot be edited.~~',
+	'config-interactive-not-allowed' => ITOP_APPLICATION_SHORT.' interactive edition of the configuration as been disabled. See <code>\'config_editor\' => \'disabled\'</code> in the configuration file.~~',
 ));
diff --git a/datamodels/2.x/itop-config/dictionaries/nl.dict.itop-config.php b/datamodels/2.x/itop-config/dictionaries/nl.dict.itop-config.php
index 33b2c01f3d..25044d80b7 100644
--- a/datamodels/2.x/itop-config/dictionaries/nl.dict.itop-config.php
+++ b/datamodels/2.x/itop-config/dictionaries/nl.dict.itop-config.php
@@ -22,7 +22,6 @@
  * along with iTop. If not, see <http://www.gnu.org/licenses/>
  */
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-
 	'Menu:ConfigEditor' => 'Configuratie',
 	'config-edit-title' => 'Aanpassen configuratie',
 	'config-edit-intro' => 'Wees uiterst voorzichtig bij het aanpassen van de configuratie.',
@@ -36,4 +35,8 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'config-parse-error' => 'Regel %2$d: %1$s.<br/>Het bestand werd <b>NIET</b> opgeslagen.',
 	'config-current-line' => 'Huidige regel: %1$s',
 	'config-saved-warning-db-password' => 'Wijzigingen zijn opgeslagen, maar de backup zal niet werken doordat het databasewachtwoord karakters bevat die niet ondersteund zijn.',
+	'config-error-transaction' => 'Error: invalid Transaction ID. The configuration was <b>NOT</b> modified.~~',
+	'config-error-file-changed' => 'Error: The Configuration file has changed since you opened it and cannot be saved. Refresh and apply your changes again.~~',
+	'config-not-allowed-in-demo' => 'Sorry, '.ITOP_APPLICATION_SHORT.' is in <b>demonstration mode</b>: the configuration file cannot be edited.~~',
+	'config-interactive-not-allowed' => ITOP_APPLICATION_SHORT.' interactive edition of the configuration as been disabled. See <code>\'config_editor\' => \'disabled\'</code> in the configuration file.~~',
 ));
diff --git a/datamodels/2.x/itop-config/dictionaries/pl.dict.itop-config.php b/datamodels/2.x/itop-config/dictionaries/pl.dict.itop-config.php
index 81dfe90ead..1f7f189830 100644
--- a/datamodels/2.x/itop-config/dictionaries/pl.dict.itop-config.php
+++ b/datamodels/2.x/itop-config/dictionaries/pl.dict.itop-config.php
@@ -20,9 +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('PL PL', 'Polish', 'Polski', array(
-
 	'Menu:ConfigEditor' => 'Konfiguracja ogólna',
 	'config-edit-title' => 'Edycja pliku konfiguracyjnego',
 	'config-edit-intro' => 'Zachowaj ostrożność podczas edycji pliku konfiguracyjnego.',
@@ -36,4 +34,8 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'config-parse-error' => 'Linia %2$d: %1$s.<br/>Plik NIE został zaktualizowany.',
 	'config-current-line' => 'Edycja linii: %1$s',
 	'config-saved-warning-db-password' => 'Zapisano pomyślnie, ale kopia zapasowa nie działa z powodu nieobsługiwanych znaków w haśle bazy danych.',
+	'config-error-transaction' => 'Error: invalid Transaction ID. The configuration was <b>NOT</b> modified.~~',
+	'config-error-file-changed' => 'Error: The Configuration file has changed since you opened it and cannot be saved. Refresh and apply your changes again.~~',
+	'config-not-allowed-in-demo' => 'Sorry, '.ITOP_APPLICATION_SHORT.' is in <b>demonstration mode</b>: the configuration file cannot be edited.~~',
+	'config-interactive-not-allowed' => ITOP_APPLICATION_SHORT.' interactive edition of the configuration as been disabled. See <code>\'config_editor\' => \'disabled\'</code> in the configuration file.~~',
 ));
diff --git a/datamodels/2.x/itop-config/dictionaries/pt_br.dict.itop-config.php b/datamodels/2.x/itop-config/dictionaries/pt_br.dict.itop-config.php
index a7a6d613f5..c7b45b9e68 100644
--- a/datamodels/2.x/itop-config/dictionaries/pt_br.dict.itop-config.php
+++ b/datamodels/2.x/itop-config/dictionaries/pt_br.dict.itop-config.php
@@ -21,7 +21,6 @@
  * along with iTop. If not, see <http://www.gnu.org/licenses/>
  */
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-
 	'Menu:ConfigEditor' => 'Configurações',
 	'config-edit-title' => 'Editor do arquivo de configuração',
 	'config-edit-intro' => 'Tenha cuidado ao editar o arquivo de configuração',
@@ -35,4 +34,8 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'config-parse-error' => 'Linha %2$d: %1$s.<br/>O arquivo não foi atualizado',
 	'config-current-line' => 'Editando linha: %1$s',
 	'config-saved-warning-db-password' => 'Salvo com sucesso, mas o backup não vai funcionar devido aos caracteres não suportados na senha do banco de dados',
+	'config-error-transaction' => 'Error: invalid Transaction ID. The configuration was <b>NOT</b> modified.~~',
+	'config-error-file-changed' => 'Error: The Configuration file has changed since you opened it and cannot be saved. Refresh and apply your changes again.~~',
+	'config-not-allowed-in-demo' => 'Sorry, '.ITOP_APPLICATION_SHORT.' is in <b>demonstration mode</b>: the configuration file cannot be edited.~~',
+	'config-interactive-not-allowed' => ITOP_APPLICATION_SHORT.' interactive edition of the configuration as been disabled. See <code>\'config_editor\' => \'disabled\'</code> in the configuration file.~~',
 ));
diff --git a/datamodels/2.x/itop-config/dictionaries/ru.dict.itop-config.php b/datamodels/2.x/itop-config/dictionaries/ru.dict.itop-config.php
index e14684e14a..9371bc456a 100644
--- a/datamodels/2.x/itop-config/dictionaries/ru.dict.itop-config.php
+++ b/datamodels/2.x/itop-config/dictionaries/ru.dict.itop-config.php
@@ -9,7 +9,6 @@
  *
  */
 Dict::Add('RU RU', 'Russian', 'Русский', array(
-
 	'Menu:ConfigEditor' => 'Основные настройки',
 	'config-edit-title' => 'Редактор файла конфигурации',
 	'config-edit-intro' => 'Будьте очень осторожны при редактировании файла конфигурации. В частности, отредактированы могут быть только глобальная конфигурация и настройки модулей.',
@@ -23,4 +22,8 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'config-parse-error' => 'Строка %2$d: %1$s.<br/>Файл не был обновлен.',
 	'config-current-line' => 'Редактируемая строка: %1$s',
 	'config-saved-warning-db-password' => 'Изменения успешно сохранены, но резервная копия не будет работать из-за неподдерживаемых символов в пароле базы данных.',
+	'config-error-transaction' => 'Error: invalid Transaction ID. The configuration was <b>NOT</b> modified.~~',
+	'config-error-file-changed' => 'Error: The Configuration file has changed since you opened it and cannot be saved. Refresh and apply your changes again.~~',
+	'config-not-allowed-in-demo' => 'Sorry, '.ITOP_APPLICATION_SHORT.' is in <b>demonstration mode</b>: the configuration file cannot be edited.~~',
+	'config-interactive-not-allowed' => ITOP_APPLICATION_SHORT.' interactive edition of the configuration as been disabled. See <code>\'config_editor\' => \'disabled\'</code> in the configuration file.~~',
 ));
diff --git a/datamodels/2.x/itop-config/dictionaries/sk.dict.itop-config.php b/datamodels/2.x/itop-config/dictionaries/sk.dict.itop-config.php
index e80264766e..5a1d5517a4 100644
--- a/datamodels/2.x/itop-config/dictionaries/sk.dict.itop-config.php
+++ b/datamodels/2.x/itop-config/dictionaries/sk.dict.itop-config.php
@@ -21,7 +21,6 @@
  * along with iTop. If not, see <http://www.gnu.org/licenses/>
  */
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
-
 	'Menu:ConfigEditor' => 'Configuration~~',
 	'config-edit-title' => 'Configuration File Editor~~',
 	'config-edit-intro' => 'Be very cautious when editing the configuration file.~~',
@@ -35,4 +34,8 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'config-parse-error' => 'Line %2$d: %1$s.<br/>The file has NOT been updated.~~',
 	'config-current-line' => 'Editing line: %1$s~~',
 	'config-saved-warning-db-password' => 'Successfully recorded, but the backup won\'t work due to unsupported characters in the database password.~~',
+	'config-error-transaction' => 'Error: invalid Transaction ID. The configuration was <b>NOT</b> modified.~~',
+	'config-error-file-changed' => 'Error: The Configuration file has changed since you opened it and cannot be saved. Refresh and apply your changes again.~~',
+	'config-not-allowed-in-demo' => 'Sorry, '.ITOP_APPLICATION_SHORT.' is in <b>demonstration mode</b>: the configuration file cannot be edited.~~',
+	'config-interactive-not-allowed' => ITOP_APPLICATION_SHORT.' interactive edition of the configuration as been disabled. See <code>\'config_editor\' => \'disabled\'</code> in the configuration file.~~',
 ));
diff --git a/datamodels/2.x/itop-config/dictionaries/tr.dict.itop-config.php b/datamodels/2.x/itop-config/dictionaries/tr.dict.itop-config.php
index d33b82b183..5579752cb6 100644
--- a/datamodels/2.x/itop-config/dictionaries/tr.dict.itop-config.php
+++ b/datamodels/2.x/itop-config/dictionaries/tr.dict.itop-config.php
@@ -21,7 +21,6 @@
  * along with iTop. If not, see <http://www.gnu.org/licenses/>
  */
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-
 	'Menu:ConfigEditor' => 'Configuration~~',
 	'config-edit-title' => 'Configuration File Editor~~',
 	'config-edit-intro' => 'Be very cautious when editing the configuration file.~~',
@@ -35,4 +34,8 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'config-parse-error' => 'Line %2$d: %1$s.<br/>The file has NOT been updated.~~',
 	'config-current-line' => 'Editing line: %1$s~~',
 	'config-saved-warning-db-password' => 'Successfully recorded, but the backup won\'t work due to unsupported characters in the database password.~~',
+	'config-error-transaction' => 'Error: invalid Transaction ID. The configuration was <b>NOT</b> modified.~~',
+	'config-error-file-changed' => 'Error: The Configuration file has changed since you opened it and cannot be saved. Refresh and apply your changes again.~~',
+	'config-not-allowed-in-demo' => 'Sorry, '.ITOP_APPLICATION_SHORT.' is in <b>demonstration mode</b>: the configuration file cannot be edited.~~',
+	'config-interactive-not-allowed' => ITOP_APPLICATION_SHORT.' interactive edition of the configuration as been disabled. See <code>\'config_editor\' => \'disabled\'</code> in the configuration file.~~',
 ));
diff --git a/datamodels/2.x/itop-config/dictionaries/zh_cn.dict.itop-config.php b/datamodels/2.x/itop-config/dictionaries/zh_cn.dict.itop-config.php
index 72c73b142e..b9c4c7e77f 100644
--- a/datamodels/2.x/itop-config/dictionaries/zh_cn.dict.itop-config.php
+++ b/datamodels/2.x/itop-config/dictionaries/zh_cn.dict.itop-config.php
@@ -21,7 +21,6 @@
  * along with iTop. If not, see <http://www.gnu.org/licenses/>
  */
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-
 	'Menu:ConfigEditor' => '编辑配置文件',
 	'config-edit-title' => '配置文件编辑器',
 	'config-edit-intro' => '编辑配置文件时请务必格外小心.',
@@ -35,4 +34,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'config-parse-error' => '第 %2$d 行: %1$s.<br/>配置文件尚未更新.',
 	'config-current-line' => '正在编辑第 %1$s 行',
 	'config-saved-warning-db-password' => '保存成功, 但因为数据库密码中包含不支持的字符,配置文件备份不会成功.',
+	'config-error-transaction' => 'Error: invalid Transaction ID. The configuration was <b>NOT</b> modified.~~',
+	'config-error-file-changed' => 'Error: The Configuration file has changed since you opened it and cannot be saved. Refresh and apply your changes again.~~',
+	'config-not-allowed-in-demo' => 'Sorry, '.ITOP_APPLICATION_SHORT.' is in <b>demonstration mode</b>: the configuration file cannot be edited.~~',
+	'config-interactive-not-allowed' => ITOP_APPLICATION_SHORT.' interactive edition of the configuration as been disabled. See <code>\'config_editor\' => \'disabled\'</code> in the configuration file.~~',
 ));
diff --git a/datamodels/2.x/itop-core-update/dictionaries/cs.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/dictionaries/cs.dict.itop-core-update.php
index 30c79061b9..37d85c5e54 100644
--- a/datamodels/2.x/itop-core-update/dictionaries/cs.dict.itop-core-update.php
+++ b/datamodels/2.x/itop-core-update/dictionaries/cs.dict.itop-core-update.php
@@ -22,88 +22,83 @@
  */
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'iTopUpdate:UI:PageTitle' => 'Application Upgrade~~',
-    'itop-core-update:UI:SelectUpdateFile' => 'Application Upgrade~~',
-    'itop-core-update:UI:ConfirmUpdate' => 'Application Upgrade~~',
-    'itop-core-update:UI:UpdateCoreFiles' => 'Application Upgrade~~',
+	'itop-core-update:UI:SelectUpdateFile' => 'Application Upgrade~~',
+	'itop-core-update:UI:ConfirmUpdate' => 'Application Upgrade~~',
+	'itop-core-update:UI:UpdateCoreFiles' => 'Application Upgrade~~',
 	'iTopUpdate:UI:MaintenanceModeActive' => 'The application is currently under maintenance, no user can access the application. You have to run a setup or restore the application archive to return in normal mode.~~',
 	'itop-core-update:UI:UpdateDone' => 'Application Upgrade~~',
-
 	'itop-core-update/Operation:SelectUpdateFile/Title' => 'Application Upgrade~~',
 	'itop-core-update/Operation:ConfirmUpdate/Title' => 'Confirm Application Upgrade~~',
 	'itop-core-update/Operation:UpdateCoreFiles/Title' => 'Application Upgrading~~',
 	'itop-core-update/Operation:UpdateDone/Title' => 'Application Upgrade Done~~',
-
 	'iTopUpdate:UI:SelectUpdateFile' => 'Select an upgrade file to upload~~',
 	'iTopUpdate:UI:CheckUpdate' => 'Verify upgrade file~~',
 	'iTopUpdate:UI:ConfirmInstallFile' => 'You are about to install %1$s~~',
 	'iTopUpdate:UI:DoUpdate' => 'Upgrade~~',
 	'iTopUpdate:UI:CurrentVersion' => 'Current installed version~~',
 	'iTopUpdate:UI:NewVersion' => 'Newly installed version~~',
-    'iTopUpdate:UI:Back' => 'Back~~',
-    'iTopUpdate:UI:Cancel' => 'Cancel~~',
-    'iTopUpdate:UI:Continue' => 'Continue~~',
+	'iTopUpdate:UI:Back' => 'Back~~',
+	'iTopUpdate:UI:Cancel' => 'Cancel~~',
+	'iTopUpdate:UI:Continue' => 'Continue~~',
 	'iTopUpdate:UI:RunSetup' => 'Run Setup~~',
-    'iTopUpdate:UI:WithDBBackup' => 'Database backup~~',
-    'iTopUpdate:UI:WithFilesBackup' => 'Application files backup~~',
-    'iTopUpdate:UI:WithoutBackup' => 'No backup is planned~~',
-    'iTopUpdate:UI:Backup' => 'Backup generated before update~~',
+	'iTopUpdate:UI:WithDBBackup' => 'Database backup~~',
+	'iTopUpdate:UI:WithFilesBackup' => 'Application files backup~~',
+	'iTopUpdate:UI:WithoutBackup' => 'No backup is planned~~',
+	'iTopUpdate:UI:Backup' => 'Backup generated before update~~',
 	'iTopUpdate:UI:DoFilesArchive' => 'Archive application files~~',
 	'iTopUpdate:UI:UploadArchive' => 'Select a package to upload~~',
 	'iTopUpdate:UI:ServerFile' => 'Path of a package already on the server~~',
 	'iTopUpdate:UI:WarningReadOnlyDuringUpdate' => 'During the upgrade, the application will be read-only.~~',
-
-    'iTopUpdate:UI:Status' => 'Status~~',
-    'iTopUpdate:UI:Action' => 'Update~~',
-    'iTopUpdate:UI:History' => 'Versions History~~',
-    'iTopUpdate:UI:Progress' => 'Progress of the upgrade~~',
-
-    'iTopUpdate:UI:DoBackup:Label' => 'Backup files and database~~',
-    'iTopUpdate:UI:DoBackup:Warning' => 'Backup is not recommended due to limited available disk space~~',
-
-    'iTopUpdate:UI:DiskFreeSpace' => 'Disk free space~~',
-    'iTopUpdate:UI:ItopDiskSpace' => ITOP_APPLICATION_SHORT.' disk space~~',
-    'iTopUpdate:UI:DBDiskSpace' => 'Database disk space~~',
+	'iTopUpdate:UI:Status' => 'Status~~',
+	'iTopUpdate:UI:Action' => 'Update~~',
+	'iTopUpdate:UI:Setup' => ITOP_APPLICATION_SHORT.' Setup~~',
+	'iTopUpdate:UI:History' => 'Versions History~~',
+	'iTopUpdate:UI:Progress' => 'Progress of the upgrade~~',
+	'iTopUpdate:UI:DoBackup:Label' => 'Backup files and database~~',
+	'iTopUpdate:UI:DoBackup:Warning' => 'Backup is not recommended due to limited available disk space~~',
+	'iTopUpdate:UI:DiskFreeSpace' => 'Disk free space~~',
+	'iTopUpdate:UI:ItopDiskSpace' => ITOP_APPLICATION_SHORT.' disk space~~',
+	'iTopUpdate:UI:DBDiskSpace' => 'Database disk space~~',
 	'iTopUpdate:UI:FileUploadMaxSize' => 'File upload max size~~',
-
 	'iTopUpdate:UI:PostMaxSize' => 'PHP ini value post_max_size: %1$s~~',
 	'iTopUpdate:UI:UploadMaxFileSize' => 'PHP ini value upload_max_filesize: %1$s~~',
-
-    'iTopUpdate:UI:CanCoreUpdate:Loading' => 'Checking filesystem~~',
-    'iTopUpdate:UI:CanCoreUpdate:Error' => 'Checking filesystem failed (%1$s)~~',
-    'iTopUpdate:UI:CanCoreUpdate:ErrorFileNotExist' => 'Checking filesystem failed (File not exist %1$s)~~',
-    'iTopUpdate:UI:CanCoreUpdate:Failed' => 'Checking filesystem failed~~',
-    'iTopUpdate:UI:CanCoreUpdate:Yes' => 'Application can be updated~~',
+	'iTopUpdate:UI:CanCoreUpdate:Loading' => 'Checking filesystem~~',
+	'iTopUpdate:UI:CanCoreUpdate:Error' => 'Checking filesystem failed (%1$s)~~',
+	'iTopUpdate:UI:CanCoreUpdate:ErrorFileNotExist' => 'Checking filesystem failed (File not exist %1$s)~~',
+	'iTopUpdate:UI:CanCoreUpdate:Failed' => 'Checking filesystem failed~~',
+	'iTopUpdate:UI:CanCoreUpdate:Yes' => 'Application can be updated~~',
 	'iTopUpdate:UI:CanCoreUpdate:No' => 'Application cannot be updated: %1$s~~',
 	'iTopUpdate:UI:CanCoreUpdate:Warning' => 'Warning: application update can fail: %1$s~~',
 	'iTopUpdate:UI:CannotUpdateUseSetup' => '<b>Some modified files were detected</b>, a partial update cannot be executed.</br>Follow the <a target="_blank" href="%2$s"> procedure</a> in order to manually upgrade your iTop. You must use the <a href="%1$s">setup</a> to update the application.~~',
-	'iTopUpdate:UI:CheckInProgress'=>'Please wait during integrity check~~',
+	'iTopUpdate:UI:CheckInProgress' => 'Please wait during integrity check~~',
+	'iTopUpdate:UI:SetupLaunch' => 'Launch '.ITOP_APPLICATION_SHORT.' Setup~~',
+	'iTopUpdate:UI:SetupLaunchConfirm' => 'This will launch '.ITOP_APPLICATION_SHORT.' setup, are you sure?~~',
 
 	// Setup Messages
-    'iTopUpdate:UI:SetupMessage:Ready' => 'Ready to start~~',
+	'iTopUpdate:UI:SetupMessage:Ready' => 'Ready to start~~',
 	'iTopUpdate:UI:SetupMessage:EnterMaintenance' => 'Entering maintenance mode~~',
 	'iTopUpdate:UI:SetupMessage:Backup' => 'Database backup~~',
 	'iTopUpdate:UI:SetupMessage:FilesArchive' => 'Archive application files~~',
-    'iTopUpdate:UI:SetupMessage:CopyFiles' => 'Copy new version files~~',
+	'iTopUpdate:UI:SetupMessage:CopyFiles' => 'Copy new version files~~',
 	'iTopUpdate:UI:SetupMessage:CheckCompile' => 'Check application upgrade~~',
 	'iTopUpdate:UI:SetupMessage:Compile' => 'Upgrade application and database~~',
 	'iTopUpdate:UI:SetupMessage:UpdateDatabase' => 'Upgrade database~~',
 	'iTopUpdate:UI:SetupMessage:ExitMaintenance' => 'Exiting maintenance mode~~',
-    'iTopUpdate:UI:SetupMessage:UpdateDone' => 'Upgrade completed~~',
+	'iTopUpdate:UI:SetupMessage:UpdateDone' => 'Upgrade completed~~',
 
 	// Errors
 	'iTopUpdate:Error:MissingFunction' => 'Impossible to start upgrade, missing function~~',
 	'iTopUpdate:Error:MissingFile' => 'Missing file: %1$s~~',
 	'iTopUpdate:Error:CorruptedFile' => 'File %1$s is corrupted~~',
-    'iTopUpdate:Error:BadFileFormat' => 'Upgrade file is not a zip file~~',
-    'iTopUpdate:Error:BadFileContent' => 'Upgrade file is not an application archive~~',
-    'iTopUpdate:Error:BadItopProduct' => 'Upgrade file is not compatible with your application~~',
+	'iTopUpdate:Error:BadFileFormat' => 'Upgrade file is not a zip file~~',
+	'iTopUpdate:Error:BadFileContent' => 'Upgrade file is not an application archive~~',
+	'iTopUpdate:Error:BadItopProduct' => 'Upgrade file is not compatible with your application~~',
 	'iTopUpdate:Error:Copy' => 'Error, cannot copy \'%1$s\' to \'%2$s\'~~',
-    'iTopUpdate:Error:FileNotFound' => 'File not found~~',
-    'iTopUpdate:Error:NoFile' => 'No file provided~~',
+	'iTopUpdate:Error:FileNotFound' => 'File not found~~',
+	'iTopUpdate:Error:NoFile' => 'No file provided~~',
 	'iTopUpdate:Error:InvalidToken' => 'Invalid token~~',
 	'iTopUpdate:Error:UpdateFailed' => 'Upgrade failed ~~',
 	'iTopUpdate:Error:FileUploadMaxSizeTooSmall' => 'The upload max size seems too small for update. Please change the PHP configuration.~~',
-
 	'iTopUpdate:UI:RestoreArchive' => 'You can restore your application from the archive \'%1$s\'~~',
 	'iTopUpdate:UI:RestoreBackup' => 'You can restore the database from \'%1$s\'~~',
 	'iTopUpdate:UI:UpdateDone' => 'Upgrade successful~~',
@@ -111,10 +106,10 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Menu:iTopUpdate+' => 'Application upgrade~~',
 
     // Missing itop entries
-    'Class:ModuleInstallation/Attribute:installed' => 'Installed on~~',
-    'Class:ModuleInstallation/Attribute:name' => 'Name~~',
-    'Class:ModuleInstallation/Attribute:version' => 'Version~~',
-    'Class:ModuleInstallation/Attribute:comment' => 'Comment~~',
+	'Class:ModuleInstallation/Attribute:installed' => 'Installed on~~',
+	'Class:ModuleInstallation/Attribute:name' => 'Name~~',
+	'Class:ModuleInstallation/Attribute:version' => 'Version~~',
+	'Class:ModuleInstallation/Attribute:comment' => 'Comment~~',
 ));
 
 
diff --git a/datamodels/2.x/itop-core-update/dictionaries/da.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/dictionaries/da.dict.itop-core-update.php
index 5c89e8a87f..df26b102ea 100644
--- a/datamodels/2.x/itop-core-update/dictionaries/da.dict.itop-core-update.php
+++ b/datamodels/2.x/itop-core-update/dictionaries/da.dict.itop-core-update.php
@@ -22,88 +22,83 @@
  */
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'iTopUpdate:UI:PageTitle' => 'Application Upgrade~~',
-    'itop-core-update:UI:SelectUpdateFile' => 'Application Upgrade~~',
-    'itop-core-update:UI:ConfirmUpdate' => 'Application Upgrade~~',
-    'itop-core-update:UI:UpdateCoreFiles' => 'Application Upgrade~~',
+	'itop-core-update:UI:SelectUpdateFile' => 'Application Upgrade~~',
+	'itop-core-update:UI:ConfirmUpdate' => 'Application Upgrade~~',
+	'itop-core-update:UI:UpdateCoreFiles' => 'Application Upgrade~~',
 	'iTopUpdate:UI:MaintenanceModeActive' => 'The application is currently under maintenance, no user can access the application. You have to run a setup or restore the application archive to return in normal mode.~~',
 	'itop-core-update:UI:UpdateDone' => 'Application Upgrade~~',
-
 	'itop-core-update/Operation:SelectUpdateFile/Title' => 'Application Upgrade~~',
 	'itop-core-update/Operation:ConfirmUpdate/Title' => 'Confirm Application Upgrade~~',
 	'itop-core-update/Operation:UpdateCoreFiles/Title' => 'Application Upgrading~~',
 	'itop-core-update/Operation:UpdateDone/Title' => 'Application Upgrade Done~~',
-
 	'iTopUpdate:UI:SelectUpdateFile' => 'Select an upgrade file to upload~~',
 	'iTopUpdate:UI:CheckUpdate' => 'Verify upgrade file~~',
 	'iTopUpdate:UI:ConfirmInstallFile' => 'You are about to install %1$s~~',
 	'iTopUpdate:UI:DoUpdate' => 'Upgrade~~',
 	'iTopUpdate:UI:CurrentVersion' => 'Current installed version~~',
 	'iTopUpdate:UI:NewVersion' => 'Newly installed version~~',
-    'iTopUpdate:UI:Back' => 'Back~~',
-    'iTopUpdate:UI:Cancel' => 'Cancel~~',
-    'iTopUpdate:UI:Continue' => 'Continue~~',
+	'iTopUpdate:UI:Back' => 'Back~~',
+	'iTopUpdate:UI:Cancel' => 'Cancel~~',
+	'iTopUpdate:UI:Continue' => 'Continue~~',
 	'iTopUpdate:UI:RunSetup' => 'Run Setup~~',
-    'iTopUpdate:UI:WithDBBackup' => 'Database backup~~',
-    'iTopUpdate:UI:WithFilesBackup' => 'Application files backup~~',
-    'iTopUpdate:UI:WithoutBackup' => 'No backup is planned~~',
-    'iTopUpdate:UI:Backup' => 'Backup generated before update~~',
+	'iTopUpdate:UI:WithDBBackup' => 'Database backup~~',
+	'iTopUpdate:UI:WithFilesBackup' => 'Application files backup~~',
+	'iTopUpdate:UI:WithoutBackup' => 'No backup is planned~~',
+	'iTopUpdate:UI:Backup' => 'Backup generated before update~~',
 	'iTopUpdate:UI:DoFilesArchive' => 'Archive application files~~',
 	'iTopUpdate:UI:UploadArchive' => 'Select a package to upload~~',
 	'iTopUpdate:UI:ServerFile' => 'Path of a package already on the server~~',
 	'iTopUpdate:UI:WarningReadOnlyDuringUpdate' => 'During the upgrade, the application will be read-only.~~',
-
-    'iTopUpdate:UI:Status' => 'Status~~',
-    'iTopUpdate:UI:Action' => 'Update~~',
-    'iTopUpdate:UI:History' => 'Versions History~~',
-    'iTopUpdate:UI:Progress' => 'Progress of the upgrade~~',
-
-    'iTopUpdate:UI:DoBackup:Label' => 'Backup files and database~~',
-    'iTopUpdate:UI:DoBackup:Warning' => 'Backup is not recommended due to limited available disk space~~',
-
-    'iTopUpdate:UI:DiskFreeSpace' => 'Disk free space~~',
-    'iTopUpdate:UI:ItopDiskSpace' => ITOP_APPLICATION_SHORT.' disk space~~',
-    'iTopUpdate:UI:DBDiskSpace' => 'Database disk space~~',
+	'iTopUpdate:UI:Status' => 'Status~~',
+	'iTopUpdate:UI:Action' => 'Update~~',
+	'iTopUpdate:UI:Setup' => ITOP_APPLICATION_SHORT.' Setup~~',
+	'iTopUpdate:UI:History' => 'Versions History~~',
+	'iTopUpdate:UI:Progress' => 'Progress of the upgrade~~',
+	'iTopUpdate:UI:DoBackup:Label' => 'Backup files and database~~',
+	'iTopUpdate:UI:DoBackup:Warning' => 'Backup is not recommended due to limited available disk space~~',
+	'iTopUpdate:UI:DiskFreeSpace' => 'Disk free space~~',
+	'iTopUpdate:UI:ItopDiskSpace' => ITOP_APPLICATION_SHORT.' disk space~~',
+	'iTopUpdate:UI:DBDiskSpace' => 'Database disk space~~',
 	'iTopUpdate:UI:FileUploadMaxSize' => 'File upload max size~~',
-
 	'iTopUpdate:UI:PostMaxSize' => 'PHP ini value post_max_size: %1$s~~',
 	'iTopUpdate:UI:UploadMaxFileSize' => 'PHP ini value upload_max_filesize: %1$s~~',
-
-    'iTopUpdate:UI:CanCoreUpdate:Loading' => 'Checking filesystem~~',
-    'iTopUpdate:UI:CanCoreUpdate:Error' => 'Checking filesystem failed (%1$s)~~',
-    'iTopUpdate:UI:CanCoreUpdate:ErrorFileNotExist' => 'Checking filesystem failed (File not exist %1$s)~~',
-    'iTopUpdate:UI:CanCoreUpdate:Failed' => 'Checking filesystem failed~~',
-    'iTopUpdate:UI:CanCoreUpdate:Yes' => 'Application can be updated~~',
+	'iTopUpdate:UI:CanCoreUpdate:Loading' => 'Checking filesystem~~',
+	'iTopUpdate:UI:CanCoreUpdate:Error' => 'Checking filesystem failed (%1$s)~~',
+	'iTopUpdate:UI:CanCoreUpdate:ErrorFileNotExist' => 'Checking filesystem failed (File not exist %1$s)~~',
+	'iTopUpdate:UI:CanCoreUpdate:Failed' => 'Checking filesystem failed~~',
+	'iTopUpdate:UI:CanCoreUpdate:Yes' => 'Application can be updated~~',
 	'iTopUpdate:UI:CanCoreUpdate:No' => 'Application cannot be updated: %1$s~~',
 	'iTopUpdate:UI:CanCoreUpdate:Warning' => 'Warning: application update can fail: %1$s~~',
 	'iTopUpdate:UI:CannotUpdateUseSetup' => '<b>Some modified files were detected</b>, a partial update cannot be executed.</br>Follow the <a target="_blank" href="%2$s"> procedure</a> in order to manually upgrade your iTop. You must use the <a href="%1$s">setup</a> to update the application.~~',
-	'iTopUpdate:UI:CheckInProgress'=>'Please wait during integrity check~~',
+	'iTopUpdate:UI:CheckInProgress' => 'Please wait during integrity check~~',
+	'iTopUpdate:UI:SetupLaunch' => 'Launch '.ITOP_APPLICATION_SHORT.' Setup~~',
+	'iTopUpdate:UI:SetupLaunchConfirm' => 'This will launch '.ITOP_APPLICATION_SHORT.' setup, are you sure?~~',
 
 	// Setup Messages
-    'iTopUpdate:UI:SetupMessage:Ready' => 'Ready to start~~',
+	'iTopUpdate:UI:SetupMessage:Ready' => 'Ready to start~~',
 	'iTopUpdate:UI:SetupMessage:EnterMaintenance' => 'Entering maintenance mode~~',
 	'iTopUpdate:UI:SetupMessage:Backup' => 'Database backup~~',
 	'iTopUpdate:UI:SetupMessage:FilesArchive' => 'Archive application files~~',
-    'iTopUpdate:UI:SetupMessage:CopyFiles' => 'Copy new version files~~',
+	'iTopUpdate:UI:SetupMessage:CopyFiles' => 'Copy new version files~~',
 	'iTopUpdate:UI:SetupMessage:CheckCompile' => 'Check application upgrade~~',
 	'iTopUpdate:UI:SetupMessage:Compile' => 'Upgrade application and database~~',
 	'iTopUpdate:UI:SetupMessage:UpdateDatabase' => 'Upgrade database~~',
 	'iTopUpdate:UI:SetupMessage:ExitMaintenance' => 'Exiting maintenance mode~~',
-    'iTopUpdate:UI:SetupMessage:UpdateDone' => 'Upgrade completed~~',
+	'iTopUpdate:UI:SetupMessage:UpdateDone' => 'Upgrade completed~~',
 
 	// Errors
 	'iTopUpdate:Error:MissingFunction' => 'Impossible to start upgrade, missing function~~',
 	'iTopUpdate:Error:MissingFile' => 'Missing file: %1$s~~',
 	'iTopUpdate:Error:CorruptedFile' => 'File %1$s is corrupted~~',
-    'iTopUpdate:Error:BadFileFormat' => 'Upgrade file is not a zip file~~',
-    'iTopUpdate:Error:BadFileContent' => 'Upgrade file is not an application archive~~',
-    'iTopUpdate:Error:BadItopProduct' => 'Upgrade file is not compatible with your application~~',
+	'iTopUpdate:Error:BadFileFormat' => 'Upgrade file is not a zip file~~',
+	'iTopUpdate:Error:BadFileContent' => 'Upgrade file is not an application archive~~',
+	'iTopUpdate:Error:BadItopProduct' => 'Upgrade file is not compatible with your application~~',
 	'iTopUpdate:Error:Copy' => 'Error, cannot copy \'%1$s\' to \'%2$s\'~~',
-    'iTopUpdate:Error:FileNotFound' => 'File not found~~',
-    'iTopUpdate:Error:NoFile' => 'No file provided~~',
+	'iTopUpdate:Error:FileNotFound' => 'File not found~~',
+	'iTopUpdate:Error:NoFile' => 'No file provided~~',
 	'iTopUpdate:Error:InvalidToken' => 'Invalid token~~',
 	'iTopUpdate:Error:UpdateFailed' => 'Upgrade failed ~~',
 	'iTopUpdate:Error:FileUploadMaxSizeTooSmall' => 'The upload max size seems too small for update. Please change the PHP configuration.~~',
-
 	'iTopUpdate:UI:RestoreArchive' => 'You can restore your application from the archive \'%1$s\'~~',
 	'iTopUpdate:UI:RestoreBackup' => 'You can restore the database from \'%1$s\'~~',
 	'iTopUpdate:UI:UpdateDone' => 'Upgrade successful~~',
@@ -111,10 +106,10 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Menu:iTopUpdate+' => 'Application upgrade~~',
 
     // Missing itop entries
-    'Class:ModuleInstallation/Attribute:installed' => 'Installed on~~',
-    'Class:ModuleInstallation/Attribute:name' => 'Name~~',
-    'Class:ModuleInstallation/Attribute:version' => 'Version~~',
-    'Class:ModuleInstallation/Attribute:comment' => 'Comment~~',
+	'Class:ModuleInstallation/Attribute:installed' => 'Installed on~~',
+	'Class:ModuleInstallation/Attribute:name' => 'Name~~',
+	'Class:ModuleInstallation/Attribute:version' => 'Version~~',
+	'Class:ModuleInstallation/Attribute:comment' => 'Comment~~',
 ));
 
 
diff --git a/datamodels/2.x/itop-core-update/dictionaries/de.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/dictionaries/de.dict.itop-core-update.php
index acd2473c26..0c14317298 100644
--- a/datamodels/2.x/itop-core-update/dictionaries/de.dict.itop-core-update.php
+++ b/datamodels/2.x/itop-core-update/dictionaries/de.dict.itop-core-update.php
@@ -22,88 +22,83 @@
  */
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'iTopUpdate:UI:PageTitle' => 'Anwendungsupgrade',
-    'itop-core-update:UI:SelectUpdateFile' => 'Upgrade-Datei hochladen',
-    'itop-core-update:UI:ConfirmUpdate' => 'Upgrade bestätigen',
-    'itop-core-update:UI:UpdateCoreFiles' => 'Upgrade der '.ITOP_APPLICATION_SHORT.'-Core-Dateien',
+	'itop-core-update:UI:SelectUpdateFile' => 'Upgrade-Datei hochladen',
+	'itop-core-update:UI:ConfirmUpdate' => 'Upgrade bestätigen',
+	'itop-core-update:UI:UpdateCoreFiles' => 'Upgrade der '.ITOP_APPLICATION_SHORT.'-Core-Dateien',
 	'iTopUpdate:UI:MaintenanceModeActive' => 'Die Anwendung läuft im Wartungsmodus, Benutzerzugriffe sind nicht möglich. Führen Sie erneut ein Setup oder Restore der Anwendung aus, um in den normalen Betriebsmodus zurückzukehren.',
 	'itop-core-update:UI:UpdateDone' => 'Upgrade abgeschlossen',
-
 	'itop-core-update/Operation:SelectUpdateFile/Title' => 'Upgrade',
 	'itop-core-update/Operation:ConfirmUpdate/Title' => 'Upgrade bestätigen',
 	'itop-core-update/Operation:UpdateCoreFiles/Title' => 'Anwendungsupgrade',
 	'itop-core-update/Operation:UpdateDone/Title' => 'App-Upgrade abgeschlossen',
-
 	'iTopUpdate:UI:SelectUpdateFile' => 'Upgrade-Datei hochladen',
 	'iTopUpdate:UI:CheckUpdate' => 'Upgrade-Datei überprüfen',
 	'iTopUpdate:UI:ConfirmInstallFile' => 'Installation von %1$s',
 	'iTopUpdate:UI:DoUpdate' => 'Upgrade',
 	'iTopUpdate:UI:CurrentVersion' => 'Installierte Version',
 	'iTopUpdate:UI:NewVersion' => 'Neue installierte Version',
-    'iTopUpdate:UI:Back' => 'Zurück',
-    'iTopUpdate:UI:Cancel' => 'Abbrechen',
-    'iTopUpdate:UI:Continue' => 'Weiter',
+	'iTopUpdate:UI:Back' => 'Zurück',
+	'iTopUpdate:UI:Cancel' => 'Abbrechen',
+	'iTopUpdate:UI:Continue' => 'Weiter',
 	'iTopUpdate:UI:RunSetup' => 'Setuplauf',
-    'iTopUpdate:UI:WithDBBackup' => 'Datenbankbackup',
-    'iTopUpdate:UI:WithFilesBackup' => 'Backup der Anwendungsdateien',
-    'iTopUpdate:UI:WithoutBackup' => 'Kein geplantes Backup',
-    'iTopUpdate:UI:Backup' => 'Backup wurde vor dem Upgrade erzeugt',
+	'iTopUpdate:UI:WithDBBackup' => 'Datenbankbackup',
+	'iTopUpdate:UI:WithFilesBackup' => 'Backup der Anwendungsdateien',
+	'iTopUpdate:UI:WithoutBackup' => 'Kein geplantes Backup',
+	'iTopUpdate:UI:Backup' => 'Backup wurde vor dem Upgrade erzeugt',
 	'iTopUpdate:UI:DoFilesArchive' => 'Anwendungsdateien archivieren',
 	'iTopUpdate:UI:UploadArchive' => 'Archivpaket hochladen',
 	'iTopUpdate:UI:ServerFile' => 'Pfad zu Archivpaket, das bereits auf dem Server liegt',
 	'iTopUpdate:UI:WarningReadOnlyDuringUpdate' => 'Während des Upgrades läuft die Anwendung im read-only Modus',
-
-    'iTopUpdate:UI:Status' => 'Status',
-    'iTopUpdate:UI:Action' => 'Update',
-    'iTopUpdate:UI:History' => 'Versionshistorie',
-    'iTopUpdate:UI:Progress' => 'Upgradefortschritt',
-
-    'iTopUpdate:UI:DoBackup:Label' => 'Backup von Dateien und Datenbank',
-    'iTopUpdate:UI:DoBackup:Warning' => 'Wegen geringem verbleibenden Speicherplatz sollte kein Backup mehr erzeugt werden.',
-
-    'iTopUpdate:UI:DiskFreeSpace' => 'Freier Speicherplatz',
-    'iTopUpdate:UI:ItopDiskSpace' => ITOP_APPLICATION_SHORT.' Speicherplatz',
-    'iTopUpdate:UI:DBDiskSpace' => 'Datenbankgröße',
+	'iTopUpdate:UI:Status' => 'Status',
+	'iTopUpdate:UI:Action' => 'Update',
+	'iTopUpdate:UI:Setup' => ITOP_APPLICATION_SHORT.' Setup',
+	'iTopUpdate:UI:History' => 'Versionshistorie',
+	'iTopUpdate:UI:Progress' => 'Upgradefortschritt',
+	'iTopUpdate:UI:DoBackup:Label' => 'Backup von Dateien und Datenbank',
+	'iTopUpdate:UI:DoBackup:Warning' => 'Wegen geringem verbleibenden Speicherplatz sollte kein Backup mehr erzeugt werden.',
+	'iTopUpdate:UI:DiskFreeSpace' => 'Freier Speicherplatz',
+	'iTopUpdate:UI:ItopDiskSpace' => ITOP_APPLICATION_SHORT.' Speicherplatz',
+	'iTopUpdate:UI:DBDiskSpace' => 'Datenbankgröße',
 	'iTopUpdate:UI:FileUploadMaxSize' => 'Maximale Dateigröße für Uploads',
-
 	'iTopUpdate:UI:PostMaxSize' => 'PHP.ini Wert post_max_size: %1$s',
 	'iTopUpdate:UI:UploadMaxFileSize' => 'PHP.ini Wert upload_max_filesize: %1$s',
-
-    'iTopUpdate:UI:CanCoreUpdate:Loading' => 'Prüfung des Dateisystems',
-    'iTopUpdate:UI:CanCoreUpdate:Error' => 'Dateisystemprüfung fehlgeschlagen (%1$s)',
-    'iTopUpdate:UI:CanCoreUpdate:ErrorFileNotExist' => 'Dateisystemprüfung fehlgeschlagen (Datei nicht vorhanden %1$s)',
-    'iTopUpdate:UI:CanCoreUpdate:Failed' => 'Dateisystemprüfung fehlgeschlagen',
-    'iTopUpdate:UI:CanCoreUpdate:Yes' => 'Anwendungsupgrade kann durchgeführt werden',
+	'iTopUpdate:UI:CanCoreUpdate:Loading' => 'Prüfung des Dateisystems',
+	'iTopUpdate:UI:CanCoreUpdate:Error' => 'Dateisystemprüfung fehlgeschlagen (%1$s)',
+	'iTopUpdate:UI:CanCoreUpdate:ErrorFileNotExist' => 'Dateisystemprüfung fehlgeschlagen (Datei nicht vorhanden %1$s)',
+	'iTopUpdate:UI:CanCoreUpdate:Failed' => 'Dateisystemprüfung fehlgeschlagen',
+	'iTopUpdate:UI:CanCoreUpdate:Yes' => 'Anwendungsupgrade kann durchgeführt werden',
 	'iTopUpdate:UI:CanCoreUpdate:No' => 'Anwendungsupgrade nicht möglich: %1$s',
 	'iTopUpdate:UI:CanCoreUpdate:Warning' => 'Vorsicht: App-Upgrade kann fehlschlagen: %1$s',
 	'iTopUpdate:UI:CannotUpdateUseSetup' => '<b>Einige angepasste Dateien wurden erkannt</b>, eine Teil-Update kann nicht ausgeführt werden.<br/>Befolgen Sie das  <a target="_blank" href="%2$s">Verfahren</a>, um Ihr iTop manuell zu aktualisieren. Sie müssen das <a href="%1$s">Setup</a> benutzen, um Ihre Applikation zu aktualisieren.<br />',
-	'iTopUpdate:UI:CheckInProgress'=>'Please wait during integrity check~~',
+	'iTopUpdate:UI:CheckInProgress' => 'Bitte warten Sie während der Integritätsprüfung',
+	'iTopUpdate:UI:SetupLaunch' => 'Starte '.ITOP_APPLICATION_SHORT.' Setup',
+	'iTopUpdate:UI:SetupLaunchConfirm' => 'Hiermit wird der '.ITOP_APPLICATION_SHORT.' Setup, sind Sie sicher?',
 
 	// Setup Messages
-    'iTopUpdate:UI:SetupMessage:Ready' => 'Bereit zum Upgrade',
+	'iTopUpdate:UI:SetupMessage:Ready' => 'Bereit zum Upgrade',
 	'iTopUpdate:UI:SetupMessage:EnterMaintenance' => 'Wartungsmodus aktiviert',
 	'iTopUpdate:UI:SetupMessage:Backup' => 'Datenbankbackup',
 	'iTopUpdate:UI:SetupMessage:FilesArchive' => 'Archivierung der Anwendungsdaten',
-    'iTopUpdate:UI:SetupMessage:CopyFiles' => 'Kopieren neuer Dateien',
+	'iTopUpdate:UI:SetupMessage:CopyFiles' => 'Kopieren neuer Dateien',
 	'iTopUpdate:UI:SetupMessage:CheckCompile' => 'Prüfung des Anwendungsupgrades',
 	'iTopUpdate:UI:SetupMessage:Compile' => 'Upgrade von Anwendung und Datenbank',
 	'iTopUpdate:UI:SetupMessage:UpdateDatabase' => 'Upgrade Datenbank',
 	'iTopUpdate:UI:SetupMessage:ExitMaintenance' => 'Wartungsmodus deaktiviert',
-    'iTopUpdate:UI:SetupMessage:UpdateDone' => 'Upgrade abgeschlossen',
+	'iTopUpdate:UI:SetupMessage:UpdateDone' => 'Upgrade abgeschlossen',
 
 	// Errors
 	'iTopUpdate:Error:MissingFunction' => 'Start des Upgrades nicht möglich. Fehlende Funktion.',
 	'iTopUpdate:Error:MissingFile' => 'Fehlende Datei: %1$s',
 	'iTopUpdate:Error:CorruptedFile' => 'Datei %1$s ist beschädigt',
-    'iTopUpdate:Error:BadFileFormat' => 'Die Upgradedatei ist keine ZIP-Datei',
-    'iTopUpdate:Error:BadFileContent' => 'Die Upgradedatei ist kein '.ITOP_APPLICATION_SHORT.'-Paket',
-    'iTopUpdate:Error:BadItopProduct' => 'Die Upgradedatei ist nicht mit dieser '.ITOP_APPLICATION_SHORT.'-Version kompatibel.',
+	'iTopUpdate:Error:BadFileFormat' => 'Die Upgradedatei ist keine ZIP-Datei',
+	'iTopUpdate:Error:BadFileContent' => 'Die Upgradedatei ist kein '.ITOP_APPLICATION_SHORT.'-Paket',
+	'iTopUpdate:Error:BadItopProduct' => 'Die Upgradedatei ist nicht mit dieser '.ITOP_APPLICATION_SHORT.'-Version kompatibel.',
 	'iTopUpdate:Error:Copy' => 'Fehler, kopieren von \'%1$s\' nach \'%2$s\' nicht möglich',
-    'iTopUpdate:Error:FileNotFound' => 'Datei nicht gefunden',
-    'iTopUpdate:Error:NoFile' => 'Keine Datei angegeben',
+	'iTopUpdate:Error:FileNotFound' => 'Datei nicht gefunden',
+	'iTopUpdate:Error:NoFile' => 'Keine Datei angegeben',
 	'iTopUpdate:Error:InvalidToken' => 'Ungültiges Token',
 	'iTopUpdate:Error:UpdateFailed' => 'Upgrade fehlgeschlagen',
 	'iTopUpdate:Error:FileUploadMaxSizeTooSmall' => 'Die maximale Größe für Dateiuploads ist zu klein. Bitte die PHP-Konfiguration anpassen.',
-
 	'iTopUpdate:UI:RestoreArchive' => 'Wiederherstellung der Anwendung aus archivierten Daten \'%1$s\'',
 	'iTopUpdate:UI:RestoreBackup' => 'Wiederherstellung der Datenbank aus \'%1$s\'',
 	'iTopUpdate:UI:UpdateDone' => 'Upgrade erfolgreich',
@@ -111,8 +106,10 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Menu:iTopUpdate+' => 'Anwendungsupgrade',
 
     // Missing itop entries
-    'Class:ModuleInstallation/Attribute:installed' => 'Installiert am',
-    'Class:ModuleInstallation/Attribute:name' => 'Name',
-    'Class:ModuleInstallation/Attribute:version' => 'Version',
-    'Class:ModuleInstallation/Attribute:comment' => 'Kommentar',
+	'Class:ModuleInstallation/Attribute:installed' => 'Installiert am',
+	'Class:ModuleInstallation/Attribute:name' => 'Name',
+	'Class:ModuleInstallation/Attribute:version' => 'Version',
+	'Class:ModuleInstallation/Attribute:comment' => 'Kommentar',
 ));
+
+
diff --git a/datamodels/2.x/itop-core-update/dictionaries/es_cr.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/dictionaries/es_cr.dict.itop-core-update.php
index 00c216f815..4d872423af 100644
--- a/datamodels/2.x/itop-core-update/dictionaries/es_cr.dict.itop-core-update.php
+++ b/datamodels/2.x/itop-core-update/dictionaries/es_cr.dict.itop-core-update.php
@@ -23,88 +23,83 @@
  */
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'iTopUpdate:UI:PageTitle' => 'Actualización de aplicación',
-    'itop-core-update:UI:SelectUpdateFile' => 'Seleccionar archivo',
-    'itop-core-update:UI:ConfirmUpdate' => 'Confirmar actualización',
-    'itop-core-update:UI:UpdateCoreFiles' => 'Actualizar aplicación',
+	'itop-core-update:UI:SelectUpdateFile' => 'Seleccionar archivo',
+	'itop-core-update:UI:ConfirmUpdate' => 'Confirmar actualización',
+	'itop-core-update:UI:UpdateCoreFiles' => 'Actualizar aplicación',
 	'iTopUpdate:UI:MaintenanceModeActive' => 'La aplicación está actualmente en mantenimiento, ningún usuario puede acceder. UStede debe ejecutar la instalación o restaturar la aplicación para regresar al modo normal.',
 	'itop-core-update:UI:UpdateDone' => 'Actualización realizada',
-
 	'itop-core-update/Operation:SelectUpdateFile/Title' => 'Seleccionar archivo',
 	'itop-core-update/Operation:ConfirmUpdate/Title' => 'Confirmar actualización de la aplicación',
 	'itop-core-update/Operation:UpdateCoreFiles/Title' => 'Actualizando aplicación',
 	'itop-core-update/Operation:UpdateDone/Title' => 'Actualización de aplicación terminada',
-
 	'iTopUpdate:UI:SelectUpdateFile' => 'Seleccione un archivo de actualización para subir',
 	'iTopUpdate:UI:CheckUpdate' => 'Verificar archivo de actualización',
 	'iTopUpdate:UI:ConfirmInstallFile' => 'Usted va a instalar %1$s',
 	'iTopUpdate:UI:DoUpdate' => 'Actualizar',
 	'iTopUpdate:UI:CurrentVersion' => 'Versión instalada actualmente',
 	'iTopUpdate:UI:NewVersion' => 'Nueva versión instalada',
-    'iTopUpdate:UI:Back' => 'Volver',
-    'iTopUpdate:UI:Cancel' => 'Cancelar',
-    'iTopUpdate:UI:Continue' => 'Continuar',
+	'iTopUpdate:UI:Back' => 'Volver',
+	'iTopUpdate:UI:Cancel' => 'Cancelar',
+	'iTopUpdate:UI:Continue' => 'Continuar',
 	'iTopUpdate:UI:RunSetup' => 'Ejecutar instalación',
-    'iTopUpdate:UI:WithDBBackup' => 'Respaldo de base de datos',
-    'iTopUpdate:UI:WithFilesBackup' => 'Respaldo de archivos de aplicación',
-    'iTopUpdate:UI:WithoutBackup' => 'No hay respaldos planificados',
-    'iTopUpdate:UI:Backup' => 'Respaldo generado antes de actualizar',
+	'iTopUpdate:UI:WithDBBackup' => 'Respaldo de base de datos',
+	'iTopUpdate:UI:WithFilesBackup' => 'Respaldo de archivos de aplicación',
+	'iTopUpdate:UI:WithoutBackup' => 'No hay respaldos planificados',
+	'iTopUpdate:UI:Backup' => 'Respaldo generado antes de actualizar',
 	'iTopUpdate:UI:DoFilesArchive' => 'Respaldar archivos de aplicación',
 	'iTopUpdate:UI:UploadArchive' => 'Selecione un paquete para subir',
 	'iTopUpdate:UI:ServerFile' => 'Ruta del paquete disponible en el servidor',
 	'iTopUpdate:UI:WarningReadOnlyDuringUpdate' => 'Durante la actualización, la aplicación estará en modo sólo lectura.',
-
-    'iTopUpdate:UI:Status' => 'Estado',
-    'iTopUpdate:UI:Action' => 'Actualización',
-    'iTopUpdate:UI:History' => 'Historial de versiones',
-    'iTopUpdate:UI:Progress' => 'Progreso de actualización',
-
-    'iTopUpdate:UI:DoBackup:Label' => 'Respaldo de archivos y base de datos',
-    'iTopUpdate:UI:DoBackup:Warning' => 'El respaldo no está recomendado por el limitado espacio en el dispositivo',
-
+	'iTopUpdate:UI:Status' => 'Estado',
+	'iTopUpdate:UI:Action' => 'Actualización',
+	'iTopUpdate:UI:Setup' => ITOP_APPLICATION_SHORT.' Setup~~',
+	'iTopUpdate:UI:History' => 'Historial de versiones',
+	'iTopUpdate:UI:Progress' => 'Progreso de actualización',
+	'iTopUpdate:UI:DoBackup:Label' => 'Respaldo de archivos y base de datos',
+	'iTopUpdate:UI:DoBackup:Warning' => 'El respaldo no está recomendado por el limitado espacio en el dispositivo',
 	'iTopUpdate:UI:DiskFreeSpace' => 'Espacio libre en el dispositivo',
 	'iTopUpdate:UI:ItopDiskSpace' => 'Espacio en disco de '.ITOP_APPLICATION_SHORT,
 	'iTopUpdate:UI:DBDiskSpace' => 'Espacio en disco de base de datos',
 	'iTopUpdate:UI:FileUploadMaxSize' => 'Máximo tamaño de carga de archivos',
-
 	'iTopUpdate:UI:PostMaxSize' => 'Valor post_max_size en PHP ini: %1$s',
 	'iTopUpdate:UI:UploadMaxFileSize' => 'Valor upload_max_filesize en PHP ini: %1$s',
-
-    'iTopUpdate:UI:CanCoreUpdate:Loading' => 'Revisando sistema de archivos',
-    'iTopUpdate:UI:CanCoreUpdate:Error' => 'La revisión del sistema de archivos falló (%1$s)',
-    'iTopUpdate:UI:CanCoreUpdate:ErrorFileNotExist' => 'La revisión del sistema de archivos falló (Archivo no existe %1$s)',
-    'iTopUpdate:UI:CanCoreUpdate:Failed' => 'La revisión del sistema de archivos falló',
-    'iTopUpdate:UI:CanCoreUpdate:Yes' => 'La aplicación puede ser actualizada',
+	'iTopUpdate:UI:CanCoreUpdate:Loading' => 'Revisando sistema de archivos',
+	'iTopUpdate:UI:CanCoreUpdate:Error' => 'La revisión del sistema de archivos falló (%1$s)',
+	'iTopUpdate:UI:CanCoreUpdate:ErrorFileNotExist' => 'La revisión del sistema de archivos falló (Archivo no existe %1$s)',
+	'iTopUpdate:UI:CanCoreUpdate:Failed' => 'La revisión del sistema de archivos falló',
+	'iTopUpdate:UI:CanCoreUpdate:Yes' => 'La aplicación puede ser actualizada',
 	'iTopUpdate:UI:CanCoreUpdate:No' => 'La aplicación no puede ser actualizada: %1$s',
 	'iTopUpdate:UI:CanCoreUpdate:Warning' => 'Advertencia: la actualización de la aplicación puede fallar: %1$s',
 	'iTopUpdate:UI:CannotUpdateUseSetup' => 'Debe usar <a href="%1$s">setup</a> para actualizar la aplicación.<br />Algunos archivos modificados fueron detectados, una actualización parcial no puede ser realizada.',
 	'iTopUpdate:UI:CheckInProgress' => 'Please wait during integrity check~~',
+	'iTopUpdate:UI:SetupLaunch' => 'Launch '.ITOP_APPLICATION_SHORT.' Setup~~',
+	'iTopUpdate:UI:SetupLaunchConfirm' => 'This will launch '.ITOP_APPLICATION_SHORT.' setup, are you sure?~~',
 
 	// Setup Messages
-    'iTopUpdate:UI:SetupMessage:Ready' => 'Listo para empezar',
+	'iTopUpdate:UI:SetupMessage:Ready' => 'Listo para empezar',
 	'iTopUpdate:UI:SetupMessage:EnterMaintenance' => 'Entrando en modo mantenimiento',
 	'iTopUpdate:UI:SetupMessage:Backup' => 'Respaldo de base de datos',
 	'iTopUpdate:UI:SetupMessage:FilesArchive' => 'Respaldar archivos de aplicación',
-    'iTopUpdate:UI:SetupMessage:CopyFiles' => 'Copiar archivos de nueva version',
+	'iTopUpdate:UI:SetupMessage:CopyFiles' => 'Copiar archivos de nueva version',
 	'iTopUpdate:UI:SetupMessage:CheckCompile' => 'Revisar actualización de aplicación',
 	'iTopUpdate:UI:SetupMessage:Compile' => 'Actualizar aplicación y base de datos',
 	'iTopUpdate:UI:SetupMessage:UpdateDatabase' => 'Actualizar base de datos',
 	'iTopUpdate:UI:SetupMessage:ExitMaintenance' => 'Saliendo del modo mantenimiento',
-    'iTopUpdate:UI:SetupMessage:UpdateDone' => 'Actualización completada',
+	'iTopUpdate:UI:SetupMessage:UpdateDone' => 'Actualización completada',
 
 	// Errors
 	'iTopUpdate:Error:MissingFunction' => 'Imposible comenzar actualización, función no disponible',
 	'iTopUpdate:Error:MissingFile' => 'Archivo no encontrado: %1$s',
 	'iTopUpdate:Error:CorruptedFile' => 'El archivo %1$s está corrupto',
-    'iTopUpdate:Error:BadFileFormat' => 'El archivo de actualización no es un archivo zip',
-    'iTopUpdate:Error:BadFileContent' => 'El archivo de actualización no es correcto',
-    'iTopUpdate:Error:BadItopProduct' => 'El archivo de actualización no es compatible con su producto',
+	'iTopUpdate:Error:BadFileFormat' => 'El archivo de actualización no es un archivo zip',
+	'iTopUpdate:Error:BadFileContent' => 'El archivo de actualización no es correcto',
+	'iTopUpdate:Error:BadItopProduct' => 'El archivo de actualización no es compatible con su producto',
 	'iTopUpdate:Error:Copy' => 'Error, no puedo copiar \'%1$s\' a \'%2$s\'',
-    'iTopUpdate:Error:FileNotFound' => 'Archivo no encontrado',
-    'iTopUpdate:Error:NoFile' => 'Archivo no seleccionado',
+	'iTopUpdate:Error:FileNotFound' => 'Archivo no encontrado',
+	'iTopUpdate:Error:NoFile' => 'Archivo no seleccionado',
 	'iTopUpdate:Error:InvalidToken' => 'Token inválido',
 	'iTopUpdate:Error:UpdateFailed' => 'La actualización ha fallado',
 	'iTopUpdate:Error:FileUploadMaxSizeTooSmall' => 'El archivo de actualización parece demasiado pequeño. Por favor cambie la configuración PHP.',
-
 	'iTopUpdate:UI:RestoreArchive' => 'Usted puede restaurar su aplicación desde el archivo \'%1$s\'',
 	'iTopUpdate:UI:RestoreBackup' => 'Usted puede restaurar la base de datos desde \'%1$s\'',
 	'iTopUpdate:UI:UpdateDone' => 'Actualización éxitosa',
@@ -112,10 +107,10 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Menu:iTopUpdate+' => 'Actualización de aplicación',
 
     // Missing itop entries
-    'Class:ModuleInstallation/Attribute:installed' => 'Instalado en',
-    'Class:ModuleInstallation/Attribute:name' => 'Nombre',
-    'Class:ModuleInstallation/Attribute:version' => 'Versión',
-    'Class:ModuleInstallation/Attribute:comment' => 'Comentario',
+	'Class:ModuleInstallation/Attribute:installed' => 'Instalado en',
+	'Class:ModuleInstallation/Attribute:name' => 'Nombre',
+	'Class:ModuleInstallation/Attribute:version' => 'Versión',
+	'Class:ModuleInstallation/Attribute:comment' => 'Comentario',
 ));
 
 
diff --git a/datamodels/2.x/itop-core-update/dictionaries/fr.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/dictionaries/fr.dict.itop-core-update.php
index 6b5c7762ba..29e3087ce6 100644
--- a/datamodels/2.x/itop-core-update/dictionaries/fr.dict.itop-core-update.php
+++ b/datamodels/2.x/itop-core-update/dictionaries/fr.dict.itop-core-update.php
@@ -22,88 +22,83 @@
  */
 Dict::Add('FR FR', 'French', 'Français', array(
 	'iTopUpdate:UI:PageTitle' => 'Mise à jour de l\'application',
-    'itop-core-update:UI:SelectUpdateFile' => 'Mise à jour',
-    'itop-core-update:UI:ConfirmUpdate' => 'Confirmation de la mise à jour',
-    'itop-core-update:UI:UpdateCoreFiles' => 'Mise à jour en cours',
+	'itop-core-update:UI:SelectUpdateFile' => 'Mise à jour',
+	'itop-core-update:UI:ConfirmUpdate' => 'Confirmation de la mise à jour',
+	'itop-core-update:UI:UpdateCoreFiles' => 'Mise à jour en cours',
 	'iTopUpdate:UI:MaintenanceModeActive' => 'L\'application est actuellement en maintenance en mode lecture seule. Vous pouvez lancer un Setup pour retourner dans un mode normal.',
 	'itop-core-update:UI:UpdateDone' => 'Mise à jour effectuée',
-
 	'itop-core-update/Operation:SelectUpdateFile/Title' => 'Mise à jour',
 	'itop-core-update/Operation:ConfirmUpdate/Title' => 'Mise à jour',
 	'itop-core-update/Operation:UpdateCoreFiles/Title' => 'Mise à jour',
 	'itop-core-update/Operation:UpdateDone/Title' => 'Mise à jour',
-
 	'iTopUpdate:UI:SelectUpdateFile' => 'Sélectionner un fichier de mise à jour',
 	'iTopUpdate:UI:CheckUpdate' => 'Vérification de la mise à jour',
 	'iTopUpdate:UI:ConfirmInstallFile' => 'La mise à jour %1$s va être installée',
 	'iTopUpdate:UI:DoUpdate' => 'Mettre à jour',
 	'iTopUpdate:UI:CurrentVersion' => 'Version installée',
 	'iTopUpdate:UI:NewVersion' => 'Nouvelle version',
-    'iTopUpdate:UI:Back' => 'Annuler',
-    'iTopUpdate:UI:Cancel' => 'Annuler',
-    'iTopUpdate:UI:Continue' => 'Continuer',
+	'iTopUpdate:UI:Back' => 'Annuler',
+	'iTopUpdate:UI:Cancel' => 'Annuler',
+	'iTopUpdate:UI:Continue' => 'Continuer',
 	'iTopUpdate:UI:RunSetup' => 'Lancer le Setup',
-    'iTopUpdate:UI:WithDBBackup' => 'Sauvegarde de la base de données',
-    'iTopUpdate:UI:WithFilesBackup' => 'Archive des fichiers de l\'application',
-    'iTopUpdate:UI:WithoutBackup' => 'Pas de sauvegarde',
-    'iTopUpdate:UI:Backup' => 'Sauvegarde effectuée avant la mise à jour',
+	'iTopUpdate:UI:WithDBBackup' => 'Sauvegarde de la base de données',
+	'iTopUpdate:UI:WithFilesBackup' => 'Archive des fichiers de l\'application',
+	'iTopUpdate:UI:WithoutBackup' => 'Pas de sauvegarde',
+	'iTopUpdate:UI:Backup' => 'Sauvegarde effectuée avant la mise à jour',
 	'iTopUpdate:UI:DoFilesArchive' => 'Archive les fichiers de l\'application',
 	'iTopUpdate:UI:UploadArchive' => 'Choisir un package à télécharger',
 	'iTopUpdate:UI:ServerFile' => 'Chemin d\'un package présent sur le serveur',
 	'iTopUpdate:UI:WarningReadOnlyDuringUpdate' => 'Pendant toute la durée de la mise à jour, l\'application sera en lecture seule.',
-
-    'iTopUpdate:UI:Status' => 'Versions installées',
-    'iTopUpdate:UI:Action' => 'Mettre à jour',
-    'iTopUpdate:UI:History' => 'Historique des versions',
-    'iTopUpdate:UI:Progress' => 'Progression de la mise à jour',
-
-    'iTopUpdate:UI:DoBackup:Label' => 'Sauvegarde de la base de données',
-    'iTopUpdate:UI:DoBackup:Warning' => 'La sauvegarde n\'est pas conseillée à cause du manque de place disque disponible',
-
-    'iTopUpdate:UI:DiskFreeSpace' => 'Taille disque disponible',
-    'iTopUpdate:UI:ItopDiskSpace' => 'Taille disque utilisée par l\'application',
-    'iTopUpdate:UI:DBDiskSpace' => 'Taille disque utilisée par la base de données',
+	'iTopUpdate:UI:Status' => 'Versions installées',
+	'iTopUpdate:UI:Action' => 'Mettre à jour',
+	'iTopUpdate:UI:Setup' => ITOP_APPLICATION_SHORT.' Setup',
+	'iTopUpdate:UI:History' => 'Historique des versions',
+	'iTopUpdate:UI:Progress' => 'Progression de la mise à jour',
+	'iTopUpdate:UI:DoBackup:Label' => 'Sauvegarde de la base de données',
+	'iTopUpdate:UI:DoBackup:Warning' => 'La sauvegarde n\'est pas conseillée à cause du manque de place disque disponible',
+	'iTopUpdate:UI:DiskFreeSpace' => 'Taille disque disponible',
+	'iTopUpdate:UI:ItopDiskSpace' => 'Taille disque utilisée par l\'application',
+	'iTopUpdate:UI:DBDiskSpace' => 'Taille disque utilisée par la base de données',
 	'iTopUpdate:UI:FileUploadMaxSize' => 'Taille maximale de chargement de fichier',
-
 	'iTopUpdate:UI:PostMaxSize' => 'Valeur PHP ini post_max_size : %1$s',
 	'iTopUpdate:UI:UploadMaxFileSize' => 'Valeur PHP ini upload_max_filesize : %1$s',
-
-    'iTopUpdate:UI:CanCoreUpdate:Loading' => 'Vérification des fichiers',
-    'iTopUpdate:UI:CanCoreUpdate:Error' => 'Échec de la vérification des fichiers (%1$s)',
-    'iTopUpdate:UI:CanCoreUpdate:ErrorFileNotExist' => 'Échec de la vérification des fichiers (Fichier manquant %1$s)',
-    'iTopUpdate:UI:CanCoreUpdate:Failed' => 'Échec de la vérification des fichiers',
-    'iTopUpdate:UI:CanCoreUpdate:Yes' => 'L\'application peut être mise à jour',
+	'iTopUpdate:UI:CanCoreUpdate:Loading' => 'Vérification des fichiers',
+	'iTopUpdate:UI:CanCoreUpdate:Error' => 'Échec de la vérification des fichiers (%1$s)',
+	'iTopUpdate:UI:CanCoreUpdate:ErrorFileNotExist' => 'Échec de la vérification des fichiers (Fichier manquant %1$s)',
+	'iTopUpdate:UI:CanCoreUpdate:Failed' => 'Échec de la vérification des fichiers',
+	'iTopUpdate:UI:CanCoreUpdate:Yes' => 'L\'application peut être mise à jour',
 	'iTopUpdate:UI:CanCoreUpdate:No' => 'L\'application ne peut pas être mise à jour : %1$s',
 	'iTopUpdate:UI:CanCoreUpdate:Warning' => 'Attention : la mise à jour de l\'application peut échouer : %1$s',
 	'iTopUpdate:UI:CannotUpdateUseSetup' => '<b>Des fichiers modifiés ont été détectés</b>, une mise à jour partielle ne peut pas être effectuée.<br />Suivez la <a target="_blank" href="%2$s"> procedure</a> pour mettre à jour manuellement votre iTop. Vous devez utiliser la page <a href="%1$s">d\'installation</a> pour mettre à jour l\'application.',
-	'iTopUpdate:UI:CheckInProgress'=>'Veuillez patienter pendant la vérification d\'intégrité',
+	'iTopUpdate:UI:CheckInProgress' => 'Veuillez patienter pendant la vérification d\'intégrité',
+	'iTopUpdate:UI:SetupLaunch' => 'Lancer le Setup',
+	'iTopUpdate:UI:SetupLaunchConfirm' => 'This will launch '.ITOP_APPLICATION_SHORT.' setup, are you sure?',
 
 	// Setup Messages
-    'iTopUpdate:UI:SetupMessage:Ready' => 'Prêt pour l\\installation',
+	'iTopUpdate:UI:SetupMessage:Ready' => 'Prêt pour l\\installation',
 	'iTopUpdate:UI:SetupMessage:EnterMaintenance' => 'Application en maintenance',
 	'iTopUpdate:UI:SetupMessage:Backup' => 'Sauvegarde des fichiers de l\'application',
 	'iTopUpdate:UI:SetupMessage:FilesArchive' => 'Archivage des fichiers de l\'application',
-    'iTopUpdate:UI:SetupMessage:CopyFiles' => 'Copie des fichiers de la nouvelle version',
+	'iTopUpdate:UI:SetupMessage:CopyFiles' => 'Copie des fichiers de la nouvelle version',
 	'iTopUpdate:UI:SetupMessage:CheckCompile' => 'Contrôle de la mise à jour',
 	'iTopUpdate:UI:SetupMessage:Compile' => 'Mise à jour de l\'application',
 	'iTopUpdate:UI:SetupMessage:UpdateDatabase' => 'Mise à jour de la base de données',
 	'iTopUpdate:UI:SetupMessage:ExitMaintenance' => 'Application en utilisation normale',
-    'iTopUpdate:UI:SetupMessage:UpdateDone' => 'Installation terminée',
+	'iTopUpdate:UI:SetupMessage:UpdateDone' => 'Installation terminée',
 
 	// Errors
 	'iTopUpdate:Error:MissingFunction' => 'Impossible de mettre à jour',
 	'iTopUpdate:Error:MissingFile' => 'Ficher manquant : %1$s',
 	'iTopUpdate:Error:CorruptedFile' => 'Le fichier %1$s est corrompu',
-    'iTopUpdate:Error:BadFileFormat' => 'Le fichier de mise à jour n\'est pas au format "zip"',
-    'iTopUpdate:Error:BadFileContent' => 'Le fichier n\'est pas un package valide',
-    'iTopUpdate:Error:BadItopProduct' => 'Le package n\'est pas compatible avec votre application',
+	'iTopUpdate:Error:BadFileFormat' => 'Le fichier de mise à jour n\'est pas au format "zip"',
+	'iTopUpdate:Error:BadFileContent' => 'Le fichier n\'est pas un package valide',
+	'iTopUpdate:Error:BadItopProduct' => 'Le package n\'est pas compatible avec votre application',
 	'iTopUpdate:Error:Copy' => 'Erreur : impossible de copier le fichier \'%1$s\' dans \'%2$s\'',
-    'iTopUpdate:Error:FileNotFound' => 'Fichier manquant',
-    'iTopUpdate:Error:NoFile' => 'Pas d\'archive',
+	'iTopUpdate:Error:FileNotFound' => 'Fichier manquant',
+	'iTopUpdate:Error:NoFile' => 'Pas d\'archive',
 	'iTopUpdate:Error:InvalidToken' => 'Information manquante',
 	'iTopUpdate:Error:UpdateFailed' => 'La mise à jour a échoué',
 	'iTopUpdate:Error:FileUploadMaxSizeTooSmall' => 'La taille maximale de chargement de fichier semble trop petite pour faire la mise à jour. Veuillez changer la configuration de PHP.',
-
 	'iTopUpdate:UI:RestoreArchive' => 'Vous pouvez restaurer l\'application depuis \'%1$s\'',
 	'iTopUpdate:UI:RestoreBackup' => 'Vous pouvez restaurer la base de données depuis \'%1$s\'',
 	'iTopUpdate:UI:UpdateDone' => 'Mise à jour effectuée',
@@ -111,10 +106,10 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Menu:iTopUpdate+' => 'Mise à jour de l\'application',
 
     // Missing itop entries
-    'Class:ModuleInstallation/Attribute:installed' => 'Installé le',
-    'Class:ModuleInstallation/Attribute:name' => 'Nom',
-    'Class:ModuleInstallation/Attribute:version' => 'Version',
-    'Class:ModuleInstallation/Attribute:comment' => 'Commentaire',
+	'Class:ModuleInstallation/Attribute:installed' => 'Installé le',
+	'Class:ModuleInstallation/Attribute:name' => 'Nom',
+	'Class:ModuleInstallation/Attribute:version' => 'Version',
+	'Class:ModuleInstallation/Attribute:comment' => 'Commentaire',
 ));
 
 
diff --git a/datamodels/2.x/itop-core-update/dictionaries/hu.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/dictionaries/hu.dict.itop-core-update.php
index 04bf920bee..0cb9515c4d 100644
--- a/datamodels/2.x/itop-core-update/dictionaries/hu.dict.itop-core-update.php
+++ b/datamodels/2.x/itop-core-update/dictionaries/hu.dict.itop-core-update.php
@@ -21,98 +21,95 @@
  * along with iTop. If not, see <http://www.gnu.org/licenses/>
  */
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'iTopUpdate:UI:PageTitle' => 'Alkalmazásfrissítés',
-    'itop-core-update:UI:SelectUpdateFile' => 'Alkalmazásfrissítés',
-    'itop-core-update:UI:ConfirmUpdate' => 'Alkalmazásfrissítés',
-    'itop-core-update:UI:UpdateCoreFiles' => 'Alkalmazásfrissítés',
-    'iTopUpdate:UI:MaintenanceModeActive' => 'Az alkalmazás jelenleg karbantartás alatt áll, egyetlen felhasználó sem tud hozzáférni az alkalmazáshoz. A normál üzemmódba való visszatéréshez telepítést kell futtatnia, vagy vissza kell állítania az alkalmazás archívumát..',
-    'itop-core-update:UI:UpdateDone' => 'Alkalmazásfrissítés',
+	'iTopUpdate:UI:PageTitle' => 'Alkalmazásfrissítés',
+	'itop-core-update:UI:SelectUpdateFile' => 'Alkalmazásfrissítés',
+	'itop-core-update:UI:ConfirmUpdate' => 'Alkalmazásfrissítés',
+	'itop-core-update:UI:UpdateCoreFiles' => 'Alkalmazásfrissítés',
+	'iTopUpdate:UI:MaintenanceModeActive' => 'Az alkalmazás jelenleg karbantartás alatt áll, egyetlen felhasználó sem tud hozzáférni az alkalmazáshoz. A normál üzemmódba való visszatéréshez telepítést kell futtatnia, vagy vissza kell állítania az alkalmazás archívumát..',
+	'itop-core-update:UI:UpdateDone' => 'Alkalmazásfrissítés',
+	'itop-core-update/Operation:SelectUpdateFile/Title' => 'Alkalmazásfrissítés',
+	'itop-core-update/Operation:ConfirmUpdate/Title' => 'Alkalmazásfrissítés jóváhagyása',
+	'itop-core-update/Operation:UpdateCoreFiles/Title' => 'Az alkalmazás frissül',
+	'itop-core-update/Operation:UpdateDone/Title' => 'Alkalmazásfrissítés kész',
+	'iTopUpdate:UI:SelectUpdateFile' => 'Válasszon egy frissítést a feltöltéshez',
+	'iTopUpdate:UI:CheckUpdate' => 'Frissítés ellenőrzése',
+	'iTopUpdate:UI:ConfirmInstallFile' => '%1$s lesz telepítve',
+	'iTopUpdate:UI:DoUpdate' => 'Frissítés',
+	'iTopUpdate:UI:CurrentVersion' => 'Jelenlegi telepített verzió',
+	'iTopUpdate:UI:NewVersion' => 'Újonnan telepített verzió',
+	'iTopUpdate:UI:Back' => 'Vissza',
+	'iTopUpdate:UI:Cancel' => 'Mégsem',
+	'iTopUpdate:UI:Continue' => 'Folytatás',
+	'iTopUpdate:UI:RunSetup' => 'Telepítés futtatása',
+	'iTopUpdate:UI:WithDBBackup' => 'Adatbázis biztonsági mentése',
+	'iTopUpdate:UI:WithFilesBackup' => 'Alkalmazás fájlok biztonsági mentése',
+	'iTopUpdate:UI:WithoutBackup' => 'Nincs mentés tervbe véve',
+	'iTopUpdate:UI:Backup' => 'Frissítés előtt létrehozott biztonsági mentés.',
+	'iTopUpdate:UI:DoFilesArchive' => 'Archív alkalmazás fájlok',
+	'iTopUpdate:UI:UploadArchive' => 'Válasszon egy csomagot a feltöltéshez',
+	'iTopUpdate:UI:ServerFile' => 'A kiszolgálón már meglévő csomag elérési útvonala',
+	'iTopUpdate:UI:WarningReadOnlyDuringUpdate' => 'A frissítés során az alkalmazás csak olvasható lesz.',
+	'iTopUpdate:UI:Status' => 'Státusz',
+	'iTopUpdate:UI:Action' => 'Frissítés',
+	'iTopUpdate:UI:Setup' => ITOP_APPLICATION_SHORT.' Setup~~',
+	'iTopUpdate:UI:History' => 'Verziótörténet',
+	'iTopUpdate:UI:Progress' => 'A frissítés folyamata',
+	'iTopUpdate:UI:DoBackup:Label' => 'Mentés fájlok és adatbázis',
+	'iTopUpdate:UI:DoBackup:Warning' => 'A biztonsági mentés nem ajánlott a korlátozottan rendelkezésre álló lemezterület miatt.',
+	'iTopUpdate:UI:DiskFreeSpace' => 'Lemez szabad terület',
+	'iTopUpdate:UI:ItopDiskSpace' => ITOP_APPLICATION_SHORT.' lemezterület',
+	'iTopUpdate:UI:DBDiskSpace' => 'Adatbázis lemezterület',
+	'iTopUpdate:UI:FileUploadMaxSize' => 'Feltöltés maximális fájlmérete',
+	'iTopUpdate:UI:PostMaxSize' => 'PHP ini érték post_max_size: %1$s',
+	'iTopUpdate:UI:UploadMaxFileSize' => 'PHP ini érték upload_max_filesize: %1$s',
+	'iTopUpdate:UI:CanCoreUpdate:Loading' => 'Fájlrendszer ellenőrzése',
+	'iTopUpdate:UI:CanCoreUpdate:Error' => 'Fájlrendszer ellenőrzése sikertelen (%1$s)',
+	'iTopUpdate:UI:CanCoreUpdate:ErrorFileNotExist' => 'Fájlrendszer ellenőrzése sikertelen (Fájl nincs meg %1$s)',
+	'iTopUpdate:UI:CanCoreUpdate:Failed' => 'Fájlrendszer ellenőrzése sikertelen',
+	'iTopUpdate:UI:CanCoreUpdate:Yes' => 'Az alkalmazás frissíthető',
+	'iTopUpdate:UI:CanCoreUpdate:No' => 'Az alkalmazás nem frissíthető: %1$s',
+	'iTopUpdate:UI:CanCoreUpdate:Warning' => 'Figyelem: alkalmazás frissítés sikertelen lehet: %1$s',
+	'iTopUpdate:UI:CannotUpdateUseSetup' => '<b>SNéhány módosított fájlt észleltünk</b>, a részleges frissítés nem hajtható végre.</br>Kövesse a <a target="_blank" href="%2$s"> eljárást</a> az iTop manuális frissítéséhez. Az alkalmazás frissítéséhez a <a href="%1$s">setup</a> parancsot kell használnia.',
+	'iTopUpdate:UI:CheckInProgress' => 'Kérjük, várjon az integritás ellenőrzés alatt',
+	'iTopUpdate:UI:SetupLaunch' => 'Launch '.ITOP_APPLICATION_SHORT.' Setup~~',
+	'iTopUpdate:UI:SetupLaunchConfirm' => 'This will launch '.ITOP_APPLICATION_SHORT.' setup, are you sure?~~',
 
-    'itop-core-update/Operation:SelectUpdateFile/Title' => 'Alkalmazásfrissítés',
-    'itop-core-update/Operation:ConfirmUpdate/Title' => 'Alkalmazásfrissítés jóváhagyása',
-    'itop-core-update/Operation:UpdateCoreFiles/Title' => 'Az alkalmazás frissül',
-    'itop-core-update/Operation:UpdateDone/Title' => 'Alkalmazásfrissítés kész',
+	// Setup Messages
+	'iTopUpdate:UI:SetupMessage:Ready' => 'Készen állunk',
+	'iTopUpdate:UI:SetupMessage:EnterMaintenance' => 'Karbantartási módba lépés',
+	'iTopUpdate:UI:SetupMessage:Backup' => 'Adatbázis biztonsági mentése',
+	'iTopUpdate:UI:SetupMessage:FilesArchive' => 'Alkalmazás fájlok archiválása',
+	'iTopUpdate:UI:SetupMessage:CopyFiles' => 'Új fájlverziók másolása',
+	'iTopUpdate:UI:SetupMessage:CheckCompile' => 'Alkalmazásfrissítés ellenőrzése',
+	'iTopUpdate:UI:SetupMessage:Compile' => 'Az alkalmazás és az adatbázis frissítése',
+	'iTopUpdate:UI:SetupMessage:UpdateDatabase' => 'Adatbázis frissítés',
+	'iTopUpdate:UI:SetupMessage:ExitMaintenance' => 'Kilépés a karbantartási módból',
+	'iTopUpdate:UI:SetupMessage:UpdateDone' => 'A frissítés befejeződött',
 
-    'iTopUpdate:UI:SelectUpdateFile' => 'Válasszon egy frissítést a feltöltéshez',
-    'iTopUpdate:UI:CheckUpdate' => 'Frissítés ellenőrzése',
-    'iTopUpdate:UI:ConfirmInstallFile' => '%1$s lesz telepítve',
-    'iTopUpdate:UI:DoUpdate' => 'Frissítés',
-    'iTopUpdate:UI:CurrentVersion' => 'Jelenlegi telepített verzió',
-    'iTopUpdate:UI:NewVersion' => 'Újonnan telepített verzió',
-    'iTopUpdate:UI:Back' => 'Vissza',
-    'iTopUpdate:UI:Cancel' => 'Mégsem',
-    'iTopUpdate:UI:Continue' => 'Folytatás',
-    'iTopUpdate:UI:RunSetup' => 'Telepítés futtatása',
-    'iTopUpdate:UI:WithDBBackup' => 'Adatbázis biztonsági mentése',
-    'iTopUpdate:UI:WithFilesBackup' => 'Alkalmazás fájlok biztonsági mentése',
-    'iTopUpdate:UI:WithoutBackup' => 'Nincs mentés tervbe véve',
-    'iTopUpdate:UI:Backup' => 'Frissítés előtt létrehozott biztonsági mentés.',
-    'iTopUpdate:UI:DoFilesArchive' => 'Archív alkalmazás fájlok',
-    'iTopUpdate:UI:UploadArchive' => 'Válasszon egy csomagot a feltöltéshez',
-    'iTopUpdate:UI:ServerFile' => 'A kiszolgálón már meglévő csomag elérési útvonala',
-    'iTopUpdate:UI:WarningReadOnlyDuringUpdate' => 'A frissítés során az alkalmazás csak olvasható lesz.',
-
-    'iTopUpdate:UI:Status' => 'Státusz',
-    'iTopUpdate:UI:Action' => 'Frissítés',
-    'iTopUpdate:UI:History' => 'Verziótörténet',
-    'iTopUpdate:UI:Progress' => 'A frissítés folyamata',
-
-    'iTopUpdate:UI:DoBackup:Label' => 'Mentés fájlok és adatbázis',
-    'iTopUpdate:UI:DoBackup:Warning' => 'A biztonsági mentés nem ajánlott a korlátozottan rendelkezésre álló lemezterület miatt.',
-
-    'iTopUpdate:UI:DiskFreeSpace' => 'Lemez szabad terület',
-    'iTopUpdate:UI:ItopDiskSpace' => ITOP_APPLICATION_SHORT.' lemezterület',
-    'iTopUpdate:UI:DBDiskSpace' => 'Adatbázis lemezterület',
-    'iTopUpdate:UI:FileUploadMaxSize' => 'Feltöltés maximális fájlmérete',
-
-    'iTopUpdate:UI:PostMaxSize' => 'PHP ini érték post_max_size: %1$s',
-    'iTopUpdate:UI:UploadMaxFileSize' => 'PHP ini érték upload_max_filesize: %1$s',
-
-    'iTopUpdate:UI:CanCoreUpdate:Loading' => 'Fájlrendszer ellenőrzése',
-    'iTopUpdate:UI:CanCoreUpdate:Error' => 'Fájlrendszer ellenőrzése sikertelen (%1$s)',
-    'iTopUpdate:UI:CanCoreUpdate:ErrorFileNotExist' => 'Fájlrendszer ellenőrzése sikertelen (Fájl nincs meg %1$s)',
-    'iTopUpdate:UI:CanCoreUpdate:Failed' => 'Fájlrendszer ellenőrzése sikertelen',
-    'iTopUpdate:UI:CanCoreUpdate:Yes' => 'Az alkalmazás frissíthető',
-    'iTopUpdate:UI:CanCoreUpdate:No' => 'Az alkalmazás nem frissíthető: %1$s',
-    'iTopUpdate:UI:CanCoreUpdate:Warning' => 'Figyelem: alkalmazás frissítés sikertelen lehet: %1$s',
-    'iTopUpdate:UI:CannotUpdateUseSetup' => '<b>SNéhány módosított fájlt észleltünk</b>, a részleges frissítés nem hajtható végre.</br>Kövesse a <a target="_blank" href="%2$s"> eljárást</a> az iTop manuális frissítéséhez. Az alkalmazás frissítéséhez a <a href="%1$s">setup</a> parancsot kell használnia.',
-    'iTopUpdate:UI:CheckInProgress' => 'Kérjük, várjon az integritás ellenőrzés alatt',
-
-    // Setup Messages
-    'iTopUpdate:UI:SetupMessage:Ready' => 'Készen állunk',
-    'iTopUpdate:UI:SetupMessage:EnterMaintenance' => 'Karbantartási módba lépés',
-    'iTopUpdate:UI:SetupMessage:Backup' => 'Adatbázis biztonsági mentése',
-    'iTopUpdate:UI:SetupMessage:FilesArchive' => 'Alkalmazás fájlok archiválása',
-    'iTopUpdate:UI:SetupMessage:CopyFiles' => 'Új fájlverziók másolása',
-    'iTopUpdate:UI:SetupMessage:CheckCompile' => 'Alkalmazásfrissítés ellenőrzése',
-    'iTopUpdate:UI:SetupMessage:Compile' => 'Az alkalmazás és az adatbázis frissítése',
-    'iTopUpdate:UI:SetupMessage:UpdateDatabase' => 'Adatbázis frissítés',
-    'iTopUpdate:UI:SetupMessage:ExitMaintenance' => 'Kilépés a karbantartási módból',
-    'iTopUpdate:UI:SetupMessage:UpdateDone' => 'A frissítés befejeződött',
-
-    // Errors
-    'iTopUpdate:Error:MissingFunction' => 'Lehetetlen elindítani a frissítést, hiányzó funkció',
-    'iTopUpdate:Error:MissingFile' => 'Hiányzó fájl: %1$',
-    'iTopUpdate:Error:CorruptedFile' => 'A %1$s fájl sérült',
-    'iTopUpdate:Error:BadFileFormat' => 'A frissítési fájl nem zip fájl',
-    'iTopUpdate:Error:BadFileContent' => 'A frissítési fájl nem alkalmazás archívum',
-    'iTopUpdate:Error:BadItopProduct' => 'A frissítési fájl nem kompatibilis az alkalmazással',
-    'iTopUpdate:Error:Copy' => 'Hiba: \'%1$s\' nem másolható \'%2$s\' -ba',
-    'iTopUpdate:Error:FileNotFound' => 'Nincs meg a fájl',
-    'iTopUpdate:Error:NoFile' => 'Nincs fájl megadva',
-    'iTopUpdate:Error:InvalidToken' => 'Érvénytelen token',
-    'iTopUpdate:Error:UpdateFailed' => 'Frissítés sikertelen',
-    'iTopUpdate:Error:FileUploadMaxSizeTooSmall' => 'A feltöltés maximális mérete túl kicsinek tűnik a frissítéshez. Kérjük, módosítsa a PHP konfigurációt.',
-
-    'iTopUpdate:UI:RestoreArchive' => 'Visszaállíthatja az alkalmazást a \'%1$s\' archívumból',
-    'iTopUpdate:UI:RestoreBackup' => 'Visszaállíthatja az adatbázist a \'%1$s\' archívumból',
-    'iTopUpdate:UI:UpdateDone' => 'Frissítés sikeres',
-    'Menu:iTopUpdate' => 'Alkalmazás frissítés',
-    'Menu:iTopUpdate+' => 'Alkalmazás frissítés',
+	// Errors
+	'iTopUpdate:Error:MissingFunction' => 'Lehetetlen elindítani a frissítést, hiányzó funkció',
+	'iTopUpdate:Error:MissingFile' => 'Hiányzó fájl: %1$',
+	'iTopUpdate:Error:CorruptedFile' => 'A %1$s fájl sérült',
+	'iTopUpdate:Error:BadFileFormat' => 'A frissítési fájl nem zip fájl',
+	'iTopUpdate:Error:BadFileContent' => 'A frissítési fájl nem alkalmazás archívum',
+	'iTopUpdate:Error:BadItopProduct' => 'A frissítési fájl nem kompatibilis az alkalmazással',
+	'iTopUpdate:Error:Copy' => 'Hiba: \'%1$s\' nem másolható \'%2$s\' -ba',
+	'iTopUpdate:Error:FileNotFound' => 'Nincs meg a fájl',
+	'iTopUpdate:Error:NoFile' => 'Nincs fájl megadva',
+	'iTopUpdate:Error:InvalidToken' => 'Érvénytelen token',
+	'iTopUpdate:Error:UpdateFailed' => 'Frissítés sikertelen',
+	'iTopUpdate:Error:FileUploadMaxSizeTooSmall' => 'A feltöltés maximális mérete túl kicsinek tűnik a frissítéshez. Kérjük, módosítsa a PHP konfigurációt.',
+	'iTopUpdate:UI:RestoreArchive' => 'Visszaállíthatja az alkalmazást a \'%1$s\' archívumból',
+	'iTopUpdate:UI:RestoreBackup' => 'Visszaállíthatja az adatbázist a \'%1$s\' archívumból',
+	'iTopUpdate:UI:UpdateDone' => 'Frissítés sikeres',
+	'Menu:iTopUpdate' => 'Alkalmazás frissítés',
+	'Menu:iTopUpdate+' => 'Alkalmazás frissítés',
 
     // Missing itop entries
-    'Class:ModuleInstallation/Attribute:installed' => 'Telepítve ',
-    'Class:ModuleInstallation/Attribute:name' => 'Név',
-    'Class:ModuleInstallation/Attribute:version' => 'Verzió',
-    'Class:ModuleInstallation/Attribute:comment' => 'Megjegyzés',
+	'Class:ModuleInstallation/Attribute:installed' => 'Telepítve ',
+	'Class:ModuleInstallation/Attribute:name' => 'Név',
+	'Class:ModuleInstallation/Attribute:version' => 'Verzió',
+	'Class:ModuleInstallation/Attribute:comment' => 'Megjegyzés',
 ));
+
+
diff --git a/datamodels/2.x/itop-core-update/dictionaries/it.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/dictionaries/it.dict.itop-core-update.php
index e616eef849..9a5cec5d63 100644
--- a/datamodels/2.x/itop-core-update/dictionaries/it.dict.itop-core-update.php
+++ b/datamodels/2.x/itop-core-update/dictionaries/it.dict.itop-core-update.php
@@ -22,88 +22,83 @@
  */
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'iTopUpdate:UI:PageTitle' => 'Application Upgrade~~',
-    'itop-core-update:UI:SelectUpdateFile' => 'Application Upgrade~~',
-    'itop-core-update:UI:ConfirmUpdate' => 'Application Upgrade~~',
-    'itop-core-update:UI:UpdateCoreFiles' => 'Application Upgrade~~',
+	'itop-core-update:UI:SelectUpdateFile' => 'Application Upgrade~~',
+	'itop-core-update:UI:ConfirmUpdate' => 'Application Upgrade~~',
+	'itop-core-update:UI:UpdateCoreFiles' => 'Application Upgrade~~',
 	'iTopUpdate:UI:MaintenanceModeActive' => 'The application is currently under maintenance, no user can access the application. You have to run a setup or restore the application archive to return in normal mode.~~',
 	'itop-core-update:UI:UpdateDone' => 'Application Upgrade~~',
-
 	'itop-core-update/Operation:SelectUpdateFile/Title' => 'Application Upgrade~~',
 	'itop-core-update/Operation:ConfirmUpdate/Title' => 'Confirm Application Upgrade~~',
 	'itop-core-update/Operation:UpdateCoreFiles/Title' => 'Application Upgrading~~',
 	'itop-core-update/Operation:UpdateDone/Title' => 'Application Upgrade Done~~',
-
 	'iTopUpdate:UI:SelectUpdateFile' => 'Select an upgrade file to upload~~',
 	'iTopUpdate:UI:CheckUpdate' => 'Verify upgrade file~~',
 	'iTopUpdate:UI:ConfirmInstallFile' => 'You are about to install %1$s~~',
 	'iTopUpdate:UI:DoUpdate' => 'Upgrade~~',
 	'iTopUpdate:UI:CurrentVersion' => 'Current installed version~~',
 	'iTopUpdate:UI:NewVersion' => 'Newly installed version~~',
-    'iTopUpdate:UI:Back' => 'Back~~',
-    'iTopUpdate:UI:Cancel' => 'Cancel~~',
-    'iTopUpdate:UI:Continue' => 'Continue~~',
+	'iTopUpdate:UI:Back' => 'Back~~',
+	'iTopUpdate:UI:Cancel' => 'Cancel~~',
+	'iTopUpdate:UI:Continue' => 'Continue~~',
 	'iTopUpdate:UI:RunSetup' => 'Run Setup~~',
-    'iTopUpdate:UI:WithDBBackup' => 'Database backup~~',
-    'iTopUpdate:UI:WithFilesBackup' => 'Application files backup~~',
-    'iTopUpdate:UI:WithoutBackup' => 'No backup is planned~~',
-    'iTopUpdate:UI:Backup' => 'Backup generated before update~~',
+	'iTopUpdate:UI:WithDBBackup' => 'Database backup~~',
+	'iTopUpdate:UI:WithFilesBackup' => 'Application files backup~~',
+	'iTopUpdate:UI:WithoutBackup' => 'No backup is planned~~',
+	'iTopUpdate:UI:Backup' => 'Backup generated before update~~',
 	'iTopUpdate:UI:DoFilesArchive' => 'Archive application files~~',
 	'iTopUpdate:UI:UploadArchive' => 'Select a package to upload~~',
 	'iTopUpdate:UI:ServerFile' => 'Path of a package already on the server~~',
 	'iTopUpdate:UI:WarningReadOnlyDuringUpdate' => 'During the upgrade, the application will be read-only.~~',
-
-    'iTopUpdate:UI:Status' => 'Status~~',
-    'iTopUpdate:UI:Action' => 'Update~~',
-    'iTopUpdate:UI:History' => 'Versions History~~',
-    'iTopUpdate:UI:Progress' => 'Progress of the upgrade~~',
-
-    'iTopUpdate:UI:DoBackup:Label' => 'Backup files and database~~',
-    'iTopUpdate:UI:DoBackup:Warning' => 'Backup is not recommended due to limited available disk space~~',
-
-    'iTopUpdate:UI:DiskFreeSpace' => 'Disk free space~~',
-    'iTopUpdate:UI:ItopDiskSpace' => ITOP_APPLICATION_SHORT.' disk space~~',
-    'iTopUpdate:UI:DBDiskSpace' => 'Database disk space~~',
+	'iTopUpdate:UI:Status' => 'Status~~',
+	'iTopUpdate:UI:Action' => 'Update~~',
+	'iTopUpdate:UI:Setup' => ITOP_APPLICATION_SHORT.' Setup~~',
+	'iTopUpdate:UI:History' => 'Versions History~~',
+	'iTopUpdate:UI:Progress' => 'Progress of the upgrade~~',
+	'iTopUpdate:UI:DoBackup:Label' => 'Backup files and database~~',
+	'iTopUpdate:UI:DoBackup:Warning' => 'Backup is not recommended due to limited available disk space~~',
+	'iTopUpdate:UI:DiskFreeSpace' => 'Disk free space~~',
+	'iTopUpdate:UI:ItopDiskSpace' => ITOP_APPLICATION_SHORT.' disk space~~',
+	'iTopUpdate:UI:DBDiskSpace' => 'Database disk space~~',
 	'iTopUpdate:UI:FileUploadMaxSize' => 'File upload max size~~',
-
 	'iTopUpdate:UI:PostMaxSize' => 'PHP ini value post_max_size: %1$s~~',
 	'iTopUpdate:UI:UploadMaxFileSize' => 'PHP ini value upload_max_filesize: %1$s~~',
-
-    'iTopUpdate:UI:CanCoreUpdate:Loading' => 'Checking filesystem~~',
-    'iTopUpdate:UI:CanCoreUpdate:Error' => 'Checking filesystem failed (%1$s)~~',
-    'iTopUpdate:UI:CanCoreUpdate:ErrorFileNotExist' => 'Checking filesystem failed (File not exist %1$s)~~',
-    'iTopUpdate:UI:CanCoreUpdate:Failed' => 'Checking filesystem failed~~',
-    'iTopUpdate:UI:CanCoreUpdate:Yes' => 'Application can be updated~~',
+	'iTopUpdate:UI:CanCoreUpdate:Loading' => 'Checking filesystem~~',
+	'iTopUpdate:UI:CanCoreUpdate:Error' => 'Checking filesystem failed (%1$s)~~',
+	'iTopUpdate:UI:CanCoreUpdate:ErrorFileNotExist' => 'Checking filesystem failed (File not exist %1$s)~~',
+	'iTopUpdate:UI:CanCoreUpdate:Failed' => 'Checking filesystem failed~~',
+	'iTopUpdate:UI:CanCoreUpdate:Yes' => 'Application can be updated~~',
 	'iTopUpdate:UI:CanCoreUpdate:No' => 'Application cannot be updated: %1$s~~',
 	'iTopUpdate:UI:CanCoreUpdate:Warning' => 'Warning: application update can fail: %1$s~~',
 	'iTopUpdate:UI:CannotUpdateUseSetup' => '<b>Some modified files were detected</b>, a partial update cannot be executed.</br>Follow the <a target="_blank" href="%2$s"> procedure</a> in order to manually upgrade your iTop. You must use the <a href="%1$s">setup</a> to update the application.~~',
 	'iTopUpdate:UI:CheckInProgress' => 'Please wait during integrity check~~',
+	'iTopUpdate:UI:SetupLaunch' => 'Launch '.ITOP_APPLICATION_SHORT.' Setup~~',
+	'iTopUpdate:UI:SetupLaunchConfirm' => 'This will launch '.ITOP_APPLICATION_SHORT.' setup, are you sure?~~',
 
 	// Setup Messages
-    'iTopUpdate:UI:SetupMessage:Ready' => 'Ready to start~~',
+	'iTopUpdate:UI:SetupMessage:Ready' => 'Ready to start~~',
 	'iTopUpdate:UI:SetupMessage:EnterMaintenance' => 'Entering maintenance mode~~',
 	'iTopUpdate:UI:SetupMessage:Backup' => 'Database backup~~',
 	'iTopUpdate:UI:SetupMessage:FilesArchive' => 'Archive application files~~',
-    'iTopUpdate:UI:SetupMessage:CopyFiles' => 'Copy new version files~~',
+	'iTopUpdate:UI:SetupMessage:CopyFiles' => 'Copy new version files~~',
 	'iTopUpdate:UI:SetupMessage:CheckCompile' => 'Check application upgrade~~',
 	'iTopUpdate:UI:SetupMessage:Compile' => 'Upgrade application and database~~',
 	'iTopUpdate:UI:SetupMessage:UpdateDatabase' => 'Upgrade database~~',
 	'iTopUpdate:UI:SetupMessage:ExitMaintenance' => 'Exiting maintenance mode~~',
-    'iTopUpdate:UI:SetupMessage:UpdateDone' => 'Upgrade completed~~',
+	'iTopUpdate:UI:SetupMessage:UpdateDone' => 'Upgrade completed~~',
 
 	// Errors
 	'iTopUpdate:Error:MissingFunction' => 'Impossible to start upgrade, missing function~~',
 	'iTopUpdate:Error:MissingFile' => 'Missing file: %1$s~~',
 	'iTopUpdate:Error:CorruptedFile' => 'File %1$s is corrupted~~',
-    'iTopUpdate:Error:BadFileFormat' => 'Upgrade file is not a zip file~~',
-    'iTopUpdate:Error:BadFileContent' => 'Upgrade file is not an application archive~~',
-    'iTopUpdate:Error:BadItopProduct' => 'Upgrade file is not compatible with your application~~',
+	'iTopUpdate:Error:BadFileFormat' => 'Upgrade file is not a zip file~~',
+	'iTopUpdate:Error:BadFileContent' => 'Upgrade file is not an application archive~~',
+	'iTopUpdate:Error:BadItopProduct' => 'Upgrade file is not compatible with your application~~',
 	'iTopUpdate:Error:Copy' => 'Error, cannot copy \'%1$s\' to \'%2$s\'~~',
-    'iTopUpdate:Error:FileNotFound' => 'File not found~~',
-    'iTopUpdate:Error:NoFile' => 'No file provided~~',
+	'iTopUpdate:Error:FileNotFound' => 'File not found~~',
+	'iTopUpdate:Error:NoFile' => 'No file provided~~',
 	'iTopUpdate:Error:InvalidToken' => 'Invalid token~~',
 	'iTopUpdate:Error:UpdateFailed' => 'Upgrade failed ~~',
 	'iTopUpdate:Error:FileUploadMaxSizeTooSmall' => 'The upload max size seems too small for update. Please change the PHP configuration.~~',
-
 	'iTopUpdate:UI:RestoreArchive' => 'You can restore your application from the archive \'%1$s\'~~',
 	'iTopUpdate:UI:RestoreBackup' => 'You can restore the database from \'%1$s\'~~',
 	'iTopUpdate:UI:UpdateDone' => 'Upgrade successful~~',
@@ -111,10 +106,10 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Menu:iTopUpdate+' => 'Application upgrade~~',
 
     // Missing itop entries
-    'Class:ModuleInstallation/Attribute:installed' => 'Installed on~~',
-    'Class:ModuleInstallation/Attribute:name' => 'Name~~',
-    'Class:ModuleInstallation/Attribute:version' => 'Version~~',
-    'Class:ModuleInstallation/Attribute:comment' => 'Comment~~',
+	'Class:ModuleInstallation/Attribute:installed' => 'Installed on~~',
+	'Class:ModuleInstallation/Attribute:name' => 'Name~~',
+	'Class:ModuleInstallation/Attribute:version' => 'Version~~',
+	'Class:ModuleInstallation/Attribute:comment' => 'Comment~~',
 ));
 
 
diff --git a/datamodels/2.x/itop-core-update/dictionaries/ja.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/dictionaries/ja.dict.itop-core-update.php
index 431c62f624..950ac4c07d 100644
--- a/datamodels/2.x/itop-core-update/dictionaries/ja.dict.itop-core-update.php
+++ b/datamodels/2.x/itop-core-update/dictionaries/ja.dict.itop-core-update.php
@@ -22,88 +22,83 @@
  */
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'iTopUpdate:UI:PageTitle' => 'Application Upgrade~~',
-    'itop-core-update:UI:SelectUpdateFile' => 'Application Upgrade~~',
-    'itop-core-update:UI:ConfirmUpdate' => 'Application Upgrade~~',
-    'itop-core-update:UI:UpdateCoreFiles' => 'Application Upgrade~~',
+	'itop-core-update:UI:SelectUpdateFile' => 'Application Upgrade~~',
+	'itop-core-update:UI:ConfirmUpdate' => 'Application Upgrade~~',
+	'itop-core-update:UI:UpdateCoreFiles' => 'Application Upgrade~~',
 	'iTopUpdate:UI:MaintenanceModeActive' => 'The application is currently under maintenance, no user can access the application. You have to run a setup or restore the application archive to return in normal mode.~~',
 	'itop-core-update:UI:UpdateDone' => 'Application Upgrade~~',
-
 	'itop-core-update/Operation:SelectUpdateFile/Title' => 'Application Upgrade~~',
 	'itop-core-update/Operation:ConfirmUpdate/Title' => 'Confirm Application Upgrade~~',
 	'itop-core-update/Operation:UpdateCoreFiles/Title' => 'Application Upgrading~~',
 	'itop-core-update/Operation:UpdateDone/Title' => 'Application Upgrade Done~~',
-
 	'iTopUpdate:UI:SelectUpdateFile' => 'Select an upgrade file to upload~~',
 	'iTopUpdate:UI:CheckUpdate' => 'Verify upgrade file~~',
 	'iTopUpdate:UI:ConfirmInstallFile' => 'You are about to install %1$s~~',
 	'iTopUpdate:UI:DoUpdate' => 'Upgrade~~',
 	'iTopUpdate:UI:CurrentVersion' => 'Current installed version~~',
 	'iTopUpdate:UI:NewVersion' => 'Newly installed version~~',
-    'iTopUpdate:UI:Back' => 'Back~~',
-    'iTopUpdate:UI:Cancel' => 'Cancel~~',
-    'iTopUpdate:UI:Continue' => 'Continue~~',
+	'iTopUpdate:UI:Back' => 'Back~~',
+	'iTopUpdate:UI:Cancel' => 'Cancel~~',
+	'iTopUpdate:UI:Continue' => 'Continue~~',
 	'iTopUpdate:UI:RunSetup' => 'Run Setup~~',
-    'iTopUpdate:UI:WithDBBackup' => 'Database backup~~',
-    'iTopUpdate:UI:WithFilesBackup' => 'Application files backup~~',
-    'iTopUpdate:UI:WithoutBackup' => 'No backup is planned~~',
-    'iTopUpdate:UI:Backup' => 'Backup generated before update~~',
+	'iTopUpdate:UI:WithDBBackup' => 'Database backup~~',
+	'iTopUpdate:UI:WithFilesBackup' => 'Application files backup~~',
+	'iTopUpdate:UI:WithoutBackup' => 'No backup is planned~~',
+	'iTopUpdate:UI:Backup' => 'Backup generated before update~~',
 	'iTopUpdate:UI:DoFilesArchive' => 'Archive application files~~',
 	'iTopUpdate:UI:UploadArchive' => 'Select a package to upload~~',
 	'iTopUpdate:UI:ServerFile' => 'Path of a package already on the server~~',
 	'iTopUpdate:UI:WarningReadOnlyDuringUpdate' => 'During the upgrade, the application will be read-only.~~',
-
-    'iTopUpdate:UI:Status' => 'Status~~',
-    'iTopUpdate:UI:Action' => 'Update~~',
-    'iTopUpdate:UI:History' => 'Versions History~~',
-    'iTopUpdate:UI:Progress' => 'Progress of the upgrade~~',
-
-    'iTopUpdate:UI:DoBackup:Label' => 'Backup files and database~~',
-    'iTopUpdate:UI:DoBackup:Warning' => 'Backup is not recommended due to limited available disk space~~',
-
-    'iTopUpdate:UI:DiskFreeSpace' => 'Disk free space~~',
-    'iTopUpdate:UI:ItopDiskSpace' => ITOP_APPLICATION_SHORT.' disk space~~',
-    'iTopUpdate:UI:DBDiskSpace' => 'Database disk space~~',
+	'iTopUpdate:UI:Status' => 'Status~~',
+	'iTopUpdate:UI:Action' => 'Update~~',
+	'iTopUpdate:UI:Setup' => ITOP_APPLICATION_SHORT.' Setup~~',
+	'iTopUpdate:UI:History' => 'Versions History~~',
+	'iTopUpdate:UI:Progress' => 'Progress of the upgrade~~',
+	'iTopUpdate:UI:DoBackup:Label' => 'Backup files and database~~',
+	'iTopUpdate:UI:DoBackup:Warning' => 'Backup is not recommended due to limited available disk space~~',
+	'iTopUpdate:UI:DiskFreeSpace' => 'Disk free space~~',
+	'iTopUpdate:UI:ItopDiskSpace' => ITOP_APPLICATION_SHORT.' disk space~~',
+	'iTopUpdate:UI:DBDiskSpace' => 'Database disk space~~',
 	'iTopUpdate:UI:FileUploadMaxSize' => 'File upload max size~~',
-
 	'iTopUpdate:UI:PostMaxSize' => 'PHP ini value post_max_size: %1$s~~',
 	'iTopUpdate:UI:UploadMaxFileSize' => 'PHP ini value upload_max_filesize: %1$s~~',
-
-    'iTopUpdate:UI:CanCoreUpdate:Loading' => 'Checking filesystem~~',
-    'iTopUpdate:UI:CanCoreUpdate:Error' => 'Checking filesystem failed (%1$s)~~',
-    'iTopUpdate:UI:CanCoreUpdate:ErrorFileNotExist' => 'Checking filesystem failed (File not exist %1$s)~~',
-    'iTopUpdate:UI:CanCoreUpdate:Failed' => 'Checking filesystem failed~~',
-    'iTopUpdate:UI:CanCoreUpdate:Yes' => 'Application can be updated~~',
+	'iTopUpdate:UI:CanCoreUpdate:Loading' => 'Checking filesystem~~',
+	'iTopUpdate:UI:CanCoreUpdate:Error' => 'Checking filesystem failed (%1$s)~~',
+	'iTopUpdate:UI:CanCoreUpdate:ErrorFileNotExist' => 'Checking filesystem failed (File not exist %1$s)~~',
+	'iTopUpdate:UI:CanCoreUpdate:Failed' => 'Checking filesystem failed~~',
+	'iTopUpdate:UI:CanCoreUpdate:Yes' => 'Application can be updated~~',
 	'iTopUpdate:UI:CanCoreUpdate:No' => 'Application cannot be updated: %1$s~~',
 	'iTopUpdate:UI:CanCoreUpdate:Warning' => 'Warning: application update can fail: %1$s~~',
 	'iTopUpdate:UI:CannotUpdateUseSetup' => '<b>Some modified files were detected</b>, a partial update cannot be executed.</br>Follow the <a target="_blank" href="%2$s"> procedure</a> in order to manually upgrade your iTop. You must use the <a href="%1$s">setup</a> to update the application.~~',
 	'iTopUpdate:UI:CheckInProgress' => 'Please wait during integrity check~~',
+	'iTopUpdate:UI:SetupLaunch' => 'Launch '.ITOP_APPLICATION_SHORT.' Setup~~',
+	'iTopUpdate:UI:SetupLaunchConfirm' => 'This will launch '.ITOP_APPLICATION_SHORT.' setup, are you sure?~~',
 
 	// Setup Messages
-    'iTopUpdate:UI:SetupMessage:Ready' => 'Ready to start~~',
+	'iTopUpdate:UI:SetupMessage:Ready' => 'Ready to start~~',
 	'iTopUpdate:UI:SetupMessage:EnterMaintenance' => 'Entering maintenance mode~~',
 	'iTopUpdate:UI:SetupMessage:Backup' => 'Database backup~~',
 	'iTopUpdate:UI:SetupMessage:FilesArchive' => 'Archive application files~~',
-    'iTopUpdate:UI:SetupMessage:CopyFiles' => 'Copy new version files~~',
+	'iTopUpdate:UI:SetupMessage:CopyFiles' => 'Copy new version files~~',
 	'iTopUpdate:UI:SetupMessage:CheckCompile' => 'Check application upgrade~~',
 	'iTopUpdate:UI:SetupMessage:Compile' => 'Upgrade application and database~~',
 	'iTopUpdate:UI:SetupMessage:UpdateDatabase' => 'Upgrade database~~',
 	'iTopUpdate:UI:SetupMessage:ExitMaintenance' => 'Exiting maintenance mode~~',
-    'iTopUpdate:UI:SetupMessage:UpdateDone' => 'Upgrade completed~~',
+	'iTopUpdate:UI:SetupMessage:UpdateDone' => 'Upgrade completed~~',
 
 	// Errors
 	'iTopUpdate:Error:MissingFunction' => 'Impossible to start upgrade, missing function~~',
 	'iTopUpdate:Error:MissingFile' => 'Missing file: %1$s~~',
 	'iTopUpdate:Error:CorruptedFile' => 'File %1$s is corrupted~~',
-    'iTopUpdate:Error:BadFileFormat' => 'Upgrade file is not a zip file~~',
-    'iTopUpdate:Error:BadFileContent' => 'Upgrade file is not an application archive~~',
-    'iTopUpdate:Error:BadItopProduct' => 'Upgrade file is not compatible with your application~~',
+	'iTopUpdate:Error:BadFileFormat' => 'Upgrade file is not a zip file~~',
+	'iTopUpdate:Error:BadFileContent' => 'Upgrade file is not an application archive~~',
+	'iTopUpdate:Error:BadItopProduct' => 'Upgrade file is not compatible with your application~~',
 	'iTopUpdate:Error:Copy' => 'Error, cannot copy \'%1$s\' to \'%2$s\'~~',
-    'iTopUpdate:Error:FileNotFound' => 'File not found~~',
-    'iTopUpdate:Error:NoFile' => 'No file provided~~',
+	'iTopUpdate:Error:FileNotFound' => 'File not found~~',
+	'iTopUpdate:Error:NoFile' => 'No file provided~~',
 	'iTopUpdate:Error:InvalidToken' => 'Invalid token~~',
 	'iTopUpdate:Error:UpdateFailed' => 'Upgrade failed ~~',
 	'iTopUpdate:Error:FileUploadMaxSizeTooSmall' => 'The upload max size seems too small for update. Please change the PHP configuration.~~',
-
 	'iTopUpdate:UI:RestoreArchive' => 'You can restore your application from the archive \'%1$s\'~~',
 	'iTopUpdate:UI:RestoreBackup' => 'You can restore the database from \'%1$s\'~~',
 	'iTopUpdate:UI:UpdateDone' => 'Upgrade successful~~',
@@ -111,10 +106,10 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Menu:iTopUpdate+' => 'Application upgrade~~',
 
     // Missing itop entries
-    'Class:ModuleInstallation/Attribute:installed' => 'Installed on~~',
-    'Class:ModuleInstallation/Attribute:name' => 'Name~~',
-    'Class:ModuleInstallation/Attribute:version' => 'Version~~',
-    'Class:ModuleInstallation/Attribute:comment' => 'Comment~~',
+	'Class:ModuleInstallation/Attribute:installed' => 'Installed on~~',
+	'Class:ModuleInstallation/Attribute:name' => 'Name~~',
+	'Class:ModuleInstallation/Attribute:version' => 'Version~~',
+	'Class:ModuleInstallation/Attribute:comment' => 'Comment~~',
 ));
 
 
diff --git a/datamodels/2.x/itop-core-update/dictionaries/nl.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/dictionaries/nl.dict.itop-core-update.php
index 60e54819b9..b7b54cf388 100644
--- a/datamodels/2.x/itop-core-update/dictionaries/nl.dict.itop-core-update.php
+++ b/datamodels/2.x/itop-core-update/dictionaries/nl.dict.itop-core-update.php
@@ -24,86 +24,83 @@
  */
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'iTopUpdate:UI:PageTitle' => 'Upgraden toepassing',
-    'itop-core-update:UI:SelectUpdateFile' => 'Upgrade',
-    'itop-core-update:UI:ConfirmUpdate' => 'Upgrade',
-    'itop-core-update:UI:UpdateCoreFiles' => 'Upgrade',
+	'itop-core-update:UI:SelectUpdateFile' => 'Upgrade',
+	'itop-core-update:UI:ConfirmUpdate' => 'Upgrade',
+	'itop-core-update:UI:UpdateCoreFiles' => 'Upgrade',
 	'iTopUpdate:UI:MaintenanceModeActive' => 'De onderhoudsmode van deze toepassing is actief. Geen enkele gebruiker heeft momenteel toegang. Voer een setup of herstel uit om de onderhoudsmode te deactiveren.',
 	'itop-core-update:UI:UpdateDone' => 'Upgrade voltooid',
-
 	'itop-core-update/Operation:SelectUpdateFile/Title' => 'Upgrade',
 	'itop-core-update/Operation:ConfirmUpdate/Title' => 'Upgrade',
 	'itop-core-update/Operation:UpdateCoreFiles/Title' => 'Upgrade',
 	'itop-core-update/Operation:UpdateDone/Title' => 'Upgrade voltooid',
-
 	'iTopUpdate:UI:SelectUpdateFile' => 'Selecteer een upgrade-bestand om te uploaden',
 	'iTopUpdate:UI:CheckUpdate' => 'Verifieer upgrade-bestand',
 	'iTopUpdate:UI:ConfirmInstallFile' => 'Er zal een upgrade uitgevoerd worden met %1$s',
 	'iTopUpdate:UI:DoUpdate' => 'Upgrade',
 	'iTopUpdate:UI:CurrentVersion' => 'Huidige versie',
 	'iTopUpdate:UI:NewVersion' => 'Nieuwe versie',
-    'iTopUpdate:UI:Back' => 'Vorige',
-    'iTopUpdate:UI:Cancel' => 'Annuleer',
-    'iTopUpdate:UI:Continue' => 'Volgende',
+	'iTopUpdate:UI:Back' => 'Vorige',
+	'iTopUpdate:UI:Cancel' => 'Annuleer',
+	'iTopUpdate:UI:Continue' => 'Volgende',
 	'iTopUpdate:UI:RunSetup' => 'Setup uitvoeren',
-    'iTopUpdate:UI:WithDBBackup' => 'Backup database',
-    'iTopUpdate:UI:WithFilesBackup' => 'Backup toepassingsbestanden',
-    'iTopUpdate:UI:WithoutBackup' => 'Er is geen backup gepland',
-    'iTopUpdate:UI:Backup' => 'Er is een backup gegenereerd voorafgaand aan de installatie',
+	'iTopUpdate:UI:WithDBBackup' => 'Backup database',
+	'iTopUpdate:UI:WithFilesBackup' => 'Backup toepassingsbestanden',
+	'iTopUpdate:UI:WithoutBackup' => 'Er is geen backup gepland',
+	'iTopUpdate:UI:Backup' => 'Er is een backup gegenereerd voorafgaand aan de installatie',
 	'iTopUpdate:UI:DoFilesArchive' => 'Archiveer toepassingsbestanden',
 	'iTopUpdate:UI:UploadArchive' => 'Selecteer een archief om te uploaden',
 	'iTopUpdate:UI:ServerFile' => 'Het pad van dit archief bestaat al op de server',
 	'iTopUpdate:UI:WarningReadOnlyDuringUpdate' => 'Tijdens de upgrade zal de applicatie enkel toegankelijk zijn als "alleen lezen".',
-
-    'iTopUpdate:UI:Status' => 'Status',
-    'iTopUpdate:UI:Action' => 'Update',
-    'iTopUpdate:UI:History' => 'Versiegeschiedenis',
-    'iTopUpdate:UI:Progress' => 'Voortgang van de upgrade',
-
-    'iTopUpdate:UI:DoBackup:Label' => 'Maak een backup van de bestanden en database',
-    'iTopUpdate:UI:DoBackup:Warning' => 'Een backup maken wordt afgeraden doordat er weinig schijfruimte is',
-
-    'iTopUpdate:UI:DiskFreeSpace' => 'Vrije schijfruimte',
-    'iTopUpdate:UI:ItopDiskSpace' => ITOP_APPLICATION_SHORT.' schijfgebruik',
-    'iTopUpdate:UI:DBDiskSpace' => 'Database schijfgebruik',
+	'iTopUpdate:UI:Status' => 'Status',
+	'iTopUpdate:UI:Action' => 'Update',
+	'iTopUpdate:UI:Setup' => ITOP_APPLICATION_SHORT.' Setup~~',
+	'iTopUpdate:UI:History' => 'Versiegeschiedenis',
+	'iTopUpdate:UI:Progress' => 'Voortgang van de upgrade',
+	'iTopUpdate:UI:DoBackup:Label' => 'Maak een backup van de bestanden en database',
+	'iTopUpdate:UI:DoBackup:Warning' => 'Een backup maken wordt afgeraden doordat er weinig schijfruimte is',
+	'iTopUpdate:UI:DiskFreeSpace' => 'Vrije schijfruimte',
+	'iTopUpdate:UI:ItopDiskSpace' => ITOP_APPLICATION_SHORT.' schijfgebruik',
+	'iTopUpdate:UI:DBDiskSpace' => 'Database schijfgebruik',
 	'iTopUpdate:UI:FileUploadMaxSize' => 'Maximale bestandsgrootte (upload)',
-
 	'iTopUpdate:UI:PostMaxSize' => 'PHP ini-waarde post_max_size: %1$s',
 	'iTopUpdate:UI:UploadMaxFileSize' => 'PHP ini-waarde upload_max_filesize: %1$s',
-
-    'iTopUpdate:UI:CanCoreUpdate:Loading' => 'Controle van het bestandssysteem',
-    'iTopUpdate:UI:CanCoreUpdate:Error' => 'Controle van het bestandssysteem is mislukt (%1$s)',
-    'iTopUpdate:UI:CanCoreUpdate:ErrorFileNotExist' => 'Controle van het bestandssysteem mislukt (Bestand bestaat niet: %1$s)',
-    'iTopUpdate:UI:CanCoreUpdate:Failed' => 'Controle van het bestandssysteem is mislukt',
-    'iTopUpdate:UI:CanCoreUpdate:Yes' => 'Updaten van toepassing is mogelijk',
+	'iTopUpdate:UI:CanCoreUpdate:Loading' => 'Controle van het bestandssysteem',
+	'iTopUpdate:UI:CanCoreUpdate:Error' => 'Controle van het bestandssysteem is mislukt (%1$s)',
+	'iTopUpdate:UI:CanCoreUpdate:ErrorFileNotExist' => 'Controle van het bestandssysteem mislukt (Bestand bestaat niet: %1$s)',
+	'iTopUpdate:UI:CanCoreUpdate:Failed' => 'Controle van het bestandssysteem is mislukt',
+	'iTopUpdate:UI:CanCoreUpdate:Yes' => 'Updaten van toepassing is mogelijk',
 	'iTopUpdate:UI:CanCoreUpdate:No' => 'Updaten van de toepassing is niet mogelijk: %1$s',
+	'iTopUpdate:UI:CanCoreUpdate:Warning' => 'Warning: application update can fail: %1$s~~',
+	'iTopUpdate:UI:CannotUpdateUseSetup' => '<b>Some modified files were detected</b>, a partial update cannot be executed.</br>Follow the <a target="_blank" href="%2$s"> procedure</a> in order to manually upgrade your iTop. You must use the <a href="%1$s">setup</a> to update the application.~~',
 	'iTopUpdate:UI:CheckInProgress' => 'Even geduld terwijl de integriteitscontrole loopt',
+	'iTopUpdate:UI:SetupLaunch' => 'Launch '.ITOP_APPLICATION_SHORT.' Setup~~',
+	'iTopUpdate:UI:SetupLaunchConfirm' => 'This will launch '.ITOP_APPLICATION_SHORT.' setup, are you sure?~~',
 
 	// Setup Messages
-    'iTopUpdate:UI:SetupMessage:Ready' => 'Klaar om verder te gaan',
+	'iTopUpdate:UI:SetupMessage:Ready' => 'Klaar om verder te gaan',
 	'iTopUpdate:UI:SetupMessage:EnterMaintenance' => 'Activeren van onderhoudsmode',
 	'iTopUpdate:UI:SetupMessage:Backup' => 'Maken van backup database',
 	'iTopUpdate:UI:SetupMessage:FilesArchive' => 'Archiveren van de toepassingsbestanden',
-    'iTopUpdate:UI:SetupMessage:CopyFiles' => 'Kopiëren van nieuwe versies van bestanden',
+	'iTopUpdate:UI:SetupMessage:CopyFiles' => 'Kopiëren van nieuwe versies van bestanden',
 	'iTopUpdate:UI:SetupMessage:CheckCompile' => 'Controleren van de upgrade van de toepassing',
 	'iTopUpdate:UI:SetupMessage:Compile' => 'Upgraden van toepassing en database',
 	'iTopUpdate:UI:SetupMessage:UpdateDatabase' => 'Upgraden van database',
 	'iTopUpdate:UI:SetupMessage:ExitMaintenance' => 'Deactiveren van onderhoudsmode',
-    'iTopUpdate:UI:SetupMessage:UpdateDone' => 'Upgrade voltooid',
+	'iTopUpdate:UI:SetupMessage:UpdateDone' => 'Upgrade voltooid',
 
 	// Errors
 	'iTopUpdate:Error:MissingFunction' => 'Onmogelijk om de upgrade te starten, een functie ontbreekt',
 	'iTopUpdate:Error:MissingFile' => 'Bestand ontbreekt: %1$s',
 	'iTopUpdate:Error:CorruptedFile' => 'Bestand %1$s is corrupt',
-    'iTopUpdate:Error:BadFileFormat' => 'Upgradebestand is geen ZIP-bestand',
-    'iTopUpdate:Error:BadFileContent' => 'Upgradebestand is geen toepassingsarchief',
-    'iTopUpdate:Error:BadItopProduct' => 'Upgradebestand is niet compatibel met jouw toepassing',
+	'iTopUpdate:Error:BadFileFormat' => 'Upgradebestand is geen ZIP-bestand',
+	'iTopUpdate:Error:BadFileContent' => 'Upgradebestand is geen toepassingsarchief',
+	'iTopUpdate:Error:BadItopProduct' => 'Upgradebestand is niet compatibel met jouw toepassing',
 	'iTopUpdate:Error:Copy' => 'Fout: kan niet kopiëren van "%1$s" naar "%2$s"',
-    'iTopUpdate:Error:FileNotFound' => 'Bestand niet gevonden',
-    'iTopUpdate:Error:NoFile' => 'Geen bestand opgegeven',
+	'iTopUpdate:Error:FileNotFound' => 'Bestand niet gevonden',
+	'iTopUpdate:Error:NoFile' => 'Geen bestand opgegeven',
 	'iTopUpdate:Error:InvalidToken' => 'Token ongeldig',
 	'iTopUpdate:Error:UpdateFailed' => 'Upgrade mislukt',
 	'iTopUpdate:Error:FileUploadMaxSizeTooSmall' => 'De maximale bestandsgrootte voor uploads lijkt te klein voor deze update. Controleer de PHP-configuratie.',
-
 	'iTopUpdate:UI:RestoreArchive' => 'Je kan de toepassing herstellen via het archief "%1$s"',
 	'iTopUpdate:UI:RestoreBackup' => 'Je kan de database herstellen via het archief "%1$s"',
 	'iTopUpdate:UI:UpdateDone' => 'Upgrade geslaagd',
@@ -111,10 +108,10 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Menu:iTopUpdate+' => 'Upgrade toepassing',
 
     // Missing itop entries
-    'Class:ModuleInstallation/Attribute:installed' => 'Geïnstalleerd op',
-    'Class:ModuleInstallation/Attribute:name' => 'Naam',
-    'Class:ModuleInstallation/Attribute:version' => 'Versie',
-    'Class:ModuleInstallation/Attribute:comment' => 'Opmerkingen',
+	'Class:ModuleInstallation/Attribute:installed' => 'Geïnstalleerd op',
+	'Class:ModuleInstallation/Attribute:name' => 'Naam',
+	'Class:ModuleInstallation/Attribute:version' => 'Versie',
+	'Class:ModuleInstallation/Attribute:comment' => 'Opmerkingen',
 ));
 
 
diff --git a/datamodels/2.x/itop-core-update/dictionaries/pl.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/dictionaries/pl.dict.itop-core-update.php
index fd5f82ecfd..bab72fff03 100644
--- a/datamodels/2.x/itop-core-update/dictionaries/pl.dict.itop-core-update.php
+++ b/datamodels/2.x/itop-core-update/dictionaries/pl.dict.itop-core-update.php
@@ -22,100 +22,92 @@
  */
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'iTopUpdate:UI:PageTitle' => 'Aktualizacja aplikacji',
-    'itop-core-update:UI:SelectUpdateFile' => 'Aktualizacja aplikacji',
-    'itop-core-update:UI:ConfirmUpdate' => 'Potwierdź aktualizację aplikacji',
-    'itop-core-update:UI:UpdateCoreFiles' => 'Aktualizacja aplikacji',
+	'itop-core-update:UI:SelectUpdateFile' => 'Aktualizacja aplikacji',
+	'itop-core-update:UI:ConfirmUpdate' => 'Potwierdź aktualizację aplikacji',
+	'itop-core-update:UI:UpdateCoreFiles' => 'Aktualizacja aplikacji',
 	'iTopUpdate:UI:MaintenanceModeActive' => 'Aplikacja jest obecnie w trakcie konserwacji w trybie tylko do odczytu. Musisz uruchomić konfigurację, aby powrócić do normalnego trybu.',
 	'itop-core-update:UI:UpdateDone' => 'Aktualizacja aplikacji',
-
 	'itop-core-update/Operation:SelectUpdateFile/Title' => 'Aktualizacja aplikacji',
 	'itop-core-update/Operation:ConfirmUpdate/Title' => 'Potwierdź aktualizację aplikacji',
 	'itop-core-update/Operation:UpdateCoreFiles/Title' => 'Aktualizacja aplikacji',
 	'itop-core-update/Operation:UpdateDone/Title' => 'Aktualizacja aplikacji zakończona',
-
 	'iTopUpdate:UI:SelectUpdateFile' => 'Wybierz plik aktualizacji do przesłania',
 	'iTopUpdate:UI:CheckUpdate' => 'Weryfikacja pliku aktualizacji',
 	'iTopUpdate:UI:ConfirmInstallFile' => 'Masz zamiar zainstalować %1$s',
 	'iTopUpdate:UI:DoUpdate' => 'Aktualizacja',
 	'iTopUpdate:UI:CurrentVersion' => 'Aktualnie zainstalowana wersja',
 	'iTopUpdate:UI:NewVersion' => 'Nowo zainstalowana wersja',
-    'iTopUpdate:UI:Back' => 'Wstecz',
-    'iTopUpdate:UI:Cancel' => 'Anuluj',
-    'iTopUpdate:UI:Continue' => 'Kontynuuj',
+	'iTopUpdate:UI:Back' => 'Wstecz',
+	'iTopUpdate:UI:Cancel' => 'Anuluj',
+	'iTopUpdate:UI:Continue' => 'Kontynuuj',
 	'iTopUpdate:UI:RunSetup' => 'Uruchom instalację',
-    'iTopUpdate:UI:WithDBBackup' => 'Kopia zapasowa bazy danych',
-    'iTopUpdate:UI:WithFilesBackup' => 'Kopia zapasowa plików aplikacji',
-    'iTopUpdate:UI:WithoutBackup' => 'Nie ma zaplanowanych kopii zapasowych',
-    'iTopUpdate:UI:Backup' => 'Kopia zapasowa wygenerowana przed aktualizacją',
+	'iTopUpdate:UI:WithDBBackup' => 'Kopia zapasowa bazy danych',
+	'iTopUpdate:UI:WithFilesBackup' => 'Kopia zapasowa plików aplikacji',
+	'iTopUpdate:UI:WithoutBackup' => 'Nie ma zaplanowanych kopii zapasowych',
+	'iTopUpdate:UI:Backup' => 'Kopia zapasowa wygenerowana przed aktualizacją',
 	'iTopUpdate:UI:DoFilesArchive' => 'Archiwizuj pliki aplikacji',
 	'iTopUpdate:UI:UploadArchive' => 'Wybierz pakiet do przesłania',
 	'iTopUpdate:UI:ServerFile' => 'Ścieżka pakietu znajdującego się na serwerze',
 	'iTopUpdate:UI:WarningReadOnlyDuringUpdate' => 'Podczas aktualizacji aplikacja będzie tylko do odczytu.',
-
 	'iTopUpdate:UI:Status' => 'Status',
 	'iTopUpdate:UI:Action' => 'Aktualizacja',
+	'iTopUpdate:UI:Setup' => ITOP_APPLICATION_SHORT.' Setup~~',
 	'iTopUpdate:UI:History' => 'Historia wersji',
 	'iTopUpdate:UI:Progress' => 'Progress of the upgrade',
-
 	'iTopUpdate:UI:DoBackup:Label' => 'Kopie zapasowe plików i bazy danych',
 	'iTopUpdate:UI:DoBackup:Warning' => 'Tworzenie kopii zapasowych nie jest zalecane ze względu na ograniczoną ilość wolnego miejsca na dysku',
-
 	'iTopUpdate:UI:DiskFreeSpace' => 'Wolne miejsce na dysku',
 	'iTopUpdate:UI:ItopDiskSpace' => 'Przestrzeń dyskowa  '.ITOP_APPLICATION_SHORT,
 	'iTopUpdate:UI:DBDiskSpace' => 'Przestrzeń dyskowa bazy danych',
 	'iTopUpdate:UI:FileUploadMaxSize' => 'Maksymalny rozmiar przesyłanego pliku',
-
 	'iTopUpdate:UI:PostMaxSize' => 'Wartość PHP ini post_max_size: %1$s',
 	'iTopUpdate:UI:UploadMaxFileSize' => 'Wartość PHP ini upload_max_filesize: %1$s',
-
 	'iTopUpdate:UI:CanCoreUpdate:Loading' => 'Sprawdzanie plików',
 	'iTopUpdate:UI:CanCoreUpdate:Error' => 'Sprawdzanie plików nie powiodło się (%1$s)',
 	'iTopUpdate:UI:CanCoreUpdate:ErrorFileNotExist' => 'Sprawdzanie plików nie powiodło się (plik nie istnieje %1$s)',
 	'iTopUpdate:UI:CanCoreUpdate:Failed' => 'Sprawdzanie plików nie powiodło się',
-    'iTopUpdate:UI:CanCoreUpdate:Yes' => 'Aplikacja może być zaktualizowana',
+	'iTopUpdate:UI:CanCoreUpdate:Yes' => 'Aplikacja może być zaktualizowana',
 	'iTopUpdate:UI:CanCoreUpdate:No' => 'Nie można zaktualizować aplikacji: %1$s',
 	'iTopUpdate:UI:CanCoreUpdate:Warning' => 'Ostrzeżenie: aktualizacja aplikacji może się nie powieść: %1$s',
 	'iTopUpdate:UI:CannotUpdateUseSetup' => '<b>Wykryto kilka zmodyfikowanych plików</b>, nie można wykonać częściowej aktualizacji.</br>Postępuj zgodnie z <a target="_blank" href="%2$s"> procedurą</a> w celu ręcznej aktualizacji iTop. Musisz użyć <a href="%1$s">setup</a> aby zaktualizować aplikację.',
 	'iTopUpdate:UI:CannotUpdateNewModules' => '<b>Wykryto kilka nowych modułów</b>, nie można wykonać częściowej aktualizacji.</br>Postępuj zgodnie z <a target="_blank" href="%2$s"> procedurą</a> w celu ręcznej aktualizacji iTop. Musisz użyć <a href="%1$s">setup</a> aby zaktualizować aplikację.',
 	'iTopUpdate:UI:CheckInProgress' => 'Proszę czekać trwa sprawdzanie integralności',
-
-	// Setup Messages
-    'iTopUpdate:UI:SetupMessage:Ready' => 'Gotowy do startu',
+	'iTopUpdate:UI:SetupLaunch' => 'Launch '.ITOP_APPLICATION_SHORT.' Setup~~',
+	'iTopUpdate:UI:SetupLaunchConfirm' => 'This will launch '.ITOP_APPLICATION_SHORT.' setup, are you sure?~~',
+    // Setup Messages
+	'iTopUpdate:UI:SetupMessage:Ready' => 'Gotowy do startu',
 	'iTopUpdate:UI:SetupMessage:EnterMaintenance' => 'Wejście w tryb konserwacji',
 	'iTopUpdate:UI:SetupMessage:Backup' => 'Kopia zapasowa bazy danych',
 	'iTopUpdate:UI:SetupMessage:FilesArchive' => 'Archiwizacja pliki aplikacji',
-    'iTopUpdate:UI:SetupMessage:CopyFiles' => 'Kopiowanie plików nowej wersji',
+	'iTopUpdate:UI:SetupMessage:CopyFiles' => 'Kopiowanie plików nowej wersji',
 	'iTopUpdate:UI:SetupMessage:CheckCompile' => 'Sprawdzenie aktualizacji aplikacji',
 	'iTopUpdate:UI:SetupMessage:Compile' => 'Aktualizacja aplikacji',
 	'iTopUpdate:UI:SetupMessage:UpdateDatabase' => 'Aktualizacja bazy danych',
 	'iTopUpdate:UI:SetupMessage:ExitMaintenance' => 'Wyjście z trybu konserwacji',
-    'iTopUpdate:UI:SetupMessage:UpdateDone' => 'Aktualizacja zakończona',
-
-	// Errors
+	'iTopUpdate:UI:SetupMessage:UpdateDone' => 'Aktualizacja zakończona',
+    // Errors
 	'iTopUpdate:Error:MissingFunction' => 'Niemożliwe rozpoczęcie aktualizacji, brak funkcji',
 	'iTopUpdate:Error:MissingFile' => 'Brakujący plik: %1$s',
 	'iTopUpdate:Error:CorruptedFile' => 'Plik %1$s jest uszkodzony',
-    'iTopUpdate:Error:BadFileFormat' => 'Plik aktualizacji nie jest plikiem ZIP',
-    'iTopUpdate:Error:BadFileContent' => 'Plik aktualizacji nie jest archiwum aplikacji',
-    'iTopUpdate:Error:BadItopProduct' => 'Plik aktualizacji nie jest zgodny z twoją aplikacją',
+	'iTopUpdate:Error:BadFileFormat' => 'Plik aktualizacji nie jest plikiem ZIP',
+	'iTopUpdate:Error:BadFileContent' => 'Plik aktualizacji nie jest archiwum aplikacji',
+	'iTopUpdate:Error:BadItopProduct' => 'Plik aktualizacji nie jest zgodny z twoją aplikacją',
 	'iTopUpdate:Error:Copy' => 'Błąd, nie można skopiować \'%1$s\' do \'%2$s\'',
-    'iTopUpdate:Error:FileNotFound' => 'Nie znaleziono pliku',
-    'iTopUpdate:Error:NoFile' => 'Brak pliku',
+	'iTopUpdate:Error:FileNotFound' => 'Nie znaleziono pliku',
+	'iTopUpdate:Error:NoFile' => 'Brak pliku',
 	'iTopUpdate:Error:InvalidToken' => 'Nieprawidłowy Token',
 	'iTopUpdate:Error:UpdateFailed' => 'Aktualizacja nie powiodła się ',
 	'iTopUpdate:Error:FileUploadMaxSizeTooSmall' => 'Maksymalny rozmiar przesyłania wydaje się za mały do aktualizacji. Zmień konfigurację PHP.',
-
 	'iTopUpdate:UI:RestoreArchive' => 'Możesz przywrócić swoją aplikację z archiwum \'%1$s\'',
 	'iTopUpdate:UI:RestoreBackup' => 'Możesz przywrócić bazę danych z pliku \'%1$s\'',
 	'iTopUpdate:UI:UpdateDone' => 'Aktualizacja powiodła się',
 	'Menu:iTopUpdate' => 'Aktualizacja aplikacji',
 	'Menu:iTopUpdate+' => 'Aktualizacja aplikacji',
-
     // Missing itop entries
-    'Class:ModuleInstallation/Attribute:installed' => 'Zainstalowano',
-    'Class:ModuleInstallation/Attribute:name' => 'Nazwa',
-    'Class:ModuleInstallation/Attribute:version' => 'Wersja',
-    'Class:ModuleInstallation/Attribute:comment' => 'Komentarz',
+	'Class:ModuleInstallation/Attribute:installed' => 'Zainstalowano',
+	'Class:ModuleInstallation/Attribute:name' => 'Nazwa',
+	'Class:ModuleInstallation/Attribute:version' => 'Wersja',
+	'Class:ModuleInstallation/Attribute:comment' => 'Komentarz',
 ));
 
 
diff --git a/datamodels/2.x/itop-core-update/dictionaries/pt_br.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/dictionaries/pt_br.dict.itop-core-update.php
index 7475905311..b659a145b4 100644
--- a/datamodels/2.x/itop-core-update/dictionaries/pt_br.dict.itop-core-update.php
+++ b/datamodels/2.x/itop-core-update/dictionaries/pt_br.dict.itop-core-update.php
@@ -22,100 +22,92 @@
  */
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'iTopUpdate:UI:PageTitle' => 'Atualização do '.ITOP_APPLICATION_SHORT,
-    'itop-core-update:UI:SelectUpdateFile' => 'Atualização do '.ITOP_APPLICATION_SHORT,
-    'itop-core-update:UI:ConfirmUpdate' => 'Atualização do '.ITOP_APPLICATION_SHORT,
-    'itop-core-update:UI:UpdateCoreFiles' => 'Atualização do '.ITOP_APPLICATION_SHORT,
+	'itop-core-update:UI:SelectUpdateFile' => 'Atualização do '.ITOP_APPLICATION_SHORT,
+	'itop-core-update:UI:ConfirmUpdate' => 'Atualização do '.ITOP_APPLICATION_SHORT,
+	'itop-core-update:UI:UpdateCoreFiles' => 'Atualização do '.ITOP_APPLICATION_SHORT,
 	'iTopUpdate:UI:MaintenanceModeActive' => 'O '.ITOP_APPLICATION_SHORT.' encontra-se em manutenção, nenhum usuário pode acessar a aplicação. Você precisa rodar o Setup ou restaurar os arquivos da aplicação para voltar ao modo normal',
 	'itop-core-update:UI:UpdateDone' => 'Atualização do '.ITOP_APPLICATION_SHORT,
-
 	'itop-core-update/Operation:SelectUpdateFile/Title' => 'Atualização do '.ITOP_APPLICATION_SHORT,
 	'itop-core-update/Operation:ConfirmUpdate/Title' => 'Confirmar Atualização do '.ITOP_APPLICATION_SHORT,
 	'itop-core-update/Operation:UpdateCoreFiles/Title' => 'Aplicação em Atualização',
 	'itop-core-update/Operation:UpdateDone/Title' => 'Atualização do '.ITOP_APPLICATION_SHORT.' finalizada',
-
 	'iTopUpdate:UI:SelectUpdateFile' => 'Escolha o arquivo de atualização para enviar',
 	'iTopUpdate:UI:CheckUpdate' => 'Verificando arquivo de atualização',
 	'iTopUpdate:UI:ConfirmInstallFile' => 'Você está prestes a instalar %1$s',
 	'iTopUpdate:UI:DoUpdate' => 'Atualizar',
 	'iTopUpdate:UI:CurrentVersion' => 'Versão atual',
 	'iTopUpdate:UI:NewVersion' => 'Nova versão',
-    'iTopUpdate:UI:Back' => 'Voltar',
-    'iTopUpdate:UI:Cancel' => 'Cancelar',
-    'iTopUpdate:UI:Continue' => 'Continuar',
+	'iTopUpdate:UI:Back' => 'Voltar',
+	'iTopUpdate:UI:Cancel' => 'Cancelar',
+	'iTopUpdate:UI:Continue' => 'Continuar',
 	'iTopUpdate:UI:RunSetup' => 'Rodar Setup',
-    'iTopUpdate:UI:WithDBBackup' => 'Backup do banco de dados',
-    'iTopUpdate:UI:WithFilesBackup' => 'Backup dos arquivos da aplicação',
-    'iTopUpdate:UI:WithoutBackup' => 'Backup não planejado',
-    'iTopUpdate:UI:Backup' => 'Backup gerado antes da atualização',
+	'iTopUpdate:UI:WithDBBackup' => 'Backup do banco de dados',
+	'iTopUpdate:UI:WithFilesBackup' => 'Backup dos arquivos da aplicação',
+	'iTopUpdate:UI:WithoutBackup' => 'Backup não planejado',
+	'iTopUpdate:UI:Backup' => 'Backup gerado antes da atualização',
 	'iTopUpdate:UI:DoFilesArchive' => 'Arquivar arquivos da aplicação',
 	'iTopUpdate:UI:UploadArchive' => 'Escolha um pacote para enviar',
 	'iTopUpdate:UI:ServerFile' => 'Caminho para o pacote já no servidor',
 	'iTopUpdate:UI:WarningReadOnlyDuringUpdate' => 'Durante a atualização, a aplicação ficará em modo leitura',
-
-    'iTopUpdate:UI:Status' => 'Status',
-    'iTopUpdate:UI:Action' => 'Atualizar',
-    'iTopUpdate:UI:History' => 'Versões anteriores',
-    'iTopUpdate:UI:Progress' => 'Progresso da atualização',
-
-    'iTopUpdate:UI:DoBackup:Label' => 'Backup de arquivos e banco de dados',
-    'iTopUpdate:UI:DoBackup:Warning' => 'Backup não recomendado devido ao espaço em disco limitado',
-
-    'iTopUpdate:UI:DiskFreeSpace' => 'Espaço em disco disponível',
-    'iTopUpdate:UI:ItopDiskSpace' => 'Espaço em disco do '.ITOP_APPLICATION_SHORT,
-    'iTopUpdate:UI:DBDiskSpace' => 'Espaço em disco do banco de dados',
+	'iTopUpdate:UI:Status' => 'Status',
+	'iTopUpdate:UI:Action' => 'Atualizar',
+	'iTopUpdate:UI:Setup' => ITOP_APPLICATION_SHORT.' Setup~~',
+	'iTopUpdate:UI:History' => 'Versões anteriores',
+	'iTopUpdate:UI:Progress' => 'Progresso da atualização',
+	'iTopUpdate:UI:DoBackup:Label' => 'Backup de arquivos e banco de dados',
+	'iTopUpdate:UI:DoBackup:Warning' => 'Backup não recomendado devido ao espaço em disco limitado',
+	'iTopUpdate:UI:DiskFreeSpace' => 'Espaço em disco disponível',
+	'iTopUpdate:UI:ItopDiskSpace' => 'Espaço em disco do '.ITOP_APPLICATION_SHORT,
+	'iTopUpdate:UI:DBDiskSpace' => 'Espaço em disco do banco de dados',
 	'iTopUpdate:UI:FileUploadMaxSize' => 'Tamanho máximo de envio de arquivos',
-
 	'iTopUpdate:UI:PostMaxSize' => 'PHP ini post_max_size: %1$s',
 	'iTopUpdate:UI:UploadMaxFileSize' => 'PHP ini upload_max_filesize: %1$s',
-
-    'iTopUpdate:UI:CanCoreUpdate:Loading' => 'Verificando arquivos de sistema',
-    'iTopUpdate:UI:CanCoreUpdate:Error' => 'Falha ao verificar arquivos de sistema (%1$s)',
-    'iTopUpdate:UI:CanCoreUpdate:ErrorFileNotExist' => 'Falha ao verificar arquivos de sistema (arquivo não existe %1$s)',
-    'iTopUpdate:UI:CanCoreUpdate:Failed' => 'Falha ao verificar arquivos de sistema',
-    'iTopUpdate:UI:CanCoreUpdate:Yes' => 'Aplicação pode ser atualizada',
+	'iTopUpdate:UI:CanCoreUpdate:Loading' => 'Verificando arquivos de sistema',
+	'iTopUpdate:UI:CanCoreUpdate:Error' => 'Falha ao verificar arquivos de sistema (%1$s)',
+	'iTopUpdate:UI:CanCoreUpdate:ErrorFileNotExist' => 'Falha ao verificar arquivos de sistema (arquivo não existe %1$s)',
+	'iTopUpdate:UI:CanCoreUpdate:Failed' => 'Falha ao verificar arquivos de sistema',
+	'iTopUpdate:UI:CanCoreUpdate:Yes' => 'Aplicação pode ser atualizada',
 	'iTopUpdate:UI:CanCoreUpdate:No' => 'Aplicação não pode ser atualizada: %1$s',
 	'iTopUpdate:UI:CanCoreUpdate:Warning' => 'Atenção: a atualização da aplicação pode falhar: %1$s',
 	'iTopUpdate:UI:CannotUpdateUseSetup' => '<b>Alguns arquivos modificados foram detectados</b>, uma atualização parcial não pode ser executada.</br>Siga o <a target="_blank" href="%2$s"> procedimento</a> para atualizar manualmente seu iTop. Você deve usar o <a href="%1$s">Setup</a> para atualizar a aplicação.',
 	'iTopUpdate:UI:CannotUpdateNewModules' => '<b>Alguns módulos novos foram detectados</b>, uma atualização parcial não pode ser executada.</br>Siga o <a target="_blank" href="%2$s"> procedimento</a> para atualizar manualmente seu iTop. Você deve usar o <a href="%1$s">Setup</a> para atualizar a aplicação.',
 	'iTopUpdate:UI:CheckInProgress' => 'Aguarde a verificação de integridade',
-
-	// Setup Messages
-    'iTopUpdate:UI:SetupMessage:Ready' => 'Pronto para começar',
+	'iTopUpdate:UI:SetupLaunch' => 'Launch '.ITOP_APPLICATION_SHORT.' Setup~~',
+	'iTopUpdate:UI:SetupLaunchConfirm' => 'This will launch '.ITOP_APPLICATION_SHORT.' setup, are you sure?~~',
+    // Setup Messages
+	'iTopUpdate:UI:SetupMessage:Ready' => 'Pronto para começar',
 	'iTopUpdate:UI:SetupMessage:EnterMaintenance' => 'Entrando em modo manutenção',
 	'iTopUpdate:UI:SetupMessage:Backup' => 'Backup do banco de dados',
 	'iTopUpdate:UI:SetupMessage:FilesArchive' => 'Arquivar arquivos da aplicação',
-    'iTopUpdate:UI:SetupMessage:CopyFiles' => 'Copiar nova versão de arquivos',
+	'iTopUpdate:UI:SetupMessage:CopyFiles' => 'Copiar nova versão de arquivos',
 	'iTopUpdate:UI:SetupMessage:CheckCompile' => 'Verificar atualização da aplicação',
 	'iTopUpdate:UI:SetupMessage:Compile' => 'Atualizar aplicação e banco de dados',
 	'iTopUpdate:UI:SetupMessage:UpdateDatabase' => 'Atualizar banco de dados',
 	'iTopUpdate:UI:SetupMessage:ExitMaintenance' => 'Saindo do modo manutenção',
-    'iTopUpdate:UI:SetupMessage:UpdateDone' => 'Atualização completa',
-
-	// Errors
+	'iTopUpdate:UI:SetupMessage:UpdateDone' => 'Atualização completa',
+    // Errors
 	'iTopUpdate:Error:MissingFunction' => 'Impossível iniciar a atualização, função ausente',
 	'iTopUpdate:Error:MissingFile' => 'O arquivo %1$s está ausente',
 	'iTopUpdate:Error:CorruptedFile' => 'O arquivo %1$s está corrompido',
-    'iTopUpdate:Error:BadFileFormat' => 'O arquivo de atualização não é um ZIP',
-    'iTopUpdate:Error:BadFileContent' => 'O arquivo de atualização não é um arquivo da aplicação',
-    'iTopUpdate:Error:BadItopProduct' => 'O arquivo de atualização não é compatível com a aplicação',
+	'iTopUpdate:Error:BadFileFormat' => 'O arquivo de atualização não é um ZIP',
+	'iTopUpdate:Error:BadFileContent' => 'O arquivo de atualização não é um arquivo da aplicação',
+	'iTopUpdate:Error:BadItopProduct' => 'O arquivo de atualização não é compatível com a aplicação',
 	'iTopUpdate:Error:Copy' => 'Erro, falha ao copiar de \'%1$s\' para \'%2$s\'',
-    'iTopUpdate:Error:FileNotFound' => 'Arquivo não encontrado',
-    'iTopUpdate:Error:NoFile' => 'Nenhum arquivo fornecido',
+	'iTopUpdate:Error:FileNotFound' => 'Arquivo não encontrado',
+	'iTopUpdate:Error:NoFile' => 'Nenhum arquivo fornecido',
 	'iTopUpdate:Error:InvalidToken' => 'Token inválido',
 	'iTopUpdate:Error:UpdateFailed' => 'Atualização falhou',
 	'iTopUpdate:Error:FileUploadMaxSizeTooSmall' => 'O tamanho máximo de envio de arquivos parece muito pequeno para a atualização. Favor alterar as configurações do PHP',
-
 	'iTopUpdate:UI:RestoreArchive' => 'Você pode restaurar sua aplicação com o arquivo \'%1$s\'',
 	'iTopUpdate:UI:RestoreBackup' => 'Você pode restaurar seu banco de dados com \'%1$s\'',
 	'iTopUpdate:UI:UpdateDone' => 'Atualizado com sucesso',
 	'Menu:iTopUpdate' => 'Atualização do '.ITOP_APPLICATION_SHORT,
 	'Menu:iTopUpdate+' => 'Atualização do '.ITOP_APPLICATION_SHORT,
-
     // Missing itop entries
-    'Class:ModuleInstallation/Attribute:installed' => 'Instalado em',
-    'Class:ModuleInstallation/Attribute:name' => 'Nome',
-    'Class:ModuleInstallation/Attribute:version' => 'Versão',
-    'Class:ModuleInstallation/Attribute:comment' => 'Comentário',
+	'Class:ModuleInstallation/Attribute:installed' => 'Instalado em',
+	'Class:ModuleInstallation/Attribute:name' => 'Nome',
+	'Class:ModuleInstallation/Attribute:version' => 'Versão',
+	'Class:ModuleInstallation/Attribute:comment' => 'Comentário',
 ));
 
 
diff --git a/datamodels/2.x/itop-core-update/dictionaries/ru.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/dictionaries/ru.dict.itop-core-update.php
index 779ec9bc07..afb2f8d2c0 100644
--- a/datamodels/2.x/itop-core-update/dictionaries/ru.dict.itop-core-update.php
+++ b/datamodels/2.x/itop-core-update/dictionaries/ru.dict.itop-core-update.php
@@ -10,88 +10,83 @@
  */
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'iTopUpdate:UI:PageTitle' => 'Обновление приложения',
-    'itop-core-update:UI:SelectUpdateFile' => 'Обновление',
-    'itop-core-update:UI:ConfirmUpdate' => 'Обновление',
-    'itop-core-update:UI:UpdateCoreFiles' => 'Обновление',
+	'itop-core-update:UI:SelectUpdateFile' => 'Обновление',
+	'itop-core-update:UI:ConfirmUpdate' => 'Обновление',
+	'itop-core-update:UI:UpdateCoreFiles' => 'Обновление',
 	'iTopUpdate:UI:MaintenanceModeActive' => 'В настоящее время приложение находится в режиме технического обслуживания, пользователи не могут получить доступ к приложению. Вы должны запустить программу установки или восстановить архив приложения, чтобы вернуться к нормальному режиму.',
 	'itop-core-update:UI:UpdateDone' => 'Обновление завершено',
-
 	'itop-core-update/Operation:SelectUpdateFile/Title' => 'Обновление приложения',
 	'itop-core-update/Operation:ConfirmUpdate/Title' => 'Подтверждение обновления приложения',
 	'itop-core-update/Operation:UpdateCoreFiles/Title' => 'Обновление приложения',
 	'itop-core-update/Operation:UpdateDone/Title' => 'Обновление приложения завершено',
-
 	'iTopUpdate:UI:SelectUpdateFile' => 'Выбор файла обновления',
 	'iTopUpdate:UI:CheckUpdate' => 'Проверить файл обновления',
 	'iTopUpdate:UI:ConfirmInstallFile' => 'Вы собираетесь установить %1$s',
 	'iTopUpdate:UI:DoUpdate' => 'Начать обновление',
 	'iTopUpdate:UI:CurrentVersion' => 'Текущая версия',
 	'iTopUpdate:UI:NewVersion' => 'Новая версия',
-    'iTopUpdate:UI:Back' => 'Назад',
-    'iTopUpdate:UI:Cancel' => 'Отменть',
-    'iTopUpdate:UI:Continue' => 'Продолжить',
+	'iTopUpdate:UI:Back' => 'Назад',
+	'iTopUpdate:UI:Cancel' => 'Отменть',
+	'iTopUpdate:UI:Continue' => 'Продолжить',
 	'iTopUpdate:UI:RunSetup' => 'Запустить установку',
-    'iTopUpdate:UI:WithDBBackup' => 'Резервная копия базы данных',
-    'iTopUpdate:UI:WithFilesBackup' => 'Архив файлов приложения',
-    'iTopUpdate:UI:WithoutBackup' => 'Без резервного копирования',
-    'iTopUpdate:UI:Backup' => 'Резервное копирование перед обновлением',
+	'iTopUpdate:UI:WithDBBackup' => 'Резервная копия базы данных',
+	'iTopUpdate:UI:WithFilesBackup' => 'Архив файлов приложения',
+	'iTopUpdate:UI:WithoutBackup' => 'Без резервного копирования',
+	'iTopUpdate:UI:Backup' => 'Резервное копирование перед обновлением',
 	'iTopUpdate:UI:DoFilesArchive' => 'Создать архив файлов приложения',
 	'iTopUpdate:UI:UploadArchive' => 'Выбор пакета для загрузки',
 	'iTopUpdate:UI:ServerFile' => 'Путь к пакету на сервере',
 	'iTopUpdate:UI:WarningReadOnlyDuringUpdate' => 'Во время обновления приложение будет доступно только для чтения.',
-
-    'iTopUpdate:UI:Status' => 'Статус',
-    'iTopUpdate:UI:Action' => 'Обновление',
-    'iTopUpdate:UI:History' => 'История версий',
-    'iTopUpdate:UI:Progress' => 'Ход обновления',
-
-    'iTopUpdate:UI:DoBackup:Label' => 'Создать резервную копию базы данных',
-    'iTopUpdate:UI:DoBackup:Warning' => 'Резервное копирование не рекомендуется из-за ограниченного свободного места на диске',
-
-    'iTopUpdate:UI:DiskFreeSpace' => 'Доступное дисковое пространство',
-    'iTopUpdate:UI:ItopDiskSpace' => 'Размер приложения',
-    'iTopUpdate:UI:DBDiskSpace' => 'Размер базы данных',
+	'iTopUpdate:UI:Status' => 'Статус',
+	'iTopUpdate:UI:Action' => 'Обновление',
+	'iTopUpdate:UI:Setup' => ITOP_APPLICATION_SHORT.' Setup~~',
+	'iTopUpdate:UI:History' => 'История версий',
+	'iTopUpdate:UI:Progress' => 'Ход обновления',
+	'iTopUpdate:UI:DoBackup:Label' => 'Создать резервную копию базы данных',
+	'iTopUpdate:UI:DoBackup:Warning' => 'Резервное копирование не рекомендуется из-за ограниченного свободного места на диске',
+	'iTopUpdate:UI:DiskFreeSpace' => 'Доступное дисковое пространство',
+	'iTopUpdate:UI:ItopDiskSpace' => 'Размер приложения',
+	'iTopUpdate:UI:DBDiskSpace' => 'Размер базы данных',
 	'iTopUpdate:UI:FileUploadMaxSize' => 'Максимальный размер загружаемого файла',
-
 	'iTopUpdate:UI:PostMaxSize' => 'Значение PHP ini post_max_size: %1$s',
 	'iTopUpdate:UI:UploadMaxFileSize' => 'Значение PHP ini upload_max_filesize: %1$s',
-
-    'iTopUpdate:UI:CanCoreUpdate:Loading' => 'Проверка файловой системы',
-    'iTopUpdate:UI:CanCoreUpdate:Error' => 'Ошибка проверки файловой системы (%1$s)',
-    'iTopUpdate:UI:CanCoreUpdate:ErrorFileNotExist' => 'Ошибка проверки файловой системы (файл не существует %1$s)',
-    'iTopUpdate:UI:CanCoreUpdate:Failed' => 'Ошибка проверки файловой системы',
-    'iTopUpdate:UI:CanCoreUpdate:Yes' => 'Приложение может быть обновлено',
+	'iTopUpdate:UI:CanCoreUpdate:Loading' => 'Проверка файловой системы',
+	'iTopUpdate:UI:CanCoreUpdate:Error' => 'Ошибка проверки файловой системы (%1$s)',
+	'iTopUpdate:UI:CanCoreUpdate:ErrorFileNotExist' => 'Ошибка проверки файловой системы (файл не существует %1$s)',
+	'iTopUpdate:UI:CanCoreUpdate:Failed' => 'Ошибка проверки файловой системы',
+	'iTopUpdate:UI:CanCoreUpdate:Yes' => 'Приложение может быть обновлено',
 	'iTopUpdate:UI:CanCoreUpdate:No' => 'Приложение не может быть обновлено: %1$s',
 	'iTopUpdate:UI:CanCoreUpdate:Warning' => 'Warning: application update can fail: %1$s~~',
 	'iTopUpdate:UI:CannotUpdateUseSetup' => '<b>Some modified files were detected</b>, a partial update cannot be executed.</br>Follow the <a target="_blank" href="%2$s"> procedure</a> in order to manually upgrade your iTop. You must use the <a href="%1$s">setup</a> to update the application.~~',
 	'iTopUpdate:UI:CheckInProgress' => 'Please wait during integrity check~~',
+	'iTopUpdate:UI:SetupLaunch' => 'Launch '.ITOP_APPLICATION_SHORT.' Setup~~',
+	'iTopUpdate:UI:SetupLaunchConfirm' => 'This will launch '.ITOP_APPLICATION_SHORT.' setup, are you sure?~~',
 
 	// Setup Messages
-    'iTopUpdate:UI:SetupMessage:Ready' => 'Всё готово к началу',
+	'iTopUpdate:UI:SetupMessage:Ready' => 'Всё готово к началу',
 	'iTopUpdate:UI:SetupMessage:EnterMaintenance' => 'Переход в режим технического обслуживания',
 	'iTopUpdate:UI:SetupMessage:Backup' => 'Резервное копирование базы данных',
 	'iTopUpdate:UI:SetupMessage:FilesArchive' => 'Архивирование файлов приложения',
-    'iTopUpdate:UI:SetupMessage:CopyFiles' => 'Копирование файлов обновления',
+	'iTopUpdate:UI:SetupMessage:CopyFiles' => 'Копирование файлов обновления',
 	'iTopUpdate:UI:SetupMessage:CheckCompile' => 'Проверка обновления',
 	'iTopUpdate:UI:SetupMessage:Compile' => 'Обновление приложения',
 	'iTopUpdate:UI:SetupMessage:UpdateDatabase' => 'Обновление базы данных',
 	'iTopUpdate:UI:SetupMessage:ExitMaintenance' => 'Выход из режима технического обслуживания',
-    'iTopUpdate:UI:SetupMessage:UpdateDone' => 'Обновление завершено',
+	'iTopUpdate:UI:SetupMessage:UpdateDone' => 'Обновление завершено',
 
 	// Errors
 	'iTopUpdate:Error:MissingFunction' => 'Невозможно запустить обновление, функция отсутствует',
 	'iTopUpdate:Error:MissingFile' => 'Отсутствует файл: %1$s',
 	'iTopUpdate:Error:CorruptedFile' => 'Файл %1$s поврежден',
-    'iTopUpdate:Error:BadFileFormat' => 'Файл обновления не является zip-файлом',
-    'iTopUpdate:Error:BadFileContent' => 'Файл обновления не является архивом приложения',
-    'iTopUpdate:Error:BadItopProduct' => 'Файл обновления не совместим с вашим приложением',
+	'iTopUpdate:Error:BadFileFormat' => 'Файл обновления не является zip-файлом',
+	'iTopUpdate:Error:BadFileContent' => 'Файл обновления не является архивом приложения',
+	'iTopUpdate:Error:BadItopProduct' => 'Файл обновления не совместим с вашим приложением',
 	'iTopUpdate:Error:Copy' => 'Ошибка, не удаётся скопировать \'%1$s\' в \'%2$s\'',
-    'iTopUpdate:Error:FileNotFound' => 'Файл не найден',
-    'iTopUpdate:Error:NoFile' => 'Нет архива',
+	'iTopUpdate:Error:FileNotFound' => 'Файл не найден',
+	'iTopUpdate:Error:NoFile' => 'Нет архива',
 	'iTopUpdate:Error:InvalidToken' => 'Недопустимый токен',
 	'iTopUpdate:Error:UpdateFailed' => 'Ошибка обновления',
 	'iTopUpdate:Error:FileUploadMaxSizeTooSmall' => 'Максимальный размер загрузки недостаточный для обновления. Пожалуйста, измените конфигурацию PHP.',
-
 	'iTopUpdate:UI:RestoreArchive' => 'Вы можете восстановить приложение из архива \'%1$s\'',
 	'iTopUpdate:UI:RestoreBackup' => 'Вы можете восстановить базу данных из резервной копии \'%1$s\'',
 	'iTopUpdate:UI:UpdateDone' => 'Обновление выполнено успешно',
@@ -99,10 +94,10 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Menu:iTopUpdate+' => 'Обновление приложения',
 
     // Missing itop entries
-    'Class:ModuleInstallation/Attribute:installed' => 'Дата установки',
-    'Class:ModuleInstallation/Attribute:name' => 'Название',
-    'Class:ModuleInstallation/Attribute:version' => 'Версия',
-    'Class:ModuleInstallation/Attribute:comment' => 'Комментарий',
+	'Class:ModuleInstallation/Attribute:installed' => 'Дата установки',
+	'Class:ModuleInstallation/Attribute:name' => 'Название',
+	'Class:ModuleInstallation/Attribute:version' => 'Версия',
+	'Class:ModuleInstallation/Attribute:comment' => 'Комментарий',
 ));
 
 
diff --git a/datamodels/2.x/itop-core-update/dictionaries/sk.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/dictionaries/sk.dict.itop-core-update.php
index ebe6883251..063152f3f4 100644
--- a/datamodels/2.x/itop-core-update/dictionaries/sk.dict.itop-core-update.php
+++ b/datamodels/2.x/itop-core-update/dictionaries/sk.dict.itop-core-update.php
@@ -22,88 +22,83 @@
  */
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'iTopUpdate:UI:PageTitle' => 'Application Upgrade~~',
-    'itop-core-update:UI:SelectUpdateFile' => 'Application Upgrade~~',
-    'itop-core-update:UI:ConfirmUpdate' => 'Application Upgrade~~',
-    'itop-core-update:UI:UpdateCoreFiles' => 'Application Upgrade~~',
+	'itop-core-update:UI:SelectUpdateFile' => 'Application Upgrade~~',
+	'itop-core-update:UI:ConfirmUpdate' => 'Application Upgrade~~',
+	'itop-core-update:UI:UpdateCoreFiles' => 'Application Upgrade~~',
 	'iTopUpdate:UI:MaintenanceModeActive' => 'The application is currently under maintenance, no user can access the application. You have to run a setup or restore the application archive to return in normal mode.~~',
 	'itop-core-update:UI:UpdateDone' => 'Application Upgrade~~',
-
 	'itop-core-update/Operation:SelectUpdateFile/Title' => 'Application Upgrade~~',
 	'itop-core-update/Operation:ConfirmUpdate/Title' => 'Confirm Application Upgrade~~',
 	'itop-core-update/Operation:UpdateCoreFiles/Title' => 'Application Upgrading~~',
 	'itop-core-update/Operation:UpdateDone/Title' => 'Application Upgrade Done~~',
-
 	'iTopUpdate:UI:SelectUpdateFile' => 'Select an upgrade file to upload~~',
 	'iTopUpdate:UI:CheckUpdate' => 'Verify upgrade file~~',
 	'iTopUpdate:UI:ConfirmInstallFile' => 'You are about to install %1$s~~',
 	'iTopUpdate:UI:DoUpdate' => 'Upgrade~~',
 	'iTopUpdate:UI:CurrentVersion' => 'Current installed version~~',
 	'iTopUpdate:UI:NewVersion' => 'Newly installed version~~',
-    'iTopUpdate:UI:Back' => 'Back~~',
-    'iTopUpdate:UI:Cancel' => 'Cancel~~',
-    'iTopUpdate:UI:Continue' => 'Continue~~',
+	'iTopUpdate:UI:Back' => 'Back~~',
+	'iTopUpdate:UI:Cancel' => 'Cancel~~',
+	'iTopUpdate:UI:Continue' => 'Continue~~',
 	'iTopUpdate:UI:RunSetup' => 'Run Setup~~',
-    'iTopUpdate:UI:WithDBBackup' => 'Database backup~~',
-    'iTopUpdate:UI:WithFilesBackup' => 'Application files backup~~',
-    'iTopUpdate:UI:WithoutBackup' => 'No backup is planned~~',
-    'iTopUpdate:UI:Backup' => 'Backup generated before update~~',
+	'iTopUpdate:UI:WithDBBackup' => 'Database backup~~',
+	'iTopUpdate:UI:WithFilesBackup' => 'Application files backup~~',
+	'iTopUpdate:UI:WithoutBackup' => 'No backup is planned~~',
+	'iTopUpdate:UI:Backup' => 'Backup generated before update~~',
 	'iTopUpdate:UI:DoFilesArchive' => 'Archive application files~~',
 	'iTopUpdate:UI:UploadArchive' => 'Select a package to upload~~',
 	'iTopUpdate:UI:ServerFile' => 'Path of a package already on the server~~',
 	'iTopUpdate:UI:WarningReadOnlyDuringUpdate' => 'During the upgrade, the application will be read-only.~~',
-
-    'iTopUpdate:UI:Status' => 'Status~~',
-    'iTopUpdate:UI:Action' => 'Update~~',
-    'iTopUpdate:UI:History' => 'Versions History~~',
-    'iTopUpdate:UI:Progress' => 'Progress of the upgrade~~',
-
-    'iTopUpdate:UI:DoBackup:Label' => 'Backup files and database~~',
-    'iTopUpdate:UI:DoBackup:Warning' => 'Backup is not recommended due to limited available disk space~~',
-
-    'iTopUpdate:UI:DiskFreeSpace' => 'Disk free space~~',
-    'iTopUpdate:UI:ItopDiskSpace' => ITOP_APPLICATION_SHORT.' disk space~~',
-    'iTopUpdate:UI:DBDiskSpace' => 'Database disk space~~',
+	'iTopUpdate:UI:Status' => 'Status~~',
+	'iTopUpdate:UI:Action' => 'Update~~',
+	'iTopUpdate:UI:Setup' => ITOP_APPLICATION_SHORT.' Setup~~',
+	'iTopUpdate:UI:History' => 'Versions History~~',
+	'iTopUpdate:UI:Progress' => 'Progress of the upgrade~~',
+	'iTopUpdate:UI:DoBackup:Label' => 'Backup files and database~~',
+	'iTopUpdate:UI:DoBackup:Warning' => 'Backup is not recommended due to limited available disk space~~',
+	'iTopUpdate:UI:DiskFreeSpace' => 'Disk free space~~',
+	'iTopUpdate:UI:ItopDiskSpace' => ITOP_APPLICATION_SHORT.' disk space~~',
+	'iTopUpdate:UI:DBDiskSpace' => 'Database disk space~~',
 	'iTopUpdate:UI:FileUploadMaxSize' => 'File upload max size~~',
-
 	'iTopUpdate:UI:PostMaxSize' => 'PHP ini value post_max_size: %1$s~~',
 	'iTopUpdate:UI:UploadMaxFileSize' => 'PHP ini value upload_max_filesize: %1$s~~',
-
-    'iTopUpdate:UI:CanCoreUpdate:Loading' => 'Checking filesystem~~',
-    'iTopUpdate:UI:CanCoreUpdate:Error' => 'Checking filesystem failed (%1$s)~~',
-    'iTopUpdate:UI:CanCoreUpdate:ErrorFileNotExist' => 'Checking filesystem failed (File not exist %1$s)~~',
-    'iTopUpdate:UI:CanCoreUpdate:Failed' => 'Checking filesystem failed~~',
-    'iTopUpdate:UI:CanCoreUpdate:Yes' => 'Application can be updated~~',
+	'iTopUpdate:UI:CanCoreUpdate:Loading' => 'Checking filesystem~~',
+	'iTopUpdate:UI:CanCoreUpdate:Error' => 'Checking filesystem failed (%1$s)~~',
+	'iTopUpdate:UI:CanCoreUpdate:ErrorFileNotExist' => 'Checking filesystem failed (File not exist %1$s)~~',
+	'iTopUpdate:UI:CanCoreUpdate:Failed' => 'Checking filesystem failed~~',
+	'iTopUpdate:UI:CanCoreUpdate:Yes' => 'Application can be updated~~',
 	'iTopUpdate:UI:CanCoreUpdate:No' => 'Application cannot be updated: %1$s~~',
 	'iTopUpdate:UI:CanCoreUpdate:Warning' => 'Warning: application update can fail: %1$s~~',
 	'iTopUpdate:UI:CannotUpdateUseSetup' => '<b>Some modified files were detected</b>, a partial update cannot be executed.</br>Follow the <a target="_blank" href="%2$s"> procedure</a> in order to manually upgrade your iTop. You must use the <a href="%1$s">setup</a> to update the application.~~',
 	'iTopUpdate:UI:CheckInProgress' => 'Please wait during integrity check~~',
+	'iTopUpdate:UI:SetupLaunch' => 'Launch '.ITOP_APPLICATION_SHORT.' Setup~~',
+	'iTopUpdate:UI:SetupLaunchConfirm' => 'This will launch '.ITOP_APPLICATION_SHORT.' setup, are you sure?~~',
 
 	// Setup Messages
-    'iTopUpdate:UI:SetupMessage:Ready' => 'Ready to start~~',
+	'iTopUpdate:UI:SetupMessage:Ready' => 'Ready to start~~',
 	'iTopUpdate:UI:SetupMessage:EnterMaintenance' => 'Entering maintenance mode~~',
 	'iTopUpdate:UI:SetupMessage:Backup' => 'Database backup~~',
 	'iTopUpdate:UI:SetupMessage:FilesArchive' => 'Archive application files~~',
-    'iTopUpdate:UI:SetupMessage:CopyFiles' => 'Copy new version files~~',
+	'iTopUpdate:UI:SetupMessage:CopyFiles' => 'Copy new version files~~',
 	'iTopUpdate:UI:SetupMessage:CheckCompile' => 'Check application upgrade~~',
 	'iTopUpdate:UI:SetupMessage:Compile' => 'Upgrade application and database~~',
 	'iTopUpdate:UI:SetupMessage:UpdateDatabase' => 'Upgrade database~~',
 	'iTopUpdate:UI:SetupMessage:ExitMaintenance' => 'Exiting maintenance mode~~',
-    'iTopUpdate:UI:SetupMessage:UpdateDone' => 'Upgrade completed~~',
+	'iTopUpdate:UI:SetupMessage:UpdateDone' => 'Upgrade completed~~',
 
 	// Errors
 	'iTopUpdate:Error:MissingFunction' => 'Impossible to start upgrade, missing function~~',
 	'iTopUpdate:Error:MissingFile' => 'Missing file: %1$s~~',
 	'iTopUpdate:Error:CorruptedFile' => 'File %1$s is corrupted~~',
-    'iTopUpdate:Error:BadFileFormat' => 'Upgrade file is not a zip file~~',
-    'iTopUpdate:Error:BadFileContent' => 'Upgrade file is not an application archive~~',
-    'iTopUpdate:Error:BadItopProduct' => 'Upgrade file is not compatible with your application~~',
+	'iTopUpdate:Error:BadFileFormat' => 'Upgrade file is not a zip file~~',
+	'iTopUpdate:Error:BadFileContent' => 'Upgrade file is not an application archive~~',
+	'iTopUpdate:Error:BadItopProduct' => 'Upgrade file is not compatible with your application~~',
 	'iTopUpdate:Error:Copy' => 'Error, cannot copy \'%1$s\' to \'%2$s\'~~',
-    'iTopUpdate:Error:FileNotFound' => 'File not found~~',
-    'iTopUpdate:Error:NoFile' => 'No file provided~~',
+	'iTopUpdate:Error:FileNotFound' => 'File not found~~',
+	'iTopUpdate:Error:NoFile' => 'No file provided~~',
 	'iTopUpdate:Error:InvalidToken' => 'Invalid token~~',
 	'iTopUpdate:Error:UpdateFailed' => 'Upgrade failed ~~',
 	'iTopUpdate:Error:FileUploadMaxSizeTooSmall' => 'The upload max size seems too small for update. Please change the PHP configuration.~~',
-
 	'iTopUpdate:UI:RestoreArchive' => 'You can restore your application from the archive \'%1$s\'~~',
 	'iTopUpdate:UI:RestoreBackup' => 'You can restore the database from \'%1$s\'~~',
 	'iTopUpdate:UI:UpdateDone' => 'Upgrade successful~~',
@@ -111,10 +106,10 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Menu:iTopUpdate+' => 'Application upgrade~~',
 
     // Missing itop entries
-    'Class:ModuleInstallation/Attribute:installed' => 'Installed on~~',
-    'Class:ModuleInstallation/Attribute:name' => 'Name~~',
-    'Class:ModuleInstallation/Attribute:version' => 'Version~~',
-    'Class:ModuleInstallation/Attribute:comment' => 'Comment~~',
+	'Class:ModuleInstallation/Attribute:installed' => 'Installed on~~',
+	'Class:ModuleInstallation/Attribute:name' => 'Name~~',
+	'Class:ModuleInstallation/Attribute:version' => 'Version~~',
+	'Class:ModuleInstallation/Attribute:comment' => 'Comment~~',
 ));
 
 
diff --git a/datamodels/2.x/itop-core-update/dictionaries/tr.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/dictionaries/tr.dict.itop-core-update.php
index 2675f9157a..8f61a725af 100644
--- a/datamodels/2.x/itop-core-update/dictionaries/tr.dict.itop-core-update.php
+++ b/datamodels/2.x/itop-core-update/dictionaries/tr.dict.itop-core-update.php
@@ -22,88 +22,83 @@
  */
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'iTopUpdate:UI:PageTitle' => 'Application Upgrade~~',
-    'itop-core-update:UI:SelectUpdateFile' => 'Application Upgrade~~',
-    'itop-core-update:UI:ConfirmUpdate' => 'Application Upgrade~~',
-    'itop-core-update:UI:UpdateCoreFiles' => 'Application Upgrade~~',
+	'itop-core-update:UI:SelectUpdateFile' => 'Application Upgrade~~',
+	'itop-core-update:UI:ConfirmUpdate' => 'Application Upgrade~~',
+	'itop-core-update:UI:UpdateCoreFiles' => 'Application Upgrade~~',
 	'iTopUpdate:UI:MaintenanceModeActive' => 'The application is currently under maintenance, no user can access the application. You have to run a setup or restore the application archive to return in normal mode.~~',
 	'itop-core-update:UI:UpdateDone' => 'Application Upgrade~~',
-
 	'itop-core-update/Operation:SelectUpdateFile/Title' => 'Application Upgrade~~',
 	'itop-core-update/Operation:ConfirmUpdate/Title' => 'Confirm Application Upgrade~~',
 	'itop-core-update/Operation:UpdateCoreFiles/Title' => 'Application Upgrading~~',
 	'itop-core-update/Operation:UpdateDone/Title' => 'Application Upgrade Done~~',
-
 	'iTopUpdate:UI:SelectUpdateFile' => 'Select an upgrade file to upload~~',
 	'iTopUpdate:UI:CheckUpdate' => 'Verify upgrade file~~',
 	'iTopUpdate:UI:ConfirmInstallFile' => 'You are about to install %1$s~~',
 	'iTopUpdate:UI:DoUpdate' => 'Upgrade~~',
 	'iTopUpdate:UI:CurrentVersion' => 'Current installed version~~',
 	'iTopUpdate:UI:NewVersion' => 'Newly installed version~~',
-    'iTopUpdate:UI:Back' => 'Back~~',
-    'iTopUpdate:UI:Cancel' => 'Cancel~~',
-    'iTopUpdate:UI:Continue' => 'Continue~~',
+	'iTopUpdate:UI:Back' => 'Back~~',
+	'iTopUpdate:UI:Cancel' => 'Cancel~~',
+	'iTopUpdate:UI:Continue' => 'Continue~~',
 	'iTopUpdate:UI:RunSetup' => 'Run Setup~~',
-    'iTopUpdate:UI:WithDBBackup' => 'Database backup~~',
-    'iTopUpdate:UI:WithFilesBackup' => 'Application files backup~~',
-    'iTopUpdate:UI:WithoutBackup' => 'No backup is planned~~',
-    'iTopUpdate:UI:Backup' => 'Backup generated before update~~',
+	'iTopUpdate:UI:WithDBBackup' => 'Database backup~~',
+	'iTopUpdate:UI:WithFilesBackup' => 'Application files backup~~',
+	'iTopUpdate:UI:WithoutBackup' => 'No backup is planned~~',
+	'iTopUpdate:UI:Backup' => 'Backup generated before update~~',
 	'iTopUpdate:UI:DoFilesArchive' => 'Archive application files~~',
 	'iTopUpdate:UI:UploadArchive' => 'Select a package to upload~~',
 	'iTopUpdate:UI:ServerFile' => 'Path of a package already on the server~~',
 	'iTopUpdate:UI:WarningReadOnlyDuringUpdate' => 'During the upgrade, the application will be read-only.~~',
-
-    'iTopUpdate:UI:Status' => 'Status~~',
-    'iTopUpdate:UI:Action' => 'Update~~',
-    'iTopUpdate:UI:History' => 'Versions History~~',
-    'iTopUpdate:UI:Progress' => 'Progress of the upgrade~~',
-
-    'iTopUpdate:UI:DoBackup:Label' => 'Backup files and database~~',
-    'iTopUpdate:UI:DoBackup:Warning' => 'Backup is not recommended due to limited available disk space~~',
-
-    'iTopUpdate:UI:DiskFreeSpace' => 'Disk free space~~',
-    'iTopUpdate:UI:ItopDiskSpace' => ITOP_APPLICATION_SHORT.' disk space~~',
-    'iTopUpdate:UI:DBDiskSpace' => 'Database disk space~~',
+	'iTopUpdate:UI:Status' => 'Status~~',
+	'iTopUpdate:UI:Action' => 'Update~~',
+	'iTopUpdate:UI:Setup' => ITOP_APPLICATION_SHORT.' Setup~~',
+	'iTopUpdate:UI:History' => 'Versions History~~',
+	'iTopUpdate:UI:Progress' => 'Progress of the upgrade~~',
+	'iTopUpdate:UI:DoBackup:Label' => 'Backup files and database~~',
+	'iTopUpdate:UI:DoBackup:Warning' => 'Backup is not recommended due to limited available disk space~~',
+	'iTopUpdate:UI:DiskFreeSpace' => 'Disk free space~~',
+	'iTopUpdate:UI:ItopDiskSpace' => ITOP_APPLICATION_SHORT.' disk space~~',
+	'iTopUpdate:UI:DBDiskSpace' => 'Database disk space~~',
 	'iTopUpdate:UI:FileUploadMaxSize' => 'File upload max size~~',
-
 	'iTopUpdate:UI:PostMaxSize' => 'PHP ini value post_max_size: %1$s~~',
 	'iTopUpdate:UI:UploadMaxFileSize' => 'PHP ini value upload_max_filesize: %1$s~~',
-
-    'iTopUpdate:UI:CanCoreUpdate:Loading' => 'Checking filesystem~~',
-    'iTopUpdate:UI:CanCoreUpdate:Error' => 'Checking filesystem failed (%1$s)~~',
-    'iTopUpdate:UI:CanCoreUpdate:ErrorFileNotExist' => 'Checking filesystem failed (File not exist %1$s)~~',
-    'iTopUpdate:UI:CanCoreUpdate:Failed' => 'Checking filesystem failed~~',
-    'iTopUpdate:UI:CanCoreUpdate:Yes' => 'Application can be updated~~',
+	'iTopUpdate:UI:CanCoreUpdate:Loading' => 'Checking filesystem~~',
+	'iTopUpdate:UI:CanCoreUpdate:Error' => 'Checking filesystem failed (%1$s)~~',
+	'iTopUpdate:UI:CanCoreUpdate:ErrorFileNotExist' => 'Checking filesystem failed (File not exist %1$s)~~',
+	'iTopUpdate:UI:CanCoreUpdate:Failed' => 'Checking filesystem failed~~',
+	'iTopUpdate:UI:CanCoreUpdate:Yes' => 'Application can be updated~~',
 	'iTopUpdate:UI:CanCoreUpdate:No' => 'Application cannot be updated: %1$s~~',
 	'iTopUpdate:UI:CanCoreUpdate:Warning' => 'Warning: application update can fail: %1$s~~',
 	'iTopUpdate:UI:CannotUpdateUseSetup' => '<b>Some modified files were detected</b>, a partial update cannot be executed.</br>Follow the <a target="_blank" href="%2$s"> procedure</a> in order to manually upgrade your iTop. You must use the <a href="%1$s">setup</a> to update the application.~~',
 	'iTopUpdate:UI:CheckInProgress' => 'Please wait during integrity check~~',
+	'iTopUpdate:UI:SetupLaunch' => 'Launch '.ITOP_APPLICATION_SHORT.' Setup~~',
+	'iTopUpdate:UI:SetupLaunchConfirm' => 'This will launch '.ITOP_APPLICATION_SHORT.' setup, are you sure?~~',
 
 	// Setup Messages
-    'iTopUpdate:UI:SetupMessage:Ready' => 'Ready to start~~',
+	'iTopUpdate:UI:SetupMessage:Ready' => 'Ready to start~~',
 	'iTopUpdate:UI:SetupMessage:EnterMaintenance' => 'Entering maintenance mode~~',
 	'iTopUpdate:UI:SetupMessage:Backup' => 'Database backup~~',
 	'iTopUpdate:UI:SetupMessage:FilesArchive' => 'Archive application files~~',
-    'iTopUpdate:UI:SetupMessage:CopyFiles' => 'Copy new version files~~',
+	'iTopUpdate:UI:SetupMessage:CopyFiles' => 'Copy new version files~~',
 	'iTopUpdate:UI:SetupMessage:CheckCompile' => 'Check application upgrade~~',
 	'iTopUpdate:UI:SetupMessage:Compile' => 'Upgrade application and database~~',
 	'iTopUpdate:UI:SetupMessage:UpdateDatabase' => 'Upgrade database~~',
 	'iTopUpdate:UI:SetupMessage:ExitMaintenance' => 'Exiting maintenance mode~~',
-    'iTopUpdate:UI:SetupMessage:UpdateDone' => 'Upgrade completed~~',
+	'iTopUpdate:UI:SetupMessage:UpdateDone' => 'Upgrade completed~~',
 
 	// Errors
 	'iTopUpdate:Error:MissingFunction' => 'Impossible to start upgrade, missing function~~',
 	'iTopUpdate:Error:MissingFile' => 'Missing file: %1$s~~',
 	'iTopUpdate:Error:CorruptedFile' => 'File %1$s is corrupted~~',
-    'iTopUpdate:Error:BadFileFormat' => 'Upgrade file is not a zip file~~',
-    'iTopUpdate:Error:BadFileContent' => 'Upgrade file is not an application archive~~',
-    'iTopUpdate:Error:BadItopProduct' => 'Upgrade file is not compatible with your application~~',
+	'iTopUpdate:Error:BadFileFormat' => 'Upgrade file is not a zip file~~',
+	'iTopUpdate:Error:BadFileContent' => 'Upgrade file is not an application archive~~',
+	'iTopUpdate:Error:BadItopProduct' => 'Upgrade file is not compatible with your application~~',
 	'iTopUpdate:Error:Copy' => 'Error, cannot copy \'%1$s\' to \'%2$s\'~~',
-    'iTopUpdate:Error:FileNotFound' => 'File not found~~',
-    'iTopUpdate:Error:NoFile' => 'No file provided~~',
+	'iTopUpdate:Error:FileNotFound' => 'File not found~~',
+	'iTopUpdate:Error:NoFile' => 'No file provided~~',
 	'iTopUpdate:Error:InvalidToken' => 'Invalid token~~',
 	'iTopUpdate:Error:UpdateFailed' => 'Upgrade failed ~~',
 	'iTopUpdate:Error:FileUploadMaxSizeTooSmall' => 'The upload max size seems too small for update. Please change the PHP configuration.~~',
-
 	'iTopUpdate:UI:RestoreArchive' => 'You can restore your application from the archive \'%1$s\'~~',
 	'iTopUpdate:UI:RestoreBackup' => 'You can restore the database from \'%1$s\'~~',
 	'iTopUpdate:UI:UpdateDone' => 'Upgrade successful~~',
@@ -111,10 +106,10 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Menu:iTopUpdate+' => 'Application upgrade~~',
 
     // Missing itop entries
-    'Class:ModuleInstallation/Attribute:installed' => 'Installed on~~',
-    'Class:ModuleInstallation/Attribute:name' => 'Name~~',
-    'Class:ModuleInstallation/Attribute:version' => 'Version~~',
-    'Class:ModuleInstallation/Attribute:comment' => 'Comment~~',
+	'Class:ModuleInstallation/Attribute:installed' => 'Installed on~~',
+	'Class:ModuleInstallation/Attribute:name' => 'Name~~',
+	'Class:ModuleInstallation/Attribute:version' => 'Version~~',
+	'Class:ModuleInstallation/Attribute:comment' => 'Comment~~',
 ));
 
 
diff --git a/datamodels/2.x/itop-core-update/dictionaries/zh_cn.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/dictionaries/zh_cn.dict.itop-core-update.php
index fed2544440..9680cc25c6 100644
--- a/datamodels/2.x/itop-core-update/dictionaries/zh_cn.dict.itop-core-update.php
+++ b/datamodels/2.x/itop-core-update/dictionaries/zh_cn.dict.itop-core-update.php
@@ -22,88 +22,83 @@
  */
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'iTopUpdate:UI:PageTitle' => '应用升级',
-    'itop-core-update:UI:SelectUpdateFile' => '应用升级',
-    'itop-core-update:UI:ConfirmUpdate' => ' 升级',
-    'itop-core-update:UI:UpdateCoreFiles' => '应用升级',
+	'itop-core-update:UI:SelectUpdateFile' => '应用升级',
+	'itop-core-update:UI:ConfirmUpdate' => ' 升级',
+	'itop-core-update:UI:UpdateCoreFiles' => '应用升级',
 	'iTopUpdate:UI:MaintenanceModeActive' => '此应用当前维护中,不允许任何用户访问.必须运行安装或恢复归档来使其处于正常模式.',
 	'itop-core-update:UI:UpdateDone' => '应用升级',
-
 	'itop-core-update/Operation:SelectUpdateFile/Title' => '应用升级',
 	'itop-core-update/Operation:ConfirmUpdate/Title' => '请确认升级应用',
 	'itop-core-update/Operation:UpdateCoreFiles/Title' => '应用正在升级',
 	'itop-core-update/Operation:UpdateDone/Title' => '应用升级完毕',
-
 	'iTopUpdate:UI:SelectUpdateFile' => '请选择要上传的升级文件',
 	'iTopUpdate:UI:CheckUpdate' => '校验升级文件',
 	'iTopUpdate:UI:ConfirmInstallFile' => '即将安装 %1$s',
 	'iTopUpdate:UI:DoUpdate' => '升级',
-	'iTopUpdate:UI:CurrentVersion' => '当前安装的版本',
+	'iTopUpdate:UI:CurrentVersion' => '当前版本',
 	'iTopUpdate:UI:NewVersion' => '新安装的版本',
-    'iTopUpdate:UI:Back' => '返回',
-    'iTopUpdate:UI:Cancel' => '取消',
-    'iTopUpdate:UI:Continue' => '继续',
+	'iTopUpdate:UI:Back' => '返回',
+	'iTopUpdate:UI:Cancel' => '取消',
+	'iTopUpdate:UI:Continue' => '继续',
 	'iTopUpdate:UI:RunSetup' => '运行向导',
-    'iTopUpdate:UI:WithDBBackup' => '数据库备份',
-    'iTopUpdate:UI:WithFilesBackup' => '应用文件备份',
-    'iTopUpdate:UI:WithoutBackup' => '无需备份',
-    'iTopUpdate:UI:Backup' => '升级之前执行备份',
+	'iTopUpdate:UI:WithDBBackup' => '数据库备份',
+	'iTopUpdate:UI:WithFilesBackup' => '应用文件备份',
+	'iTopUpdate:UI:WithoutBackup' => '无需备份',
+	'iTopUpdate:UI:Backup' => '升级之前执行备份',
 	'iTopUpdate:UI:DoFilesArchive' => '打包应用文件',
 	'iTopUpdate:UI:UploadArchive' => '请选择要上传的软件包',
 	'iTopUpdate:UI:ServerFile' => '服务器上的软件包路径已存在',
 	'iTopUpdate:UI:WarningReadOnlyDuringUpdate' => '升级期间, 应用会变成只读状态.',
-
-    'iTopUpdate:UI:Status' => '状态',
-    'iTopUpdate:UI:Action' => '升级',
-    'iTopUpdate:UI:History' => '版本历史',
-    'iTopUpdate:UI:Progress' => '升级进度',
-
-    'iTopUpdate:UI:DoBackup:Label' => '备份文件和数据库',
-    'iTopUpdate:UI:DoBackup:Warning' => '由于磁盘空间不足, 不建议备份',
-
-    'iTopUpdate:UI:DiskFreeSpace' => '磁盘剩余空间',
-    'iTopUpdate:UI:ItopDiskSpace' => ITOP_APPLICATION_SHORT.' 的磁盘空间',
-    'iTopUpdate:UI:DBDiskSpace' => '数据库的磁盘空间',
+	'iTopUpdate:UI:Status' => '状态',
+	'iTopUpdate:UI:Action' => '升级',
+	'iTopUpdate:UI:Setup' => ITOP_APPLICATION_SHORT.' Setup~~',
+	'iTopUpdate:UI:History' => '版本历史',
+	'iTopUpdate:UI:Progress' => '升级进度',
+	'iTopUpdate:UI:DoBackup:Label' => '备份文件和数据库',
+	'iTopUpdate:UI:DoBackup:Warning' => '由于磁盘空间不足, 不建议备份',
+	'iTopUpdate:UI:DiskFreeSpace' => '磁盘剩余空间',
+	'iTopUpdate:UI:ItopDiskSpace' => ITOP_APPLICATION_SHORT.' 的磁盘空间',
+	'iTopUpdate:UI:DBDiskSpace' => '数据库的磁盘空间',
 	'iTopUpdate:UI:FileUploadMaxSize' => '文件上传大小上限',
-
 	'iTopUpdate:UI:PostMaxSize' => 'PHP ini 值 post_max_size: %1$s',
 	'iTopUpdate:UI:UploadMaxFileSize' => 'PHP ini 值 upload_max_filesize: %1$s',
-
-    'iTopUpdate:UI:CanCoreUpdate:Loading' => '正在文件系统',
-    'iTopUpdate:UI:CanCoreUpdate:Error' => '文件系统检查失败 (%1$s)',
-    'iTopUpdate:UI:CanCoreUpdate:ErrorFileNotExist' => '文件系统检查失败 ( %1$s 文件不存在)',
-    'iTopUpdate:UI:CanCoreUpdate:Failed' => '文件系统检查失败',
-    'iTopUpdate:UI:CanCoreUpdate:Yes' => '应用无法升级',
+	'iTopUpdate:UI:CanCoreUpdate:Loading' => '正在文件系统',
+	'iTopUpdate:UI:CanCoreUpdate:Error' => '文件系统检查失败 (%1$s)',
+	'iTopUpdate:UI:CanCoreUpdate:ErrorFileNotExist' => '文件系统检查失败 ( %1$s 文件不存在)',
+	'iTopUpdate:UI:CanCoreUpdate:Failed' => '文件系统检查失败',
+	'iTopUpdate:UI:CanCoreUpdate:Yes' => '应用无法升级',
 	'iTopUpdate:UI:CanCoreUpdate:No' => '应用无法升级: %1$s',
 	'iTopUpdate:UI:CanCoreUpdate:Warning' => '警告: 应用升级可能失败: %1$s',
 	'iTopUpdate:UI:CannotUpdateUseSetup' => '<b>Some modified files were detected</b>, a partial update cannot be executed.</br>Follow the <a target="_blank" href="%2$s"> procedure</a> in order to manually upgrade your iTop. You must use the <a href="%1$s">setup</a> to update the application.~~',
 	'iTopUpdate:UI:CheckInProgress' => 'Please wait during integrity check~~',
+	'iTopUpdate:UI:SetupLaunch' => 'Launch '.ITOP_APPLICATION_SHORT.' Setup~~',
+	'iTopUpdate:UI:SetupLaunchConfirm' => 'This will launch '.ITOP_APPLICATION_SHORT.' setup, are you sure?~~',
 
 	// Setup Messages
-    'iTopUpdate:UI:SetupMessage:Ready' => '准备开始',
+	'iTopUpdate:UI:SetupMessage:Ready' => '准备开始',
 	'iTopUpdate:UI:SetupMessage:EnterMaintenance' => '正在进入维护模式',
 	'iTopUpdate:UI:SetupMessage:Backup' => '数据库备份',
 	'iTopUpdate:UI:SetupMessage:FilesArchive' => '打包应用文件',
-    'iTopUpdate:UI:SetupMessage:CopyFiles' => '复制新文件',
+	'iTopUpdate:UI:SetupMessage:CopyFiles' => '复制新文件',
 	'iTopUpdate:UI:SetupMessage:CheckCompile' => '检查更新',
 	'iTopUpdate:UI:SetupMessage:Compile' => '升级应用程序和数据库',
 	'iTopUpdate:UI:SetupMessage:UpdateDatabase' => '升级数据库',
 	'iTopUpdate:UI:SetupMessage:ExitMaintenance' => '正在退出维护模式',
-    'iTopUpdate:UI:SetupMessage:UpdateDone' => '升级完成',
+	'iTopUpdate:UI:SetupMessage:UpdateDone' => '升级完成',
 
 	// Errors
 	'iTopUpdate:Error:MissingFunction' => '无法开始升级, 功能缺失',
 	'iTopUpdate:Error:MissingFile' => '缺少文件: %1$s',
 	'iTopUpdate:Error:CorruptedFile' => '文件 %1$s 已损坏',
-    'iTopUpdate:Error:BadFileFormat' => '上传的不是zip格式的文件',
-    'iTopUpdate:Error:BadFileContent' => '升级文件不是程序升级包',
-    'iTopUpdate:Error:BadItopProduct' => '升级文件与您的系统不兼容',
+	'iTopUpdate:Error:BadFileFormat' => '上传的不是zip格式的文件',
+	'iTopUpdate:Error:BadFileContent' => '升级文件不是程序升级包',
+	'iTopUpdate:Error:BadItopProduct' => '升级文件与您的系统不兼容',
 	'iTopUpdate:Error:Copy' => '错误, 无法复制 \'%1$s\' 到 \'%2$s\'',
-    'iTopUpdate:Error:FileNotFound' => '文件找不到',
-    'iTopUpdate:Error:NoFile' => '没有提供文件',
+	'iTopUpdate:Error:FileNotFound' => '文件找不到',
+	'iTopUpdate:Error:NoFile' => '没有提供文件',
 	'iTopUpdate:Error:InvalidToken' => '无效的token',
 	'iTopUpdate:Error:UpdateFailed' => '升级失败',
 	'iTopUpdate:Error:FileUploadMaxSizeTooSmall' => '上传上限太小. 请调整PHP配置.',
-
 	'iTopUpdate:UI:RestoreArchive' => '您可以从归档文件 \'%1$s\' 还原应用程序',
 	'iTopUpdate:UI:RestoreBackup' => '您可以从 \'%1$s\' 还原数据库',
 	'iTopUpdate:UI:UpdateDone' => '升级成功',
@@ -111,10 +106,10 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Menu:iTopUpdate+' => '应用升级',
 
     // Missing itop entries
-    'Class:ModuleInstallation/Attribute:installed' => '安装时间',
-    'Class:ModuleInstallation/Attribute:name' => '名称',
-    'Class:ModuleInstallation/Attribute:version' => '版本',
-    'Class:ModuleInstallation/Attribute:comment' => '备注',
+	'Class:ModuleInstallation/Attribute:installed' => '安装时间',
+	'Class:ModuleInstallation/Attribute:name' => '名称',
+	'Class:ModuleInstallation/Attribute:version' => '版本',
+	'Class:ModuleInstallation/Attribute:comment' => '备注',
 ));
 
 
diff --git a/datamodels/2.x/itop-datacenter-mgmt/datamodel.itop-datacenter-mgmt.xml b/datamodels/2.x/itop-datacenter-mgmt/datamodel.itop-datacenter-mgmt.xml
index 4c9f66011f..bf0566e4b1 100755
--- a/datamodels/2.x/itop-datacenter-mgmt/datamodel.itop-datacenter-mgmt.xml
+++ b/datamodels/2.x/itop-datacenter-mgmt/datamodel.itop-datacenter-mgmt.xml
@@ -44,8 +44,6 @@
           <edit_mode>add_only</edit_mode>
           <count_min>0</count_min>
           <count_max>0</count_max>
-          <relation_type>link</relation_type>
-          <read_only>false</read_only>
         </field>
         <field id="enclosure_list" xsi:type="AttributeLinkedSet">
           <linked_class>Enclosure</linked_class>
@@ -53,8 +51,6 @@
           <edit_mode>add_only</edit_mode>
           <count_min>0</count_min>
           <count_max>0</count_max>
-          <relation_type>link</relation_type>
-          <read_only>false</read_only>
         </field>
       </fields>
       <methods/>
@@ -255,8 +251,6 @@
           <edit_mode>add_only</edit_mode>
           <count_min>0</count_min>
           <count_max>0</count_max>
-          <relation_type>link</relation_type>
-          <read_only>false</read_only>
         </field>
       </fields>
       <methods/>
@@ -613,8 +607,6 @@
           <edit_mode>add_only</edit_mode>
           <count_min>0</count_min>
           <count_max>0</count_max>
-          <relation_type>link</relation_type>
-          <read_only>false</read_only>
         </field>
       </fields>
       <methods/>
diff --git a/datamodels/2.x/itop-datacenter-mgmt/dictionaries/pl.dict.itop-datacenter-mgmt.php b/datamodels/2.x/itop-datacenter-mgmt/dictionaries/pl.dict.itop-datacenter-mgmt.php
index 8c8116fcf2..01c3735422 100644
--- a/datamodels/2.x/itop-datacenter-mgmt/dictionaries/pl.dict.itop-datacenter-mgmt.php
+++ b/datamodels/2.x/itop-datacenter-mgmt/dictionaries/pl.dict.itop-datacenter-mgmt.php
@@ -20,7 +20,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/>
  */
-
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	// Dictionary entries go here
 ));
diff --git a/datamodels/2.x/itop-endusers-devices/dictionaries/pl.dict.itop-endusers-devices.php b/datamodels/2.x/itop-endusers-devices/dictionaries/pl.dict.itop-endusers-devices.php
index 8c8116fcf2..01c3735422 100644
--- a/datamodels/2.x/itop-endusers-devices/dictionaries/pl.dict.itop-endusers-devices.php
+++ b/datamodels/2.x/itop-endusers-devices/dictionaries/pl.dict.itop-endusers-devices.php
@@ -20,7 +20,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/>
  */
-
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	// Dictionary entries go here
 ));
diff --git a/datamodels/2.x/itop-faq-light/datamodel.itop-faq-light.xml b/datamodels/2.x/itop-faq-light/datamodel.itop-faq-light.xml
index f66d13ebe4..9ec307ae95 100755
--- a/datamodels/2.x/itop-faq-light/datamodel.itop-faq-light.xml
+++ b/datamodels/2.x/itop-faq-light/datamodel.itop-faq-light.xml
@@ -176,8 +176,6 @@
           <edit_mode>add_only</edit_mode>
           <count_min>0</count_min>
           <count_max>0</count_max>
-          <relation_type>link</relation_type>
-          <read_only>false</read_only>
         </field>
       </fields>
       <methods/>
diff --git a/datamodels/2.x/itop-faq-light/dictionaries/de.dict.itop-faq-light.php b/datamodels/2.x/itop-faq-light/dictionaries/de.dict.itop-faq-light.php
index 7f4d91a3c1..55d10b6492 100644
--- a/datamodels/2.x/itop-faq-light/dictionaries/de.dict.itop-faq-light.php
+++ b/datamodels/2.x/itop-faq-light/dictionaries/de.dict.itop-faq-light.php
@@ -55,7 +55,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:FAQCategory/Attribute:name' => 'Name',
 	'Class:FAQCategory/Attribute:name+' => '',
 	'Class:FAQCategory/Attribute:faq_list' => 'FAQs',
-	'Class:FAQCategory/Attribute:faq_list+' => 'All the frequently asked questions related to this category~~',
+	'Class:FAQCategory/Attribute:faq_list+' => 'Alle FAQ-Einträge (frequently asked questions) verknüpft mit dieser Kategorie',
 ));
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Menu:ProblemManagement' => 'Problem Management',
diff --git a/datamodels/2.x/itop-faq-light/dictionaries/es_cr.dict.itop-faq-light.php b/datamodels/2.x/itop-faq-light/dictionaries/es_cr.dict.itop-faq-light.php
index 94ed3a3594..8d72d13592 100644
--- a/datamodels/2.x/itop-faq-light/dictionaries/es_cr.dict.itop-faq-light.php
+++ b/datamodels/2.x/itop-faq-light/dictionaries/es_cr.dict.itop-faq-light.php
@@ -73,6 +73,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 //
 // Class: FAQCategory
 //
+
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:FAQCategory' => 'Categoría de Preguntas y Respuesta Frecuentes',
 	'Class:FAQCategory+' => 'Categoría de Preguntas y Respuesta Frecuentes',
@@ -92,4 +93,4 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Brick:Portal:FAQ:Menu' => 'Preguntas y Respuestas',
 	'Brick:Portal:FAQ:Title' => 'Preguntas y Respuestas Frecuentes',
 	'Brick:Portal:FAQ:Title+' => '<p>¿En una prisa?</p><p>Vea la lista de las preguntas más comunes y encontrará (tal vez) la respuesta inmediata a sus necesidades.</p>',
-));
\ No newline at end of file
+));
diff --git a/datamodels/2.x/itop-faq-light/dictionaries/fr.dict.itop-faq-light.php b/datamodels/2.x/itop-faq-light/dictionaries/fr.dict.itop-faq-light.php
index 2e6d5e98cc..f1af2875f1 100644
--- a/datamodels/2.x/itop-faq-light/dictionaries/fr.dict.itop-faq-light.php
+++ b/datamodels/2.x/itop-faq-light/dictionaries/fr.dict.itop-faq-light.php
@@ -66,7 +66,6 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Brick:Portal:FAQ:Title' => 'Foire Aux Questions',
 	'Brick:Portal:FAQ:Title+' => '<p>Vous êtes pressé&nbsp;?</p><p>Consultez la liste des questions les plus fréquentes et vous trouverez (peut-être) immédiatement la réponse à votre besoin.</p>',
 ));
-
 // 1:n relations custom labels for tooltip and pop-up title
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:FAQCategory/Attribute:faq_list/UI:Links:Create:Button+' => 'Créer une %4$s',
@@ -74,5 +73,5 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:FAQCategory/Attribute:faq_list/UI:Links:Remove:Button+' => 'Retirer cette %4$s',
 	'Class:FAQCategory/Attribute:faq_list/UI:Links:Remove:Modal:Title' => 'Retirer cette %4$s de sa %1$s',
 	'Class:FAQCategory/Attribute:faq_list/UI:Links:Delete:Button+' => 'Supprimer cette %4$s',
-	'Class:FAQCategory/Attribute:faq_list/UI:Links:Delete:Modal:Title' => 'Supprimer une %4$s',
-));
\ No newline at end of file
+	'Class:FAQCategory/Attribute:faq_list/UI:Links:Delete:Modal:Title' => 'Supprimer une %4$s'
+));
diff --git a/datamodels/2.x/itop-faq-light/dictionaries/hu.dict.itop-faq-light.php b/datamodels/2.x/itop-faq-light/dictionaries/hu.dict.itop-faq-light.php
index 85797a14f2..273e1a0a1b 100644
--- a/datamodels/2.x/itop-faq-light/dictionaries/hu.dict.itop-faq-light.php
+++ b/datamodels/2.x/itop-faq-light/dictionaries/hu.dict.itop-faq-light.php
@@ -23,23 +23,23 @@
 // Class: FAQ
 //
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:FAQ' => 'Tudástár',
-    'Class:FAQ+' => 'Gyakran Ismételt Kérdések',
-    'Class:FAQ/Attribute:title' => 'Cím',
-    'Class:FAQ/Attribute:title+' => '~~',
-    'Class:FAQ/Attribute:summary' => 'Összefoglaló',
-    'Class:FAQ/Attribute:summary+' => '~~',
-    'Class:FAQ/Attribute:description' => 'Leírás',
-    'Class:FAQ/Attribute:description+' => '~~',
-    'Class:FAQ/Attribute:category_id' => 'Kategória',
-    'Class:FAQ/Attribute:category_id+' => '~~',
-    'Class:FAQ/Attribute:category_name' => 'Kategória név',
-    'Class:FAQ/Attribute:category_name+' => '~~',
-    'Class:FAQ/Attribute:error_code' => 'Hibakód',
-    'Class:FAQ/Attribute:error_code+' => '~~',
-    'Class:FAQ/Attribute:key_words' => 'Kulcsszavak',
-    'Class:FAQ/Attribute:key_words+' => '~~',
-    'Class:FAQ/Attribute:domains' => 'Hibatartomány',
+	'Class:FAQ' => 'Tudástár',
+	'Class:FAQ+' => 'Gyakran Ismételt Kérdések',
+	'Class:FAQ/Attribute:title' => 'Cím',
+	'Class:FAQ/Attribute:title+' => '~~',
+	'Class:FAQ/Attribute:summary' => 'Összefoglaló',
+	'Class:FAQ/Attribute:summary+' => '~~',
+	'Class:FAQ/Attribute:description' => 'Leírás',
+	'Class:FAQ/Attribute:description+' => '~~',
+	'Class:FAQ/Attribute:category_id' => 'Kategória',
+	'Class:FAQ/Attribute:category_id+' => '~~',
+	'Class:FAQ/Attribute:category_name' => 'Kategória név',
+	'Class:FAQ/Attribute:category_name+' => '~~',
+	'Class:FAQ/Attribute:error_code' => 'Hibakód',
+	'Class:FAQ/Attribute:error_code+' => '~~',
+	'Class:FAQ/Attribute:key_words' => 'Kulcsszavak',
+	'Class:FAQ/Attribute:key_words+' => '~~',
+	'Class:FAQ/Attribute:domains' => 'Hibatartomány',
 ));
 
 //
@@ -47,23 +47,22 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:FAQCategory' => 'Tudástár kategória',
-    'Class:FAQCategory+' => 'Category for FAQ~~',
-    'Class:FAQCategory/Attribute:name' => 'Név',
-    'Class:FAQCategory/Attribute:name+' => '~~',
-    'Class:FAQCategory/Attribute:faq_list' => 'Tudástárak',
-    'Class:FAQCategory/Attribute:faq_list+' => 'All the frequently asked questions related to this category~~',
+	'Class:FAQCategory' => 'Tudástár kategória',
+	'Class:FAQCategory+' => 'Category for FAQ~~',
+	'Class:FAQCategory/Attribute:name' => 'Név',
+	'Class:FAQCategory/Attribute:name+' => '~~',
+	'Class:FAQCategory/Attribute:faq_list' => 'Tudástárak',
+	'Class:FAQCategory/Attribute:faq_list+' => 'All the frequently asked questions related to this category~~',
 ));
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Menu:ProblemManagement' => 'Problémakezelés',
-    'Menu:ProblemManagement+' => '',
-    'Menu:Problem:Shortcuts' => 'Gyorsgombok',
-    'Menu:FAQCategory' => 'Tudástár kategória',
-    'Menu:FAQCategory+' => 'Összes tudástár kategória',
-    'Menu:FAQ' => 'Tudástár',
-    'Menu:FAQ+' => 'Összes tudástár',
-    'Brick:Portal:FAQ:Menu' => 'Tudástár',
-    'Brick:Portal:FAQ:Title' => 'Tudástárak',
-    'Brick:Portal:FAQ:Title+' => '<p>Siet?</p><p>Nézze át a leggyakoribb kérdések listáját, és (talán) azonnal megtalálja a keresett választ.</p>',
+	'Menu:ProblemManagement' => 'Problémakezelés',
+	'Menu:ProblemManagement+' => '',
+	'Menu:Problem:Shortcuts' => 'Gyorsgombok',
+	'Menu:FAQCategory' => 'Tudástár kategória',
+	'Menu:FAQCategory+' => 'Összes tudástár kategória',
+	'Menu:FAQ' => 'Tudástár',
+	'Menu:FAQ+' => 'Összes tudástár',
+	'Brick:Portal:FAQ:Menu' => 'Tudástár',
+	'Brick:Portal:FAQ:Title' => 'Tudástárak',
+	'Brick:Portal:FAQ:Title+' => '<p>Siet?</p><p>Nézze át a leggyakoribb kérdések listáját, és (talán) azonnal megtalálja a keresett választ.</p>',
 ));
-
diff --git a/datamodels/2.x/itop-faq-light/dictionaries/pl.dict.itop-faq-light.php b/datamodels/2.x/itop-faq-light/dictionaries/pl.dict.itop-faq-light.php
index 7070da51e5..11640ea284 100644
--- a/datamodels/2.x/itop-faq-light/dictionaries/pl.dict.itop-faq-light.php
+++ b/datamodels/2.x/itop-faq-light/dictionaries/pl.dict.itop-faq-light.php
@@ -20,7 +20,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/>
  */
-
 // Dictionnay conventions
 // Class:<class_name>
 // Class:<class_name>+
@@ -30,12 +29,10 @@
 // Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
 // Class:<class_name>/Stimulus:<stimulus_code>
 // Class:<class_name>/Stimulus:<stimulus_code>+
-
 //////////////////////////////////////////////////////////////////////
 // Classes in 'bizmodel'
 //////////////////////////////////////////////////////////////////////
 //
-
 // Dictionnay conventions
 // Class:<class_name>
 // Class:<class_name>+
@@ -45,11 +42,9 @@
 // Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
 // Class:<class_name>/Stimulus:<stimulus_code>
 // Class:<class_name>/Stimulus:<stimulus_code>+
-
 //
 // Class: FAQ
 //
-
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:FAQ' => 'Pytania FAQ',
 	'Class:FAQ+' => 'Często Zadawane Pytania',
diff --git a/datamodels/2.x/itop-faq-light/dictionaries/tr.dict.itop-faq-light.php b/datamodels/2.x/itop-faq-light/dictionaries/tr.dict.itop-faq-light.php
index 448f72413c..143747dd4e 100644
--- a/datamodels/2.x/itop-faq-light/dictionaries/tr.dict.itop-faq-light.php
+++ b/datamodels/2.x/itop-faq-light/dictionaries/tr.dict.itop-faq-light.php
@@ -87,7 +87,6 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Menu:FAQCategory+' => 'Tüm SSS kategorileri',
 	'Menu:FAQ' => 'SSS',
 	'Menu:FAQ+' => 'Tüm SSS',
-
 	'Brick:Portal:FAQ:Menu' => 'SSS',
 	'Brick:Portal:FAQ:Title' => 'Sıkça Sorulan Sorular',
 	'Brick:Portal:FAQ:Title+' => '<p>In a hurry?</p><p>Check out the list of most common questions and (maybe) find the expected answer right away.</p>~~',
diff --git a/datamodels/2.x/itop-files-information/dictionaries/de.dict.itop-files-information.php b/datamodels/2.x/itop-files-information/dictionaries/de.dict.itop-files-information.php
index 5fc5428042..ad876cc6e4 100644
--- a/datamodels/2.x/itop-files-information/dictionaries/de.dict.itop-files-information.php
+++ b/datamodels/2.x/itop-files-information/dictionaries/de.dict.itop-files-information.php
@@ -24,7 +24,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	// Errors
 	'FilesInformation:Error:MissingFile' => 'Fehlende Datei: %1$s',
 	'FilesInformation:Error:CorruptedFile' => 'Datei %1$s ist beschädigt',
-	'FilesInformation:Error:ListCorruptedFile' => 'File(s) corrupted: %1$s~~',
+	'FilesInformation:Error:ListCorruptedFile' => 'Beschädigte Datei(en): %1$s',
 	'FilesInformation:Error:CantWriteToFile' => 'Datei %1$s kann nicht geschrieben werden',
 ));
 
diff --git a/datamodels/2.x/itop-files-information/dictionaries/pl.dict.itop-files-information.php b/datamodels/2.x/itop-files-information/dictionaries/pl.dict.itop-files-information.php
index 8b884944f5..94b047a55b 100644
--- a/datamodels/2.x/itop-files-information/dictionaries/pl.dict.itop-files-information.php
+++ b/datamodels/2.x/itop-files-information/dictionaries/pl.dict.itop-files-information.php
@@ -20,7 +20,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/>
  */
-
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	// Errors
 	'FilesInformation:Error:MissingFile' => 'Brakujący plik: %1$s',
diff --git a/datamodels/2.x/itop-hub-connector/dictionaries/cs.dict.itop-hub-connector.php b/datamodels/2.x/itop-hub-connector/dictionaries/cs.dict.itop-hub-connector.php
index 83afe0be87..f5edb825b0 100644
--- a/datamodels/2.x/itop-hub-connector/dictionaries/cs.dict.itop-hub-connector.php
+++ b/datamodels/2.x/itop-hub-connector/dictionaries/cs.dict.itop-hub-connector.php
@@ -38,7 +38,6 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'iTopHub:AutoSubmit' => 'Don\'t ask me again. Next time, go to iTop Hub automatically.~~',
 	'UI:About:RemoteExtensionSource' => 'iTop Hub~~',
 	'iTopHub:Explanation' => 'By clicking this button you will be redirected to iTop Hub.~~',
-
 	'iTopHub:BackupFreeDiskSpaceIn' => '%1$s free disk space in %2$s.~~',
 	'iTopHub:FailedToCheckFreeDiskSpace' => 'Failed to check free disk space.~~',
 	'iTopHub:BackupOk' => 'Backup Ok.~~',
@@ -48,7 +47,6 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'iTopHub:CompiledOK' => 'Compilation successful.~~',
 	'iTopHub:ConfigurationSafelyReverted' => 'Error detected during deployment!<br/>'.ITOP_APPLICATION_SHORT.' configuration has NOT been modified.~~',
 	'iTopHub:FailAuthent' => 'Authentication failed for this action.~~',
-
 	'iTopHub:InstalledExtensions' => 'Extensions deployed on this instance~~',
 	'iTopHub:ExtensionCategory:Manual' => 'Extensions deployed manually~~',
 	'iTopHub:ExtensionCategory:Manual+' => 'The following extensions have been deployed by copying them manually in the %1$s directory of '.ITOP_APPLICATION_SHORT.':~~',
@@ -58,7 +56,6 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'iTopHub:NoExtensionInThisCategory+' => 'Browse iTop Hub to find the extensions that will help you customize and adapt '.ITOP_APPLICATION_SHORT.' to your processes !~~',
 	'iTopHub:ExtensionNotInstalled' => 'Not installed~~',
 	'iTopHub:GetMoreExtensions' => 'Get extensions from iTop Hub...~~',
-
 	'iTopHub:LandingWelcome' => 'Congratulations! The following extensions were downloaded from iTop Hub and deployed into your '.ITOP_APPLICATION_SHORT.'.~~',
 	'iTopHub:GoBackToITopBtn' => 'Go Back to '.ITOP_APPLICATION_SHORT.'~~',
 	'iTopHub:Uncompressing' => 'Uncompressing extensions...~~',
@@ -67,7 +64,6 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'iTopHub:DBBackupSentence' => 'Do a backup of the database and '.ITOP_APPLICATION_SHORT.' configuration before updating~~',
 	'iTopHub:DeployBtn' => 'Deploy !~~',
 	'iTopHub:DatabaseBackupProgress' => 'Instance backup...~~',
-
 	'iTopHub:InstallationEffect:Install' => 'Version: %1$s will be installed.~~',
 	'iTopHub:InstallationEffect:NoChange' => 'Version: %1$s already installed. Nothing will change.~~',
 	'iTopHub:InstallationEffect:Upgrade' => 'Will be <b>upgraded</b> from version %1$s to version %2$s.~~',
@@ -77,7 +73,6 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'iTopHub:InstallationEffect:MissingDependencies' => 'This extension cannot be installed because of unmet dependencies.~~',
 	'iTopHub:InstallationEffect:MissingDependencies_Details' => 'The extension requires the module(s): %1$s~~',
 	'iTopHub:InstallationProgress:InstallationSuccessful' => 'Installation successful!~~',
-
 	'iTopHub:InstallationStatus:Installed_Version' => '%1$s version: %2$s.~~',
 	'iTopHub:InstallationStatus:Installed' => 'Installed~~',
 	'iTopHub:InstallationStatus:Version_NotInstalled' => 'Version %1$s <b>NOT</b> installed.~~',
diff --git a/datamodels/2.x/itop-hub-connector/dictionaries/da.dict.itop-hub-connector.php b/datamodels/2.x/itop-hub-connector/dictionaries/da.dict.itop-hub-connector.php
index 7a1db4e21f..b4a82bcfd4 100644
--- a/datamodels/2.x/itop-hub-connector/dictionaries/da.dict.itop-hub-connector.php
+++ b/datamodels/2.x/itop-hub-connector/dictionaries/da.dict.itop-hub-connector.php
@@ -38,7 +38,6 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'iTopHub:AutoSubmit' => 'Don\'t ask me again. Next time, go to iTop Hub automatically.~~',
 	'UI:About:RemoteExtensionSource' => 'iTop Hub~~',
 	'iTopHub:Explanation' => 'By clicking this button you will be redirected to iTop Hub.~~',
-
 	'iTopHub:BackupFreeDiskSpaceIn' => '%1$s free disk space in %2$s.~~',
 	'iTopHub:FailedToCheckFreeDiskSpace' => 'Failed to check free disk space.~~',
 	'iTopHub:BackupOk' => 'Backup Ok.~~',
@@ -48,7 +47,6 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'iTopHub:CompiledOK' => 'Compilation successful.~~',
 	'iTopHub:ConfigurationSafelyReverted' => 'Error detected during deployment!<br/>'.ITOP_APPLICATION_SHORT.' configuration has NOT been modified.~~',
 	'iTopHub:FailAuthent' => 'Authentication failed for this action.~~',
-
 	'iTopHub:InstalledExtensions' => 'Extensions deployed on this instance~~',
 	'iTopHub:ExtensionCategory:Manual' => 'Extensions deployed manually~~',
 	'iTopHub:ExtensionCategory:Manual+' => 'The following extensions have been deployed by copying them manually in the %1$s directory of '.ITOP_APPLICATION_SHORT.':~~',
@@ -58,7 +56,6 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'iTopHub:NoExtensionInThisCategory+' => 'Browse iTop Hub to find the extensions that will help you customize and adapt '.ITOP_APPLICATION_SHORT.' to your processes !~~',
 	'iTopHub:ExtensionNotInstalled' => 'Not installed~~',
 	'iTopHub:GetMoreExtensions' => 'Get extensions from iTop Hub...~~',
-
 	'iTopHub:LandingWelcome' => 'Congratulations! The following extensions were downloaded from iTop Hub and deployed into your '.ITOP_APPLICATION_SHORT.'.~~',
 	'iTopHub:GoBackToITopBtn' => 'Go Back to '.ITOP_APPLICATION_SHORT.'~~',
 	'iTopHub:Uncompressing' => 'Uncompressing extensions...~~',
@@ -67,7 +64,6 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'iTopHub:DBBackupSentence' => 'Do a backup of the database and '.ITOP_APPLICATION_SHORT.' configuration before updating~~',
 	'iTopHub:DeployBtn' => 'Deploy !~~',
 	'iTopHub:DatabaseBackupProgress' => 'Instance backup...~~',
-
 	'iTopHub:InstallationEffect:Install' => 'Version: %1$s will be installed.~~',
 	'iTopHub:InstallationEffect:NoChange' => 'Version: %1$s already installed. Nothing will change.~~',
 	'iTopHub:InstallationEffect:Upgrade' => 'Will be <b>upgraded</b> from version %1$s to version %2$s.~~',
@@ -77,7 +73,6 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'iTopHub:InstallationEffect:MissingDependencies' => 'This extension cannot be installed because of unmet dependencies.~~',
 	'iTopHub:InstallationEffect:MissingDependencies_Details' => 'The extension requires the module(s): %1$s~~',
 	'iTopHub:InstallationProgress:InstallationSuccessful' => 'Installation successful!~~',
-
 	'iTopHub:InstallationStatus:Installed_Version' => '%1$s version: %2$s.~~',
 	'iTopHub:InstallationStatus:Installed' => 'Installed~~',
 	'iTopHub:InstallationStatus:Version_NotInstalled' => 'Version %1$s <b>NOT</b> installed.~~',
diff --git a/datamodels/2.x/itop-hub-connector/dictionaries/de.dict.itop-hub-connector.php b/datamodels/2.x/itop-hub-connector/dictionaries/de.dict.itop-hub-connector.php
index 2d1d5a9fdf..52c9ce002c 100644
--- a/datamodels/2.x/itop-hub-connector/dictionaries/de.dict.itop-hub-connector.php
+++ b/datamodels/2.x/itop-hub-connector/dictionaries/de.dict.itop-hub-connector.php
@@ -38,7 +38,6 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'iTopHub:AutoSubmit' => 'Diese Meldung nicht noch einmal anzeigen und beim nächsten Mal automatisch zum iTop Hub gehen.',
 	'UI:About:RemoteExtensionSource' => 'iTop Hub',
 	'iTopHub:Explanation' => 'Durch Klick auf diesen Button werden Sie zum iTop Hub weitergeleitet.',
-
 	'iTopHub:BackupFreeDiskSpaceIn' => '%1$s freier Speicherplatz aus %2$s.',
 	'iTopHub:FailedToCheckFreeDiskSpace' => 'Überprüfung des freien Speicherplatzes fehlgeschlagen',
 	'iTopHub:BackupOk' => 'Backup erstellt.',
@@ -48,7 +47,6 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'iTopHub:CompiledOK' => 'Installation erfolgreich',
 	'iTopHub:ConfigurationSafelyReverted' => 'Fehler während der Installation!<br/>'.ITOP_APPLICATION_SHORT.' Konfiguration wurde NICHT angepasst.',
 	'iTopHub:FailAuthent' => 'Die Authentifizierung für diese Aktion ist fehlgeschlagen.',
-
 	'iTopHub:InstalledExtensions' => 'Erweiterungen, die auf dieser Instanz installiert sind',
 	'iTopHub:ExtensionCategory:Manual' => 'Manuell installierte Erweiterungen',
 	'iTopHub:ExtensionCategory:Manual+' => 'Die folgenden Erweiterungen wurden installiert, indem sie manuell in das Verzeichnis %1$s kopiert wurden:',
@@ -58,7 +56,6 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'iTopHub:NoExtensionInThisCategory+' => 'Besuchen Sie den iTop Hub, um Erweiterungen zu finden, die Ihnen helfen, Ihr '.ITOP_APPLICATION_SHORT.' so zu erweitern, dass es besser zu Ihren Bedürfnissen passt!',
 	'iTopHub:ExtensionNotInstalled' => 'Nicht installiert',
 	'iTopHub:GetMoreExtensions' => 'Erweiterungen vom iTop Hub beziehen ...',
-
 	'iTopHub:LandingWelcome' => 'Herzlichen Glückwunsch! Die folgenden Erweiterungen wurden vom iTop Hub heruntergeladen und installiert:',
 	'iTopHub:GoBackToITopBtn' => 'Gehe zurück zu '.ITOP_APPLICATION_SHORT,
 	'iTopHub:Uncompressing' => 'Erweiterungen entpacken...',
@@ -67,7 +64,6 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'iTopHub:DBBackupSentence' => 'Vor dem Update ein Backup der iTop Datenbank und der '.ITOP_APPLICATION_SHORT.' Konfiguration durchführen.',
 	'iTopHub:DeployBtn' => 'Installieren!',
 	'iTopHub:DatabaseBackupProgress' => 'Backup durchführen...',
-
 	'iTopHub:InstallationEffect:Install' => 'Version: %1$s wird installiert.',
 	'iTopHub:InstallationEffect:NoChange' => 'Version: %1$s ist bereits installiert. Es wird keine Änderung durchgeführt.',
 	'iTopHub:InstallationEffect:Upgrade' => 'Aktualisierung von Version %1$s auf Version %2$s.',
@@ -77,7 +73,6 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'iTopHub:InstallationEffect:MissingDependencies' => 'Diese Erweiterung kann nicht installiert werden, da Abhängigkeiten nicht erfüllt werden.',
 	'iTopHub:InstallationEffect:MissingDependencies_Details' => 'The Erweiterung benötigt folgende(s) Modul(e): %1$s',
 	'iTopHub:InstallationProgress:InstallationSuccessful' => 'Installation erfolgreich!',
-
 	'iTopHub:InstallationStatus:Installed_Version' => '%1$s Version: %2$s.',
 	'iTopHub:InstallationStatus:Installed' => 'Installiert',
 	'iTopHub:InstallationStatus:Version_NotInstalled' => 'Version %1$s <b>NICHT</b> installiert.',
diff --git a/datamodels/2.x/itop-hub-connector/dictionaries/es_cr.dict.itop-hub-connector.php b/datamodels/2.x/itop-hub-connector/dictionaries/es_cr.dict.itop-hub-connector.php
index aa8c8f4ca1..c52aad83e0 100644
--- a/datamodels/2.x/itop-hub-connector/dictionaries/es_cr.dict.itop-hub-connector.php
+++ b/datamodels/2.x/itop-hub-connector/dictionaries/es_cr.dict.itop-hub-connector.php
@@ -39,7 +39,6 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'iTopHub:AutoSubmit' => 'No me pregunte otra vez. Siguiente ocasión ir automáticamente a iTop Hub.',
 	'UI:About:RemoteExtensionSource' => 'iTop Hub',
 	'iTopHub:Explanation' => 'Dando click a este botón, usted será redireccionado a iTop Hub.',
-
 	'iTopHub:BackupFreeDiskSpaceIn' => '%1$s espacio libre en disco en %2$s.',
 	'iTopHub:FailedToCheckFreeDiskSpace' => 'Falló en revisar disponibilidad de espacio libre en disco.',
 	'iTopHub:BackupOk' => 'Respaldo Ok.',
@@ -49,7 +48,6 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'iTopHub:CompiledOK' => 'Compilación éxitosa.',
 	'iTopHub:ConfigurationSafelyReverted' => 'Error detectado durante la instalación!<br/>La configuración de '.ITOP_APPLICATION_SHORT.' NO fue modificada.',
 	'iTopHub:FailAuthent' => 'Autenticación fallida para esta acciónn.',
-
 	'iTopHub:InstalledExtensions' => 'Extensiones instaladas en esta instancia',
 	'iTopHub:ExtensionCategory:Manual' => 'Extensiones instaladas manualmente',
 	'iTopHub:ExtensionCategory:Manual+' => 'Las siguientes extensiones fueron instaladas copiandolas manualmente en el directorio %1$s de '.ITOP_APPLICATION_SHORT.':',
@@ -59,7 +57,6 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'iTopHub:NoExtensionInThisCategory+' => 'Navegue en iTop Hub para encontrar aquellas que le ayuden a personalizar y adaptar '.ITOP_APPLICATION_SHORT.' a sus procesos !',
 	'iTopHub:ExtensionNotInstalled' => 'No instalada',
 	'iTopHub:GetMoreExtensions' => 'Obtener extensiones de iTop Hub...',
-
 	'iTopHub:LandingWelcome' => '¡Felicidades! Las siguientes extensiones fueron descargadas de iTop Hub e instaladas en su '.ITOP_APPLICATION_SHORT.'.',
 	'iTopHub:GoBackToITopBtn' => 'Regresar a '.ITOP_APPLICATION_SHORT,
 	'iTopHub:Uncompressing' => 'Descomprimiendo extensiones...',
@@ -68,7 +65,6 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'iTopHub:DBBackupSentence' => 'Realice un respaldo de la base de datos y configuración de '.ITOP_APPLICATION_SHORT.' antes de actualizar.',
 	'iTopHub:DeployBtn' => 'Instalar !',
 	'iTopHub:DatabaseBackupProgress' => 'Respaldo de Instancia...',
-
 	'iTopHub:InstallationEffect:Install' => 'Version: %1$s será instalada.',
 	'iTopHub:InstallationEffect:NoChange' => 'Version: %1$s ya está instalada. Nada por cambiar.',
 	'iTopHub:InstallationEffect:Upgrade' => 'Se <b>actualizará</b> de la versión %1$s a la versión %2$s.',
@@ -78,7 +74,6 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'iTopHub:InstallationEffect:MissingDependencies' => 'Esta extensión no puede ser instalad porque no cumple con las dependencias.',
 	'iTopHub:InstallationEffect:MissingDependencies_Details' => 'La extensión require el/los módulo(s): %1$s',
 	'iTopHub:InstallationProgress:InstallationSuccessful' => '¡Instalación éxitosa!',
-
 	'iTopHub:InstallationStatus:Installed_Version' => '%1$s versión: %2$s.',
 	'iTopHub:InstallationStatus:Installed' => 'Instalada',
 	'iTopHub:InstallationStatus:Version_NotInstalled' => 'Versión %1$s <b>NO</b> está instalada.',
diff --git a/datamodels/2.x/itop-hub-connector/dictionaries/fr.dict.itop-hub-connector.php b/datamodels/2.x/itop-hub-connector/dictionaries/fr.dict.itop-hub-connector.php
index 7bb9e356ad..83c10a4df6 100644
--- a/datamodels/2.x/itop-hub-connector/dictionaries/fr.dict.itop-hub-connector.php
+++ b/datamodels/2.x/itop-hub-connector/dictionaries/fr.dict.itop-hub-connector.php
@@ -23,7 +23,6 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'iTopHub:AutoSubmit' => 'Ne plus me demander. La prochaine fois, aller sur iTop Hub automatiquement.',
 	'UI:About:RemoteExtensionSource' => 'iTop Hub',
 	'iTopHub:Explanation' => 'En cliquant sur ce bouton, vous serez redirigé vers iTop Hub.',
-
 	'iTopHub:BackupFreeDiskSpaceIn' => '%1$s d\'espace disque disponible sur %2$s.',
 	'iTopHub:FailedToCheckFreeDiskSpace' => 'Echec de la vérification de l\'espace disque.',
 	'iTopHub:BackupOk' => 'Sauvegarde Ok.',
@@ -33,7 +32,6 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'iTopHub:CompiledOK' => 'Compilation réussie.',
 	'iTopHub:ConfigurationSafelyReverted' => 'Une erreur a été détectée durant le déploiement!<br/>La configuration d\'iTop n\'a PAS été modifiée.',
 	'iTopHub:FailAuthent' => 'Échec d\'authentification pour cette action',
-
 	'iTopHub:InstalledExtensions' => 'Extensions déployées sur cette instance',
 	'iTopHub:ExtensionCategory:Manual' => 'Extensions déployées manuellement',
 	'iTopHub:ExtensionCategory:Manual+' => 'Les extensions ci-dessous ont été déployées en les copiant manuellement dans le répertoire %1$s d\''.ITOP_APPLICATION_SHORT.':',
@@ -43,7 +41,6 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'iTopHub:NoExtensionInThisCategory+' => 'Avec iTop Hub trouvez en quelques clics les extensions qui vous permettront de construire un iTop sur mesure qui se conforme à vos processus !',
 	'iTopHub:ExtensionNotInstalled' => 'Non installée',
 	'iTopHub:GetMoreExtensions' => 'Obtenir des extensions depuis iTop Hub...',
-
 	'iTopHub:LandingWelcome' => 'Félicitations! Les extensions ci-dessous ont été téléchargées depuis iTop Hub et installées sur cette instance d\''.ITOP_APPLICATION_SHORT.'.',
 	'iTopHub:GoBackToITopBtn' => 'Retourner dans '.ITOP_APPLICATION_SHORT,
 	'iTopHub:Uncompressing' => 'Décompression des extensions...',
@@ -52,7 +49,6 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'iTopHub:DBBackupSentence' => 'Faire une sauvegarde de la base de données et des paramétrages d\''.ITOP_APPLICATION_SHORT,
 	'iTopHub:DeployBtn' => 'Déployer !',
 	'iTopHub:DatabaseBackupProgress' => 'Sauvegarde de l\'instance...',
-
 	'iTopHub:InstallationEffect:Install' => 'Version: %1$s sera installée.',
 	'iTopHub:InstallationEffect:NoChange' => 'Version: %1$s déjà installée. Rien ne changera.',
 	'iTopHub:InstallationEffect:Upgrade' => 'Sera <b>mise à jour</b> de version %1$s en version %2$s.',
@@ -62,7 +58,6 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'iTopHub:InstallationEffect:MissingDependencies' => 'Cette extension ne peut pas être installée à cause de ses dépendences.',
 	'iTopHub:InstallationEffect:MissingDependencies_Details' => 'Cette extension nécessite le(s) module(s): %1$s',
 	'iTopHub:InstallationProgress:InstallationSuccessful' => 'Installation réussie !',
-
 	'iTopHub:InstallationStatus:Installed_Version' => '%1$s version: %2$s.',
 	'iTopHub:InstallationStatus:Installed' => 'Installée',
 	'iTopHub:InstallationStatus:Version_NotInstalled' => 'Version %1$s <b>NON</b> installée.',
diff --git a/datamodels/2.x/itop-hub-connector/dictionaries/hu.dict.itop-hub-connector.php b/datamodels/2.x/itop-hub-connector/dictionaries/hu.dict.itop-hub-connector.php
index 2faf82d794..2a12556b75 100644
--- a/datamodels/2.x/itop-hub-connector/dictionaries/hu.dict.itop-hub-connector.php
+++ b/datamodels/2.x/itop-hub-connector/dictionaries/hu.dict.itop-hub-connector.php
@@ -21,64 +21,61 @@
  * along with iTop. If not, see <http://www.gnu.org/licenses/>
  */
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    // Dictionary entries go here
-    'Menu:iTopHub' => 'iTop Hub',
-    'Menu:iTopHub:Register' => 'Kapcsolódás az iTop Hub-ra',
-    'Menu:iTopHub:Register+' => 'Továbblépés az iTop Hub-ra a '.ITOP_APPLICATION_SHORT.' példányának frissítéséhez',
-    'Menu:iTopHub:Register:Description' => '<p>Szerezzen hozzáférést az iTop Hub közösségi platformjához!</br>Találja meg az összes szükséges tartalmat és információt, kezelje példányait személyre szabott eszközökkel és telepítsen további bővítményeket.</br><br/>Ha erről az oldalról csatlakozik a Hub-hoz, akkor a Hub-ra továbbítja az '.ITOP_APPLICATION_SHORT.' példányára vonatkozó információkat.</p>',
-    'Menu:iTopHub:MyExtensions' => 'Telepített bővítmények',
-    'Menu:iTopHub:MyExtensions+' => 'Lásd a '.ITOP_APPLICATION_SHORT.' példányon telepített bővítmények listáját',
-    'Menu:iTopHub:BrowseExtensions' => 'Bővítmények beszerzése az iTop Hub-ról',
-    'Menu:iTopHub:BrowseExtensions+' => 'További bővítmények keresése az iTop Hub-on',
-    'Menu:iTopHub:BrowseExtensions:Description' => '<p>Nézze meg az iTop Hub áruházát, az Ön egyablakos helyét, ahol csodálatos '.ITOP_APPLICATION_SHORT.' bővítményeket talál!</br>Keresse meg azokat, amelyek segítenek a '.ITOP_APPLICATION_SHORT.' testreszabásában és az Ön folyamataihoz való igazításában.</br><br/>Ha erről az oldalról csatlakozik a Hub-hoz, akkor a Hub-ra továbbítja a '.ITOP_APPLICATION_SHORT.' példányára vonatkozó információkat.</p>',
-    'iTopHub:GoBtn' => 'Tovább az iTop Hub-ra',
-    'iTopHub:CloseBtn' => 'Bezárás',
-    'iTopHub:GoBtn:Tooltip' => 'Ugrás a www.itophub.io -ra',
-    'iTopHub:OpenInNewWindow' => 'iTop Hub megnyitása új ablakban',
-    'iTopHub:AutoSubmit' => 'Ne kérdezze újra. Legközelebb menjen az iTop Hub-hoz automatikusan.',
-    'UI:About:RemoteExtensionSource' => 'iTop Hub',
-    'iTopHub:Explanation' => 'Erre a gombra kattintva átirányítjuk Önt az iTop Hub oldalára.',
-
-    'iTopHub:BackupFreeDiskSpaceIn' => '%1$s szabad lemezterület %2$s -ben',
-    'iTopHub:FailedToCheckFreeDiskSpace' => 'Nem sikerült ellenőrizni a szabad lemezterületet.',
-    'iTopHub:BackupOk' => 'Biztonsági mentés Ok.',
-    'iTopHub:BackupFailed' => 'Biztonsági mentés sikertelen!',
-    'iTopHub:Landing:Status' => 'Telepítés állapota',
-    'iTopHub:Landing:Install' => 'Bővítmények telepítése...',
-    'iTopHub:CompiledOK' => 'Összeállítás sikeres',
-    'iTopHub:ConfigurationSafelyReverted' => 'Hiba történt telepítés közben!<br/>Az '.ITOP_APPLICATION_SHORT.' konfigurációja NEM lett elmentve.',
-    'iTopHub:FailAuthent' => 'Azonosítás sikertelen ennél a műveletnél.',
-
-    'iTopHub:InstalledExtensions' => 'A bővítmények feltelepültek erre a példányra',
-    'iTopHub:ExtensionCategory:Manual' => 'A bővítmények manuálisan telepítve',
-    'iTopHub:ExtensionCategory:Manual+' => 'A következő bővítményeket kézi másolással telepítettük a '.ITOP_APPLICATION_SHORT.' %1$s könyvtárába:',
-    'iTopHub:ExtensionCategory:Remote' => 'Az iTop Hub-ról telepített bővítmények',
-    'iTopHub:ExtensionCategory:Remote+' => 'A következő bővítményeket telepítettük az iTop Hub-ról:',
-    'iTopHub:NoExtensionInThisCategory' => 'Ebben a kategóriában nincs bővítmény',
-    'iTopHub:NoExtensionInThisCategory+' => 'Böngésszen az iTop Hub-ban, hogy megtalálja azokat a bővítményeket, amelyek segítenek testreszabni és az Ön folyamataihoz igazítani az '.ITOP_APPLICATION_SHORT.'-ot !',
-    'iTopHub:ExtensionNotInstalled' => 'Nincs telepítve',
-    'iTopHub:GetMoreExtensions' => 'Bővítmények beszerzése az iTop Hub-ról...',
-
-    'iTopHub:LandingWelcome' => 'Gratulálunk! A következő bővítményeket letöltöttük az iTop Hub-ról, és telepítettük az Ön '.ITOP_APPLICATION_SHORT.' példányára.',
-    'iTopHub:GoBackToITopBtn' => 'Vissza az '.ITOP_APPLICATION_SHORT.'-hoz',
-    'iTopHub:Uncompressing' => 'Bővítmények kicsomagolása...',
-    'iTopHub:InstallationWelcome' => 'Az iTop Hub-ról letöltött bővítmények telepítése',
-    'iTopHub:DBBackupLabel' => 'Példány mentés',
-    'iTopHub:DBBackupSentence' => 'A frissítés előtt biztonsági mentést készítünk az adatbázisról és az '.ITOP_APPLICATION_SHORT.' konfigurációról.',
-    'iTopHub:DeployBtn' => 'Telepítés !',
-    'iTopHub:DatabaseBackupProgress' => 'Példány mentés...',
-
-    'iTopHub:InstallationEffect:Install' => 'Verzió: %1$s lesz telepítve.',
-    'iTopHub:InstallationEffect:NoChange' => 'Verzió: %1$s már telepítve. Nincs változás.',
-    'iTopHub:InstallationEffect:Upgrade' => '<b>Frissítve</b> lesz %1$s verzióról %2$s verzióra.',
-    'iTopHub:InstallationEffect:Downgrade' => '<b>Lebutítva</b> lesz %1$s verzióról %2$s verzióra.',
-    'iTopHub:InstallationProgress:DatabaseBackup' => ITOP_APPLICATION_SHORT.' példány backup...',
-    'iTopHub:InstallationProgress:ExtensionsInstallation' => 'A bővítmény telepítése',
-    'iTopHub:InstallationEffect:MissingDependencies' => 'Ez a bővítmény nem telepíthető nem teljesített függőségek miatt.',
-    'iTopHub:InstallationEffect:MissingDependencies_Details' => 'A bővítményhez további modulok szükségesek: %1$s',
-    'iTopHub:InstallationProgress:InstallationSuccessful' => 'A telepítés sikeres',
-
-    'iTopHub:InstallationStatus:Installed_Version' => '%1$s verzió: %2$s.',
-    'iTopHub:InstallationStatus:Installed' => 'Telepítve',
-    'iTopHub:InstallationStatus:Version_NotInstalled' => 'A %1$s verzió <b>NINCS</b> telepítve.',
+	// Dictionary entries go here
+	'Menu:iTopHub' => 'iTop Hub',
+	'Menu:iTopHub:Register' => 'Kapcsolódás az iTop Hub-ra',
+	'Menu:iTopHub:Register+' => 'Továbblépés az iTop Hub-ra a '.ITOP_APPLICATION_SHORT.' példányának frissítéséhez',
+	'Menu:iTopHub:Register:Description' => '<p>Szerezzen hozzáférést az iTop Hub közösségi platformjához!</br>Találja meg az összes szükséges tartalmat és információt, kezelje példányait személyre szabott eszközökkel és telepítsen további bővítményeket.</br><br/>Ha erről az oldalról csatlakozik a Hub-hoz, akkor a Hub-ra továbbítja az '.ITOP_APPLICATION_SHORT.' példányára vonatkozó információkat.</p>',
+	'Menu:iTopHub:MyExtensions' => 'Telepített bővítmények',
+	'Menu:iTopHub:MyExtensions+' => 'Lásd a '.ITOP_APPLICATION_SHORT.' példányon telepített bővítmények listáját',
+	'Menu:iTopHub:BrowseExtensions' => 'Bővítmények beszerzése az iTop Hub-ról',
+	'Menu:iTopHub:BrowseExtensions+' => 'További bővítmények keresése az iTop Hub-on',
+	'Menu:iTopHub:BrowseExtensions:Description' => '<p>Nézze meg az iTop Hub áruházát, az Ön egyablakos helyét, ahol csodálatos '.ITOP_APPLICATION_SHORT.' bővítményeket talál!</br>Keresse meg azokat, amelyek segítenek a '.ITOP_APPLICATION_SHORT.' testreszabásában és az Ön folyamataihoz való igazításában.</br><br/>Ha erről az oldalról csatlakozik a Hub-hoz, akkor a Hub-ra továbbítja a '.ITOP_APPLICATION_SHORT.' példányára vonatkozó információkat.</p>',
+	'iTopHub:GoBtn' => 'Tovább az iTop Hub-ra',
+	'iTopHub:CloseBtn' => 'Bezárás',
+	'iTopHub:GoBtn:Tooltip' => 'Ugrás a www.itophub.io -ra',
+	'iTopHub:OpenInNewWindow' => 'iTop Hub megnyitása új ablakban',
+	'iTopHub:AutoSubmit' => 'Ne kérdezze újra. Legközelebb menjen az iTop Hub-hoz automatikusan.',
+	'UI:About:RemoteExtensionSource' => 'iTop Hub',
+	'iTopHub:Explanation' => 'Erre a gombra kattintva átirányítjuk Önt az iTop Hub oldalára.',
+	'iTopHub:BackupFreeDiskSpaceIn' => '%1$s szabad lemezterület %2$s -ben',
+	'iTopHub:FailedToCheckFreeDiskSpace' => 'Nem sikerült ellenőrizni a szabad lemezterületet.',
+	'iTopHub:BackupOk' => 'Biztonsági mentés Ok.',
+	'iTopHub:BackupFailed' => 'Biztonsági mentés sikertelen!',
+	'iTopHub:Landing:Status' => 'Telepítés állapota',
+	'iTopHub:Landing:Install' => 'Bővítmények telepítése...',
+	'iTopHub:CompiledOK' => 'Összeállítás sikeres',
+	'iTopHub:ConfigurationSafelyReverted' => 'Hiba történt telepítés közben!<br/>Az '.ITOP_APPLICATION_SHORT.' konfigurációja NEM lett elmentve.',
+	'iTopHub:FailAuthent' => 'Azonosítás sikertelen ennél a műveletnél.',
+	'iTopHub:InstalledExtensions' => 'A bővítmények feltelepültek erre a példányra',
+	'iTopHub:ExtensionCategory:Manual' => 'A bővítmények manuálisan telepítve',
+	'iTopHub:ExtensionCategory:Manual+' => 'A következő bővítményeket kézi másolással telepítettük a '.ITOP_APPLICATION_SHORT.' %1$s könyvtárába:',
+	'iTopHub:ExtensionCategory:Remote' => 'Az iTop Hub-ról telepített bővítmények',
+	'iTopHub:ExtensionCategory:Remote+' => 'A következő bővítményeket telepítettük az iTop Hub-ról:',
+	'iTopHub:NoExtensionInThisCategory' => 'Ebben a kategóriában nincs bővítmény',
+	'iTopHub:NoExtensionInThisCategory+' => 'Böngésszen az iTop Hub-ban, hogy megtalálja azokat a bővítményeket, amelyek segítenek testreszabni és az Ön folyamataihoz igazítani az '.ITOP_APPLICATION_SHORT.'-ot !',
+	'iTopHub:ExtensionNotInstalled' => 'Nincs telepítve',
+	'iTopHub:GetMoreExtensions' => 'Bővítmények beszerzése az iTop Hub-ról...',
+	'iTopHub:LandingWelcome' => 'Gratulálunk! A következő bővítményeket letöltöttük az iTop Hub-ról, és telepítettük az Ön '.ITOP_APPLICATION_SHORT.' példányára.',
+	'iTopHub:GoBackToITopBtn' => 'Vissza az '.ITOP_APPLICATION_SHORT.'-hoz',
+	'iTopHub:Uncompressing' => 'Bővítmények kicsomagolása...',
+	'iTopHub:InstallationWelcome' => 'Az iTop Hub-ról letöltött bővítmények telepítése',
+	'iTopHub:DBBackupLabel' => 'Példány mentés',
+	'iTopHub:DBBackupSentence' => 'A frissítés előtt biztonsági mentést készítünk az adatbázisról és az '.ITOP_APPLICATION_SHORT.' konfigurációról.',
+	'iTopHub:DeployBtn' => 'Telepítés !',
+	'iTopHub:DatabaseBackupProgress' => 'Példány mentés...',
+	'iTopHub:InstallationEffect:Install' => 'Verzió: %1$s lesz telepítve.',
+	'iTopHub:InstallationEffect:NoChange' => 'Verzió: %1$s már telepítve. Nincs változás.',
+	'iTopHub:InstallationEffect:Upgrade' => '<b>Frissítve</b> lesz %1$s verzióról %2$s verzióra.',
+	'iTopHub:InstallationEffect:Downgrade' => '<b>Lebutítva</b> lesz %1$s verzióról %2$s verzióra.',
+	'iTopHub:InstallationProgress:DatabaseBackup' => ITOP_APPLICATION_SHORT.' példány backup...',
+	'iTopHub:InstallationProgress:ExtensionsInstallation' => 'A bővítmény telepítése',
+	'iTopHub:InstallationEffect:MissingDependencies' => 'Ez a bővítmény nem telepíthető nem teljesített függőségek miatt.',
+	'iTopHub:InstallationEffect:MissingDependencies_Details' => 'A bővítményhez további modulok szükségesek: %1$s',
+	'iTopHub:InstallationProgress:InstallationSuccessful' => 'A telepítés sikeres',
+	'iTopHub:InstallationStatus:Installed_Version' => '%1$s verzió: %2$s.',
+	'iTopHub:InstallationStatus:Installed' => 'Telepítve',
+	'iTopHub:InstallationStatus:Version_NotInstalled' => 'A %1$s verzió <b>NINCS</b> telepítve.',
 ));
+
+
diff --git a/datamodels/2.x/itop-hub-connector/dictionaries/it.dict.itop-hub-connector.php b/datamodels/2.x/itop-hub-connector/dictionaries/it.dict.itop-hub-connector.php
index 0a6ceb1112..b0ddc3f703 100644
--- a/datamodels/2.x/itop-hub-connector/dictionaries/it.dict.itop-hub-connector.php
+++ b/datamodels/2.x/itop-hub-connector/dictionaries/it.dict.itop-hub-connector.php
@@ -38,7 +38,6 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'iTopHub:AutoSubmit' => 'Don\'t ask me again. Next time, go to iTop Hub automatically.~~',
 	'UI:About:RemoteExtensionSource' => 'iTop Hub~~',
 	'iTopHub:Explanation' => 'By clicking this button you will be redirected to iTop Hub.~~',
-
 	'iTopHub:BackupFreeDiskSpaceIn' => '%1$s free disk space in %2$s.~~',
 	'iTopHub:FailedToCheckFreeDiskSpace' => 'Failed to check free disk space.~~',
 	'iTopHub:BackupOk' => 'Backup Ok.~~',
@@ -48,7 +47,6 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'iTopHub:CompiledOK' => 'Compilation successful.~~',
 	'iTopHub:ConfigurationSafelyReverted' => 'Error detected during deployment!<br/>'.ITOP_APPLICATION_SHORT.' configuration has NOT been modified.~~',
 	'iTopHub:FailAuthent' => 'Authentication failed for this action.~~',
-
 	'iTopHub:InstalledExtensions' => 'Extensions deployed on this instance~~',
 	'iTopHub:ExtensionCategory:Manual' => 'Extensions deployed manually~~',
 	'iTopHub:ExtensionCategory:Manual+' => 'The following extensions have been deployed by copying them manually in the %1$s directory of '.ITOP_APPLICATION_SHORT.':~~',
@@ -58,7 +56,6 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'iTopHub:NoExtensionInThisCategory+' => 'Browse iTop Hub to find the extensions that will help you customize and adapt '.ITOP_APPLICATION_SHORT.' to your processes !~~',
 	'iTopHub:ExtensionNotInstalled' => 'Not installed~~',
 	'iTopHub:GetMoreExtensions' => 'Get extensions from iTop Hub...~~',
-
 	'iTopHub:LandingWelcome' => 'Congratulations! The following extensions were downloaded from iTop Hub and deployed into your '.ITOP_APPLICATION_SHORT.'.~~',
 	'iTopHub:GoBackToITopBtn' => 'Go Back to '.ITOP_APPLICATION_SHORT.'~~',
 	'iTopHub:Uncompressing' => 'Uncompressing extensions...~~',
@@ -67,7 +64,6 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'iTopHub:DBBackupSentence' => 'Do a backup of the database and '.ITOP_APPLICATION_SHORT.' configuration before updating~~',
 	'iTopHub:DeployBtn' => 'Deploy !~~',
 	'iTopHub:DatabaseBackupProgress' => 'Instance backup...~~',
-
 	'iTopHub:InstallationEffect:Install' => 'Version: %1$s will be installed.~~',
 	'iTopHub:InstallationEffect:NoChange' => 'Version: %1$s already installed. Nothing will change.~~',
 	'iTopHub:InstallationEffect:Upgrade' => 'Will be <b>upgraded</b> from version %1$s to version %2$s.~~',
@@ -77,7 +73,6 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'iTopHub:InstallationEffect:MissingDependencies' => 'This extension cannot be installed because of unmet dependencies.~~',
 	'iTopHub:InstallationEffect:MissingDependencies_Details' => 'The extension requires the module(s): %1$s~~',
 	'iTopHub:InstallationProgress:InstallationSuccessful' => 'Installation successful!~~',
-
 	'iTopHub:InstallationStatus:Installed_Version' => '%1$s version: %2$s.~~',
 	'iTopHub:InstallationStatus:Installed' => 'Installed~~',
 	'iTopHub:InstallationStatus:Version_NotInstalled' => 'Version %1$s <b>NOT</b> installed.~~',
diff --git a/datamodels/2.x/itop-hub-connector/dictionaries/ja.dict.itop-hub-connector.php b/datamodels/2.x/itop-hub-connector/dictionaries/ja.dict.itop-hub-connector.php
index c03575b99d..14422d10de 100644
--- a/datamodels/2.x/itop-hub-connector/dictionaries/ja.dict.itop-hub-connector.php
+++ b/datamodels/2.x/itop-hub-connector/dictionaries/ja.dict.itop-hub-connector.php
@@ -38,7 +38,6 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'iTopHub:AutoSubmit' => 'Don\'t ask me again. Next time, go to iTop Hub automatically.~~',
 	'UI:About:RemoteExtensionSource' => 'iTop Hub~~',
 	'iTopHub:Explanation' => 'By clicking this button you will be redirected to iTop Hub.~~',
-
 	'iTopHub:BackupFreeDiskSpaceIn' => '%1$s free disk space in %2$s.~~',
 	'iTopHub:FailedToCheckFreeDiskSpace' => 'Failed to check free disk space.~~',
 	'iTopHub:BackupOk' => 'Backup Ok.~~',
@@ -48,7 +47,6 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'iTopHub:CompiledOK' => 'Compilation successful.~~',
 	'iTopHub:ConfigurationSafelyReverted' => 'Error detected during deployment!<br/>iTop configuration has NOT been modified.~~',
 	'iTopHub:FailAuthent' => 'Authentication failed for this action.~~',
-
 	'iTopHub:InstalledExtensions' => 'Extensions deployed on this instance~~',
 	'iTopHub:ExtensionCategory:Manual' => 'Extensions deployed manually~~',
 	'iTopHub:ExtensionCategory:Manual+' => 'The following extensions have been deployed by copying them manually in the %1$s directory of '.ITOP_APPLICATION_SHORT.':~~',
@@ -58,7 +56,6 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'iTopHub:NoExtensionInThisCategory+' => 'Browse iTop Hub to find the extensions that will help you customize and adapt iTop to your processes !~~',
 	'iTopHub:ExtensionNotInstalled' => 'Not installed~~',
 	'iTopHub:GetMoreExtensions' => 'Get extensions from iTop Hub...~~',
-
 	'iTopHub:LandingWelcome' => 'Congratulations! The following extensions were downloaded from iTop Hub and deployed into your '.ITOP_APPLICATION_SHORT.'.~~',
 	'iTopHub:GoBackToITopBtn' => 'Go Back to '.ITOP_APPLICATION_SHORT.'~~',
 	'iTopHub:Uncompressing' => 'Uncompressing extensions...~~',
@@ -67,7 +64,6 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'iTopHub:DBBackupSentence' => 'Do a backup of the database and iTop configuration before updating~~',
 	'iTopHub:DeployBtn' => 'Deploy !~~',
 	'iTopHub:DatabaseBackupProgress' => 'Instance backup...~~',
-
 	'iTopHub:InstallationEffect:Install' => 'Version: %1$s will be installed.~~',
 	'iTopHub:InstallationEffect:NoChange' => 'Version: %1$s already installed. Nothing will change.~~',
 	'iTopHub:InstallationEffect:Upgrade' => 'Will be <b>upgraded</b> from version %1$s to version %2$s.~~',
@@ -77,7 +73,6 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'iTopHub:InstallationEffect:MissingDependencies' => 'This extension cannot be installed because of unmet dependencies.~~',
 	'iTopHub:InstallationEffect:MissingDependencies_Details' => 'The extension requires the module(s): %1$s~~',
 	'iTopHub:InstallationProgress:InstallationSuccessful' => 'Installation successful!~~',
-
 	'iTopHub:InstallationStatus:Installed_Version' => '%1$s version: %2$s.~~',
 	'iTopHub:InstallationStatus:Installed' => 'Installed~~',
 	'iTopHub:InstallationStatus:Version_NotInstalled' => 'Version %1$s <b>NOT</b> installed.~~',
diff --git a/datamodels/2.x/itop-hub-connector/dictionaries/nl.dict.itop-hub-connector.php b/datamodels/2.x/itop-hub-connector/dictionaries/nl.dict.itop-hub-connector.php
index e04dc56cc9..dfd15f1bde 100644
--- a/datamodels/2.x/itop-hub-connector/dictionaries/nl.dict.itop-hub-connector.php
+++ b/datamodels/2.x/itop-hub-connector/dictionaries/nl.dict.itop-hub-connector.php
@@ -39,7 +39,6 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'iTopHub:AutoSubmit' => 'Vraag dit niet opnieuw en ga volgende keer automatisch naar iTop Hub.',
 	'UI:About:RemoteExtensionSource' => 'iTop Hub',
 	'iTopHub:Explanation' => 'Door op deze knop te klikken, word je doorgestuurd naar iTop Hub.',
-
 	'iTopHub:BackupFreeDiskSpaceIn' => '%1$s vrije schijfruimte in %2$s.',
 	'iTopHub:FailedToCheckFreeDiskSpace' => 'Kon niet controleren hoeveel schijfruimte nog vrij is.',
 	'iTopHub:BackupOk' => 'Backup geslaagd.',
@@ -49,7 +48,6 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'iTopHub:CompiledOK' => 'Compilatie geslaagd.',
 	'iTopHub:ConfigurationSafelyReverted' => 'Er trad een fout op bij de installatie!<br/>'.ITOP_APPLICATION_SHORT.'-configuratie werd NIET aangepast.',
 	'iTopHub:FailAuthent' => 'Aanmelden lukt niet voor deze actie.',
-
 	'iTopHub:InstalledExtensions' => 'Manueel geïnstalleerde extensies',
 	'iTopHub:ExtensionCategory:Manual' => 'Manueel geïnstalleerde extensies',
 	'iTopHub:ExtensionCategory:Manual+' => 'Deze extensies werden geïnstalleerd door ze manueel in de map %1$s te plaatsen:',
@@ -59,7 +57,6 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'iTopHub:NoExtensionInThisCategory+' => 'Blader op iTop Hub en ontdek welke extensies te vinden die je helpen om iTop aan te passen aan jouw manier van werken !',
 	'iTopHub:ExtensionNotInstalled' => 'Niet geïnstalleerd',
 	'iTopHub:GetMoreExtensions' => 'Extensies zoeken op iTop Hub...',
-
 	'iTopHub:LandingWelcome' => 'Gefeliciteerd! Deze extensies werden gedownload via iTop Hub en op deze iTop geïnstalleerd.',
 	'iTopHub:GoBackToITopBtn' => 'Terug naar '.ITOP_APPLICATION_SHORT,
 	'iTopHub:Uncompressing' => 'Extensies aan het uitpakken...',
@@ -68,7 +65,6 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'iTopHub:DBBackupSentence' => 'Neem vooraf een backup van de database en '.ITOP_APPLICATION_SHORT.'-configuratie vooraleer de update uit te voeren',
 	'iTopHub:DeployBtn' => 'Installeer!',
 	'iTopHub:DatabaseBackupProgress' => 'Backup deze omgeving...',
-
 	'iTopHub:InstallationEffect:Install' => 'Versie: %1$s zal geïnstalleerd worden.',
 	'iTopHub:InstallationEffect:NoChange' => 'Versie: %1$s is al geïnstalleerd.',
 	'iTopHub:InstallationEffect:Upgrade' => 'Er zal een <b>upgrade</b> gebeuren van versie %1$s naar %2$s.',
@@ -78,7 +74,6 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'iTopHub:InstallationEffect:MissingDependencies' => 'Deze extensie kan niet geïnstalleerd worden omdat er niet aan vereisten voldaan is.',
 	'iTopHub:InstallationEffect:MissingDependencies_Details' => 'De extensie vereist de module(s): %1$s',
 	'iTopHub:InstallationProgress:InstallationSuccessful' => 'Installatie gelukt!',
-
 	'iTopHub:InstallationStatus:Installed_Version' => '%1$s versie: %2$s.',
 	'iTopHub:InstallationStatus:Installed' => 'Geïnstalleerd',
 	'iTopHub:InstallationStatus:Version_NotInstalled' => 'Versie %1$s is <b>NIET</b> geïnstalleerd.',
diff --git a/datamodels/2.x/itop-hub-connector/dictionaries/pl.dict.itop-hub-connector.php b/datamodels/2.x/itop-hub-connector/dictionaries/pl.dict.itop-hub-connector.php
index 05a18dcd1c..34b47e69ff 100644
--- a/datamodels/2.x/itop-hub-connector/dictionaries/pl.dict.itop-hub-connector.php
+++ b/datamodels/2.x/itop-hub-connector/dictionaries/pl.dict.itop-hub-connector.php
@@ -38,7 +38,6 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'iTopHub:AutoSubmit' => 'Nie pytaj mnie ponownie. Następnym razem przejdź automatycznie do iTop Hub.',
 	'UI:About:RemoteExtensionSource' => 'iTop Hub',
 	'iTopHub:Explanation' => 'Kliknięcie tego przycisku spowoduje przekierowanie do iTop Hub.',
-
 	'iTopHub:BackupFreeDiskSpaceIn' => '%1$s wolne miejsce na dysku w %2$s.',
 	'iTopHub:FailedToCheckFreeDiskSpace' => 'Nie udało się sprawdzić wolnego miejsca na dysku.',
 	'iTopHub:BackupOk' => 'Kopia zapasowa Ok.',
@@ -48,7 +47,6 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'iTopHub:CompiledOK' => 'Kompilacja pomyślna.',
 	'iTopHub:ConfigurationSafelyReverted' => 'Wykryto błąd podczas wdrażania!<br/>Konfiguracja '.ITOP_APPLICATION_SHORT.' NIE została zmodyfikowana.',
 	'iTopHub:FailAuthent' => 'Uwierzytelnianie nie powiodło się dla tej akcji.',
-
 	'iTopHub:InstalledExtensions' => 'Rozszerzenia wdrożone w tej instancji',
 	'iTopHub:ExtensionCategory:Manual' => 'Rozszerzenia wdrażane ręcznie',
 	'iTopHub:ExtensionCategory:Manual+' => 'Następujące rozszerzenia zostały wdrożone przez ręczne skopiowanie ich do katalogu %1$s programu '.ITOP_APPLICATION_SHORT.':',
@@ -58,7 +56,6 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'iTopHub:NoExtensionInThisCategory+' => '',
 	'iTopHub:ExtensionNotInstalled' => 'Nie zainstalowane',
 	'iTopHub:GetMoreExtensions' => 'Pobierz rozszerzenia z iTop Hub...',
-
 	'iTopHub:LandingWelcome' => 'Gratulacje! Następujące rozszerzenia zostały pobrane z iTop Hub i wdrożone w '.ITOP_APPLICATION_SHORT.'.',
 	'iTopHub:GoBackToITopBtn' => 'Wróć do '.ITOP_APPLICATION_SHORT,
 	'iTopHub:Uncompressing' => 'Rozpakowywanie rozszerzeń...',
@@ -67,7 +64,6 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'iTopHub:DBBackupSentence' => 'Przed aktualizacją wykonaj kopię zapasową bazy danych i konfiguracji '.ITOP_APPLICATION_SHORT,
 	'iTopHub:DeployBtn' => 'Wykonaj !',
 	'iTopHub:DatabaseBackupProgress' => 'Kopia zapasowa instancji...',
-
 	'iTopHub:InstallationEffect:Install' => 'Wersja: %1$s zostanie zainstalowana.',
 	'iTopHub:InstallationEffect:NoChange' => 'Wersja: %1$s jest zainstalowana. Nic się nie zmieni.',
 	'iTopHub:InstallationEffect:Upgrade' => 'Zostanie <b>uaktualniony</b> z wersji %1$s do wersji %2$s.',
@@ -77,7 +73,6 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'iTopHub:InstallationEffect:MissingDependencies' => 'Nie można zainstalować tego rozszerzenia z powodu niespełnionych zależności.',
 	'iTopHub:InstallationEffect:MissingDependencies_Details' => 'Rozszerzenie wymaga modułu(ów): %1$s',
 	'iTopHub:InstallationProgress:InstallationSuccessful' => 'Instalacja zakończyła się sukcesem!',
-
 	'iTopHub:InstallationStatus:Installed_Version' => '%1$s wersja: %2$s.',
 	'iTopHub:InstallationStatus:Installed' => 'Zainstalowana',
 	'iTopHub:InstallationStatus:Version_NotInstalled' => 'Wersja %1$s <b>NIE</b> zainstalowana.',
diff --git a/datamodels/2.x/itop-hub-connector/dictionaries/pt_br.dict.itop-hub-connector.php b/datamodels/2.x/itop-hub-connector/dictionaries/pt_br.dict.itop-hub-connector.php
index c62a1bcaca..b55db0aada 100644
--- a/datamodels/2.x/itop-hub-connector/dictionaries/pt_br.dict.itop-hub-connector.php
+++ b/datamodels/2.x/itop-hub-connector/dictionaries/pt_br.dict.itop-hub-connector.php
@@ -38,7 +38,6 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'iTopHub:AutoSubmit' => 'Não me pergunte novamente. Da próxima vez, vá para o iTop Hub automaticamente',
 	'UI:About:RemoteExtensionSource' => 'iTop Hub',
 	'iTopHub:Explanation' => 'Ao clicar neste botão, você será redirecionado para o iTop Hub',
-
 	'iTopHub:BackupFreeDiskSpaceIn' => '%1$s de espaço livre em disco em %2$s',
 	'iTopHub:FailedToCheckFreeDiskSpace' => 'Falha ao verificar o espaço livre em disco',
 	'iTopHub:BackupOk' => 'Backup concluído com sucesso',
@@ -48,7 +47,6 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'iTopHub:CompiledOK' => 'Compilação bem-sucedida',
 	'iTopHub:ConfigurationSafelyReverted' => 'Erro detectado durante a implantação!<br/>A configuração do '.ITOP_APPLICATION_SHORT.' NÃO foi modificada',
 	'iTopHub:FailAuthent' => 'Autenticação falhou para esta ação',
-
 	'iTopHub:InstalledExtensions' => 'Extensões implantadas nesta instância',
 	'iTopHub:ExtensionCategory:Manual' => 'Extensões implantadas manualmente',
 	'iTopHub:ExtensionCategory:Manual+' => 'As seguintes extensões foram implantadas copiando-as manualmente no diretório %1$s do '.ITOP_APPLICATION_SHORT.':',
@@ -58,7 +56,6 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'iTopHub:NoExtensionInThisCategory+' => 'Acesse o iTop Hub para encontrar as extensões que ajudarão você a personalizar e adaptar o '.ITOP_APPLICATION_SHORT.' aos seus processos !',
 	'iTopHub:ExtensionNotInstalled' => 'Não instalado',
 	'iTopHub:GetMoreExtensions' => 'Obter extensões do iTop Hub...',
-
 	'iTopHub:LandingWelcome' => 'Parabéns! As extensões a seguir foram baixadas do iTop Hub e implantadas no seu '.ITOP_APPLICATION_SHORT,
 	'iTopHub:GoBackToITopBtn' => 'Voltar para o '.ITOP_APPLICATION_SHORT,
 	'iTopHub:Uncompressing' => 'Descompactando extensão(ões)...',
@@ -67,7 +64,6 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'iTopHub:DBBackupSentence' => 'Faça um backup do banco de dados e configuração do '.ITOP_APPLICATION_SHORT.' antes de atualizar',
 	'iTopHub:DeployBtn' => 'Implantar !',
 	'iTopHub:DatabaseBackupProgress' => 'Backup da instância...',
-
 	'iTopHub:InstallationEffect:Install' => 'Versão: %1$s será instalada.',
 	'iTopHub:InstallationEffect:NoChange' => 'Versão: %1$s já está instalada. Nenhuma alteração realizada',
 	'iTopHub:InstallationEffect:Upgrade' => 'Será <b>atualizada</b> da versão %1$s para a versão %2$s',
@@ -77,7 +73,6 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'iTopHub:InstallationEffect:MissingDependencies' => 'Esta extensão não pode ser instalada por causa de dependências não atendidas',
 	'iTopHub:InstallationEffect:MissingDependencies_Details' => 'A extensão requer o(s) módulo(s): %1$s',
 	'iTopHub:InstallationProgress:InstallationSuccessful' => 'Instalação bem-sucedida!',
-
 	'iTopHub:InstallationStatus:Installed_Version' => '%1$s versão: %2$s',
 	'iTopHub:InstallationStatus:Installed' => 'Instalado',
 	'iTopHub:InstallationStatus:Version_NotInstalled' => 'Versão %1$s <b>NÃO</b> instalada',
diff --git a/datamodels/2.x/itop-hub-connector/dictionaries/ru.dict.itop-hub-connector.php b/datamodels/2.x/itop-hub-connector/dictionaries/ru.dict.itop-hub-connector.php
index 0d1151b77d..a9e80491cf 100644
--- a/datamodels/2.x/itop-hub-connector/dictionaries/ru.dict.itop-hub-connector.php
+++ b/datamodels/2.x/itop-hub-connector/dictionaries/ru.dict.itop-hub-connector.php
@@ -26,7 +26,6 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'iTopHub:AutoSubmit' => 'Don\'t ask me again. Next time, go to iTop Hub automatically.~~',
 	'UI:About:RemoteExtensionSource' => 'iTop Hub~~',
 	'iTopHub:Explanation' => 'By clicking this button you will be redirected to iTop Hub.~~',
-
 	'iTopHub:BackupFreeDiskSpaceIn' => '%1$s free disk space in %2$s.~~',
 	'iTopHub:FailedToCheckFreeDiskSpace' => 'Failed to check free disk space.~~',
 	'iTopHub:BackupOk' => 'Backup Ok.~~',
@@ -36,7 +35,6 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'iTopHub:CompiledOK' => 'Compilation successful.~~',
 	'iTopHub:ConfigurationSafelyReverted' => 'Error detected during deployment!<br/>'.ITOP_APPLICATION_SHORT.' configuration has NOT been modified.~~',
 	'iTopHub:FailAuthent' => 'Authentication failed for this action.~~',
-
 	'iTopHub:InstalledExtensions' => 'Extensions deployed on this instance~~',
 	'iTopHub:ExtensionCategory:Manual' => 'Extensions deployed manually~~',
 	'iTopHub:ExtensionCategory:Manual+' => 'The following extensions have been deployed by copying them manually in the %1$s directory of '.ITOP_APPLICATION_SHORT.':~~',
@@ -46,7 +44,6 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'iTopHub:NoExtensionInThisCategory+' => 'Browse iTop Hub to find the extensions that will help you customize and adapt '.ITOP_APPLICATION_SHORT.' to your processes !~~',
 	'iTopHub:ExtensionNotInstalled' => 'Not installed~~',
 	'iTopHub:GetMoreExtensions' => 'Get extensions from iTop Hub...~~',
-
 	'iTopHub:LandingWelcome' => 'Congratulations! The following extensions were downloaded from iTop Hub and deployed into your '.ITOP_APPLICATION_SHORT.'.~~',
 	'iTopHub:GoBackToITopBtn' => 'Go Back to '.ITOP_APPLICATION_SHORT.'~~',
 	'iTopHub:Uncompressing' => 'Uncompressing extensions...~~',
@@ -55,7 +52,6 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'iTopHub:DBBackupSentence' => 'Do a backup of the database and '.ITOP_APPLICATION_SHORT.' configuration before updating~~',
 	'iTopHub:DeployBtn' => 'Deploy !~~',
 	'iTopHub:DatabaseBackupProgress' => 'Instance backup...~~',
-
 	'iTopHub:InstallationEffect:Install' => 'Version: %1$s will be installed.~~',
 	'iTopHub:InstallationEffect:NoChange' => 'Version: %1$s already installed. Nothing will change.~~',
 	'iTopHub:InstallationEffect:Upgrade' => 'Will be <b>upgraded</b> from version %1$s to version %2$s.~~',
@@ -65,7 +61,6 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'iTopHub:InstallationEffect:MissingDependencies' => 'This extension cannot be installed because of unmet dependencies.~~',
 	'iTopHub:InstallationEffect:MissingDependencies_Details' => 'The extension requires the module(s): %1$s~~',
 	'iTopHub:InstallationProgress:InstallationSuccessful' => 'Installation successful!~~',
-
 	'iTopHub:InstallationStatus:Installed_Version' => '%1$s version: %2$s.~~',
 	'iTopHub:InstallationStatus:Installed' => 'Installed~~',
 	'iTopHub:InstallationStatus:Version_NotInstalled' => 'Version %1$s <b>NOT</b> installed.~~',
diff --git a/datamodels/2.x/itop-hub-connector/dictionaries/sk.dict.itop-hub-connector.php b/datamodels/2.x/itop-hub-connector/dictionaries/sk.dict.itop-hub-connector.php
index f04c02e17f..fda35f291d 100644
--- a/datamodels/2.x/itop-hub-connector/dictionaries/sk.dict.itop-hub-connector.php
+++ b/datamodels/2.x/itop-hub-connector/dictionaries/sk.dict.itop-hub-connector.php
@@ -38,7 +38,6 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'iTopHub:AutoSubmit' => 'Don\'t ask me again. Next time, go to iTop Hub automatically.~~',
 	'UI:About:RemoteExtensionSource' => 'iTop Hub~~',
 	'iTopHub:Explanation' => 'By clicking this button you will be redirected to iTop Hub.~~',
-
 	'iTopHub:BackupFreeDiskSpaceIn' => '%1$s free disk space in %2$s.~~',
 	'iTopHub:FailedToCheckFreeDiskSpace' => 'Failed to check free disk space.~~',
 	'iTopHub:BackupOk' => 'Backup Ok.~~',
@@ -48,7 +47,6 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'iTopHub:CompiledOK' => 'Compilation successful.~~',
 	'iTopHub:ConfigurationSafelyReverted' => 'Error detected during deployment!<br/>'.ITOP_APPLICATION_SHORT.' configuration has NOT been modified.~~',
 	'iTopHub:FailAuthent' => 'Authentication failed for this action.~~',
-
 	'iTopHub:InstalledExtensions' => 'Extensions deployed on this instance~~',
 	'iTopHub:ExtensionCategory:Manual' => 'Extensions deployed manually~~',
 	'iTopHub:ExtensionCategory:Manual+' => 'The following extensions have been deployed by copying them manually in the %1$s directory of '.ITOP_APPLICATION_SHORT.':~~',
@@ -58,7 +56,6 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'iTopHub:NoExtensionInThisCategory+' => 'Browse iTop Hub to find the extensions that will help you customize and adapt '.ITOP_APPLICATION_SHORT.' to your processes !~~',
 	'iTopHub:ExtensionNotInstalled' => 'Not installed~~',
 	'iTopHub:GetMoreExtensions' => 'Get extensions from iTop Hub...~~',
-
 	'iTopHub:LandingWelcome' => 'Congratulations! The following extensions were downloaded from iTop Hub and deployed into your '.ITOP_APPLICATION_SHORT.'.~~',
 	'iTopHub:GoBackToITopBtn' => 'Go Back to '.ITOP_APPLICATION_SHORT.'~~',
 	'iTopHub:Uncompressing' => 'Uncompressing extensions...~~',
@@ -67,7 +64,6 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'iTopHub:DBBackupSentence' => 'Do a backup of the database and '.ITOP_APPLICATION_SHORT.' configuration before updating~~',
 	'iTopHub:DeployBtn' => 'Deploy !~~',
 	'iTopHub:DatabaseBackupProgress' => 'Instance backup...~~',
-
 	'iTopHub:InstallationEffect:Install' => 'Version: %1$s will be installed.~~',
 	'iTopHub:InstallationEffect:NoChange' => 'Version: %1$s already installed. Nothing will change.~~',
 	'iTopHub:InstallationEffect:Upgrade' => 'Will be <b>upgraded</b> from version %1$s to version %2$s.~~',
@@ -77,7 +73,6 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'iTopHub:InstallationEffect:MissingDependencies' => 'This extension cannot be installed because of unmet dependencies.~~',
 	'iTopHub:InstallationEffect:MissingDependencies_Details' => 'The extension requires the module(s): %1$s~~',
 	'iTopHub:InstallationProgress:InstallationSuccessful' => 'Installation successful!~~',
-
 	'iTopHub:InstallationStatus:Installed_Version' => '%1$s version: %2$s.~~',
 	'iTopHub:InstallationStatus:Installed' => 'Installed~~',
 	'iTopHub:InstallationStatus:Version_NotInstalled' => 'Version %1$s <b>NOT</b> installed.~~',
diff --git a/datamodels/2.x/itop-hub-connector/dictionaries/tr.dict.itop-hub-connector.php b/datamodels/2.x/itop-hub-connector/dictionaries/tr.dict.itop-hub-connector.php
index 62b819b19b..6006771c49 100644
--- a/datamodels/2.x/itop-hub-connector/dictionaries/tr.dict.itop-hub-connector.php
+++ b/datamodels/2.x/itop-hub-connector/dictionaries/tr.dict.itop-hub-connector.php
@@ -38,7 +38,6 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'iTopHub:AutoSubmit' => 'Don\'t ask me again. Next time, go to iTop Hub automatically.~~',
 	'UI:About:RemoteExtensionSource' => 'iTop Hub~~',
 	'iTopHub:Explanation' => 'By clicking this button you will be redirected to iTop Hub.~~',
-
 	'iTopHub:BackupFreeDiskSpaceIn' => '%1$s free disk space in %2$s.~~',
 	'iTopHub:FailedToCheckFreeDiskSpace' => 'Failed to check free disk space.~~',
 	'iTopHub:BackupOk' => 'Backup Ok.~~',
@@ -48,7 +47,6 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'iTopHub:CompiledOK' => 'Compilation successful.~~',
 	'iTopHub:ConfigurationSafelyReverted' => 'Error detected during deployment!<br/>'.ITOP_APPLICATION_SHORT.' configuration has NOT been modified.~~',
 	'iTopHub:FailAuthent' => 'Authentication failed for this action.~~',
-
 	'iTopHub:InstalledExtensions' => 'Extensions deployed on this instance~~',
 	'iTopHub:ExtensionCategory:Manual' => 'Extensions deployed manually~~',
 	'iTopHub:ExtensionCategory:Manual+' => 'The following extensions have been deployed by copying them manually in the %1$s directory of '.ITOP_APPLICATION_SHORT.':~~',
@@ -58,7 +56,6 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'iTopHub:NoExtensionInThisCategory+' => 'Browse iTop Hub to find the extensions that will help you customize and adapt '.ITOP_APPLICATION_SHORT.' to your processes !~~',
 	'iTopHub:ExtensionNotInstalled' => 'Not installed~~',
 	'iTopHub:GetMoreExtensions' => 'Get extensions from iTop Hub...~~',
-
 	'iTopHub:LandingWelcome' => 'Congratulations! The following extensions were downloaded from iTop Hub and deployed into your '.ITOP_APPLICATION_SHORT.'.~~',
 	'iTopHub:GoBackToITopBtn' => 'Go Back to '.ITOP_APPLICATION_SHORT.'~~',
 	'iTopHub:Uncompressing' => 'Uncompressing extensions...~~',
@@ -67,7 +64,6 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'iTopHub:DBBackupSentence' => 'Do a backup of the database and '.ITOP_APPLICATION_SHORT.' configuration before updating~~',
 	'iTopHub:DeployBtn' => 'Deploy !~~',
 	'iTopHub:DatabaseBackupProgress' => 'Instance backup...~~',
-
 	'iTopHub:InstallationEffect:Install' => 'Version: %1$s will be installed.~~',
 	'iTopHub:InstallationEffect:NoChange' => 'Version: %1$s already installed. Nothing will change.~~',
 	'iTopHub:InstallationEffect:Upgrade' => 'Will be <b>upgraded</b> from version %1$s to version %2$s.~~',
@@ -77,7 +73,6 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'iTopHub:InstallationEffect:MissingDependencies' => 'This extension cannot be installed because of unmet dependencies.~~',
 	'iTopHub:InstallationEffect:MissingDependencies_Details' => 'The extension requires the module(s): %1$s~~',
 	'iTopHub:InstallationProgress:InstallationSuccessful' => 'Installation successful!~~',
-
 	'iTopHub:InstallationStatus:Installed_Version' => '%1$s version: %2$s.~~',
 	'iTopHub:InstallationStatus:Installed' => 'Installed~~',
 	'iTopHub:InstallationStatus:Version_NotInstalled' => 'Version %1$s <b>NOT</b> installed.~~',
diff --git a/datamodels/2.x/itop-hub-connector/dictionaries/zh_cn.dict.itop-hub-connector.php b/datamodels/2.x/itop-hub-connector/dictionaries/zh_cn.dict.itop-hub-connector.php
index f55e3d811e..a705fd8e41 100644
--- a/datamodels/2.x/itop-hub-connector/dictionaries/zh_cn.dict.itop-hub-connector.php
+++ b/datamodels/2.x/itop-hub-connector/dictionaries/zh_cn.dict.itop-hub-connector.php
@@ -38,7 +38,6 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'iTopHub:AutoSubmit' => '不再询问. 下次自动进入iTop Hub .',
 	'UI:About:RemoteExtensionSource' => 'iTop Hub',
 	'iTopHub:Explanation' => '点击这个按钮您将被引导至iTop Hub.',
-
 	'iTopHub:BackupFreeDiskSpaceIn' => '%1$s 可用磁盘空间位于 %2$s.',
 	'iTopHub:FailedToCheckFreeDiskSpace' => '检查可用磁盘空间失败.',
 	'iTopHub:BackupOk' => '备份成功.',
@@ -48,7 +47,6 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'iTopHub:CompiledOK' => '编译成功.',
 	'iTopHub:ConfigurationSafelyReverted' => '安装时发生错误!<br/>iTop配置将不会改变.',
 	'iTopHub:FailAuthent' => '认证失败.',
-
 	'iTopHub:InstalledExtensions' => '本机已安装的扩展',
 	'iTopHub:ExtensionCategory:Manual' => '手动安装的扩展',
 	'iTopHub:ExtensionCategory:Manual+' => '下列已安装的扩展是手动将文件放置到 %1$s 目录的:',
@@ -58,7 +56,6 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'iTopHub:NoExtensionInThisCategory+' => '浏览iTop Hub,去寻找符合您喜欢的扩展吧.',
 	'iTopHub:ExtensionNotInstalled' => '未安装',
 	'iTopHub:GetMoreExtensions' => '从iTop Hub获取扩展...',
-
 	'iTopHub:LandingWelcome' => '恭喜! 下列来自iTop Hub的扩展已被下载并安装到本机.',
 	'iTopHub:GoBackToITopBtn' => '返回'.ITOP_APPLICATION_SHORT,
 	'iTopHub:Uncompressing' => '扩展解压中...',
@@ -67,7 +64,6 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'iTopHub:DBBackupSentence' => '在升级之前,备份数据库和 '.ITOP_APPLICATION_SHORT.' 配置文件',
 	'iTopHub:DeployBtn' => '安装 !',
 	'iTopHub:DatabaseBackupProgress' => '本机备份...',
-
 	'iTopHub:InstallationEffect:Install' => 'Version: %1$s 将被安装.',
 	'iTopHub:InstallationEffect:NoChange' => 'Version: %1$s 已安装. 保持不变.',
 	'iTopHub:InstallationEffect:Upgrade' => '将从 version %1$s <b>升级</b> 到 version %2$s.',
@@ -77,7 +73,6 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'iTopHub:InstallationEffect:MissingDependencies' => '扩展无法安装,因为未知的依赖.',
 	'iTopHub:InstallationEffect:MissingDependencies_Details' => '此扩展依赖模块: %1$s',
 	'iTopHub:InstallationProgress:InstallationSuccessful' => '安装成功!',
-
 	'iTopHub:InstallationStatus:Installed_Version' => '%1$s 版本: %2$s.',
 	'iTopHub:InstallationStatus:Installed' => '已安装',
 	'iTopHub:InstallationStatus:Version_NotInstalled' => 'Version %1$s <b>未</b> 安装.',
diff --git a/datamodels/2.x/itop-incident-mgmt-itil/datamodel.itop-incident-mgmt-itil.xml b/datamodels/2.x/itop-incident-mgmt-itil/datamodel.itop-incident-mgmt-itil.xml
index 8e1653ffde..a3918d10d3 100755
--- a/datamodels/2.x/itop-incident-mgmt-itil/datamodel.itop-incident-mgmt-itil.xml
+++ b/datamodels/2.x/itop-incident-mgmt-itil/datamodel.itop-incident-mgmt-itil.xml
@@ -458,8 +458,6 @@
           <edit_mode>add_remove</edit_mode>
           <count_min>0</count_min>
           <count_max>0</count_max>
-          <relation_type>link</relation_type>
-          <read_only>false</read_only>
         </field>
         <field id="child_incidents_list" xsi:type="AttributeLinkedSet">
           <linked_class>Incident</linked_class>
@@ -467,8 +465,6 @@
           <edit_mode>add_remove</edit_mode>
           <count_min>0</count_min>
           <count_max>0</count_max>
-          <relation_type>link</relation_type>
-          <read_only>false</read_only>
         </field>
         <field id="public_log" xsi:type="AttributeCaseLog">
           <sql>public_log</sql>
diff --git a/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/cs.dict.itop-incident-mgmt-itil.php b/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/cs.dict.itop-incident-mgmt-itil.php
index 382e44cf56..af00fea9dc 100644
--- a/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/cs.dict.itop-incident-mgmt-itil.php
+++ b/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/cs.dict.itop-incident-mgmt-itil.php
@@ -113,6 +113,10 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:Incident/Attribute:urgency/Value:4+' => '',
 	'Class:Incident/Attribute:origin' => 'Původ',
 	'Class:Incident/Attribute:origin+' => '',
+	'Class:Incident/Attribute:origin/Value:in_person' => 'In-person~~',
+	'Class:Incident/Attribute:origin/Value:in_person+' => 'Incident created following a face-to-face discussion~~',
+	'Class:Incident/Attribute:origin/Value:chat' => 'Chat~~',
+	'Class:Incident/Attribute:origin/Value:chat+' => 'Incident created following a ~~',
 	'Class:Incident/Attribute:origin/Value:mail' => 'email',
 	'Class:Incident/Attribute:origin/Value:mail+' => '',
 	'Class:Incident/Attribute:origin/Value:monitoring' => 'monitoring',
@@ -234,7 +238,6 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:Incident/Stimulus:ev_reopen' => 'Znovu otevřít',
 	'Class:Incident/Stimulus:ev_reopen+' => '',
 	'Class:Incident/Error:CannotAssignParentIncidentIdToSelf' => 'Incident nemůže být nadřazený sám sobě',
-
 	'Class:Incident/Method:ResolveChildTickets' => 'Vyřešit podřízené tikety',
 	'Class:Incident/Method:ResolveChildTickets+' => 'Cascade the resolution to child ticket (ev_autoresolve), and align the following characteristics: service, team, agent, resolution info~~',
 	'Tickets:Related:OpenIncidents' => 'Otevřené incidenty',
diff --git a/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/da.dict.itop-incident-mgmt-itil.php b/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/da.dict.itop-incident-mgmt-itil.php
index 1882a2e756..61c1d75a8d 100644
--- a/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/da.dict.itop-incident-mgmt-itil.php
+++ b/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/da.dict.itop-incident-mgmt-itil.php
@@ -110,6 +110,10 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:Incident/Attribute:urgency/Value:4+' => '',
 	'Class:Incident/Attribute:origin' => 'Oprindelse',
 	'Class:Incident/Attribute:origin+' => '',
+	'Class:Incident/Attribute:origin/Value:in_person' => 'In-person~~',
+	'Class:Incident/Attribute:origin/Value:in_person+' => 'Incident created following a face-to-face discussion~~',
+	'Class:Incident/Attribute:origin/Value:chat' => 'Chat~~',
+	'Class:Incident/Attribute:origin/Value:chat+' => 'Incident created following a ~~',
 	'Class:Incident/Attribute:origin/Value:mail' => 'Mail',
 	'Class:Incident/Attribute:origin/Value:mail+' => '',
 	'Class:Incident/Attribute:origin/Value:monitoring' => 'Monitoring',
@@ -231,7 +235,6 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:Incident/Stimulus:ev_reopen' => 'Genåben',
 	'Class:Incident/Stimulus:ev_reopen+' => '',
 	'Class:Incident/Error:CannotAssignParentIncidentIdToSelf' => 'Cannot assign the Parent incident to the incident itself~~',
-
 	'Class:Incident/Method:ResolveChildTickets' => 'ResolveChildTickets~~',
 	'Class:Incident/Method:ResolveChildTickets+' => 'Cascade the resolution to child ticket (ev_autoresolve), and align the following characteristics: service, team, agent, resolution info~~',
 	'Tickets:Related:OpenIncidents' => 'Open incidents~~',
diff --git a/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/de.dict.itop-incident-mgmt-itil.php b/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/de.dict.itop-incident-mgmt-itil.php
index b58cb9b9c6..af3a051c88 100644
--- a/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/de.dict.itop-incident-mgmt-itil.php
+++ b/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/de.dict.itop-incident-mgmt-itil.php
@@ -28,17 +28,17 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Menu:Incident:Overview' => 'Übersicht',
 	'Menu:Incident:Overview+' => '',
 	'Menu:NewIncident' => 'Neuer Incident',
-	'Menu:NewIncident+' => '',
+	'Menu:NewIncident+' => 'Einen neuen Incident dokumentieren',
 	'Menu:SearchIncidents' => 'Nach Incidents suchen',
-	'Menu:SearchIncidents+' => '',
+	'Menu:SearchIncidents+' => 'Suche nach einem bestehendem Incident',
 	'Menu:Incident:Shortcuts' => 'Shortcuts',
 	'Menu:Incident:Shortcuts+' => '',
 	'Menu:Incident:MyIncidents' => 'Mir zugewiesene Incidents',
-	'Menu:Incident:MyIncidents+' => '',
+	'Menu:Incident:MyIncidents+' => 'Incidents die mir als Bearbeiter zugewiesen sind',
 	'Menu:Incident:EscalatedIncidents' => 'Eskalierte Incidents',
-	'Menu:Incident:EscalatedIncidents+' => '',
+	'Menu:Incident:EscalatedIncidents+' => 'Incidents die eskaliert sind',
 	'Menu:Incident:OpenIncidents' => 'Alle offenen Incidents',
-	'Menu:Incident:OpenIncidents+' => '',
+	'Menu:Incident:OpenIncidents+' => 'Alle offenen Incidents',
 	'UI-IncidentManagementOverview-IncidentByPriority-last-14-days' => 'Incidents der letzten 14 Tage nach Priorität',
 	'UI-IncidentManagementOverview-Last-14-days' => 'Anzahl Incidents der letzten 14 Tage',
 	'UI-IncidentManagementOverview-OpenIncidentByStatus' => 'Offene Incidents nach Status',
@@ -83,7 +83,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:Incident/Attribute:status/Value:closed' => 'Geschlossen',
 	'Class:Incident/Attribute:status/Value:closed+' => '',
 	'Class:Incident/Attribute:impact' => 'Auswirkung',
-	'Class:Incident/Attribute:impact+' => '',
+	'Class:Incident/Attribute:impact+' => 'Die Auswirkung gibt die Schwere des Vorfalls an, oft geschätzt durch die Anzahl der Betroffenen',
 	'Class:Incident/Attribute:impact/Value:1' => 'Eine Abteilung',
 	'Class:Incident/Attribute:impact/Value:1+' => '',
 	'Class:Incident/Attribute:impact/Value:2' => 'Ein Service',
@@ -101,7 +101,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:Incident/Attribute:priority/Value:4' => 'Niedrig',
 	'Class:Incident/Attribute:priority/Value:4+' => '',
 	'Class:Incident/Attribute:urgency' => 'Dringlichkeit',
-	'Class:Incident/Attribute:urgency+' => '',
+	'Class:Incident/Attribute:urgency+' => 'Wie schnell der Vorfall behandelt werden muss',
 	'Class:Incident/Attribute:urgency/Value:1' => 'Kritisch',
 	'Class:Incident/Attribute:urgency/Value:1+' => '',
 	'Class:Incident/Attribute:urgency/Value:2' => 'Hoch',
@@ -112,14 +112,18 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:Incident/Attribute:urgency/Value:4+' => '',
 	'Class:Incident/Attribute:origin' => 'Herkunft',
 	'Class:Incident/Attribute:origin+' => '',
+	'Class:Incident/Attribute:origin/Value:in_person' => 'Persönlich',
+	'Class:Incident/Attribute:origin/Value:in_person+' => 'Incident auf Basis einer Diskussion im direkten Gespräch',
+	'Class:Incident/Attribute:origin/Value:chat' => 'Chat',
+	'Class:Incident/Attribute:origin/Value:chat+' => 'Incident auf Basis einer Diskussion in einem Chat',
 	'Class:Incident/Attribute:origin/Value:mail' => 'Mail',
-	'Class:Incident/Attribute:origin/Value:mail+' => '',
+	'Class:Incident/Attribute:origin/Value:mail+' => 'Incident auf Basis einer empfangenen Mail',
 	'Class:Incident/Attribute:origin/Value:monitoring' => 'Monitoring',
-	'Class:Incident/Attribute:origin/Value:monitoring+' => '',
+	'Class:Incident/Attribute:origin/Value:monitoring+' => 'Incident auf Basis eines Monitoring-Events',
 	'Class:Incident/Attribute:origin/Value:phone' => 'Telefon',
-	'Class:Incident/Attribute:origin/Value:phone+' => '',
+	'Class:Incident/Attribute:origin/Value:phone+' => 'Incident auf Basis eines Telefonanrufs',
 	'Class:Incident/Attribute:origin/Value:portal' => 'Portal',
-	'Class:Incident/Attribute:origin/Value:portal+' => '',
+	'Class:Incident/Attribute:origin/Value:portal+' => 'Incident, der über das Portal erstellt wurde',
 	'Class:Incident/Attribute:service_id' => 'Service',
 	'Class:Incident/Attribute:service_id+' => '',
 	'Class:Incident/Attribute:service_name' => 'Service-Name',
@@ -165,7 +169,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:Incident/Attribute:resolution_code' => 'Lösungs-Code',
 	'Class:Incident/Attribute:resolution_code+' => '',
 	'Class:Incident/Attribute:resolution_code/Value:assistance' => 'Unterstützung',
-	'Class:Incident/Attribute:resolution_code/Value:assistance+' => '',
+	'Class:Incident/Attribute:resolution_code/Value:assistance+' => 'Was wurde unternommen, um den Incident zu beheben?',
 	'Class:Incident/Attribute:resolution_code/Value:bug fixed' => 'Bugfix',
 	'Class:Incident/Attribute:resolution_code/Value:bug fixed+' => '',
 	'Class:Incident/Attribute:resolution_code/Value:hardware repair' => 'Hardware-Reparatur',
@@ -197,7 +201,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:Incident/Attribute:related_request_list' => 'Kind-Requests',
 	'Class:Incident/Attribute:related_request_list+' => '',
 	'Class:Incident/Attribute:child_incidents_list' => 'Abgeleitete Incidents',
-	'Class:Incident/Attribute:child_incidents_list+' => 'All the child incidents related to this incident~~',
+	'Class:Incident/Attribute:child_incidents_list+' => 'Alle abgeleiteten Incidents, die mit diesem Incident verknüpft sind',
 	'Class:Incident/Attribute:public_log' => 'Öffentliches Log',
 	'Class:Incident/Attribute:public_log+' => '',
 	'Class:Incident/Attribute:user_satisfaction' => 'Benutzerzufriedenheit',
@@ -212,7 +216,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:Incident/Attribute:user_satisfaction/Value:4+' => '',
 	'Class:Incident/Attribute:user_comment' => 'Benutzer-Kommentar',
 	'Class:Incident/Attribute:user_comment+' => '',
-	'Class:Incident/Attribute:parent_incident_id_friendlyname' => 'Parent-Incident-Friendly Name',
+	'Class:Incident/Attribute:parent_incident_id_friendlyname' => 'Parent-Incident Anzeigename',
 	'Class:Incident/Attribute:parent_incident_id_friendlyname+' => '',
 	'Class:Incident/Stimulus:ev_assign' => 'Zuweisen',
 	'Class:Incident/Stimulus:ev_assign+' => '',
@@ -233,7 +237,6 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:Incident/Stimulus:ev_reopen' => 'Wiedereröffnen',
 	'Class:Incident/Stimulus:ev_reopen+' => '',
 	'Class:Incident/Error:CannotAssignParentIncidentIdToSelf' => 'Kann Incident-Ticket nicht als eigenes Parent-Ticket verwenden',
-
 	'Class:Incident/Method:ResolveChildTickets' => 'Kind-Tickets lösen',
 	'Class:Incident/Method:ResolveChildTickets+' => 'Lösung auf Kind-Tickets übertragen (ev_autoresolve), und folgende Ticket-Eigenschaften angleichen: Service, Team, Agent, Lösungsinformationen',
 	'Tickets:Related:OpenIncidents' => 'Offene Incidents',
diff --git a/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/es_cr.dict.itop-incident-mgmt-itil.php b/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/es_cr.dict.itop-incident-mgmt-itil.php
index bd6949b4e4..42f26b9451 100644
--- a/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/es_cr.dict.itop-incident-mgmt-itil.php
+++ b/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/es_cr.dict.itop-incident-mgmt-itil.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
@@ -112,6 +112,10 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Incident/Attribute:urgency/Value:4+' => 'Baja',
 	'Class:Incident/Attribute:origin' => 'Origen',
 	'Class:Incident/Attribute:origin+' => 'Origen',
+	'Class:Incident/Attribute:origin/Value:in_person' => 'In-person~~',
+	'Class:Incident/Attribute:origin/Value:in_person+' => 'Incident created following a face-to-face discussion~~',
+	'Class:Incident/Attribute:origin/Value:chat' => 'Chat~~',
+	'Class:Incident/Attribute:origin/Value:chat+' => 'Incident created following a ~~',
 	'Class:Incident/Attribute:origin/Value:mail' => 'Correo-e',
 	'Class:Incident/Attribute:origin/Value:mail+' => 'Correo-e',
 	'Class:Incident/Attribute:origin/Value:monitoring' => 'Monitoreo',
@@ -233,7 +237,6 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Incident/Stimulus:ev_reopen' => 'Reabrir',
 	'Class:Incident/Stimulus:ev_reopen+' => 'Reabrir',
 	'Class:Incident/Error:CannotAssignParentIncidentIdToSelf' => 'No puede asignarse el incidente Padre a si mismo',
-
 	'Class:Incident/Method:ResolveChildTickets' => 'Resolver tickets hijos',
 	'Class:Incident/Method:ResolveChildTickets+' => 'Cascadear la solución a los tickets hijos (ev_autoresolve), y alinear las siguientes características: servicio, equipo, agente, información de solución',
 	'Tickets:Related:OpenIncidents' => 'Incidentes Abiertos',
diff --git a/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/fr.dict.itop-incident-mgmt-itil.php b/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/fr.dict.itop-incident-mgmt-itil.php
index c97c6784f7..980e61ac72 100644
--- a/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/fr.dict.itop-incident-mgmt-itil.php
+++ b/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/fr.dict.itop-incident-mgmt-itil.php
@@ -237,12 +237,10 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:Incident/Stimulus:ev_reopen' => 'Ré-ouvrir',
 	'Class:Incident/Stimulus:ev_reopen+' => '',
 	'Class:Incident/Error:CannotAssignParentIncidentIdToSelf' => 'L\'incident parent ne peut pas être lui-même',
-
 	'Class:Incident/Method:ResolveChildTickets' => 'ResolveChildTickets (résoudre les tickets fils)',
 	'Class:Incident/Method:ResolveChildTickets+' => 'Cascader l\'action de résolution du ticket (ev_autoresolve) vers les requêtes et incidents fils, et aligner les caractéristiques suivantes : service, équipe, agent, information de résolution',
 	'Tickets:Related:OpenIncidents' => 'Incidents ouverts',
 ));
-
 // 1:n relations custom labels for tooltip and pop-up title
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:Incident/Attribute:child_incidents_list/UI:Links:Create:Button+' => 'Créer un %4$s',
@@ -256,5 +254,5 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:Incident/Attribute:related_request_list/UI:Links:Remove:Button+' => 'Retirer cette %4$s',
 	'Class:Incident/Attribute:related_request_list/UI:Links:Remove:Modal:Title' => 'Retirer cette %4$s de son %1$s',
 	'Class:Incident/Attribute:related_request_list/UI:Links:Delete:Button+' => 'Supprimer cette %4$s',
-	'Class:Incident/Attribute:related_request_list/UI:Links:Delete:Modal:Title' => 'Supprimer une %4$s',
-));
\ No newline at end of file
+	'Class:Incident/Attribute:related_request_list/UI:Links:Delete:Modal:Title' => 'Supprimer une %4$s'
+));
diff --git a/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/hu.dict.itop-incident-mgmt-itil.php b/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/hu.dict.itop-incident-mgmt-itil.php
index 7d35a5e063..e30d20f080 100644
--- a/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/hu.dict.itop-incident-mgmt-itil.php
+++ b/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/hu.dict.itop-incident-mgmt-itil.php
@@ -21,27 +21,27 @@
  * along with iTop. If not, see <http://www.gnu.org/licenses/>
  */
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Menu:IncidentManagement' => 'Incidenskezelés',
-    'Menu:IncidentManagement+' => 'Incident Management~~',
-    'Menu:Incident:Overview' => 'Áttekintő',
-    'Menu:Incident:Overview+' => 'Overview~~',
-    'Menu:NewIncident' => 'Új incidens',
-    'Menu:NewIncident+' => 'Create a new incident ticket~~',
-    'Menu:SearchIncidents' => 'Incidensek keresése',
-    'Menu:SearchIncidents+' => 'Search for incident tickets~~',
-    'Menu:Incident:Shortcuts' => 'Gyorsgombok',
-    'Menu:Incident:Shortcuts+' => '~~',
-    'Menu:Incident:MyIncidents' => 'Hozzám rendelt incidensek',
-    'Menu:Incident:MyIncidents+' => 'Hozzám rendelt incidensek (felelősként)',
-    'Menu:Incident:EscalatedIncidents' => 'Eszkalált incidensek',
-    'Menu:Incident:EscalatedIncidents+' => 'Escalated incidents~~',
-    'Menu:Incident:OpenIncidents' => 'Minden nyitott incidens',
-    'Menu:Incident:OpenIncidents+' => 'All open incidents~~',
-    'UI-IncidentManagementOverview-IncidentByPriority-last-14-days' => 'Az elmúlt 14 nap incidensei prioritásuk szerint',
-    'UI-IncidentManagementOverview-Last-14-days' => 'Az elmúlt 14 nap incidensei',
-    'UI-IncidentManagementOverview-OpenIncidentByStatus' => 'Nyitott incidensek állapotuk szerint',
-    'UI-IncidentManagementOverview-OpenIncidentByAgent' => 'Nyitott incidensek felelősönként',
-    'UI-IncidentManagementOverview-OpenIncidentByCustomer' => 'Nyitott incidensek ügyfelenként',
+	'Menu:IncidentManagement' => 'Incidenskezelés',
+	'Menu:IncidentManagement+' => 'Incident Management~~',
+	'Menu:Incident:Overview' => 'Áttekintő',
+	'Menu:Incident:Overview+' => 'Overview~~',
+	'Menu:NewIncident' => 'Új incidens',
+	'Menu:NewIncident+' => 'Create a new incident ticket~~',
+	'Menu:SearchIncidents' => 'Incidensek keresése',
+	'Menu:SearchIncidents+' => 'Search for incident tickets~~',
+	'Menu:Incident:Shortcuts' => 'Gyorsgombok',
+	'Menu:Incident:Shortcuts+' => '~~',
+	'Menu:Incident:MyIncidents' => 'Hozzám rendelt incidensek',
+	'Menu:Incident:MyIncidents+' => 'Hozzám rendelt incidensek (felelősként)',
+	'Menu:Incident:EscalatedIncidents' => 'Eszkalált incidensek',
+	'Menu:Incident:EscalatedIncidents+' => 'Escalated incidents~~',
+	'Menu:Incident:OpenIncidents' => 'Minden nyitott incidens',
+	'Menu:Incident:OpenIncidents+' => 'All open incidents~~',
+	'UI-IncidentManagementOverview-IncidentByPriority-last-14-days' => 'Az elmúlt 14 nap incidensei prioritásuk szerint',
+	'UI-IncidentManagementOverview-Last-14-days' => 'Az elmúlt 14 nap incidensei',
+	'UI-IncidentManagementOverview-OpenIncidentByStatus' => 'Nyitott incidensek állapotuk szerint',
+	'UI-IncidentManagementOverview-OpenIncidentByAgent' => 'Nyitott incidensek felelősönként',
+	'UI-IncidentManagementOverview-OpenIncidentByCustomer' => 'Nyitott incidensek ügyfelenként',
 ));
 
 
@@ -60,180 +60,182 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:Incident' => 'Incidens',
-    'Class:Incident+' => '~~',
-    'Class:Incident/Attribute:status' => 'Állapot',
-    'Class:Incident/Attribute:status+' => '~~',
-    'Class:Incident/Attribute:status/Value:new' => 'Új',
-    'Class:Incident/Attribute:status/Value:new+' => '~~',
-    'Class:Incident/Attribute:status/Value:escalated_tto' => 'Eszkalált TTO',
-    'Class:Incident/Attribute:status/Value:escalated_tto+' => '~~',
-    'Class:Incident/Attribute:status/Value:assigned' => 'Hozzárendelt',
-    'Class:Incident/Attribute:status/Value:assigned+' => '~~',
-    'Class:Incident/Attribute:status/Value:escalated_ttr' => 'Eszkalált TTR',
-    'Class:Incident/Attribute:status/Value:escalated_ttr+' => '~~',
-    'Class:Incident/Attribute:status/Value:waiting_for_approval' => 'Jóváhagyásra vár',
-    'Class:Incident/Attribute:status/Value:waiting_for_approval+' => '~~',
-    'Class:Incident/Attribute:status/Value:pending' => 'Folyamatban',
-    'Class:Incident/Attribute:status/Value:pending+' => '~~',
-    'Class:Incident/Attribute:status/Value:resolved' => 'Megoldva',
-    'Class:Incident/Attribute:status/Value:resolved+' => '~~',
-    'Class:Incident/Attribute:status/Value:closed' => 'Lezárt',
-    'Class:Incident/Attribute:status/Value:closed+' => '~~',
-    'Class:Incident/Attribute:impact' => 'Hatása',
-    'Class:Incident/Attribute:impact+' => '~~',
-    'Class:Incident/Attribute:impact/Value:1' => 'Részlegre',
-    'Class:Incident/Attribute:impact/Value:1+' => '~~',
-    'Class:Incident/Attribute:impact/Value:2' => 'Szolgáltatásra',
-    'Class:Incident/Attribute:impact/Value:2+' => '~~',
-    'Class:Incident/Attribute:impact/Value:3' => 'Személyre',
-    'Class:Incident/Attribute:impact/Value:3+' => '~~',
-    'Class:Incident/Attribute:priority' => 'Prioritás',
-    'Class:Incident/Attribute:priority+' => '~~',
-    'Class:Incident/Attribute:priority/Value:1' => 'Kritikus',
-    'Class:Incident/Attribute:priority/Value:1+' => 'critical~~',
-    'Class:Incident/Attribute:priority/Value:2' => 'Magas',
-    'Class:Incident/Attribute:priority/Value:2+' => 'high~~',
-    'Class:Incident/Attribute:priority/Value:3' => 'Közepes',
-    'Class:Incident/Attribute:priority/Value:3+' => 'medium~~',
-    'Class:Incident/Attribute:priority/Value:4' => 'Alacsony',
-    'Class:Incident/Attribute:priority/Value:4+' => 'low~~',
-    'Class:Incident/Attribute:urgency' => 'Sürgősség',
-    'Class:Incident/Attribute:urgency+' => '~~',
-    'Class:Incident/Attribute:urgency/Value:1' => 'Nem várhat',
-    'Class:Incident/Attribute:urgency/Value:1+' => 'critical~~',
-    'Class:Incident/Attribute:urgency/Value:2' => 'Nagyon sürgős',
-    'Class:Incident/Attribute:urgency/Value:2+' => 'high~~',
-    'Class:Incident/Attribute:urgency/Value:3' => 'Sürgős',
-    'Class:Incident/Attribute:urgency/Value:3+' => 'sürgős',
-    'Class:Incident/Attribute:urgency/Value:4' => 'Nem sürgős',
-    'Class:Incident/Attribute:urgency/Value:4+' => 'low~~',
-    'Class:Incident/Attribute:origin' => 'Eredet',
-    'Class:Incident/Attribute:origin+' => '~~',
-    'Class:Incident/Attribute:origin/Value:mail' => 'Email',
-    'Class:Incident/Attribute:origin/Value:mail+' => 'email~~',
-    'Class:Incident/Attribute:origin/Value:monitoring' => 'Felügyelet',
-    'Class:Incident/Attribute:origin/Value:monitoring+' => 'monitoring~~',
-    'Class:Incident/Attribute:origin/Value:phone' => 'Telefon',
-    'Class:Incident/Attribute:origin/Value:phone+' => 'phone~~',
-    'Class:Incident/Attribute:origin/Value:portal' => 'Portál',
-    'Class:Incident/Attribute:origin/Value:portal+' => 'portal~~',
-    'Class:Incident/Attribute:service_id' => 'Szolgáltatás',
-    'Class:Incident/Attribute:service_id+' => '~~',
-    'Class:Incident/Attribute:service_name' => 'Szolgáltatás név',
-    'Class:Incident/Attribute:service_name+' => '~~',
-    'Class:Incident/Attribute:servicesubcategory_id' => 'Szolgáltatás alkategória',
-    'Class:Incident/Attribute:servicesubcategory_id+' => '~~',
-    'Class:Incident/Attribute:servicesubcategory_name' => 'Szolgáltatás alkategória név',
-    'Class:Incident/Attribute:servicesubcategory_name+' => '~~',
-    'Class:Incident/Attribute:escalation_flag' => 'Sürgősség jelzés',
-    'Class:Incident/Attribute:escalation_flag+' => '~~',
-    'Class:Incident/Attribute:escalation_flag/Value:no' => 'Nem',
-    'Class:Incident/Attribute:escalation_flag/Value:no+' => 'No~~',
-    'Class:Incident/Attribute:escalation_flag/Value:yes' => 'Igen',
-    'Class:Incident/Attribute:escalation_flag/Value:yes+' => 'Yes~~',
-    'Class:Incident/Attribute:escalation_reason' => 'Sürgősségi ok',
-    'Class:Incident/Attribute:escalation_reason+' => '~~',
-    'Class:Incident/Attribute:assignment_date' => 'Megbízás dátuma',
-    'Class:Incident/Attribute:assignment_date+' => '~~',
-    'Class:Incident/Attribute:resolution_date' => 'Megoldási dátum',
-    'Class:Incident/Attribute:resolution_date+' => '~~',
-    'Class:Incident/Attribute:last_pending_date' => 'Utolsó függőben lévő dátum',
-    'Class:Incident/Attribute:last_pending_date+' => '~~',
-    'Class:Incident/Attribute:cumulatedpending' => 'Kumulált függőben lévő',
-    'Class:Incident/Attribute:cumulatedpending+' => '~~',
-    'Class:Incident/Attribute:tto' => 'TTO',
-    'Class:Incident/Attribute:tto+' => '~~',
-    'Class:Incident/Attribute:ttr' => 'TTR',
-    'Class:Incident/Attribute:ttr+' => '~~',
-    'Class:Incident/Attribute:tto_escalation_deadline' => 'TTO határidő',
-    'Class:Incident/Attribute:tto_escalation_deadline+' => '~~',
-    'Class:Incident/Attribute:sla_tto_passed' => 'SLA TTO letelt',
-    'Class:Incident/Attribute:sla_tto_passed+' => '~~',
-    'Class:Incident/Attribute:sla_tto_over' => 'SLA TTO túllépett',
-    'Class:Incident/Attribute:sla_tto_over+' => '~~',
-    'Class:Incident/Attribute:ttr_escalation_deadline' => 'TTR határidő',
-    'Class:Incident/Attribute:ttr_escalation_deadline+' => '~~',
-    'Class:Incident/Attribute:sla_ttr_passed' => 'SLA TTR letelt',
-    'Class:Incident/Attribute:sla_ttr_passed+' => '~~',
-    'Class:Incident/Attribute:sla_ttr_over' => 'SLA TTR túllépett',
-    'Class:Incident/Attribute:sla_ttr_over+' => '~~',
-    'Class:Incident/Attribute:time_spent' => 'Időráfordítás',
-    'Class:Incident/Attribute:time_spent+' => '~~',
-    'Class:Incident/Attribute:resolution_code' => 'Megoldás kód',
-    'Class:Incident/Attribute:resolution_code+' => '~~',
-    'Class:Incident/Attribute:resolution_code/Value:assistance' => 'Támogatás',
-    'Class:Incident/Attribute:resolution_code/Value:assistance+' => 'assistance~~',
-    'Class:Incident/Attribute:resolution_code/Value:bug fixed' => 'Programiba javítás',
-    'Class:Incident/Attribute:resolution_code/Value:bug fixed+' => 'bug fixed~~',
-    'Class:Incident/Attribute:resolution_code/Value:hardware repair' => 'Hardver javítás',
-    'Class:Incident/Attribute:resolution_code/Value:hardware repair+' => 'hardware repair~~',
-    'Class:Incident/Attribute:resolution_code/Value:other' => 'Egyéb',
-    'Class:Incident/Attribute:resolution_code/Value:other+' => 'other~~',
-    'Class:Incident/Attribute:resolution_code/Value:software patch' => 'Szoftverfrissítés',
-    'Class:Incident/Attribute:resolution_code/Value:software patch+' => 'software patch~~',
-    'Class:Incident/Attribute:resolution_code/Value:system update' => 'Rendszerfrissítés',
-    'Class:Incident/Attribute:resolution_code/Value:system update+' => 'system update~~',
-    'Class:Incident/Attribute:resolution_code/Value:training' => 'Oktatás',
-    'Class:Incident/Attribute:resolution_code/Value:training+' => 'training~~',
-    'Class:Incident/Attribute:solution' => 'Megoldás',
-    'Class:Incident/Attribute:solution+' => '~~',
-    'Class:Incident/Attribute:pending_reason' => 'Függőben lévőség oka',
-    'Class:Incident/Attribute:pending_reason+' => '~~',
-    'Class:Incident/Attribute:parent_incident_id' => 'Szülő incidens',
-    'Class:Incident/Attribute:parent_incident_id+' => '~~',
-    'Class:Incident/Attribute:parent_incident_ref' => 'Szülő incidens ref.',
-    'Class:Incident/Attribute:parent_incident_ref+' => '~~',
-    'Class:Incident/Attribute:parent_change_id' => 'Szülő változás',
-    'Class:Incident/Attribute:parent_change_id+' => '~~',
-    'Class:Incident/Attribute:parent_change_ref' => 'Szülő változás ref.',
-    'Class:Incident/Attribute:parent_change_ref+' => '~~',
-    'Class:Incident/Attribute:parent_problem_id' => 'Szülő probléma azonosító',
-    'Class:Incident/Attribute:parent_problem_id+' => '~~',
-    'Class:Incident/Attribute:parent_problem_ref' => 'Szülő probléma ref.',
-    'Class:Incident/Attribute:parent_problem_ref+' => '~~',
-    'Class:Incident/Attribute:related_request_list' => 'Gyermek kérelmek',
-    'Class:Incident/Attribute:related_request_list+' => '~~',
-    'Class:Incident/Attribute:child_incidents_list' => 'Gyermek incidensek',
-    'Class:Incident/Attribute:child_incidents_list+' => 'Az összes ehhez az incidenshez kapcsolódó gyermek incidens',
-    'Class:Incident/Attribute:public_log' => 'Nyilvános napló',
-    'Class:Incident/Attribute:public_log+' => '~~',
-    'Class:Incident/Attribute:user_satisfaction' => 'Felhasználói elégedettség',
-    'Class:Incident/Attribute:user_satisfaction+' => '~~',
-    'Class:Incident/Attribute:user_satisfaction/Value:1' => 'Nagyon elégedett',
-    'Class:Incident/Attribute:user_satisfaction/Value:1+' => 'Very satisfied~~',
-    'Class:Incident/Attribute:user_satisfaction/Value:2' => 'Viszonylag elégedett',
-    'Class:Incident/Attribute:user_satisfaction/Value:2+' => 'Fairly statisfied~~',
-    'Class:Incident/Attribute:user_satisfaction/Value:3' => 'Inkább elégedetlen',
-    'Class:Incident/Attribute:user_satisfaction/Value:3+' => 'Rather Dissatified~~',
-    'Class:Incident/Attribute:user_satisfaction/Value:4' => 'Nagyon elégedetlen',
-    'Class:Incident/Attribute:user_satisfaction/Value:4+' => 'Very Dissatisfied~~',
-    'Class:Incident/Attribute:user_comment' => 'Felhasználói megjegyzés',
-    'Class:Incident/Attribute:user_comment+' => '~~',
-    'Class:Incident/Attribute:parent_incident_id_friendlyname' => 'parent_incident_id_friendlyname',
-    'Class:Incident/Attribute:parent_incident_id_friendlyname+' => '~~',
-    'Class:Incident/Stimulus:ev_assign' => 'Hozzárendelés',
-    'Class:Incident/Stimulus:ev_assign+' => '~~',
-    'Class:Incident/Stimulus:ev_reassign' => 'Újra hozzárendelés',
-    'Class:Incident/Stimulus:ev_reassign+' => '~~',
-    'Class:Incident/Stimulus:ev_pending' => 'Függőben',
-    'Class:Incident/Stimulus:ev_pending+' => '~~',
-    'Class:Incident/Stimulus:ev_timeout' => 'Időtúllépés',
-    'Class:Incident/Stimulus:ev_timeout+' => '~~',
-    'Class:Incident/Stimulus:ev_autoresolve' => 'Automatikus megoldás',
-    'Class:Incident/Stimulus:ev_autoresolve+' => '~~',
-    'Class:Incident/Stimulus:ev_autoclose' => 'Automatikus lezárás',
-    'Class:Incident/Stimulus:ev_autoclose+' => '~~',
-    'Class:Incident/Stimulus:ev_resolve' => 'Megjelölés megoldottként',
-    'Class:Incident/Stimulus:ev_resolve+' => '~~',
-    'Class:Incident/Stimulus:ev_close' => 'Kérelem lezárása',
-    'Class:Incident/Stimulus:ev_close+' => '~~',
-    'Class:Incident/Stimulus:ev_reopen' => 'Újranyitás',
-    'Class:Incident/Stimulus:ev_reopen+' => '~~',
-    'Class:Incident/Error:CannotAssignParentIncidentIdToSelf' => 'A szülő incidenst nem lehet magához az incidenshez rendelni.',
-
-    'Class:Incident/Method:ResolveChildTickets' => 'ResolveChildTickets',
-    'Class:Incident/Method:ResolveChildTickets+' => 'A felbontás kaszkádolása a gyermek jegyhez (ev_autoresolve), és a következő jellemzők összehangolása: szolgáltatás, csapat, ügynök, megoldási információ.',
-    'Tickets:Related:OpenIncidents' => 'Nyitott incidensek',
+	'Class:Incident' => 'Incidens',
+	'Class:Incident+' => '~~',
+	'Class:Incident/Attribute:status' => 'Állapot',
+	'Class:Incident/Attribute:status+' => '~~',
+	'Class:Incident/Attribute:status/Value:new' => 'Új',
+	'Class:Incident/Attribute:status/Value:new+' => '~~',
+	'Class:Incident/Attribute:status/Value:escalated_tto' => 'Eszkalált TTO',
+	'Class:Incident/Attribute:status/Value:escalated_tto+' => '~~',
+	'Class:Incident/Attribute:status/Value:assigned' => 'Hozzárendelt',
+	'Class:Incident/Attribute:status/Value:assigned+' => '~~',
+	'Class:Incident/Attribute:status/Value:escalated_ttr' => 'Eszkalált TTR',
+	'Class:Incident/Attribute:status/Value:escalated_ttr+' => '~~',
+	'Class:Incident/Attribute:status/Value:waiting_for_approval' => 'Jóváhagyásra vár',
+	'Class:Incident/Attribute:status/Value:waiting_for_approval+' => '~~',
+	'Class:Incident/Attribute:status/Value:pending' => 'Folyamatban',
+	'Class:Incident/Attribute:status/Value:pending+' => '~~',
+	'Class:Incident/Attribute:status/Value:resolved' => 'Megoldva',
+	'Class:Incident/Attribute:status/Value:resolved+' => '~~',
+	'Class:Incident/Attribute:status/Value:closed' => 'Lezárt',
+	'Class:Incident/Attribute:status/Value:closed+' => '~~',
+	'Class:Incident/Attribute:impact' => 'Hatása',
+	'Class:Incident/Attribute:impact+' => '~~',
+	'Class:Incident/Attribute:impact/Value:1' => 'Részlegre',
+	'Class:Incident/Attribute:impact/Value:1+' => '~~',
+	'Class:Incident/Attribute:impact/Value:2' => 'Szolgáltatásra',
+	'Class:Incident/Attribute:impact/Value:2+' => '~~',
+	'Class:Incident/Attribute:impact/Value:3' => 'Személyre',
+	'Class:Incident/Attribute:impact/Value:3+' => '~~',
+	'Class:Incident/Attribute:priority' => 'Prioritás',
+	'Class:Incident/Attribute:priority+' => '~~',
+	'Class:Incident/Attribute:priority/Value:1' => 'Kritikus',
+	'Class:Incident/Attribute:priority/Value:1+' => 'critical~~',
+	'Class:Incident/Attribute:priority/Value:2' => 'Magas',
+	'Class:Incident/Attribute:priority/Value:2+' => 'high~~',
+	'Class:Incident/Attribute:priority/Value:3' => 'Közepes',
+	'Class:Incident/Attribute:priority/Value:3+' => 'medium~~',
+	'Class:Incident/Attribute:priority/Value:4' => 'Alacsony',
+	'Class:Incident/Attribute:priority/Value:4+' => 'low~~',
+	'Class:Incident/Attribute:urgency' => 'Sürgősség',
+	'Class:Incident/Attribute:urgency+' => '~~',
+	'Class:Incident/Attribute:urgency/Value:1' => 'Nem várhat',
+	'Class:Incident/Attribute:urgency/Value:1+' => 'critical~~',
+	'Class:Incident/Attribute:urgency/Value:2' => 'Nagyon sürgős',
+	'Class:Incident/Attribute:urgency/Value:2+' => 'high~~',
+	'Class:Incident/Attribute:urgency/Value:3' => 'Sürgős',
+	'Class:Incident/Attribute:urgency/Value:3+' => 'sürgős',
+	'Class:Incident/Attribute:urgency/Value:4' => 'Nem sürgős',
+	'Class:Incident/Attribute:urgency/Value:4+' => 'low~~',
+	'Class:Incident/Attribute:origin' => 'Eredet',
+	'Class:Incident/Attribute:origin+' => '~~',
+	'Class:Incident/Attribute:origin/Value:in_person' => 'In-person~~',
+	'Class:Incident/Attribute:origin/Value:in_person+' => 'Incident created following a face-to-face discussion~~',
+	'Class:Incident/Attribute:origin/Value:chat' => 'Chat~~',
+	'Class:Incident/Attribute:origin/Value:chat+' => 'Incident created following a ~~',
+	'Class:Incident/Attribute:origin/Value:mail' => 'Email',
+	'Class:Incident/Attribute:origin/Value:mail+' => 'email~~',
+	'Class:Incident/Attribute:origin/Value:monitoring' => 'Felügyelet',
+	'Class:Incident/Attribute:origin/Value:monitoring+' => 'monitoring~~',
+	'Class:Incident/Attribute:origin/Value:phone' => 'Telefon',
+	'Class:Incident/Attribute:origin/Value:phone+' => 'phone~~',
+	'Class:Incident/Attribute:origin/Value:portal' => 'Portál',
+	'Class:Incident/Attribute:origin/Value:portal+' => 'portal~~',
+	'Class:Incident/Attribute:service_id' => 'Szolgáltatás',
+	'Class:Incident/Attribute:service_id+' => '~~',
+	'Class:Incident/Attribute:service_name' => 'Szolgáltatás név',
+	'Class:Incident/Attribute:service_name+' => '~~',
+	'Class:Incident/Attribute:servicesubcategory_id' => 'Szolgáltatás alkategória',
+	'Class:Incident/Attribute:servicesubcategory_id+' => '~~',
+	'Class:Incident/Attribute:servicesubcategory_name' => 'Szolgáltatás alkategória név',
+	'Class:Incident/Attribute:servicesubcategory_name+' => '~~',
+	'Class:Incident/Attribute:escalation_flag' => 'Sürgősség jelzés',
+	'Class:Incident/Attribute:escalation_flag+' => '~~',
+	'Class:Incident/Attribute:escalation_flag/Value:no' => 'Nem',
+	'Class:Incident/Attribute:escalation_flag/Value:no+' => 'No~~',
+	'Class:Incident/Attribute:escalation_flag/Value:yes' => 'Igen',
+	'Class:Incident/Attribute:escalation_flag/Value:yes+' => 'Yes~~',
+	'Class:Incident/Attribute:escalation_reason' => 'Sürgősségi ok',
+	'Class:Incident/Attribute:escalation_reason+' => '~~',
+	'Class:Incident/Attribute:assignment_date' => 'Megbízás dátuma',
+	'Class:Incident/Attribute:assignment_date+' => '~~',
+	'Class:Incident/Attribute:resolution_date' => 'Megoldási dátum',
+	'Class:Incident/Attribute:resolution_date+' => '~~',
+	'Class:Incident/Attribute:last_pending_date' => 'Utolsó függőben lévő dátum',
+	'Class:Incident/Attribute:last_pending_date+' => '~~',
+	'Class:Incident/Attribute:cumulatedpending' => 'Kumulált függőben lévő',
+	'Class:Incident/Attribute:cumulatedpending+' => '~~',
+	'Class:Incident/Attribute:tto' => 'TTO',
+	'Class:Incident/Attribute:tto+' => '~~',
+	'Class:Incident/Attribute:ttr' => 'TTR',
+	'Class:Incident/Attribute:ttr+' => '~~',
+	'Class:Incident/Attribute:tto_escalation_deadline' => 'TTO határidő',
+	'Class:Incident/Attribute:tto_escalation_deadline+' => '~~',
+	'Class:Incident/Attribute:sla_tto_passed' => 'SLA TTO letelt',
+	'Class:Incident/Attribute:sla_tto_passed+' => '~~',
+	'Class:Incident/Attribute:sla_tto_over' => 'SLA TTO túllépett',
+	'Class:Incident/Attribute:sla_tto_over+' => '~~',
+	'Class:Incident/Attribute:ttr_escalation_deadline' => 'TTR határidő',
+	'Class:Incident/Attribute:ttr_escalation_deadline+' => '~~',
+	'Class:Incident/Attribute:sla_ttr_passed' => 'SLA TTR letelt',
+	'Class:Incident/Attribute:sla_ttr_passed+' => '~~',
+	'Class:Incident/Attribute:sla_ttr_over' => 'SLA TTR túllépett',
+	'Class:Incident/Attribute:sla_ttr_over+' => '~~',
+	'Class:Incident/Attribute:time_spent' => 'Időráfordítás',
+	'Class:Incident/Attribute:time_spent+' => '~~',
+	'Class:Incident/Attribute:resolution_code' => 'Megoldás kód',
+	'Class:Incident/Attribute:resolution_code+' => '~~',
+	'Class:Incident/Attribute:resolution_code/Value:assistance' => 'Támogatás',
+	'Class:Incident/Attribute:resolution_code/Value:assistance+' => 'assistance~~',
+	'Class:Incident/Attribute:resolution_code/Value:bug fixed' => 'Programiba javítás',
+	'Class:Incident/Attribute:resolution_code/Value:bug fixed+' => 'bug fixed~~',
+	'Class:Incident/Attribute:resolution_code/Value:hardware repair' => 'Hardver javítás',
+	'Class:Incident/Attribute:resolution_code/Value:hardware repair+' => 'hardware repair~~',
+	'Class:Incident/Attribute:resolution_code/Value:other' => 'Egyéb',
+	'Class:Incident/Attribute:resolution_code/Value:other+' => 'other~~',
+	'Class:Incident/Attribute:resolution_code/Value:software patch' => 'Szoftverfrissítés',
+	'Class:Incident/Attribute:resolution_code/Value:software patch+' => 'software patch~~',
+	'Class:Incident/Attribute:resolution_code/Value:system update' => 'Rendszerfrissítés',
+	'Class:Incident/Attribute:resolution_code/Value:system update+' => 'system update~~',
+	'Class:Incident/Attribute:resolution_code/Value:training' => 'Oktatás',
+	'Class:Incident/Attribute:resolution_code/Value:training+' => 'training~~',
+	'Class:Incident/Attribute:solution' => 'Megoldás',
+	'Class:Incident/Attribute:solution+' => '~~',
+	'Class:Incident/Attribute:pending_reason' => 'Függőben lévőség oka',
+	'Class:Incident/Attribute:pending_reason+' => '~~',
+	'Class:Incident/Attribute:parent_incident_id' => 'Szülő incidens',
+	'Class:Incident/Attribute:parent_incident_id+' => '~~',
+	'Class:Incident/Attribute:parent_incident_ref' => 'Szülő incidens ref.',
+	'Class:Incident/Attribute:parent_incident_ref+' => '~~',
+	'Class:Incident/Attribute:parent_change_id' => 'Szülő változás',
+	'Class:Incident/Attribute:parent_change_id+' => '~~',
+	'Class:Incident/Attribute:parent_change_ref' => 'Szülő változás ref.',
+	'Class:Incident/Attribute:parent_change_ref+' => '~~',
+	'Class:Incident/Attribute:parent_problem_id' => 'Szülő probléma azonosító',
+	'Class:Incident/Attribute:parent_problem_id+' => '~~',
+	'Class:Incident/Attribute:parent_problem_ref' => 'Szülő probléma ref.',
+	'Class:Incident/Attribute:parent_problem_ref+' => '~~',
+	'Class:Incident/Attribute:related_request_list' => 'Gyermek kérelmek',
+	'Class:Incident/Attribute:related_request_list+' => '~~',
+	'Class:Incident/Attribute:child_incidents_list' => 'Gyermek incidensek',
+	'Class:Incident/Attribute:child_incidents_list+' => 'Az összes ehhez az incidenshez kapcsolódó gyermek incidens',
+	'Class:Incident/Attribute:public_log' => 'Nyilvános napló',
+	'Class:Incident/Attribute:public_log+' => '~~',
+	'Class:Incident/Attribute:user_satisfaction' => 'Felhasználói elégedettség',
+	'Class:Incident/Attribute:user_satisfaction+' => '~~',
+	'Class:Incident/Attribute:user_satisfaction/Value:1' => 'Nagyon elégedett',
+	'Class:Incident/Attribute:user_satisfaction/Value:1+' => 'Very satisfied~~',
+	'Class:Incident/Attribute:user_satisfaction/Value:2' => 'Viszonylag elégedett',
+	'Class:Incident/Attribute:user_satisfaction/Value:2+' => 'Fairly statisfied~~',
+	'Class:Incident/Attribute:user_satisfaction/Value:3' => 'Inkább elégedetlen',
+	'Class:Incident/Attribute:user_satisfaction/Value:3+' => 'Rather Dissatified~~',
+	'Class:Incident/Attribute:user_satisfaction/Value:4' => 'Nagyon elégedetlen',
+	'Class:Incident/Attribute:user_satisfaction/Value:4+' => 'Very Dissatisfied~~',
+	'Class:Incident/Attribute:user_comment' => 'Felhasználói megjegyzés',
+	'Class:Incident/Attribute:user_comment+' => '~~',
+	'Class:Incident/Attribute:parent_incident_id_friendlyname' => 'parent_incident_id_friendlyname',
+	'Class:Incident/Attribute:parent_incident_id_friendlyname+' => '~~',
+	'Class:Incident/Stimulus:ev_assign' => 'Hozzárendelés',
+	'Class:Incident/Stimulus:ev_assign+' => '~~',
+	'Class:Incident/Stimulus:ev_reassign' => 'Újra hozzárendelés',
+	'Class:Incident/Stimulus:ev_reassign+' => '~~',
+	'Class:Incident/Stimulus:ev_pending' => 'Függőben',
+	'Class:Incident/Stimulus:ev_pending+' => '~~',
+	'Class:Incident/Stimulus:ev_timeout' => 'Időtúllépés',
+	'Class:Incident/Stimulus:ev_timeout+' => '~~',
+	'Class:Incident/Stimulus:ev_autoresolve' => 'Automatikus megoldás',
+	'Class:Incident/Stimulus:ev_autoresolve+' => '~~',
+	'Class:Incident/Stimulus:ev_autoclose' => 'Automatikus lezárás',
+	'Class:Incident/Stimulus:ev_autoclose+' => '~~',
+	'Class:Incident/Stimulus:ev_resolve' => 'Megjelölés megoldottként',
+	'Class:Incident/Stimulus:ev_resolve+' => '~~',
+	'Class:Incident/Stimulus:ev_close' => 'Kérelem lezárása',
+	'Class:Incident/Stimulus:ev_close+' => '~~',
+	'Class:Incident/Stimulus:ev_reopen' => 'Újranyitás',
+	'Class:Incident/Stimulus:ev_reopen+' => '~~',
+	'Class:Incident/Error:CannotAssignParentIncidentIdToSelf' => 'A szülő incidenst nem lehet magához az incidenshez rendelni.',
+	'Class:Incident/Method:ResolveChildTickets' => 'ResolveChildTickets',
+	'Class:Incident/Method:ResolveChildTickets+' => 'A felbontás kaszkádolása a gyermek jegyhez (ev_autoresolve), és a következő jellemzők összehangolása: szolgáltatás, csapat, ügynök, megoldási információ.',
+	'Tickets:Related:OpenIncidents' => 'Nyitott incidensek',
 ));
-
diff --git a/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/it.dict.itop-incident-mgmt-itil.php b/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/it.dict.itop-incident-mgmt-itil.php
index df45a56d7d..72862ac101 100644
--- a/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/it.dict.itop-incident-mgmt-itil.php
+++ b/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/it.dict.itop-incident-mgmt-itil.php
@@ -110,6 +110,10 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:Incident/Attribute:urgency/Value:4+' => 'Bassa',
 	'Class:Incident/Attribute:origin' => 'Origine',
 	'Class:Incident/Attribute:origin+' => '~~',
+	'Class:Incident/Attribute:origin/Value:in_person' => 'In-person~~',
+	'Class:Incident/Attribute:origin/Value:in_person+' => 'Incident created following a face-to-face discussion~~',
+	'Class:Incident/Attribute:origin/Value:chat' => 'Chat~~',
+	'Class:Incident/Attribute:origin/Value:chat+' => 'Incident created following a ~~',
 	'Class:Incident/Attribute:origin/Value:mail' => 'Mail',
 	'Class:Incident/Attribute:origin/Value:mail+' => 'Mail',
 	'Class:Incident/Attribute:origin/Value:monitoring' => 'Monitoring',
@@ -231,7 +235,6 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:Incident/Stimulus:ev_reopen' => 'Ri-Apri',
 	'Class:Incident/Stimulus:ev_reopen+' => '~~',
 	'Class:Incident/Error:CannotAssignParentIncidentIdToSelf' => 'Non si può assegnare una richiesta padre a se stesso',
-
 	'Class:Incident/Method:ResolveChildTickets' => 'ResolveChildTickets~~',
 	'Class:Incident/Method:ResolveChildTickets+' => 'Risoluzione a cascata delle richieste figlie (ev_autoresolve), e allineare le seguenti caratteristiche: servizio, team, agente e risoluzione',
 	'Tickets:Related:OpenIncidents' => 'Incidenti aperti',
diff --git a/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/ja.dict.itop-incident-mgmt-itil.php b/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/ja.dict.itop-incident-mgmt-itil.php
index 4555981cac..7641f2f997 100644
--- a/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/ja.dict.itop-incident-mgmt-itil.php
+++ b/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/ja.dict.itop-incident-mgmt-itil.php
@@ -109,6 +109,10 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:Incident/Attribute:urgency/Value:4+' => '低',
 	'Class:Incident/Attribute:origin' => '情報源',
 	'Class:Incident/Attribute:origin+' => '',
+	'Class:Incident/Attribute:origin/Value:in_person' => 'In-person~~',
+	'Class:Incident/Attribute:origin/Value:in_person+' => 'Incident created following a face-to-face discussion~~',
+	'Class:Incident/Attribute:origin/Value:chat' => 'Chat~~',
+	'Class:Incident/Attribute:origin/Value:chat+' => 'Incident created following a ~~',
 	'Class:Incident/Attribute:origin/Value:mail' => 'メール',
 	'Class:Incident/Attribute:origin/Value:mail+' => 'メール',
 	'Class:Incident/Attribute:origin/Value:monitoring' => 'モニタリング',
@@ -230,7 +234,6 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:Incident/Stimulus:ev_reopen' => '再オープン',
 	'Class:Incident/Stimulus:ev_reopen+' => '',
 	'Class:Incident/Error:CannotAssignParentIncidentIdToSelf' => 'Cannot assign the Parent incident to the incident itself~~',
-
 	'Class:Incident/Method:ResolveChildTickets' => 'ResolveChildTickets~~',
 	'Class:Incident/Method:ResolveChildTickets+' => 'Cascade the resolution to child ticket (ev_autoresolve), and align the following characteristics: service, team, agent, resolution info~~',
 	'Tickets:Related:OpenIncidents' => 'Open incidents~~',
diff --git a/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/nl.dict.itop-incident-mgmt-itil.php b/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/nl.dict.itop-incident-mgmt-itil.php
index 8206ba1f26..ad987949b9 100644
--- a/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/nl.dict.itop-incident-mgmt-itil.php
+++ b/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/nl.dict.itop-incident-mgmt-itil.php
@@ -222,7 +222,6 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:Incident/Stimulus:ev_reopen' => 'Heropen',
 	'Class:Incident/Stimulus:ev_reopen+' => '',
 	'Class:Incident/Error:CannotAssignParentIncidentIdToSelf' => 'Kan het incident niet aan zichzelf toewijzen als hoofdincident',
-
 	'Class:Incident/Method:ResolveChildTickets' => 'ResolveChildTickets',
 	'Class:Incident/Method:ResolveChildTickets+' => 'Pas de oplossing ook toe op subverzoeken (ev_autoresolve) en neem deze kenmerken over: service, team, agent, oplossing',
 	'Tickets:Related:OpenIncidents' => 'Open incidenten',
diff --git a/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/pl.dict.itop-incident-mgmt-itil.php b/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/pl.dict.itop-incident-mgmt-itil.php
index ae25f0c093..9529e09b23 100644
--- a/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/pl.dict.itop-incident-mgmt-itil.php
+++ b/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/pl.dict.itop-incident-mgmt-itil.php
@@ -20,7 +20,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/>
  */
-
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Menu:IncidentManagement' => 'Zarządzanie incydentami',
 	'Menu:IncidentManagement+' => 'Zarządzanie incydentami',
@@ -111,6 +110,10 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:Incident/Attribute:urgency/Value:4+' => 'niska',
 	'Class:Incident/Attribute:origin' => 'Pochodzenie',
 	'Class:Incident/Attribute:origin+' => '',
+	'Class:Incident/Attribute:origin/Value:in_person' => 'In-person~~',
+	'Class:Incident/Attribute:origin/Value:in_person+' => 'Incident created following a face-to-face discussion~~',
+	'Class:Incident/Attribute:origin/Value:chat' => 'Chat~~',
+	'Class:Incident/Attribute:origin/Value:chat+' => 'Incident created following a ~~',
 	'Class:Incident/Attribute:origin/Value:mail' => 'e-mail',
 	'Class:Incident/Attribute:origin/Value:mail+' => 'e-mail',
 	'Class:Incident/Attribute:origin/Value:monitoring' => 'monitoring',
@@ -232,7 +235,6 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:Incident/Stimulus:ev_reopen' => 'Otwórz ponownie',
 	'Class:Incident/Stimulus:ev_reopen+' => '',
 	'Class:Incident/Error:CannotAssignParentIncidentIdToSelf' => 'Nie można przypisać zdarzenia nadrzędnego do samego zdarzenia',
-
 	'Class:Incident/Method:ResolveChildTickets' => 'Rozpatrz zgłoszenia podrzędne',
 	'Class:Incident/Method:ResolveChildTickets+' => 'Połącz rozwiązanie kaskadowo ze zgłoszeniem podrzędnym (ev_autoresolve) i dopasuj następujące cechy: usługa, zespół, agent, informacje o rozwiązaniu',
 	'Tickets:Related:OpenIncidents' => 'Otwarte incydenty',
diff --git a/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/pt_br.dict.itop-incident-mgmt-itil.php b/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/pt_br.dict.itop-incident-mgmt-itil.php
index 54d305ca42..ab7a09da45 100644
--- a/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/pt_br.dict.itop-incident-mgmt-itil.php
+++ b/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/pt_br.dict.itop-incident-mgmt-itil.php
@@ -111,6 +111,10 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:Incident/Attribute:urgency/Value:4+' => '',
 	'Class:Incident/Attribute:origin' => 'Origem',
 	'Class:Incident/Attribute:origin+' => '',
+	'Class:Incident/Attribute:origin/Value:in_person' => 'In-person~~',
+	'Class:Incident/Attribute:origin/Value:in_person+' => 'Incident created following a face-to-face discussion~~',
+	'Class:Incident/Attribute:origin/Value:chat' => 'Chat~~',
+	'Class:Incident/Attribute:origin/Value:chat+' => 'Incident created following a ~~',
 	'Class:Incident/Attribute:origin/Value:mail' => 'E-mail',
 	'Class:Incident/Attribute:origin/Value:mail+' => '',
 	'Class:Incident/Attribute:origin/Value:monitoring' => 'Monitoramento',
@@ -232,7 +236,6 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:Incident/Stimulus:ev_reopen' => 'Re-abrir',
 	'Class:Incident/Stimulus:ev_reopen+' => '',
 	'Class:Incident/Error:CannotAssignParentIncidentIdToSelf' => 'Não é possível atribuir o incidente pai ao próprio incidente',
-
 	'Class:Incident/Method:ResolveChildTickets' => 'ResolveChildTickets (resolver solicitações filhas)',
 	'Class:Incident/Method:ResolveChildTickets+' => 'Conecte a solução a solicitação filha (ev_autoresolve) e alinhe as seguintes características: serviço, equipe, agente, informação da solução',
 	'Tickets:Related:OpenIncidents' => 'Incidentes abertos',
diff --git a/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/ru.dict.itop-incident-mgmt-itil.php b/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/ru.dict.itop-incident-mgmt-itil.php
index 0ca45512ea..c0a6a1892e 100644
--- a/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/ru.dict.itop-incident-mgmt-itil.php
+++ b/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/ru.dict.itop-incident-mgmt-itil.php
@@ -98,6 +98,10 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:Incident/Attribute:urgency/Value:4+' => 'Низкая',
 	'Class:Incident/Attribute:origin' => 'Источник',
 	'Class:Incident/Attribute:origin+' => '',
+	'Class:Incident/Attribute:origin/Value:in_person' => 'In-person~~',
+	'Class:Incident/Attribute:origin/Value:in_person+' => 'Incident created following a face-to-face discussion~~',
+	'Class:Incident/Attribute:origin/Value:chat' => 'Chat~~',
+	'Class:Incident/Attribute:origin/Value:chat+' => 'Incident created following a ~~',
 	'Class:Incident/Attribute:origin/Value:mail' => 'Почта',
 	'Class:Incident/Attribute:origin/Value:mail+' => 'Почта',
 	'Class:Incident/Attribute:origin/Value:monitoring' => 'Мониторинг',
@@ -219,7 +223,6 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:Incident/Stimulus:ev_reopen' => 'Вновь открыть',
 	'Class:Incident/Stimulus:ev_reopen+' => '',
 	'Class:Incident/Error:CannotAssignParentIncidentIdToSelf' => 'Невозможно назначить этот же инцидент в качестве родительского',
-
 	'Class:Incident/Method:ResolveChildTickets' => 'ResolveChildTickets',
 	'Class:Incident/Method:ResolveChildTickets+' => 'Каскадное решение дочерних тикетов (ev_autoresolve) с установкой следующих параметров: услуга, команда, агент, информация о решении.',
 	'Tickets:Related:OpenIncidents' => 'Открытые инциденты',
diff --git a/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/sk.dict.itop-incident-mgmt-itil.php b/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/sk.dict.itop-incident-mgmt-itil.php
index d4c14c0aad..827dc1e5aa 100644
--- a/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/sk.dict.itop-incident-mgmt-itil.php
+++ b/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/sk.dict.itop-incident-mgmt-itil.php
@@ -110,6 +110,10 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:Incident/Attribute:urgency/Value:4+' => 'low~~',
 	'Class:Incident/Attribute:origin' => 'Origin~~',
 	'Class:Incident/Attribute:origin+' => '~~',
+	'Class:Incident/Attribute:origin/Value:in_person' => 'In-person~~',
+	'Class:Incident/Attribute:origin/Value:in_person+' => 'Incident created following a face-to-face discussion~~',
+	'Class:Incident/Attribute:origin/Value:chat' => 'Chat~~',
+	'Class:Incident/Attribute:origin/Value:chat+' => 'Incident created following a ~~',
 	'Class:Incident/Attribute:origin/Value:mail' => 'email~~',
 	'Class:Incident/Attribute:origin/Value:mail+' => 'email~~',
 	'Class:Incident/Attribute:origin/Value:monitoring' => 'monitoring~~',
@@ -231,7 +235,6 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:Incident/Stimulus:ev_reopen' => 'Re-open~~',
 	'Class:Incident/Stimulus:ev_reopen+' => '~~',
 	'Class:Incident/Error:CannotAssignParentIncidentIdToSelf' => 'Cannot assign the Parent incident to the incident itself~~',
-
 	'Class:Incident/Method:ResolveChildTickets' => 'ResolveChildTickets~~',
 	'Class:Incident/Method:ResolveChildTickets+' => 'Cascade the resolution to child ticket (ev_autoresolve), and align the following characteristics: service, team, agent, resolution info~~',
 	'Tickets:Related:OpenIncidents' => 'Open incidents~~',
diff --git a/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/tr.dict.itop-incident-mgmt-itil.php b/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/tr.dict.itop-incident-mgmt-itil.php
index 58cddce612..0cd526eb0d 100644
--- a/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/tr.dict.itop-incident-mgmt-itil.php
+++ b/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/tr.dict.itop-incident-mgmt-itil.php
@@ -110,6 +110,10 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:Incident/Attribute:urgency/Value:4+' => 'low~~',
 	'Class:Incident/Attribute:origin' => 'Origin~~',
 	'Class:Incident/Attribute:origin+' => '~~',
+	'Class:Incident/Attribute:origin/Value:in_person' => 'In-person~~',
+	'Class:Incident/Attribute:origin/Value:in_person+' => 'Incident created following a face-to-face discussion~~',
+	'Class:Incident/Attribute:origin/Value:chat' => 'Chat~~',
+	'Class:Incident/Attribute:origin/Value:chat+' => 'Incident created following a ~~',
 	'Class:Incident/Attribute:origin/Value:mail' => 'email~~',
 	'Class:Incident/Attribute:origin/Value:mail+' => 'email~~',
 	'Class:Incident/Attribute:origin/Value:monitoring' => 'monitoring~~',
@@ -231,7 +235,6 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:Incident/Stimulus:ev_reopen' => 'Re-open~~',
 	'Class:Incident/Stimulus:ev_reopen+' => '~~',
 	'Class:Incident/Error:CannotAssignParentIncidentIdToSelf' => 'Cannot assign the Parent incident to the incident itself~~',
-
 	'Class:Incident/Method:ResolveChildTickets' => 'ResolveChildTickets~~',
 	'Class:Incident/Method:ResolveChildTickets+' => 'Cascade the resolution to child ticket (ev_autoresolve), and align the following characteristics: service, team, agent, resolution info~~',
 	'Tickets:Related:OpenIncidents' => 'Open incidents~~',
diff --git a/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/zh_cn.dict.itop-incident-mgmt-itil.php b/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/zh_cn.dict.itop-incident-mgmt-itil.php
index 54a9dc8842..073640a708 100644
--- a/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/zh_cn.dict.itop-incident-mgmt-itil.php
+++ b/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/zh_cn.dict.itop-incident-mgmt-itil.php
@@ -110,6 +110,10 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:Incident/Attribute:urgency/Value:4+' => '低',
 	'Class:Incident/Attribute:origin' => '来源',
 	'Class:Incident/Attribute:origin+' => '',
+	'Class:Incident/Attribute:origin/Value:in_person' => 'In-person~~',
+	'Class:Incident/Attribute:origin/Value:in_person+' => 'Incident created following a face-to-face discussion~~',
+	'Class:Incident/Attribute:origin/Value:chat' => 'Chat~~',
+	'Class:Incident/Attribute:origin/Value:chat+' => 'Incident created following a ~~',
 	'Class:Incident/Attribute:origin/Value:mail' => '邮件',
 	'Class:Incident/Attribute:origin/Value:mail+' => '邮件',
 	'Class:Incident/Attribute:origin/Value:monitoring' => '监控',
@@ -194,8 +198,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:Incident/Attribute:parent_problem_ref+' => '~~',
 	'Class:Incident/Attribute:related_request_list' => '相关需求',
 	'Class:Incident/Attribute:related_request_list+' => '此事件相关的所有需求',
-	'Class:Incident/Attribute:child_incidents_list' => '衍生事件',
-	'Class:Incident/Attribute:child_incidents_list+' => '此事件相关的所有子事件',
+	'Class:Incident/Attribute:child_incidents_list' => '子事件',
+	'Class:Incident/Attribute:child_incidents_list+' => '此事件相关的所有衍生事件',
 	'Class:Incident/Attribute:public_log' => '评论',
 	'Class:Incident/Attribute:public_log+' => '',
 	'Class:Incident/Attribute:user_satisfaction' => '用户满意度',
@@ -230,9 +234,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:Incident/Stimulus:ev_close+' => '',
 	'Class:Incident/Stimulus:ev_reopen' => '重新打开',
 	'Class:Incident/Stimulus:ev_reopen+' => '',
-	'Class:Incident/Error:CannotAssignParentIncidentIdToSelf' => '不能分配父级事件给自己',
-
+	'Class:Incident/Error:CannotAssignParentIncidentIdToSelf' => '无法分配父级事件给自己',
 	'Class:Incident/Method:ResolveChildTickets' => '解决子工单',
-	'Class:Incident/Method:ResolveChildTickets+' => '级联解决子Ticket(事件自动解决),和调整以下内容保持一至: 服务, 团队, 办理人, 解决方案',
+	'Class:Incident/Method:ResolveChildTickets+' => '递归解决子工单(自动解决),并调整相关字段与父级工单保持一致: 服务, 团队, 办理人, 解决方案',
 	'Tickets:Related:OpenIncidents' => '打开的事件',
 ));
diff --git a/datamodels/2.x/itop-knownerror-mgmt/datamodel.itop-knownerror-mgmt.xml b/datamodels/2.x/itop-knownerror-mgmt/datamodel.itop-knownerror-mgmt.xml
index 104f6ce4ad..45a4b41492 100755
--- a/datamodels/2.x/itop-knownerror-mgmt/datamodel.itop-knownerror-mgmt.xml
+++ b/datamodels/2.x/itop-knownerror-mgmt/datamodel.itop-knownerror-mgmt.xml
@@ -122,7 +122,6 @@
           <count_max>0</count_max>
           <ext_key_to_remote>functionalci_id</ext_key_to_remote>
           <duplicates/>
-          <read_only>false</read_only>
         </field>
         <field id="document_list" xsi:type="AttributeLinkedSetIndirect">
           <linked_class>lnkDocumentToError</linked_class>
@@ -131,7 +130,6 @@
           <count_max>0</count_max>
           <ext_key_to_remote>document_id</ext_key_to_remote>
           <duplicates/>
-          <read_only>false</read_only>
         </field>
       </fields>
       <methods/>
diff --git a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/cs.dict.itop-knownerror-mgmt.php b/datamodels/2.x/itop-knownerror-mgmt/dictionaries/cs.dict.itop-knownerror-mgmt.php
index 6165494aca..183532e7f8 100644
--- a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/cs.dict.itop-knownerror-mgmt.php
+++ b/datamodels/2.x/itop-knownerror-mgmt/dictionaries/cs.dict.itop-knownerror-mgmt.php
@@ -100,6 +100,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:lnkErrorToFunctionalCI' => 'Spojení (Chyba / Funkční konfigurační položka)',
 	'Class:lnkErrorToFunctionalCI+' => 'Konfigurační položky vztahující se k chybě',
+	'Class:lnkErrorToFunctionalCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_id' => 'Konfigurační položka',
 	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_id+' => '',
 	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_name' => 'Název konfigurační položky',
@@ -119,6 +120,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:lnkDocumentToError' => 'Spojení (Dokument / Chyba)',
 	'Class:lnkDocumentToError+' => 'Spojení mezi dokumentem a známou chybou',
+	'Class:lnkDocumentToError/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToError/Attribute:document_id' => 'Dokument',
 	'Class:lnkDocumentToError/Attribute:document_id+' => '',
 	'Class:lnkDocumentToError/Attribute:document_name' => 'Název dokumentu',
diff --git a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/da.dict.itop-knownerror-mgmt.php b/datamodels/2.x/itop-knownerror-mgmt/dictionaries/da.dict.itop-knownerror-mgmt.php
index e6b98ccd43..05890a62a5 100644
--- a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/da.dict.itop-knownerror-mgmt.php
+++ b/datamodels/2.x/itop-knownerror-mgmt/dictionaries/da.dict.itop-knownerror-mgmt.php
@@ -72,6 +72,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:lnkErrorToFunctionalCI' => 'Sammenhæng Fejl/FunctionalCI',
 	'Class:lnkErrorToFunctionalCI+' => '',
+	'Class:lnkErrorToFunctionalCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_id' => 'CI',
 	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_id+' => '',
 	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_name' => 'CI-Navn',
@@ -91,6 +92,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:lnkDocumentToError' => 'Sammenhæng Dokumenter/Fejl',
 	'Class:lnkDocumentToError+' => '',
+	'Class:lnkDocumentToError/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToError/Attribute:document_id' => 'Dokument',
 	'Class:lnkDocumentToError/Attribute:document_id+' => '',
 	'Class:lnkDocumentToError/Attribute:document_name' => 'Dokumentnavn',
diff --git a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/de.dict.itop-knownerror-mgmt.php b/datamodels/2.x/itop-knownerror-mgmt/dictionaries/de.dict.itop-knownerror-mgmt.php
index aa52a54f3d..ebd3d4db6d 100644
--- a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/de.dict.itop-knownerror-mgmt.php
+++ b/datamodels/2.x/itop-knownerror-mgmt/dictionaries/de.dict.itop-knownerror-mgmt.php
@@ -24,7 +24,7 @@
 */
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:KnownError' => 'Known Error',
-	'Class:KnownError+' => 'Dokumentierter Fehler für ein Issue',
+	'Class:KnownError+' => 'Dokumentierter Fehler für ein Problem',
 	'Class:KnownError/Attribute:name' => 'Name',
 	'Class:KnownError/Attribute:name+' => '',
 	'Class:KnownError/Attribute:org_id' => 'Kunde',
@@ -62,9 +62,9 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:KnownError/Attribute:version' => 'Version',
 	'Class:KnownError/Attribute:version+' => '',
 	'Class:KnownError/Attribute:ci_list' => 'CIs',
-	'Class:KnownError/Attribute:ci_list+' => 'All the configuration items that are related to this known error~~',
+	'Class:KnownError/Attribute:ci_list+' => 'Alle CIs, die mit diesem Known Error verknüpft sind',
 	'Class:KnownError/Attribute:document_list' => 'Dokumente',
-	'Class:KnownError/Attribute:document_list+' => 'All the documents linked to this known error~~',
+	'Class:KnownError/Attribute:document_list+' => 'Alle Dokumente, die mit diesem Known Error verknüpft sind',
 ));
 
 //
@@ -74,6 +74,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:lnkErrorToFunctionalCI' => 'Verknüpfung KnownError/FunctionalCI',
 	'Class:lnkErrorToFunctionalCI+' => '',
+	'Class:lnkErrorToFunctionalCI/Name' => '%1$s / %2$s',
 	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_id' => 'CI',
 	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_id+' => '',
 	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_name' => 'CI-Name',
@@ -93,6 +94,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:lnkDocumentToError' => 'Verknüpfung Dokumente/KnownError',
 	'Class:lnkDocumentToError+' => '',
+	'Class:lnkDocumentToError/Name' => '%1$s / %2$s',
 	'Class:lnkDocumentToError/Attribute:document_id' => 'Dokument',
 	'Class:lnkDocumentToError/Attribute:document_id+' => '',
 	'Class:lnkDocumentToError/Attribute:document_name' => 'Dokumentname',
@@ -110,9 +112,9 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Menu:ProblemManagement+' => 'Problem Management',
 	'Menu:Problem:Shortcuts' => 'Shortcuts',
 	'Menu:NewError' => 'Neuer Known Error',
-	'Menu:NewError+' => '',
+	'Menu:NewError+' => 'Neuen Known Error dokumentieren',
 	'Menu:SearchError' => 'Nach Known Error suchen',
-	'Menu:SearchError+' => '',
+	'Menu:SearchError+' => 'Nach dokumentierten Fehlern suchen',
 	'Menu:Problem:KnownErrors' => 'Alle Known Errors',
 	'Menu:Problem:KnownErrors+' => 'Alle Known Errors',
 ));
diff --git a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/es_cr.dict.itop-knownerror-mgmt.php b/datamodels/2.x/itop-knownerror-mgmt/dictionaries/es_cr.dict.itop-knownerror-mgmt.php
index 5e62a43420..ecd503b707 100644
--- a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/es_cr.dict.itop-knownerror-mgmt.php
+++ b/datamodels/2.x/itop-knownerror-mgmt/dictionaries/es_cr.dict.itop-knownerror-mgmt.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
@@ -99,6 +99,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkErrorToFunctionalCI' => 'Relación Error Conocido y EC Funcional',
 	'Class:lnkErrorToFunctionalCI+' => 'Relación Error Conocido y EC Funcional',
+	'Class:lnkErrorToFunctionalCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_id' => 'EC',
 	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_id+' => 'Elemento de Configuración',
 	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_name' => 'CI',
@@ -118,6 +119,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkDocumentToError' => 'Relación Documento y Error Conocido',
 	'Class:lnkDocumentToError+' => 'Relación Documento y Error Conocido',
+	'Class:lnkDocumentToError/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToError/Attribute:document_id' => 'Documento',
 	'Class:lnkDocumentToError/Attribute:document_id+' => 'Documento',
 	'Class:lnkDocumentToError/Attribute:document_name' => 'Documento',
diff --git a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/fr.dict.itop-knownerror-mgmt.php b/datamodels/2.x/itop-knownerror-mgmt/dictionaries/fr.dict.itop-knownerror-mgmt.php
index d1cba26230..00e1d4aee9 100644
--- a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/fr.dict.itop-knownerror-mgmt.php
+++ b/datamodels/2.x/itop-knownerror-mgmt/dictionaries/fr.dict.itop-knownerror-mgmt.php
@@ -74,6 +74,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:lnkErrorToFunctionalCI' => 'Lien Erreur / CI',
 	'Class:lnkErrorToFunctionalCI+' => 'Lien entre une erreur et un ci',
+	'Class:lnkErrorToFunctionalCI/Name' => '%1$s / %2$s',
 	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_id' => 'CI',
 	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_id+' => '',
 	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_name' => 'Nom CI',
@@ -93,6 +94,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:lnkDocumentToError' => 'Lien Documents / Errors',
 	'Class:lnkDocumentToError+' => 'Lien entre un document et une erreur',
+	'Class:lnkDocumentToError/Name' => '%1$s / %2$s',
 	'Class:lnkDocumentToError/Attribute:document_id' => 'Document',
 	'Class:lnkDocumentToError/Attribute:document_id+' => '',
 	'Class:lnkDocumentToError/Attribute:document_name' => 'Nom Document',
diff --git a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/hu.dict.itop-knownerror-mgmt.php b/datamodels/2.x/itop-knownerror-mgmt/dictionaries/hu.dict.itop-knownerror-mgmt.php
index 83c0336bac..0a8f5c7705 100644
--- a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/hu.dict.itop-knownerror-mgmt.php
+++ b/datamodels/2.x/itop-knownerror-mgmt/dictionaries/hu.dict.itop-knownerror-mgmt.php
@@ -20,47 +20,47 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:KnownError' => 'Ismert hiba',
-    'Class:KnownError+' => '',
-    'Class:KnownError/Attribute:name' => 'Név',
-    'Class:KnownError/Attribute:name+' => '',
-    'Class:KnownError/Attribute:org_id' => 'Ügyfél',
-    'Class:KnownError/Attribute:org_id+' => '',
-    'Class:KnownError/Attribute:cust_name' => 'Ügyfél neve',
-    'Class:KnownError/Attribute:cust_name+' => '',
-    'Class:KnownError/Attribute:problem_id' => 'Kapcsolódó probléma',
-    'Class:KnownError/Attribute:problem_id+' => '',
-    'Class:KnownError/Attribute:problem_ref' => 'Referencia',
-    'Class:KnownError/Attribute:problem_ref+' => '',
-    'Class:KnownError/Attribute:symptom' => 'Hibajelenség',
-    'Class:KnownError/Attribute:symptom+' => '',
-    'Class:KnownError/Attribute:root_cause' => 'Gyökérok',
-    'Class:KnownError/Attribute:root_cause+' => '',
-    'Class:KnownError/Attribute:workaround' => 'Elkerülő megoldás',
-    'Class:KnownError/Attribute:workaround+' => '',
-    'Class:KnownError/Attribute:solution' => 'Megoldás',
-    'Class:KnownError/Attribute:solution+' => '',
-    'Class:KnownError/Attribute:error_code' => 'Hibakód',
-    'Class:KnownError/Attribute:error_code+' => '',
-    'Class:KnownError/Attribute:domain' => 'Hibatartomány',
-    'Class:KnownError/Attribute:domain+' => '',
-    'Class:KnownError/Attribute:domain/Value:Application' => 'Alkalmazás',
-    'Class:KnownError/Attribute:domain/Value:Application+' => 'Application',
-    'Class:KnownError/Attribute:domain/Value:Desktop' => 'Desktop',
-    'Class:KnownError/Attribute:domain/Value:Desktop+' => 'Desktop',
-    'Class:KnownError/Attribute:domain/Value:Network' => 'Hálózat',
-    'Class:KnownError/Attribute:domain/Value:Network+' => 'Network',
-    'Class:KnownError/Attribute:domain/Value:Server' => 'Szerver',
-    'Class:KnownError/Attribute:domain/Value:Server+' => 'Server',
-    'Class:KnownError/Attribute:vendor' => 'Gyártó',
-    'Class:KnownError/Attribute:vendor+' => '',
-    'Class:KnownError/Attribute:model' => 'Modell',
-    'Class:KnownError/Attribute:model+' => '',
-    'Class:KnownError/Attribute:version' => 'Verzió',
-    'Class:KnownError/Attribute:version+' => '',
-    'Class:KnownError/Attribute:ci_list' => 'CI-k',
+	'Class:KnownError' => 'Ismert hiba',
+	'Class:KnownError+' => '',
+	'Class:KnownError/Attribute:name' => 'Név',
+	'Class:KnownError/Attribute:name+' => '',
+	'Class:KnownError/Attribute:org_id' => 'Ügyfél',
+	'Class:KnownError/Attribute:org_id+' => '',
+	'Class:KnownError/Attribute:cust_name' => 'Ügyfél neve',
+	'Class:KnownError/Attribute:cust_name+' => '',
+	'Class:KnownError/Attribute:problem_id' => 'Kapcsolódó probléma',
+	'Class:KnownError/Attribute:problem_id+' => '',
+	'Class:KnownError/Attribute:problem_ref' => 'Referencia',
+	'Class:KnownError/Attribute:problem_ref+' => '',
+	'Class:KnownError/Attribute:symptom' => 'Hibajelenség',
+	'Class:KnownError/Attribute:symptom+' => '',
+	'Class:KnownError/Attribute:root_cause' => 'Gyökérok',
+	'Class:KnownError/Attribute:root_cause+' => '',
+	'Class:KnownError/Attribute:workaround' => 'Elkerülő megoldás',
+	'Class:KnownError/Attribute:workaround+' => '',
+	'Class:KnownError/Attribute:solution' => 'Megoldás',
+	'Class:KnownError/Attribute:solution+' => '',
+	'Class:KnownError/Attribute:error_code' => 'Hibakód',
+	'Class:KnownError/Attribute:error_code+' => '',
+	'Class:KnownError/Attribute:domain' => 'Hibatartomány',
+	'Class:KnownError/Attribute:domain+' => '',
+	'Class:KnownError/Attribute:domain/Value:Application' => 'Alkalmazás',
+	'Class:KnownError/Attribute:domain/Value:Application+' => 'Application',
+	'Class:KnownError/Attribute:domain/Value:Desktop' => 'Desktop',
+	'Class:KnownError/Attribute:domain/Value:Desktop+' => 'Desktop',
+	'Class:KnownError/Attribute:domain/Value:Network' => 'Hálózat',
+	'Class:KnownError/Attribute:domain/Value:Network+' => 'Network',
+	'Class:KnownError/Attribute:domain/Value:Server' => 'Szerver',
+	'Class:KnownError/Attribute:domain/Value:Server+' => 'Server',
+	'Class:KnownError/Attribute:vendor' => 'Gyártó',
+	'Class:KnownError/Attribute:vendor+' => '',
+	'Class:KnownError/Attribute:model' => 'Modell',
+	'Class:KnownError/Attribute:model+' => '',
+	'Class:KnownError/Attribute:version' => 'Verzió',
+	'Class:KnownError/Attribute:version+' => '',
+	'Class:KnownError/Attribute:ci_list' => 'CI-k',
 	'Class:KnownError/Attribute:ci_list+' => 'All the configuration items that are related to this known error~~',
-    'Class:KnownError/Attribute:document_list' => 'Dokumentumok',
+	'Class:KnownError/Attribute:document_list' => 'Dokumentumok',
 	'Class:KnownError/Attribute:document_list+' => 'All the documents linked to this known error~~',
 ));
 
@@ -69,18 +69,19 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:lnkErrorToFunctionalCI' => 'Hiba / Funkcionális CI',
-    'Class:lnkErrorToFunctionalCI+' => 'Infra ismert hibához kapcsolódóan',
-    'Class:lnkErrorToFunctionalCI/Attribute:functionalci_id' => 'CI',
-    'Class:lnkErrorToFunctionalCI/Attribute:functionalci_id+' => '~~',
-    'Class:lnkErrorToFunctionalCI/Attribute:functionalci_name' => 'CI név',
-    'Class:lnkErrorToFunctionalCI/Attribute:functionalci_name+' => '~~',
-    'Class:lnkErrorToFunctionalCI/Attribute:error_id' => 'Hiba',
-    'Class:lnkErrorToFunctionalCI/Attribute:error_id+' => '~~',
-    'Class:lnkErrorToFunctionalCI/Attribute:error_name' => 'Hiba név',
-    'Class:lnkErrorToFunctionalCI/Attribute:error_name+' => '~~',
-    'Class:lnkErrorToFunctionalCI/Attribute:reason' => 'Hibaok',
-    'Class:lnkErrorToFunctionalCI/Attribute:reason+' => '~~',
+	'Class:lnkErrorToFunctionalCI' => 'Hiba / Funkcionális CI',
+	'Class:lnkErrorToFunctionalCI+' => 'Infra ismert hibához kapcsolódóan',
+	'Class:lnkErrorToFunctionalCI/Name' => '%1$s / %2$s~~',
+	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_id' => 'CI',
+	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_id+' => '~~',
+	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_name' => 'CI név',
+	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_name+' => '~~',
+	'Class:lnkErrorToFunctionalCI/Attribute:error_id' => 'Hiba',
+	'Class:lnkErrorToFunctionalCI/Attribute:error_id+' => '~~',
+	'Class:lnkErrorToFunctionalCI/Attribute:error_name' => 'Hiba név',
+	'Class:lnkErrorToFunctionalCI/Attribute:error_name+' => '~~',
+	'Class:lnkErrorToFunctionalCI/Attribute:reason' => 'Hibaok',
+	'Class:lnkErrorToFunctionalCI/Attribute:reason+' => '~~',
 ));
 
 //
@@ -88,28 +89,29 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:lnkDocumentToError' => 'Dokumentumok / Hibák',
-    'Class:lnkDocumentToError+' => 'A link between a document and a known error~~',
-    'Class:lnkDocumentToError/Attribute:document_id' => 'Dokumentum',
-    'Class:lnkDocumentToError/Attribute:document_id+' => '~~',
-    'Class:lnkDocumentToError/Attribute:document_name' => 'Dokumentum név',
-    'Class:lnkDocumentToError/Attribute:document_name+' => '~~',
-    'Class:lnkDocumentToError/Attribute:error_id' => 'Hiba',
-    'Class:lnkDocumentToError/Attribute:error_id+' => '~~',
-    'Class:lnkDocumentToError/Attribute:error_name' => 'Hiba név',
-    'Class:lnkDocumentToError/Attribute:error_name+' => '~~',
-    'Class:lnkDocumentToError/Attribute:link_type' => 'link_type',
-    'Class:lnkDocumentToError/Attribute:link_type+' => '~~',
+	'Class:lnkDocumentToError' => 'Dokumentumok / Hibák',
+	'Class:lnkDocumentToError+' => 'A link between a document and a known error~~',
+	'Class:lnkDocumentToError/Name' => '%1$s / %2$s~~',
+	'Class:lnkDocumentToError/Attribute:document_id' => 'Dokumentum',
+	'Class:lnkDocumentToError/Attribute:document_id+' => '~~',
+	'Class:lnkDocumentToError/Attribute:document_name' => 'Dokumentum név',
+	'Class:lnkDocumentToError/Attribute:document_name+' => '~~',
+	'Class:lnkDocumentToError/Attribute:error_id' => 'Hiba',
+	'Class:lnkDocumentToError/Attribute:error_id+' => '~~',
+	'Class:lnkDocumentToError/Attribute:error_name' => 'Hiba név',
+	'Class:lnkDocumentToError/Attribute:error_name+' => '~~',
+	'Class:lnkDocumentToError/Attribute:link_type' => 'link_type',
+	'Class:lnkDocumentToError/Attribute:link_type+' => '~~',
 ));
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Menu:ProblemManagement' => 'Problémakezelés',
-    'Menu:ProblemManagement+' => '',
-    'Menu:Problem:Shortcuts' => 'Gyorsgomb',
-    'Menu:NewError' => 'Új ismert hiba',
-    'Menu:NewError+' => '',
-    'Menu:SearchError' => 'Ismert hiba keresés',
-    'Menu:SearchError+' => '',
-    'Menu:Problem:KnownErrors' => 'Összes ismert hiba',
-    'Menu:Problem:KnownErrors+' => '',
+	'Menu:ProblemManagement' => 'Problémakezelés',
+	'Menu:ProblemManagement+' => '',
+	'Menu:Problem:Shortcuts' => 'Gyorsgomb',
+	'Menu:NewError' => 'Új ismert hiba',
+	'Menu:NewError+' => '',
+	'Menu:SearchError' => 'Ismert hiba keresés',
+	'Menu:SearchError+' => '',
+	'Menu:Problem:KnownErrors' => 'Összes ismert hiba',
+	'Menu:Problem:KnownErrors+' => '',
 ));
diff --git a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/it.dict.itop-knownerror-mgmt.php b/datamodels/2.x/itop-knownerror-mgmt/dictionaries/it.dict.itop-knownerror-mgmt.php
index 99277b326d..213cef09f8 100644
--- a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/it.dict.itop-knownerror-mgmt.php
+++ b/datamodels/2.x/itop-knownerror-mgmt/dictionaries/it.dict.itop-knownerror-mgmt.php
@@ -98,6 +98,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:lnkErrorToFunctionalCI' => 'Link Errore /CIFunzionale',
 	'Class:lnkErrorToFunctionalCI+' => 'Infra impattata dal errore conosciuto',
+	'Class:lnkErrorToFunctionalCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_id' => 'CI',
 	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_id+' => '~~',
 	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_name' => 'CI Nome',
@@ -117,6 +118,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:lnkDocumentToError' => 'Link Documento / Errore',
 	'Class:lnkDocumentToError+' => 'Link tra il documento e l\'errore conosciuto',
+	'Class:lnkDocumentToError/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToError/Attribute:document_id' => 'Documenti',
 	'Class:lnkDocumentToError/Attribute:document_id+' => '~~',
 	'Class:lnkDocumentToError/Attribute:document_name' => 'Nome dei documenti',
diff --git a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/ja.dict.itop-knownerror-mgmt.php b/datamodels/2.x/itop-knownerror-mgmt/dictionaries/ja.dict.itop-knownerror-mgmt.php
index a66cb2d797..20fc582e62 100644
--- a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/ja.dict.itop-knownerror-mgmt.php
+++ b/datamodels/2.x/itop-knownerror-mgmt/dictionaries/ja.dict.itop-knownerror-mgmt.php
@@ -71,6 +71,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:lnkErrorToFunctionalCI' => 'リンク エラー/機能的CI',
 	'Class:lnkErrorToFunctionalCI+' => '既知のエラーに関連するインフラ',
+	'Class:lnkErrorToFunctionalCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_id' => 'CI',
 	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_id+' => '',
 	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_name' => 'CI名',
@@ -90,6 +91,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:lnkDocumentToError' => 'リンク 文書/エラー',
 	'Class:lnkDocumentToError+' => '文書と既知のエラー間のリンク',
+	'Class:lnkDocumentToError/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToError/Attribute:document_id' => '文書',
 	'Class:lnkDocumentToError/Attribute:document_id+' => '',
 	'Class:lnkDocumentToError/Attribute:document_name' => '文書名',
diff --git a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/nl.dict.itop-knownerror-mgmt.php b/datamodels/2.x/itop-knownerror-mgmt/dictionaries/nl.dict.itop-knownerror-mgmt.php
index d285662bd2..f4b5c1ade2 100644
--- a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/nl.dict.itop-knownerror-mgmt.php
+++ b/datamodels/2.x/itop-knownerror-mgmt/dictionaries/nl.dict.itop-knownerror-mgmt.php
@@ -103,6 +103,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:lnkErrorToFunctionalCI' => 'Link Fout / Functioneel CI',
 	'Class:lnkErrorToFunctionalCI+' => 'Infrastructuur gelinkt aan een gekende fout',
+	'Class:lnkErrorToFunctionalCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_id' => 'CI',
 	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_id+' => '',
 	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_name' => 'Naam CI',
@@ -122,6 +123,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:lnkDocumentToError' => 'Link Document / Fout',
 	'Class:lnkDocumentToError+' => 'Een link tussen een document en een gekende fout',
+	'Class:lnkDocumentToError/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToError/Attribute:document_id' => 'Document',
 	'Class:lnkDocumentToError/Attribute:document_id+' => '',
 	'Class:lnkDocumentToError/Attribute:document_name' => 'Naam document',
diff --git a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/pl.dict.itop-knownerror-mgmt.php b/datamodels/2.x/itop-knownerror-mgmt/dictionaries/pl.dict.itop-knownerror-mgmt.php
index cbcd8b70f9..0dc035b2ac 100644
--- a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/pl.dict.itop-knownerror-mgmt.php
+++ b/datamodels/2.x/itop-knownerror-mgmt/dictionaries/pl.dict.itop-knownerror-mgmt.php
@@ -20,7 +20,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/>
  */
-
 // Dictionnay conventions
 // Class:<class_name>
 // Class:<class_name>+
@@ -30,12 +29,10 @@
 // Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
 // Class:<class_name>/Stimulus:<stimulus_code>
 // Class:<class_name>/Stimulus:<stimulus_code>+
-
 //////////////////////////////////////////////////////////////////////
 // Classes in 'bizmodel'
 //////////////////////////////////////////////////////////////////////
 //
-
 // Dictionnay conventions
 // Class:<class_name>
 // Class:<class_name>+
@@ -45,11 +42,9 @@
 // Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
 // Class:<class_name>/Stimulus:<stimulus_code>
 // Class:<class_name>/Stimulus:<stimulus_code>+
-
 //
 // Class: KnownError
 //
-
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:KnownError' => 'Znany błąd',
 	'Class:KnownError+' => 'Udokumentowano błąd dotyczący znanego problemu',
@@ -102,6 +97,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:lnkErrorToFunctionalCI' => 'Połączenie Błąd / Konfiguracja',
 	'Class:lnkErrorToFunctionalCI+' => 'Konfiguracje związane ze znanym błędem',
+	'Class:lnkErrorToFunctionalCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_id' => 'Konfiguracja',
 	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_id+' => '',
 	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_name' => 'Nazwa konfiguracji',
@@ -121,6 +117,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:lnkDocumentToError' => 'Połączenie Dokumenty / Błędy',
 	'Class:lnkDocumentToError+' => 'Łącze między dokumentem a znanym błędem',
+	'Class:lnkDocumentToError/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToError/Attribute:document_id' => 'Dokument',
 	'Class:lnkDocumentToError/Attribute:document_id+' => '',
 	'Class:lnkDocumentToError/Attribute:document_name' => 'Nazwa dokumentu',
diff --git a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/pt_br.dict.itop-knownerror-mgmt.php b/datamodels/2.x/itop-knownerror-mgmt/dictionaries/pt_br.dict.itop-knownerror-mgmt.php
index b03339a106..807937ab37 100644
--- a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/pt_br.dict.itop-knownerror-mgmt.php
+++ b/datamodels/2.x/itop-knownerror-mgmt/dictionaries/pt_br.dict.itop-knownerror-mgmt.php
@@ -98,6 +98,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:lnkErrorToFunctionalCI' => 'Link Erro Conhecido / IC',
 	'Class:lnkErrorToFunctionalCI+' => 'Infraestrutura associada a este erro conhecido',
+	'Class:lnkErrorToFunctionalCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_id' => 'ICs',
 	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_id+' => '',
 	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_name' => 'Nome do IC',
@@ -117,6 +118,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:lnkDocumentToError' => 'Link Documentos / Erros',
 	'Class:lnkDocumentToError+' => 'Uma ligação entre um documento e um erro conhecido',
+	'Class:lnkDocumentToError/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToError/Attribute:document_id' => 'Documento',
 	'Class:lnkDocumentToError/Attribute:document_id+' => '',
 	'Class:lnkDocumentToError/Attribute:document_name' => 'Nome do documento',
diff --git a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/ru.dict.itop-knownerror-mgmt.php b/datamodels/2.x/itop-knownerror-mgmt/dictionaries/ru.dict.itop-knownerror-mgmt.php
index 9de919e7cd..30a5bc6b13 100644
--- a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/ru.dict.itop-knownerror-mgmt.php
+++ b/datamodels/2.x/itop-knownerror-mgmt/dictionaries/ru.dict.itop-knownerror-mgmt.php
@@ -63,6 +63,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:lnkErrorToFunctionalCI' => 'Связь Известная ошибка/Функциональная КЕ',
 	'Class:lnkErrorToFunctionalCI+' => 'Infra related to a known error',
+	'Class:lnkErrorToFunctionalCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_id' => 'КЕ',
 	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_id+' => '',
 	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_name' => 'КЕ',
@@ -82,6 +83,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:lnkDocumentToError' => 'Связь Документ/Известная ошибка',
 	'Class:lnkDocumentToError+' => 'A link between a document and a known error',
+	'Class:lnkDocumentToError/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToError/Attribute:document_id' => 'Документ',
 	'Class:lnkDocumentToError/Attribute:document_id+' => '',
 	'Class:lnkDocumentToError/Attribute:document_name' => 'Документ',
diff --git a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/sk.dict.itop-knownerror-mgmt.php b/datamodels/2.x/itop-knownerror-mgmt/dictionaries/sk.dict.itop-knownerror-mgmt.php
index 7c2cdb18bf..57cde2ff9d 100644
--- a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/sk.dict.itop-knownerror-mgmt.php
+++ b/datamodels/2.x/itop-knownerror-mgmt/dictionaries/sk.dict.itop-knownerror-mgmt.php
@@ -97,6 +97,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:lnkErrorToFunctionalCI' => 'Link Error / FunctionalCI~~',
 	'Class:lnkErrorToFunctionalCI+' => 'Infra related to a known error~~',
+	'Class:lnkErrorToFunctionalCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_id' => 'CI~~',
 	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_id+' => '~~',
 	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_name' => 'CI name~~',
@@ -116,6 +117,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:lnkDocumentToError' => 'Link Documents / Errors~~',
 	'Class:lnkDocumentToError+' => 'A link between a document and a known error~~',
+	'Class:lnkDocumentToError/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToError/Attribute:document_id' => 'Document~~',
 	'Class:lnkDocumentToError/Attribute:document_id+' => '~~',
 	'Class:lnkDocumentToError/Attribute:document_name' => 'Document Name~~',
diff --git a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/tr.dict.itop-knownerror-mgmt.php b/datamodels/2.x/itop-knownerror-mgmt/dictionaries/tr.dict.itop-knownerror-mgmt.php
index 0406bcc51f..7b32763bca 100644
--- a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/tr.dict.itop-knownerror-mgmt.php
+++ b/datamodels/2.x/itop-knownerror-mgmt/dictionaries/tr.dict.itop-knownerror-mgmt.php
@@ -99,6 +99,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:lnkErrorToFunctionalCI' => 'Hata / İşlevsel CI bağla',
 	'Class:lnkErrorToFunctionalCI+' => ' Bilinen bir hatayla ilgili alt bilgi',
+	'Class:lnkErrorToFunctionalCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_id' => 'CI',
 	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_id+' => '~~',
 	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_name' => 'CI Adı',
@@ -118,6 +119,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:lnkDocumentToError' => 'Belge / hata bağla',
 	'Class:lnkDocumentToError+' => 'Bir belge ile bilinen bir hata arasındaki bağlantı',
+	'Class:lnkDocumentToError/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToError/Attribute:document_id' => 'Belge',
 	'Class:lnkDocumentToError/Attribute:document_id+' => '~~',
 	'Class:lnkDocumentToError/Attribute:document_name' => 'Belge Adı',
diff --git a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/zh_cn.dict.itop-knownerror-mgmt.php b/datamodels/2.x/itop-knownerror-mgmt/dictionaries/zh_cn.dict.itop-knownerror-mgmt.php
index 4f2e10b330..1efa17f4ca 100644
--- a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/zh_cn.dict.itop-knownerror-mgmt.php
+++ b/datamodels/2.x/itop-knownerror-mgmt/dictionaries/zh_cn.dict.itop-knownerror-mgmt.php
@@ -97,6 +97,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:lnkErrorToFunctionalCI' => '关联 已知问题/功能配置项',
 	'Class:lnkErrorToFunctionalCI+' => '已知问题和功能配置项之间的关联',
+	'Class:lnkErrorToFunctionalCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_id' => '配置项',
 	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_id+' => '',
 	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_name' => '配置项名称',
@@ -116,6 +117,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:lnkDocumentToError' => '关联 文档/已知问题',
 	'Class:lnkDocumentToError+' => '文档和已知问题之间的关联',
+	'Class:lnkDocumentToError/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToError/Attribute:document_id' => '文档',
 	'Class:lnkDocumentToError/Attribute:document_id+' => '',
 	'Class:lnkDocumentToError/Attribute:document_name' => '文档名称',
diff --git a/datamodels/2.x/itop-oauth-client/cs.dict.itop-oauth-client.php b/datamodels/2.x/itop-oauth-client/cs.dict.itop-oauth-client.php
index a46039b66a..bd077f715a 100644
--- a/datamodels/2.x/itop-oauth-client/cs.dict.itop-oauth-client.php
+++ b/datamodels/2.x/itop-oauth-client/cs.dict.itop-oauth-client.php
@@ -5,22 +5,24 @@
  * @copyright   Copyright (C) 2013 XXXXX
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
-
 Dict::Add('CS CZ', 'Czech', 'Čeština', [
 	'Menu:CreateMailbox' => 'Create a mailbox...~~',
 	'Menu:OAuthClient' => 'OAuth client~~',
 	'Menu:OAuthClient+' => '~~',
 	'Menu:GenerateTokens' => 'Generate access tokens...~~',
 	'Menu:RegenerateTokens' => 'Regenerate access tokens...~~',
-
 	'itop-oauth-client/Operation:CreateMailBox/Title' => 'Mailbox creation~~',
-
 	'itop-oauth-client:UsedForSMTP' => 'This OAuth client is used for SMTP~~',
 	'itop-oauth-client:TestSMTP' => 'Email send test~~',
 	'itop-oauth-client:MissingOAuthClient' => 'Missing Oauth client for user name %1$s~~',
 	'itop-oauth-client:Message:MissingToken' => 'Generate access token before using this OAuth client~~',
+	'itop-oauth-client:Message:RegenerateToken' => 'Regenerate access token to to take into account the changes~~',
 	'itop-oauth-client:Message:TokenCreated' => 'Access token created~~',
 	'itop-oauth-client:Message:TokenRecreated' => 'Access token regenerated~~',
+	'itop-oauth-client:Message:TokenError' => 'Access token not generated due to server error~~',
+	'OAuthClient:Name/UseForSMTPMustBeUnique' => 'The combination Login (%1$s) and Use for SMTP (%2$s) has already be used for OAuth Client~~',
+	'OAuthClient:baseinfo' => 'Base Information~~',
+	'OAuthClient:scope' => 'Scope~~',
 ]);
 
 //
@@ -35,6 +37,10 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', [
 	'Class:OAuthClient/Attribute:name+' => '~~',
 	'Class:OAuthClient/Attribute:scope' => 'Scope~~',
 	'Class:OAuthClient/Attribute:scope+' => '~~',
+	'Class:OAuthClient/Attribute:status' => 'Status~~',
+	'Class:OAuthClient/Attribute:status+' => 'After creation, use the action “Generate access token” to be able to use this OAuth client~~',
+	'Class:OAuthClient/Attribute:status/Value:active' => 'Access token generated~~',
+	'Class:OAuthClient/Attribute:status/Value:inactive' => 'No Access token~~',
 	'Class:OAuthClient/Attribute:description' => 'Description~~',
 	'Class:OAuthClient/Attribute:description+' => '~~',
 	'Class:OAuthClient/Attribute:client_id' => 'Client id~~',
@@ -52,23 +58,59 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', [
 	'Class:OAuthClient/Attribute:redirect_url' => 'Redirect url~~',
 	'Class:OAuthClient/Attribute:redirect_url+' => '~~',
 	'Class:OAuthClient/Attribute:mailbox_list' => 'Mailbox list~~',
-	'Class:OAuthClient/Attribute:mailbox_list+' => '~~',
+	'Class:OAuthClient/Attribute:mailbox_list+' => '~~'
 ]);
 
 //
 // Class: OAuthClientAzure
 //
-Dict::Add('CS CZ', 'Czech', 'Čeština', [
+
+Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:OAuthClientAzure' => 'OAuth client for Microsoft Azure~~',
 	'Class:OAuthClientAzure/Name' => '%1$s (%2$s)~~',
-
-]);
+	'Class:OAuthClientAzure/Attribute:scope' => 'Scope~~',
+	'Class:OAuthClientAzure/Attribute:scope+' => 'Usually default selection is appropriate~~',
+	'Class:OAuthClientAzure/Attribute:scope/Value:SMTP' => 'SMTP~~',
+	'Class:OAuthClientAzure/Attribute:scope/Value:SMTP+' => '~~',
+	'Class:OAuthClientAzure/Attribute:scope/Value:IMAP' => 'IMAP~~',
+	'Class:OAuthClientAzure/Attribute:scope/Value:IMAP+' => '~~',
+	'Class:OAuthClientAzure/Attribute:advanced_scope' => 'Advanced scope~~',
+	'Class:OAuthClientAzure/Attribute:advanced_scope+' => 'As soon as you enter something here it takes precedence on the “Scope” selection which is then ignored~~',
+	'Class:OAuthClientAzure/Attribute:used_scope' => 'Used scope~~',
+	'Class:OAuthClientAzure/Attribute:used_scope+' => '~~',
+	'Class:OAuthClientAzure/Attribute:used_scope/Value:simple' => 'Simple~~',
+	'Class:OAuthClientAzure/Attribute:used_scope/Value:simple+' => '~~',
+	'Class:OAuthClientAzure/Attribute:used_scope/Value:advanced' => 'Advanced~~',
+	'Class:OAuthClientAzure/Attribute:used_scope/Value:advanced+' => '~~',
+	'Class:OAuthClientAzure/Attribute:used_for_smtp' => 'Used for SMTP~~',
+	'Class:OAuthClientAzure/Attribute:used_for_smtp+' => 'At least one OAuth client must have this flag to “Yes”, if you want iTop to use it for sending mails~~',
+	'Class:OAuthClientAzure/Attribute:used_for_smtp/Value:yes' => 'Yes~~',
+	'Class:OAuthClientAzure/Attribute:used_for_smtp/Value:no' => 'No~~',
+));
 
 //
 // Class: OAuthClientGoogle
 //
-Dict::Add('CS CZ', 'Czech', 'Čeština', [
+
+Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:OAuthClientGoogle' => 'OAuth client for Google~~',
 	'Class:OAuthClientGoogle/Name' => '%1$s (%2$s)~~',
-]);
-
+	'Class:OAuthClientGoogle/Attribute:scope' => 'Scope~~',
+	'Class:OAuthClientGoogle/Attribute:scope+' => 'Usually default selection is appropriate~~',
+	'Class:OAuthClientGoogle/Attribute:scope/Value:SMTP' => 'SMTP~~',
+	'Class:OAuthClientGoogle/Attribute:scope/Value:SMTP+' => '~~',
+	'Class:OAuthClientGoogle/Attribute:scope/Value:IMAP' => 'IMAP~~',
+	'Class:OAuthClientGoogle/Attribute:scope/Value:IMAP+' => '~~',
+	'Class:OAuthClientGoogle/Attribute:advanced_scope' => 'Advanced scope~~',
+	'Class:OAuthClientGoogle/Attribute:advanced_scope+' => 'As soon as you enter something here it takes precedence on the “Scope” selection which is then ignored~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope' => 'Used scope~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope+' => '~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope/Value:simple' => 'Simple~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope/Value:simple+' => '~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope/Value:advanced' => 'Advanced~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope/Value:advanced+' => '~~',
+	'Class:OAuthClientGoogle/Attribute:used_for_smtp' => 'Used for SMTP~~',
+	'Class:OAuthClientGoogle/Attribute:used_for_smtp+' => 'At least one OAuth client must have this flag to “Yes”, if you want iTop to use it for sending mails~~',
+	'Class:OAuthClientGoogle/Attribute:used_for_smtp/Value:yes' => 'Yes~~',
+	'Class:OAuthClientGoogle/Attribute:used_for_smtp/Value:no' => 'No~~',
+));
diff --git a/datamodels/2.x/itop-oauth-client/da.dict.itop-oauth-client.php b/datamodels/2.x/itop-oauth-client/da.dict.itop-oauth-client.php
index 6d593294c1..61a80fc163 100644
--- a/datamodels/2.x/itop-oauth-client/da.dict.itop-oauth-client.php
+++ b/datamodels/2.x/itop-oauth-client/da.dict.itop-oauth-client.php
@@ -5,22 +5,24 @@
  * @copyright   Copyright (C) 2013 XXXXX
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
-
 Dict::Add('DA DA', 'Danish', 'Dansk', [
 	'Menu:CreateMailbox' => 'Create a mailbox...~~',
 	'Menu:OAuthClient' => 'OAuth Client~~',
 	'Menu:OAuthClient+' => '~~',
 	'Menu:GenerateTokens' => 'Generate access tokens...~~',
 	'Menu:RegenerateTokens' => 'Regenerate access tokens...~~',
-
 	'itop-oauth-client/Operation:CreateMailBox/Title' => 'Mailbox creation~~',
-
 	'itop-oauth-client:UsedForSMTP' => 'This OAuth client is used for SMTP~~',
 	'itop-oauth-client:TestSMTP' => 'Email send test~~',
 	'itop-oauth-client:MissingOAuthClient' => 'Missing Oauth client for user name %1$s~~',
 	'itop-oauth-client:Message:MissingToken' => 'Generate access token before using this OAuth client~~',
+	'itop-oauth-client:Message:RegenerateToken' => 'Regenerate access token to to take into account the changes~~',
 	'itop-oauth-client:Message:TokenCreated' => 'Access token created~~',
 	'itop-oauth-client:Message:TokenRecreated' => 'Access token regenerated~~',
+	'itop-oauth-client:Message:TokenError' => 'Access token not generated due to server error~~',
+	'OAuthClient:Name/UseForSMTPMustBeUnique' => 'The combination Login (%1$s) and Use for SMTP (%2$s) has already be used for OAuth Client~~',
+	'OAuthClient:baseinfo' => 'Base Information~~',
+	'OAuthClient:scope' => 'Scope~~',
 ]);
 
 //
@@ -35,6 +37,10 @@ Dict::Add('DA DA', 'Danish', 'Dansk', [
 	'Class:OAuthClient/Attribute:name+' => '~~',
 	'Class:OAuthClient/Attribute:scope' => 'Scope~~',
 	'Class:OAuthClient/Attribute:scope+' => '~~',
+	'Class:OAuthClient/Attribute:status' => 'Status~~',
+	'Class:OAuthClient/Attribute:status+' => 'After creation, use the action “Generate access token” to be able to use this OAuth client~~',
+	'Class:OAuthClient/Attribute:status/Value:active' => 'Access token generated~~',
+	'Class:OAuthClient/Attribute:status/Value:inactive' => 'No Access token~~',
 	'Class:OAuthClient/Attribute:description' => 'Description~~',
 	'Class:OAuthClient/Attribute:description+' => '~~',
 	'Class:OAuthClient/Attribute:client_id' => 'Client id~~',
@@ -52,23 +58,59 @@ Dict::Add('DA DA', 'Danish', 'Dansk', [
 	'Class:OAuthClient/Attribute:redirect_url' => 'Redirect url~~',
 	'Class:OAuthClient/Attribute:redirect_url+' => '~~',
 	'Class:OAuthClient/Attribute:mailbox_list' => 'Mailbox list~~',
-	'Class:OAuthClient/Attribute:mailbox_list+' => '~~',
+	'Class:OAuthClient/Attribute:mailbox_list+' => '~~'
 ]);
 
 //
 // Class: OAuthClientAzure
 //
-Dict::Add('DA DA', 'Danish', 'Dansk', [
+
+Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:OAuthClientAzure' => 'OAuth client for Microsoft Azure~~',
 	'Class:OAuthClientAzure/Name' => '%1$s (%2$s)~~',
-
-]);
+	'Class:OAuthClientAzure/Attribute:scope' => 'Scope~~',
+	'Class:OAuthClientAzure/Attribute:scope+' => 'Usually default selection is appropriate~~',
+	'Class:OAuthClientAzure/Attribute:scope/Value:SMTP' => 'SMTP~~',
+	'Class:OAuthClientAzure/Attribute:scope/Value:SMTP+' => '~~',
+	'Class:OAuthClientAzure/Attribute:scope/Value:IMAP' => 'IMAP~~',
+	'Class:OAuthClientAzure/Attribute:scope/Value:IMAP+' => '~~',
+	'Class:OAuthClientAzure/Attribute:advanced_scope' => 'Advanced scope~~',
+	'Class:OAuthClientAzure/Attribute:advanced_scope+' => 'As soon as you enter something here it takes precedence on the “Scope” selection which is then ignored~~',
+	'Class:OAuthClientAzure/Attribute:used_scope' => 'Used scope~~',
+	'Class:OAuthClientAzure/Attribute:used_scope+' => '~~',
+	'Class:OAuthClientAzure/Attribute:used_scope/Value:simple' => 'Simple~~',
+	'Class:OAuthClientAzure/Attribute:used_scope/Value:simple+' => '~~',
+	'Class:OAuthClientAzure/Attribute:used_scope/Value:advanced' => 'Advanced~~',
+	'Class:OAuthClientAzure/Attribute:used_scope/Value:advanced+' => '~~',
+	'Class:OAuthClientAzure/Attribute:used_for_smtp' => 'Used for SMTP~~',
+	'Class:OAuthClientAzure/Attribute:used_for_smtp+' => 'At least one OAuth client must have this flag to “Yes”, if you want iTop to use it for sending mails~~',
+	'Class:OAuthClientAzure/Attribute:used_for_smtp/Value:yes' => 'Yes~~',
+	'Class:OAuthClientAzure/Attribute:used_for_smtp/Value:no' => 'No~~',
+));
 
 //
 // Class: OAuthClientGoogle
 //
-Dict::Add('DA DA', 'Danish', 'Dansk', [
+
+Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:OAuthClientGoogle' => 'OAuth client for Google~~',
 	'Class:OAuthClientGoogle/Name' => '%1$s (%2$s)~~',
-]);
-
+	'Class:OAuthClientGoogle/Attribute:scope' => 'Scope~~',
+	'Class:OAuthClientGoogle/Attribute:scope+' => 'Usually default selection is appropriate~~',
+	'Class:OAuthClientGoogle/Attribute:scope/Value:SMTP' => 'SMTP~~',
+	'Class:OAuthClientGoogle/Attribute:scope/Value:SMTP+' => '~~',
+	'Class:OAuthClientGoogle/Attribute:scope/Value:IMAP' => 'IMAP~~',
+	'Class:OAuthClientGoogle/Attribute:scope/Value:IMAP+' => '~~',
+	'Class:OAuthClientGoogle/Attribute:advanced_scope' => 'Advanced scope~~',
+	'Class:OAuthClientGoogle/Attribute:advanced_scope+' => 'As soon as you enter something here it takes precedence on the “Scope” selection which is then ignored~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope' => 'Used scope~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope+' => '~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope/Value:simple' => 'Simple~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope/Value:simple+' => '~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope/Value:advanced' => 'Advanced~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope/Value:advanced+' => '~~',
+	'Class:OAuthClientGoogle/Attribute:used_for_smtp' => 'Used for SMTP~~',
+	'Class:OAuthClientGoogle/Attribute:used_for_smtp+' => 'At least one OAuth client must have this flag to “Yes”, if you want iTop to use it for sending mails~~',
+	'Class:OAuthClientGoogle/Attribute:used_for_smtp/Value:yes' => 'Yes~~',
+	'Class:OAuthClientGoogle/Attribute:used_for_smtp/Value:no' => 'No~~',
+));
diff --git a/datamodels/2.x/itop-oauth-client/datamodel.itop-oauth-client.xml b/datamodels/2.x/itop-oauth-client/datamodel.itop-oauth-client.xml
index db79a1b3d1..56bab83926 100644
--- a/datamodels/2.x/itop-oauth-client/datamodel.itop-oauth-client.xml
+++ b/datamodels/2.x/itop-oauth-client/datamodel.itop-oauth-client.xml
@@ -112,8 +112,6 @@
           <ext_key_to_me>oauth_client_id</ext_key_to_me>
           <count_min>0</count_min>
           <count_max>0</count_max>
-          <relation_type>link</relation_type>
-          <read_only>false</read_only>
         </field>
       </fields>
       <methods>
diff --git a/datamodels/2.x/itop-oauth-client/de.dict.itop-oauth-client.php b/datamodels/2.x/itop-oauth-client/de.dict.itop-oauth-client.php
index e8514312b6..318f1f06f5 100644
--- a/datamodels/2.x/itop-oauth-client/de.dict.itop-oauth-client.php
+++ b/datamodels/2.x/itop-oauth-client/de.dict.itop-oauth-client.php
@@ -5,22 +5,24 @@
  * @copyright   Copyright (C) 2013 XXXXX
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
-
 Dict::Add('DE DE', 'German', 'Deutsch', [
 	'Menu:CreateMailbox' => 'Mailpostfach erstellen...',
 	'Menu:OAuthClient' => 'OAuth-Client',
 	'Menu:OAuthClient+' => '',
-	'Menu:GenerateTokens' => 'Zugriffs-Token generieren...',
-	'Menu:RegenerateTokens' => 'Zugriffs-Token neu generieren...',
-
+	'Menu:GenerateTokens' => 'Zugriffstoken generieren...',
+	'Menu:RegenerateTokens' => 'Zugriffstoken neu generieren...',
 	'itop-oauth-client/Operation:CreateMailBox/Title' => 'Mailpostfach-Erstellung',
-
 	'itop-oauth-client:UsedForSMTP' => 'Dieser OAuth-Client wird für SMTP verwendet',
 	'itop-oauth-client:TestSMTP' => 'Mail-Versand testen',
 	'itop-oauth-client:MissingOAuthClient' => 'Fehlender OAuth-Client für den Benutzernamen %1$s',
-	'itop-oauth-client:Message:MissingToken' => 'Bitte Zugriffs-Token generieren bevor der OAuth-Client verwendet wird',
-	'itop-oauth-client:Message:TokenCreated' => 'Zugriffs-Token erstellt',
-	'itop-oauth-client:Message:TokenRecreated' => 'Zugriffs-Token neu erstellt',
+	'itop-oauth-client:Message:MissingToken' => 'Bitte Zugriffstoken generieren bevor der OAuth-Client verwendet wird',
+	'itop-oauth-client:Message:RegenerateToken' => 'Generieren Sie das Zugriffstoken neu, um die Änderungen zu berücksichtigen',
+	'itop-oauth-client:Message:TokenCreated' => 'Zugriffstoken erstellt',
+	'itop-oauth-client:Message:TokenRecreated' => 'Zugriffstoken neu erstellt',
+	'itop-oauth-client:Message:TokenError' => 'Das Zugriffstoken wurde aufgrund eines Serverfehlers nicht generiert.',
+	'OAuthClient:Name/UseForSMTPMustBeUnique' => 'Die Kombination aus "Login" (%1$s) und "Verwendung für SMTP" (%2$s) existiert bereits.',
+	'OAuthClient:baseinfo' => 'Allgemeine Informationen',
+	'OAuthClient:scope' => 'Scope',
 ]);
 
 //
@@ -35,40 +37,84 @@ Dict::Add('DE DE', 'German', 'Deutsch', [
 	'Class:OAuthClient/Attribute:name+' => '',
 	'Class:OAuthClient/Attribute:scope' => 'Scope',
 	'Class:OAuthClient/Attribute:scope+' => '',
+	'Class:OAuthClient/Attribute:status' => 'Status',
+	'Class:OAuthClient/Attribute:status+' => 'Führen Sie nach der Objekterstellung die Aktion "Zugriffstoken generieren..." aus, um diesen oAuth-Client zu aktivieren.',
+	'Class:OAuthClient/Attribute:status/Value:active' => 'Zugriffstoken erstellt',
+	'Class:OAuthClient/Attribute:status/Value:inactive' => 'Kein Zugriffstoken',
 	'Class:OAuthClient/Attribute:description' => 'Beschreibung',
 	'Class:OAuthClient/Attribute:description+' => '',
 	'Class:OAuthClient/Attribute:client_id' => 'Client ID',
-	'Class:OAuthClient/Attribute:client_id+' => '',
+	'Class:OAuthClient/Attribute:client_id+' => 'Eine lange Zeichenfolge, die durch den oAuth2-Provider bereitgestellt wird',
 	'Class:OAuthClient/Attribute:client_secret' => 'Client Secret',
-	'Class:OAuthClient/Attribute:client_secret+' => '',
+	'Class:OAuthClient/Attribute:client_secret+' => 'Eine weitere lange Zeichenfolge, die durch den oAuth2-Provider bereitgestellt wird',
 	'Class:OAuthClient/Attribute:refresh_token' => 'Erneuerungs-Token',
 	'Class:OAuthClient/Attribute:refresh_token+' => '',
 	'Class:OAuthClient/Attribute:refresh_token_expiration' => 'Erneuerungs-Token Ablaufzeitpunkt',
 	'Class:OAuthClient/Attribute:refresh_token_expiration+' => '',
-	'Class:OAuthClient/Attribute:token' => 'Zugriffs-Token',
+	'Class:OAuthClient/Attribute:token' => 'Zugriffstoken',
 	'Class:OAuthClient/Attribute:token+' => '',
-	'Class:OAuthClient/Attribute:token_expiration' => 'Zugriffs-Token Ablaufszeitpunkt',
+	'Class:OAuthClient/Attribute:token_expiration' => 'Zugriffstoken Ablaufszeitpunkt',
 	'Class:OAuthClient/Attribute:token_expiration+' => '',
 	'Class:OAuthClient/Attribute:redirect_url' => 'Umleitungs-URL',
-	'Class:OAuthClient/Attribute:redirect_url+' => '',
+	'Class:OAuthClient/Attribute:redirect_url+' => <<<EOF
+Diese URL muss in die oAuth2-Konfiguration des Providers kopiert werden.
+Löschen Sie das Feld, um den Standardwert neu zu berechnen.
+EOF
+,
 	'Class:OAuthClient/Attribute:mailbox_list' => 'Mailpostfächer',
-	'Class:OAuthClient/Attribute:mailbox_list+' => '',
+	'Class:OAuthClient/Attribute:mailbox_list+' => ''
 ]);
 
 //
 // Class: OAuthClientAzure
 //
-Dict::Add('DE DE', 'German', 'Deutsch', [
+
+Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:OAuthClientAzure' => 'OAuth-Client für Microsoft Azure',
 	'Class:OAuthClientAzure/Name' => '%1$s (%2$s)',
-
-]);
+	'Class:OAuthClientAzure/Attribute:scope' => 'Scope',
+	'Class:OAuthClientAzure/Attribute:scope+' => 'Normalerweise ist die Standardauswahl ausreichend.',
+	'Class:OAuthClientAzure/Attribute:scope/Value:SMTP' => 'SMTP',
+	'Class:OAuthClientAzure/Attribute:scope/Value:SMTP+' => '',
+	'Class:OAuthClientAzure/Attribute:scope/Value:IMAP' => 'IMAP',
+	'Class:OAuthClientAzure/Attribute:scope/Value:IMAP+' => '',
+	'Class:OAuthClientAzure/Attribute:advanced_scope' => 'Erweiterter Scope',
+	'Class:OAuthClientAzure/Attribute:advanced_scope+' => 'Sobald Sie hier etwas eingeben, hat es Vorrang vor der Auswahl im Feld "Scope", die dann ignoriert wird.',
+	'Class:OAuthClientAzure/Attribute:used_scope' => 'Angewendeter Scope',
+	'Class:OAuthClientAzure/Attribute:used_scope+' => '',
+	'Class:OAuthClientAzure/Attribute:used_scope/Value:simple' => 'Einfach',
+	'Class:OAuthClientAzure/Attribute:used_scope/Value:simple+' => '',
+	'Class:OAuthClientAzure/Attribute:used_scope/Value:advanced' => 'Erweitert',
+	'Class:OAuthClientAzure/Attribute:used_scope/Value:advanced+' => '',
+	'Class:OAuthClientAzure/Attribute:used_for_smtp' => 'Verwendung für SMTP',
+	'Class:OAuthClientAzure/Attribute:used_for_smtp+' => 'Mindestens ein oAuth-Client muss dieses Flag auf "Ja" gesetzt haben, um über diesen Weg Mails durch iTop senden zu lassen.',
+	'Class:OAuthClientAzure/Attribute:used_for_smtp/Value:yes' => 'Ja',
+	'Class:OAuthClientAzure/Attribute:used_for_smtp/Value:no' => 'Nein',
+));
 
 //
 // Class: OAuthClientGoogle
 //
-Dict::Add('DE DE', 'German', 'Deutsch', [
+
+Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:OAuthClientGoogle' => 'OAuth-Client für Google',
 	'Class:OAuthClientGoogle/Name' => '%1$s (%2$s)',
-]);
-
+	'Class:OAuthClientGoogle/Attribute:scope' => 'Scope',
+	'Class:OAuthClientGoogle/Attribute:scope+' => 'Normalerweise ist die Standardauswahl ausreichend.',
+	'Class:OAuthClientGoogle/Attribute:scope/Value:SMTP' => 'SMTP',
+	'Class:OAuthClientGoogle/Attribute:scope/Value:SMTP+' => '',
+	'Class:OAuthClientGoogle/Attribute:scope/Value:IMAP' => 'IMAP',
+	'Class:OAuthClientGoogle/Attribute:scope/Value:IMAP+' => '',
+	'Class:OAuthClientGoogle/Attribute:advanced_scope' => 'Erweiterter Scope',
+	'Class:OAuthClientGoogle/Attribute:advanced_scope+' => 'Sobald Sie hier etwas eingeben, hat es Vorrang vor der Auswahl im Feld "Scope", die dann ignoriert wird.',
+	'Class:OAuthClientGoogle/Attribute:used_scope' => 'Angewendeter Scope',
+	'Class:OAuthClientGoogle/Attribute:used_scope+' => '',
+	'Class:OAuthClientGoogle/Attribute:used_scope/Value:simple' => 'Einfach',
+	'Class:OAuthClientGoogle/Attribute:used_scope/Value:simple+' => '',
+	'Class:OAuthClientGoogle/Attribute:used_scope/Value:advanced' => 'Erweitert',
+	'Class:OAuthClientGoogle/Attribute:used_scope/Value:advanced+' => '',
+	'Class:OAuthClientGoogle/Attribute:used_for_smtp' => 'Verwendung für SMTP',
+	'Class:OAuthClientGoogle/Attribute:used_for_smtp+' => 'Mindestens ein oAuth-Client muss dieses Flag auf "Ja" gesetzt haben, um über diesen Weg Mails durch iTop senden zu lassen.',
+	'Class:OAuthClientGoogle/Attribute:used_for_smtp/Value:yes' => 'Ja',
+	'Class:OAuthClientGoogle/Attribute:used_for_smtp/Value:no' => 'Nein',
+));
diff --git a/datamodels/2.x/itop-oauth-client/es_cr.dict.itop-oauth-client.php b/datamodels/2.x/itop-oauth-client/es_cr.dict.itop-oauth-client.php
index a6c5be5844..fd9be5ed89 100644
--- a/datamodels/2.x/itop-oauth-client/es_cr.dict.itop-oauth-client.php
+++ b/datamodels/2.x/itop-oauth-client/es_cr.dict.itop-oauth-client.php
@@ -5,29 +5,31 @@
  * @copyright   Copyright (C) 2013 XXXXX
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
-
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', [
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Menu:CreateMailbox' => 'Create a mailbox...~~',
 	'Menu:OAuthClient' => 'OAuth client~~',
 	'Menu:OAuthClient+' => '~~',
 	'Menu:GenerateTokens' => 'Generate access tokens...~~',
 	'Menu:RegenerateTokens' => 'Regenerate access tokens...~~',
-
 	'itop-oauth-client/Operation:CreateMailBox/Title' => 'Mailbox creation~~',
-
 	'itop-oauth-client:UsedForSMTP' => 'This OAuth client is used for SMTP~~',
 	'itop-oauth-client:TestSMTP' => 'Email send test~~',
 	'itop-oauth-client:MissingOAuthClient' => 'Missing Oauth client for user name %1$s~~',
 	'itop-oauth-client:Message:MissingToken' => 'Generate access token before using this OAuth client~~',
+	'itop-oauth-client:Message:RegenerateToken' => 'Regenerate access token to to take into account the changes~~',
 	'itop-oauth-client:Message:TokenCreated' => 'Access token created~~',
 	'itop-oauth-client:Message:TokenRecreated' => 'Access token regenerated~~',
+	'itop-oauth-client:Message:TokenError' => 'Access token not generated due to server error~~',
+	'OAuthClient:Name/UseForSMTPMustBeUnique' => 'The combination Login (%1$s) and Use for SMTP (%2$s) has already be used for OAuth Client~~',
+	'OAuthClient:baseinfo' => 'Base Information~~',
+	'OAuthClient:scope' => 'Scope~~',
 ]);
 
 //
 // Class: OAuthClient
 //
 
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', [
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:OAuthClient' => 'OAuth Client~~',
 	'Class:OAuthClient/Attribute:provider' => 'Provider~~',
 	'Class:OAuthClient/Attribute:provider+' => '~~',
@@ -35,6 +37,10 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', [
 	'Class:OAuthClient/Attribute:name+' => '~~',
 	'Class:OAuthClient/Attribute:scope' => 'Scope~~',
 	'Class:OAuthClient/Attribute:scope+' => '~~',
+	'Class:OAuthClient/Attribute:status' => 'Status~~',
+	'Class:OAuthClient/Attribute:status+' => 'After creation, use the action “Generate access token” to be able to use this OAuth client~~',
+	'Class:OAuthClient/Attribute:status/Value:active' => 'Access token generated~~',
+	'Class:OAuthClient/Attribute:status/Value:inactive' => 'No Access token~~',
 	'Class:OAuthClient/Attribute:description' => 'Description~~',
 	'Class:OAuthClient/Attribute:description+' => '~~',
 	'Class:OAuthClient/Attribute:client_id' => 'Client id~~',
@@ -52,23 +58,59 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', [
 	'Class:OAuthClient/Attribute:redirect_url' => 'Redirect url~~',
 	'Class:OAuthClient/Attribute:redirect_url+' => '~~',
 	'Class:OAuthClient/Attribute:mailbox_list' => 'Mailbox list~~',
-	'Class:OAuthClient/Attribute:mailbox_list+' => '~~',
+	'Class:OAuthClient/Attribute:mailbox_list+' => '~~'
 ]);
 
 //
 // Class: OAuthClientAzure
 //
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', [
+
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:OAuthClientAzure' => 'OAuth client for Microsoft Azure~~',
 	'Class:OAuthClientAzure/Name' => '%1$s (%2$s)~~',
-
-]);
+	'Class:OAuthClientAzure/Attribute:scope' => 'Scope~~',
+	'Class:OAuthClientAzure/Attribute:scope+' => 'Usually default selection is appropriate~~',
+	'Class:OAuthClientAzure/Attribute:scope/Value:SMTP' => 'SMTP~~',
+	'Class:OAuthClientAzure/Attribute:scope/Value:SMTP+' => '~~',
+	'Class:OAuthClientAzure/Attribute:scope/Value:IMAP' => 'IMAP~~',
+	'Class:OAuthClientAzure/Attribute:scope/Value:IMAP+' => '~~',
+	'Class:OAuthClientAzure/Attribute:advanced_scope' => 'Advanced scope~~',
+	'Class:OAuthClientAzure/Attribute:advanced_scope+' => 'As soon as you enter something here it takes precedence on the “Scope” selection which is then ignored~~',
+	'Class:OAuthClientAzure/Attribute:used_scope' => 'Used scope~~',
+	'Class:OAuthClientAzure/Attribute:used_scope+' => '~~',
+	'Class:OAuthClientAzure/Attribute:used_scope/Value:simple' => 'Simple~~',
+	'Class:OAuthClientAzure/Attribute:used_scope/Value:simple+' => '~~',
+	'Class:OAuthClientAzure/Attribute:used_scope/Value:advanced' => 'Advanced~~',
+	'Class:OAuthClientAzure/Attribute:used_scope/Value:advanced+' => '~~',
+	'Class:OAuthClientAzure/Attribute:used_for_smtp' => 'Used for SMTP~~',
+	'Class:OAuthClientAzure/Attribute:used_for_smtp+' => 'At least one OAuth client must have this flag to “Yes”, if you want iTop to use it for sending mails~~',
+	'Class:OAuthClientAzure/Attribute:used_for_smtp/Value:yes' => 'Yes~~',
+	'Class:OAuthClientAzure/Attribute:used_for_smtp/Value:no' => 'No~~',
+));
 
 //
 // Class: OAuthClientGoogle
 //
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', [
+
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:OAuthClientGoogle' => 'OAuth client for Google~~',
 	'Class:OAuthClientGoogle/Name' => '%1$s (%2$s)~~',
-]);
-
+	'Class:OAuthClientGoogle/Attribute:scope' => 'Scope~~',
+	'Class:OAuthClientGoogle/Attribute:scope+' => 'Usually default selection is appropriate~~',
+	'Class:OAuthClientGoogle/Attribute:scope/Value:SMTP' => 'SMTP~~',
+	'Class:OAuthClientGoogle/Attribute:scope/Value:SMTP+' => '~~',
+	'Class:OAuthClientGoogle/Attribute:scope/Value:IMAP' => 'IMAP~~',
+	'Class:OAuthClientGoogle/Attribute:scope/Value:IMAP+' => '~~',
+	'Class:OAuthClientGoogle/Attribute:advanced_scope' => 'Advanced scope~~',
+	'Class:OAuthClientGoogle/Attribute:advanced_scope+' => 'As soon as you enter something here it takes precedence on the “Scope” selection which is then ignored~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope' => 'Used scope~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope+' => '~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope/Value:simple' => 'Simple~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope/Value:simple+' => '~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope/Value:advanced' => 'Advanced~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope/Value:advanced+' => '~~',
+	'Class:OAuthClientGoogle/Attribute:used_for_smtp' => 'Used for SMTP~~',
+	'Class:OAuthClientGoogle/Attribute:used_for_smtp+' => 'At least one OAuth client must have this flag to “Yes”, if you want iTop to use it for sending mails~~',
+	'Class:OAuthClientGoogle/Attribute:used_for_smtp/Value:yes' => 'Yes~~',
+	'Class:OAuthClientGoogle/Attribute:used_for_smtp/Value:no' => 'No~~',
+));
diff --git a/datamodels/2.x/itop-oauth-client/fr.dict.itop-oauth-client.php b/datamodels/2.x/itop-oauth-client/fr.dict.itop-oauth-client.php
index dfcb5f3ae8..518ab87a85 100644
--- a/datamodels/2.x/itop-oauth-client/fr.dict.itop-oauth-client.php
+++ b/datamodels/2.x/itop-oauth-client/fr.dict.itop-oauth-client.php
@@ -5,16 +5,13 @@
  * @copyright   Copyright (C) 2013 XXXXX
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
-
 Dict::Add('FR FR', 'French', 'Français', [
 	'Menu:CreateMailbox' => 'Créer une boite mail...',
 	'Menu:OAuthClient' => 'Client OAuth',
 	'Menu:OAuthClient+' => '',
 	'Menu:GenerateTokens' => 'Créer un jeton d\'accès...',
 	'Menu:RegenerateTokens' => 'Recréer un jeton d\'accès..',
-
 	'itop-oauth-client/Operation:CreateMailBox/Title' => 'Création de boite mail',
-
 	'itop-oauth-client:UsedForSMTP' => 'Ce client Oauth est utilisé pour SMTP',
 	'itop-oauth-client:TestSMTP' => 'Tester l\'envoi de mail',
 	'itop-oauth-client:MissingOAuthClient' => 'Il n\'y a pas de client OAuth pour l\'utilisateur %1$s',
@@ -23,9 +20,7 @@ Dict::Add('FR FR', 'French', 'Français', [
 	'itop-oauth-client:Message:TokenCreated' => 'Le jeton d\'accès à été créé',
 	'itop-oauth-client:Message:TokenRecreated' => 'Le jeton d\'accès à été renouvelé',
 	'itop-oauth-client:Message:TokenError' => 'Le jeton d\'accès n\'a pas été généré à cause d`une erreur serveur',
-
 	'OAuthClient:Name/UseForSMTPMustBeUnique' => 'La combinaison Login (%1$s) and Utilisé pour SMTP (%2$s) a déjà été utilisée pour OAuth Client',
-
 	'OAuthClient:baseinfo' => 'Information',
 	'OAuthClient:scope' => 'Scope',
 ]);
@@ -63,6 +58,7 @@ Dict::Add('FR FR', 'French', 'Français', [
 Cet URL doit être recopiée dans la configuration OAuth2 de votre fournisseur
 Pour recalculer la valeur par défaut, il faut effacer le champ
 EOF
+
 ,
 	'Class:OAuthClient/Attribute:mailbox_list' => 'Mailbox list',
 	'Class:OAuthClient/Attribute:mailbox_list+' => '',
@@ -113,6 +109,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:OAuthClientGoogle/Attribute:used_scope' => 'Niveaux d\'accès utilisés',
 	'Class:OAuthClientGoogle/Attribute:used_scope+' => '',
 	'Class:OAuthClientGoogle/Attribute:used_scope/Value:simple' => 'Simple',
+	'Class:OAuthClientGoogle/Attribute:used_scope/Value:simple+' => '',
 	'Class:OAuthClientGoogle/Attribute:used_scope/Value:advanced' => 'Avancé',
 	'Class:OAuthClientGoogle/Attribute:used_scope/Value:advanced+' => '',
 	'Class:OAuthClientGoogle/Attribute:used_for_smtp' => 'Utilisé pour SMTP',
@@ -120,7 +117,6 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:OAuthClientGoogle/Attribute:used_for_smtp/Value:yes' => 'Oui',
 	'Class:OAuthClientGoogle/Attribute:used_for_smtp/Value:no' => 'Non',
 ));
-
 // 1:n relations custom labels for tooltip and pop-up title
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:OAuthClient/Attribute:mailbox_list/UI:Links:Create:Button+' => 'Créer une %4$s',
@@ -128,5 +124,5 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:OAuthClient/Attribute:mailbox_list/UI:Links:Remove:Button+' => 'Retirer cette %4$s',
 	'Class:OAuthClient/Attribute:mailbox_list/UI:Links:Remove:Modal:Title' => 'Retirer cette %4$s de son %1$s',
 	'Class:OAuthClient/Attribute:mailbox_list/UI:Links:Delete:Button+' => 'Supprimer cette %4$s',
-	'Class:OAuthClient/Attribute:mailbox_list/UI:Links:Delete:Modal:Title' => 'Supprimer une %4$s',
-));
\ No newline at end of file
+	'Class:OAuthClient/Attribute:mailbox_list/UI:Links:Delete:Modal:Title' => 'Supprimer une %4$s'
+));
diff --git a/datamodels/2.x/itop-oauth-client/hu.dict.itop-oauth-client.php b/datamodels/2.x/itop-oauth-client/hu.dict.itop-oauth-client.php
index 1439cd98c6..59bfabaaec 100644
--- a/datamodels/2.x/itop-oauth-client/hu.dict.itop-oauth-client.php
+++ b/datamodels/2.x/itop-oauth-client/hu.dict.itop-oauth-client.php
@@ -5,22 +5,24 @@
  * @copyright   Copyright (C) 2013 XXXXX
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
-
 Dict::Add('HU HU', 'Hungarian', 'Magyar', [
 	'Menu:CreateMailbox' => 'Postafiók létrehozása...',
 	'Menu:OAuthClient' => 'OAuth ügyfél',
 	'Menu:OAuthClient+' => '~~',
 	'Menu:GenerateTokens' => 'Hozzáférési tokenek generálása...',
 	'Menu:RegenerateTokens' => 'Hozzáférési tokenek újragenerálása...',
-
 	'itop-oauth-client/Operation:CreateMailBox/Title' => 'Postafiók létrehozás',
-
 	'itop-oauth-client:UsedForSMTP' => 'Ez az OAuth ügyfél SMTP-hez van használva',
 	'itop-oauth-client:TestSMTP' => 'Email tesztüzenet',
 	'itop-oauth-client:MissingOAuthClient' => 'Hiányzó Oauth ügyfél a %1$s felhasználóhoz',
 	'itop-oauth-client:Message:MissingToken' => 'Hozzáférési token generálása az OAuth ügyfél használata előtt',
+	'itop-oauth-client:Message:RegenerateToken' => 'Regenerate access token to to take into account the changes~~',
 	'itop-oauth-client:Message:TokenCreated' => 'Hozzáférési token kész',
 	'itop-oauth-client:Message:TokenRecreated' => 'Hozzáférési token újragenerálva',
+	'itop-oauth-client:Message:TokenError' => 'Access token not generated due to server error~~',
+	'OAuthClient:Name/UseForSMTPMustBeUnique' => 'The combination Login (%1$s) and Use for SMTP (%2$s) has already be used for OAuth Client~~',
+	'OAuthClient:baseinfo' => 'Base Information~~',
+	'OAuthClient:scope' => 'Scope~~',
 ]);
 
 //
@@ -35,6 +37,10 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', [
 	'Class:OAuthClient/Attribute:name+' => '~~',
 	'Class:OAuthClient/Attribute:scope' => 'Hatókör',
 	'Class:OAuthClient/Attribute:scope+' => '~~',
+	'Class:OAuthClient/Attribute:status' => 'Status~~',
+	'Class:OAuthClient/Attribute:status+' => 'After creation, use the action “Generate access token” to be able to use this OAuth client~~',
+	'Class:OAuthClient/Attribute:status/Value:active' => 'Access token generated~~',
+	'Class:OAuthClient/Attribute:status/Value:inactive' => 'No Access token~~',
 	'Class:OAuthClient/Attribute:description' => 'Leírás',
 	'Class:OAuthClient/Attribute:description+' => '~~',
 	'Class:OAuthClient/Attribute:client_id' => 'Ügyfél azonosító',
@@ -52,23 +58,59 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', [
 	'Class:OAuthClient/Attribute:redirect_url' => 'URL átirányítás',
 	'Class:OAuthClient/Attribute:redirect_url+' => '~~',
 	'Class:OAuthClient/Attribute:mailbox_list' => 'Postafiók lista',
-	'Class:OAuthClient/Attribute:mailbox_list+' => '~~',
+	'Class:OAuthClient/Attribute:mailbox_list+' => '~~'
 ]);
 
 //
 // Class: OAuthClientAzure
 //
-Dict::Add('HU HU', 'Hungarian', 'Magyar', [
+
+Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:OAuthClientAzure' => 'OAuth ügyfél Microsoft Azure-hoz',
 	'Class:OAuthClientAzure/Name' => '%1$s (%2$s)',
-
-]);
+	'Class:OAuthClientAzure/Attribute:scope' => 'Scope~~',
+	'Class:OAuthClientAzure/Attribute:scope+' => 'Usually default selection is appropriate~~',
+	'Class:OAuthClientAzure/Attribute:scope/Value:SMTP' => 'SMTP~~',
+	'Class:OAuthClientAzure/Attribute:scope/Value:SMTP+' => '~~',
+	'Class:OAuthClientAzure/Attribute:scope/Value:IMAP' => 'IMAP~~',
+	'Class:OAuthClientAzure/Attribute:scope/Value:IMAP+' => '~~',
+	'Class:OAuthClientAzure/Attribute:advanced_scope' => 'Advanced scope~~',
+	'Class:OAuthClientAzure/Attribute:advanced_scope+' => 'As soon as you enter something here it takes precedence on the “Scope” selection which is then ignored~~',
+	'Class:OAuthClientAzure/Attribute:used_scope' => 'Used scope~~',
+	'Class:OAuthClientAzure/Attribute:used_scope+' => '~~',
+	'Class:OAuthClientAzure/Attribute:used_scope/Value:simple' => 'Simple~~',
+	'Class:OAuthClientAzure/Attribute:used_scope/Value:simple+' => '~~',
+	'Class:OAuthClientAzure/Attribute:used_scope/Value:advanced' => 'Advanced~~',
+	'Class:OAuthClientAzure/Attribute:used_scope/Value:advanced+' => '~~',
+	'Class:OAuthClientAzure/Attribute:used_for_smtp' => 'Used for SMTP~~',
+	'Class:OAuthClientAzure/Attribute:used_for_smtp+' => 'At least one OAuth client must have this flag to “Yes”, if you want iTop to use it for sending mails~~',
+	'Class:OAuthClientAzure/Attribute:used_for_smtp/Value:yes' => 'Yes~~',
+	'Class:OAuthClientAzure/Attribute:used_for_smtp/Value:no' => 'No~~',
+));
 
 //
 // Class: OAuthClientGoogle
 //
-Dict::Add('HU HU', 'Hungarian', 'Magyar', [
+
+Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:OAuthClientGoogle' => 'OAuth ügyfél a Google-höz',
 	'Class:OAuthClientGoogle/Name' => '%1$s (%2$s)',
-]);
-
+	'Class:OAuthClientGoogle/Attribute:scope' => 'Scope~~',
+	'Class:OAuthClientGoogle/Attribute:scope+' => 'Usually default selection is appropriate~~',
+	'Class:OAuthClientGoogle/Attribute:scope/Value:SMTP' => 'SMTP~~',
+	'Class:OAuthClientGoogle/Attribute:scope/Value:SMTP+' => '~~',
+	'Class:OAuthClientGoogle/Attribute:scope/Value:IMAP' => 'IMAP~~',
+	'Class:OAuthClientGoogle/Attribute:scope/Value:IMAP+' => '~~',
+	'Class:OAuthClientGoogle/Attribute:advanced_scope' => 'Advanced scope~~',
+	'Class:OAuthClientGoogle/Attribute:advanced_scope+' => 'As soon as you enter something here it takes precedence on the “Scope” selection which is then ignored~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope' => 'Used scope~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope+' => '~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope/Value:simple' => 'Simple~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope/Value:simple+' => '~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope/Value:advanced' => 'Advanced~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope/Value:advanced+' => '~~',
+	'Class:OAuthClientGoogle/Attribute:used_for_smtp' => 'Used for SMTP~~',
+	'Class:OAuthClientGoogle/Attribute:used_for_smtp+' => 'At least one OAuth client must have this flag to “Yes”, if you want iTop to use it for sending mails~~',
+	'Class:OAuthClientGoogle/Attribute:used_for_smtp/Value:yes' => 'Yes~~',
+	'Class:OAuthClientGoogle/Attribute:used_for_smtp/Value:no' => 'No~~',
+));
diff --git a/datamodels/2.x/itop-oauth-client/it.dict.itop-oauth-client.php b/datamodels/2.x/itop-oauth-client/it.dict.itop-oauth-client.php
index d0580ac15c..53123cadf7 100644
--- a/datamodels/2.x/itop-oauth-client/it.dict.itop-oauth-client.php
+++ b/datamodels/2.x/itop-oauth-client/it.dict.itop-oauth-client.php
@@ -5,22 +5,24 @@
  * @copyright   Copyright (C) 2013 XXXXX
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
-
 Dict::Add('IT IT', 'Italian', 'Italiano', [
 	'Menu:CreateMailbox' => 'Create a mailbox...~~',
 	'Menu:OAuthClient' => 'OAuth client~~',
 	'Menu:OAuthClient+' => '~~',
 	'Menu:GenerateTokens' => 'Generate access tokens...~~',
 	'Menu:RegenerateTokens' => 'Regenerate access tokens...~~',
-
 	'itop-oauth-client/Operation:CreateMailBox/Title' => 'Mailbox creation~~',
-
 	'itop-oauth-client:UsedForSMTP' => 'This OAuth client is used for SMTP~~',
 	'itop-oauth-client:TestSMTP' => 'Email send test~~',
 	'itop-oauth-client:MissingOAuthClient' => 'Missing Oauth client for user name %1$s~~',
 	'itop-oauth-client:Message:MissingToken' => 'Generate access token before using this OAuth client~~',
+	'itop-oauth-client:Message:RegenerateToken' => 'Regenerate access token to to take into account the changes~~',
 	'itop-oauth-client:Message:TokenCreated' => 'Access token created~~',
 	'itop-oauth-client:Message:TokenRecreated' => 'Access token regenerated~~',
+	'itop-oauth-client:Message:TokenError' => 'Access token not generated due to server error~~',
+	'OAuthClient:Name/UseForSMTPMustBeUnique' => 'The combination Login (%1$s) and Use for SMTP (%2$s) has already be used for OAuth Client~~',
+	'OAuthClient:baseinfo' => 'Base Information~~',
+	'OAuthClient:scope' => 'Scope~~',
 ]);
 
 //
@@ -35,6 +37,10 @@ Dict::Add('IT IT', 'Italian', 'Italiano', [
 	'Class:OAuthClient/Attribute:name+' => '~~',
 	'Class:OAuthClient/Attribute:scope' => 'Scope~~',
 	'Class:OAuthClient/Attribute:scope+' => '~~',
+	'Class:OAuthClient/Attribute:status' => 'Status~~',
+	'Class:OAuthClient/Attribute:status+' => 'After creation, use the action “Generate access token” to be able to use this OAuth client~~',
+	'Class:OAuthClient/Attribute:status/Value:active' => 'Access token generated~~',
+	'Class:OAuthClient/Attribute:status/Value:inactive' => 'No Access token~~',
 	'Class:OAuthClient/Attribute:description' => 'Description~~',
 	'Class:OAuthClient/Attribute:description+' => '~~',
 	'Class:OAuthClient/Attribute:client_id' => 'Client id~~',
@@ -52,23 +58,59 @@ Dict::Add('IT IT', 'Italian', 'Italiano', [
 	'Class:OAuthClient/Attribute:redirect_url' => 'Redirect url~~',
 	'Class:OAuthClient/Attribute:redirect_url+' => '~~',
 	'Class:OAuthClient/Attribute:mailbox_list' => 'Mailbox list~~',
-	'Class:OAuthClient/Attribute:mailbox_list+' => '~~',
+	'Class:OAuthClient/Attribute:mailbox_list+' => '~~'
 ]);
 
 //
 // Class: OAuthClientAzure
 //
-Dict::Add('IT IT', 'Italian', 'Italiano', [
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:OAuthClientAzure' => 'OAuth client for Microsoft Azure~~',
 	'Class:OAuthClientAzure/Name' => '%1$s (%2$s)~~',
-
-]);
+	'Class:OAuthClientAzure/Attribute:scope' => 'Scope~~',
+	'Class:OAuthClientAzure/Attribute:scope+' => 'Usually default selection is appropriate~~',
+	'Class:OAuthClientAzure/Attribute:scope/Value:SMTP' => 'SMTP~~',
+	'Class:OAuthClientAzure/Attribute:scope/Value:SMTP+' => '~~',
+	'Class:OAuthClientAzure/Attribute:scope/Value:IMAP' => 'IMAP~~',
+	'Class:OAuthClientAzure/Attribute:scope/Value:IMAP+' => '~~',
+	'Class:OAuthClientAzure/Attribute:advanced_scope' => 'Advanced scope~~',
+	'Class:OAuthClientAzure/Attribute:advanced_scope+' => 'As soon as you enter something here it takes precedence on the “Scope” selection which is then ignored~~',
+	'Class:OAuthClientAzure/Attribute:used_scope' => 'Used scope~~',
+	'Class:OAuthClientAzure/Attribute:used_scope+' => '~~',
+	'Class:OAuthClientAzure/Attribute:used_scope/Value:simple' => 'Simple~~',
+	'Class:OAuthClientAzure/Attribute:used_scope/Value:simple+' => '~~',
+	'Class:OAuthClientAzure/Attribute:used_scope/Value:advanced' => 'Advanced~~',
+	'Class:OAuthClientAzure/Attribute:used_scope/Value:advanced+' => '~~',
+	'Class:OAuthClientAzure/Attribute:used_for_smtp' => 'Used for SMTP~~',
+	'Class:OAuthClientAzure/Attribute:used_for_smtp+' => 'At least one OAuth client must have this flag to “Yes”, if you want iTop to use it for sending mails~~',
+	'Class:OAuthClientAzure/Attribute:used_for_smtp/Value:yes' => 'Yes~~',
+	'Class:OAuthClientAzure/Attribute:used_for_smtp/Value:no' => 'No~~',
+));
 
 //
 // Class: OAuthClientGoogle
 //
-Dict::Add('IT IT', 'Italian', 'Italiano', [
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:OAuthClientGoogle' => 'OAuth client for Google~~',
 	'Class:OAuthClientGoogle/Name' => '%1$s (%2$s)~~',
-]);
-
+	'Class:OAuthClientGoogle/Attribute:scope' => 'Scope~~',
+	'Class:OAuthClientGoogle/Attribute:scope+' => 'Usually default selection is appropriate~~',
+	'Class:OAuthClientGoogle/Attribute:scope/Value:SMTP' => 'SMTP~~',
+	'Class:OAuthClientGoogle/Attribute:scope/Value:SMTP+' => '~~',
+	'Class:OAuthClientGoogle/Attribute:scope/Value:IMAP' => 'IMAP~~',
+	'Class:OAuthClientGoogle/Attribute:scope/Value:IMAP+' => '~~',
+	'Class:OAuthClientGoogle/Attribute:advanced_scope' => 'Advanced scope~~',
+	'Class:OAuthClientGoogle/Attribute:advanced_scope+' => 'As soon as you enter something here it takes precedence on the “Scope” selection which is then ignored~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope' => 'Used scope~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope+' => '~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope/Value:simple' => 'Simple~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope/Value:simple+' => '~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope/Value:advanced' => 'Advanced~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope/Value:advanced+' => '~~',
+	'Class:OAuthClientGoogle/Attribute:used_for_smtp' => 'Used for SMTP~~',
+	'Class:OAuthClientGoogle/Attribute:used_for_smtp+' => 'At least one OAuth client must have this flag to “Yes”, if you want iTop to use it for sending mails~~',
+	'Class:OAuthClientGoogle/Attribute:used_for_smtp/Value:yes' => 'Yes~~',
+	'Class:OAuthClientGoogle/Attribute:used_for_smtp/Value:no' => 'No~~',
+));
diff --git a/datamodels/2.x/itop-oauth-client/ja.dict.itop-oauth-client.php b/datamodels/2.x/itop-oauth-client/ja.dict.itop-oauth-client.php
index a42f8ab664..e8ccd0e7c8 100644
--- a/datamodels/2.x/itop-oauth-client/ja.dict.itop-oauth-client.php
+++ b/datamodels/2.x/itop-oauth-client/ja.dict.itop-oauth-client.php
@@ -5,22 +5,24 @@
  * @copyright   Copyright (C) 2013 XXXXX
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
-
 Dict::Add('JA JP', 'Japanese', '日本語', [
 	'Menu:CreateMailbox' => 'Create a mailbox...~~',
 	'Menu:OAuthClient' => 'OAuth client~~',
 	'Menu:OAuthClient+' => '~~',
 	'Menu:GenerateTokens' => 'Generate access tokens...~~',
 	'Menu:RegenerateTokens' => 'Regenerate access tokens...~~',
-
 	'itop-oauth-client/Operation:CreateMailBox/Title' => 'Mailbox creation~~',
-
 	'itop-oauth-client:UsedForSMTP' => 'This OAuth client is used for SMTP~~',
 	'itop-oauth-client:TestSMTP' => 'Email send test~~',
 	'itop-oauth-client:MissingOAuthClient' => 'Missing Oauth client for user name %1$s~~',
 	'itop-oauth-client:Message:MissingToken' => 'Generate access token before using this OAuth client~~',
+	'itop-oauth-client:Message:RegenerateToken' => 'Regenerate access token to to take into account the changes~~',
 	'itop-oauth-client:Message:TokenCreated' => 'Access token created~~',
 	'itop-oauth-client:Message:TokenRecreated' => 'Access token regenerated~~',
+	'itop-oauth-client:Message:TokenError' => 'Access token not generated due to server error~~',
+	'OAuthClient:Name/UseForSMTPMustBeUnique' => 'The combination Login (%1$s) and Use for SMTP (%2$s) has already be used for OAuth Client~~',
+	'OAuthClient:baseinfo' => 'Base Information~~',
+	'OAuthClient:scope' => 'Scope~~',
 ]);
 
 //
@@ -35,6 +37,10 @@ Dict::Add('JA JP', 'Japanese', '日本語', [
 	'Class:OAuthClient/Attribute:name+' => '~~',
 	'Class:OAuthClient/Attribute:scope' => 'Scope~~',
 	'Class:OAuthClient/Attribute:scope+' => '~~',
+	'Class:OAuthClient/Attribute:status' => 'Status~~',
+	'Class:OAuthClient/Attribute:status+' => 'After creation, use the action “Generate access token” to be able to use this OAuth client~~',
+	'Class:OAuthClient/Attribute:status/Value:active' => 'Access token generated~~',
+	'Class:OAuthClient/Attribute:status/Value:inactive' => 'No Access token~~',
 	'Class:OAuthClient/Attribute:description' => 'Description~~',
 	'Class:OAuthClient/Attribute:description+' => '~~',
 	'Class:OAuthClient/Attribute:client_id' => 'Client id~~',
@@ -52,23 +58,59 @@ Dict::Add('JA JP', 'Japanese', '日本語', [
 	'Class:OAuthClient/Attribute:redirect_url' => 'Redirect url~~',
 	'Class:OAuthClient/Attribute:redirect_url+' => '~~',
 	'Class:OAuthClient/Attribute:mailbox_list' => 'Mailbox list~~',
-	'Class:OAuthClient/Attribute:mailbox_list+' => '~~',
+	'Class:OAuthClient/Attribute:mailbox_list+' => '~~'
 ]);
 
 //
 // Class: OAuthClientAzure
 //
-Dict::Add('JA JP', 'Japanese', '日本語', [
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:OAuthClientAzure' => 'OAuth client for Microsoft Azure~~',
 	'Class:OAuthClientAzure/Name' => '%1$s (%2$s)~~',
-
-]);
+	'Class:OAuthClientAzure/Attribute:scope' => 'Scope~~',
+	'Class:OAuthClientAzure/Attribute:scope+' => 'Usually default selection is appropriate~~',
+	'Class:OAuthClientAzure/Attribute:scope/Value:SMTP' => 'SMTP~~',
+	'Class:OAuthClientAzure/Attribute:scope/Value:SMTP+' => '~~',
+	'Class:OAuthClientAzure/Attribute:scope/Value:IMAP' => 'IMAP~~',
+	'Class:OAuthClientAzure/Attribute:scope/Value:IMAP+' => '~~',
+	'Class:OAuthClientAzure/Attribute:advanced_scope' => 'Advanced scope~~',
+	'Class:OAuthClientAzure/Attribute:advanced_scope+' => 'As soon as you enter something here it takes precedence on the “Scope” selection which is then ignored~~',
+	'Class:OAuthClientAzure/Attribute:used_scope' => 'Used scope~~',
+	'Class:OAuthClientAzure/Attribute:used_scope+' => '~~',
+	'Class:OAuthClientAzure/Attribute:used_scope/Value:simple' => 'Simple~~',
+	'Class:OAuthClientAzure/Attribute:used_scope/Value:simple+' => '~~',
+	'Class:OAuthClientAzure/Attribute:used_scope/Value:advanced' => 'Advanced~~',
+	'Class:OAuthClientAzure/Attribute:used_scope/Value:advanced+' => '~~',
+	'Class:OAuthClientAzure/Attribute:used_for_smtp' => 'Used for SMTP~~',
+	'Class:OAuthClientAzure/Attribute:used_for_smtp+' => 'At least one OAuth client must have this flag to “Yes”, if you want iTop to use it for sending mails~~',
+	'Class:OAuthClientAzure/Attribute:used_for_smtp/Value:yes' => 'Yes~~',
+	'Class:OAuthClientAzure/Attribute:used_for_smtp/Value:no' => 'No~~',
+));
 
 //
 // Class: OAuthClientGoogle
 //
-Dict::Add('JA JP', 'Japanese', '日本語', [
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:OAuthClientGoogle' => 'OAuth client for Google~~',
 	'Class:OAuthClientGoogle/Name' => '%1$s (%2$s)~~',
-]);
-
+	'Class:OAuthClientGoogle/Attribute:scope' => 'Scope~~',
+	'Class:OAuthClientGoogle/Attribute:scope+' => 'Usually default selection is appropriate~~',
+	'Class:OAuthClientGoogle/Attribute:scope/Value:SMTP' => 'SMTP~~',
+	'Class:OAuthClientGoogle/Attribute:scope/Value:SMTP+' => '~~',
+	'Class:OAuthClientGoogle/Attribute:scope/Value:IMAP' => 'IMAP~~',
+	'Class:OAuthClientGoogle/Attribute:scope/Value:IMAP+' => '~~',
+	'Class:OAuthClientGoogle/Attribute:advanced_scope' => 'Advanced scope~~',
+	'Class:OAuthClientGoogle/Attribute:advanced_scope+' => 'As soon as you enter something here it takes precedence on the “Scope” selection which is then ignored~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope' => 'Used scope~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope+' => '~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope/Value:simple' => 'Simple~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope/Value:simple+' => '~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope/Value:advanced' => 'Advanced~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope/Value:advanced+' => '~~',
+	'Class:OAuthClientGoogle/Attribute:used_for_smtp' => 'Used for SMTP~~',
+	'Class:OAuthClientGoogle/Attribute:used_for_smtp+' => 'At least one OAuth client must have this flag to “Yes”, if you want iTop to use it for sending mails~~',
+	'Class:OAuthClientGoogle/Attribute:used_for_smtp/Value:yes' => 'Yes~~',
+	'Class:OAuthClientGoogle/Attribute:used_for_smtp/Value:no' => 'No~~',
+));
diff --git a/datamodels/2.x/itop-oauth-client/nl.dict.itop-oauth-client.php b/datamodels/2.x/itop-oauth-client/nl.dict.itop-oauth-client.php
index 79cc729035..f178eea2c1 100644
--- a/datamodels/2.x/itop-oauth-client/nl.dict.itop-oauth-client.php
+++ b/datamodels/2.x/itop-oauth-client/nl.dict.itop-oauth-client.php
@@ -5,22 +5,24 @@
  * @copyright   Copyright (C) 2013 XXXXX
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
-
 Dict::Add('NL NL', 'Dutch', 'Nederlands', [
 	'Menu:CreateMailbox' => 'Create a mailbox...~~',
 	'Menu:OAuthClient' => 'OAuth Client~~',
 	'Menu:OAuthClient+' => '~~',
 	'Menu:GenerateTokens' => 'Generate access tokens...~~',
 	'Menu:RegenerateTokens' => 'Regenerate access tokens...~~',
-
 	'itop-oauth-client/Operation:CreateMailBox/Title' => 'Mailbox creation~~',
-
 	'itop-oauth-client:UsedForSMTP' => 'This OAuth client is used for SMTP~~',
 	'itop-oauth-client:TestSMTP' => 'Email send test~~',
 	'itop-oauth-client:MissingOAuthClient' => 'Missing Oauth client for user name %1$s~~',
 	'itop-oauth-client:Message:MissingToken' => 'Generate access token before using this OAuth client~~',
+	'itop-oauth-client:Message:RegenerateToken' => 'Regenerate access token to to take into account the changes~~',
 	'itop-oauth-client:Message:TokenCreated' => 'Access token created~~',
 	'itop-oauth-client:Message:TokenRecreated' => 'Access token regenerated~~',
+	'itop-oauth-client:Message:TokenError' => 'Access token not generated due to server error~~',
+	'OAuthClient:Name/UseForSMTPMustBeUnique' => 'The combination Login (%1$s) and Use for SMTP (%2$s) has already be used for OAuth Client~~',
+	'OAuthClient:baseinfo' => 'Base Information~~',
+	'OAuthClient:scope' => 'Scope~~',
 ]);
 
 //
@@ -35,6 +37,10 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', [
 	'Class:OAuthClient/Attribute:name+' => '~~',
 	'Class:OAuthClient/Attribute:scope' => 'Scope~~',
 	'Class:OAuthClient/Attribute:scope+' => '~~',
+	'Class:OAuthClient/Attribute:status' => 'Status~~',
+	'Class:OAuthClient/Attribute:status+' => 'After creation, use the action “Generate access token” to be able to use this OAuth client~~',
+	'Class:OAuthClient/Attribute:status/Value:active' => 'Access token generated~~',
+	'Class:OAuthClient/Attribute:status/Value:inactive' => 'No Access token~~',
 	'Class:OAuthClient/Attribute:description' => 'Description~~',
 	'Class:OAuthClient/Attribute:description+' => '~~',
 	'Class:OAuthClient/Attribute:client_id' => 'Client id~~',
@@ -52,23 +58,59 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', [
 	'Class:OAuthClient/Attribute:redirect_url' => 'Redirect url~~',
 	'Class:OAuthClient/Attribute:redirect_url+' => '~~',
 	'Class:OAuthClient/Attribute:mailbox_list' => 'Mailbox list~~',
-	'Class:OAuthClient/Attribute:mailbox_list+' => '~~',
+	'Class:OAuthClient/Attribute:mailbox_list+' => '~~'
 ]);
 
 //
 // Class: OAuthClientAzure
 //
-Dict::Add('NL NL', 'Dutch', 'Nederlands', [
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:OAuthClientAzure' => 'OAuth client for Microsoft Azure~~',
 	'Class:OAuthClientAzure/Name' => '%1$s (%2$s)~~',
-
-]);
+	'Class:OAuthClientAzure/Attribute:scope' => 'Scope~~',
+	'Class:OAuthClientAzure/Attribute:scope+' => 'Usually default selection is appropriate~~',
+	'Class:OAuthClientAzure/Attribute:scope/Value:SMTP' => 'SMTP~~',
+	'Class:OAuthClientAzure/Attribute:scope/Value:SMTP+' => '~~',
+	'Class:OAuthClientAzure/Attribute:scope/Value:IMAP' => 'IMAP~~',
+	'Class:OAuthClientAzure/Attribute:scope/Value:IMAP+' => '~~',
+	'Class:OAuthClientAzure/Attribute:advanced_scope' => 'Advanced scope~~',
+	'Class:OAuthClientAzure/Attribute:advanced_scope+' => 'As soon as you enter something here it takes precedence on the “Scope” selection which is then ignored~~',
+	'Class:OAuthClientAzure/Attribute:used_scope' => 'Used scope~~',
+	'Class:OAuthClientAzure/Attribute:used_scope+' => '~~',
+	'Class:OAuthClientAzure/Attribute:used_scope/Value:simple' => 'Simple~~',
+	'Class:OAuthClientAzure/Attribute:used_scope/Value:simple+' => '~~',
+	'Class:OAuthClientAzure/Attribute:used_scope/Value:advanced' => 'Advanced~~',
+	'Class:OAuthClientAzure/Attribute:used_scope/Value:advanced+' => '~~',
+	'Class:OAuthClientAzure/Attribute:used_for_smtp' => 'Used for SMTP~~',
+	'Class:OAuthClientAzure/Attribute:used_for_smtp+' => 'At least one OAuth client must have this flag to “Yes”, if you want iTop to use it for sending mails~~',
+	'Class:OAuthClientAzure/Attribute:used_for_smtp/Value:yes' => 'Yes~~',
+	'Class:OAuthClientAzure/Attribute:used_for_smtp/Value:no' => 'No~~',
+));
 
 //
 // Class: OAuthClientGoogle
 //
-Dict::Add('NL NL', 'Dutch', 'Nederlands', [
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:OAuthClientGoogle' => 'OAuth client for Google~~',
 	'Class:OAuthClientGoogle/Name' => '%1$s (%2$s)~~',
-]);
-
+	'Class:OAuthClientGoogle/Attribute:scope' => 'Scope~~',
+	'Class:OAuthClientGoogle/Attribute:scope+' => 'Usually default selection is appropriate~~',
+	'Class:OAuthClientGoogle/Attribute:scope/Value:SMTP' => 'SMTP~~',
+	'Class:OAuthClientGoogle/Attribute:scope/Value:SMTP+' => '~~',
+	'Class:OAuthClientGoogle/Attribute:scope/Value:IMAP' => 'IMAP~~',
+	'Class:OAuthClientGoogle/Attribute:scope/Value:IMAP+' => '~~',
+	'Class:OAuthClientGoogle/Attribute:advanced_scope' => 'Advanced scope~~',
+	'Class:OAuthClientGoogle/Attribute:advanced_scope+' => 'As soon as you enter something here it takes precedence on the “Scope” selection which is then ignored~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope' => 'Used scope~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope+' => '~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope/Value:simple' => 'Simple~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope/Value:simple+' => '~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope/Value:advanced' => 'Advanced~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope/Value:advanced+' => '~~',
+	'Class:OAuthClientGoogle/Attribute:used_for_smtp' => 'Used for SMTP~~',
+	'Class:OAuthClientGoogle/Attribute:used_for_smtp+' => 'At least one OAuth client must have this flag to “Yes”, if you want iTop to use it for sending mails~~',
+	'Class:OAuthClientGoogle/Attribute:used_for_smtp/Value:yes' => 'Yes~~',
+	'Class:OAuthClientGoogle/Attribute:used_for_smtp/Value:no' => 'No~~',
+));
diff --git a/datamodels/2.x/itop-oauth-client/pl.dict.itop-oauth-client.php b/datamodels/2.x/itop-oauth-client/pl.dict.itop-oauth-client.php
new file mode 100644
index 0000000000..25a7567c99
--- /dev/null
+++ b/datamodels/2.x/itop-oauth-client/pl.dict.itop-oauth-client.php
@@ -0,0 +1,269 @@
+<?php
+/**
+ * Localized data
+ *
+ * @copyright   Copyright (C) 2013 XXXXX
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+Dict::Add('PL PL', 'Polish', 'Polski', [
+	'Menu:CreateMailbox' => 'Create a mailbox...~~',
+	'Menu:OAuthClient' => 'OAuth client~~',
+	'Menu:OAuthClient+' => '~~',
+	'Menu:GenerateTokens' => 'Generate access token...~~',
+	'Menu:RegenerateTokens' => 'Regenerate access token...~~',
+	'itop-oauth-client/Operation:CreateMailBox/Title' => 'Mailbox creation~~',
+	'itop-oauth-client:UsedForSMTP' => 'This OAuth client is used for SMTP~~',
+	'itop-oauth-client:TestSMTP' => 'Email send test~~',
+	'itop-oauth-client:MissingOAuthClient' => 'Missing Oauth client for user name %1$s~~',
+	'itop-oauth-client:Message:MissingToken' => 'Generate access token before using this OAuth client~~',
+	'itop-oauth-client:Message:RegenerateToken' => 'Regenerate access token to to take into account the changes~~',
+	'itop-oauth-client:Message:TokenCreated' => 'Access token created~~',
+	'itop-oauth-client:Message:TokenRecreated' => 'Access token regenerated~~',
+	'itop-oauth-client:Message:TokenError' => 'Access token not generated due to server error~~',
+	'OAuthClient:Name/UseForSMTPMustBeUnique' => 'The combination Login (%1$s) and Use for SMTP (%2$s) has already be used for OAuth Client~~',
+	'OAuthClient:baseinfo' => 'Base Information~~',
+	'OAuthClient:scope' => 'Scope~~',
+]);
+
+//
+// Class: OAuthClient
+//
+
+Dict::Add('PL PL', 'Polish', 'Polski', [
+	'Class:OAuthClient' => 'OAuth Client~~',
+	'Class:OAuthClient/Attribute:provider' => 'Provider~~',
+	'Class:OAuthClient/Attribute:provider+' => '~~',
+	'Class:OAuthClient/Attribute:name' => 'Login~~',
+	'Class:OAuthClient/Attribute:name+' => 'In general, this is your email address~~',
+	'Class:OAuthClient/Attribute:status' => 'Status~~',
+	'Class:OAuthClient/Attribute:status+' => 'After creation, use the action “Generate access token” to be able to use this OAuth client~~',
+	'Class:OAuthClient/Attribute:status/Value:active' => 'Access token generated~~',
+	'Class:OAuthClient/Attribute:status/Value:inactive' => 'No Access token~~',
+	'Class:OAuthClient/Attribute:description' => 'Description~~',
+	'Class:OAuthClient/Attribute:description+' => '~~',
+	'Class:OAuthClient/Attribute:client_id' => 'Client id~~',
+	'Class:OAuthClient/Attribute:client_id+' => 'A long string of characters provided by your OAuth2 provider~~',
+	'Class:OAuthClient/Attribute:client_secret' => 'Client secret~~',
+	'Class:OAuthClient/Attribute:client_secret+' => 'Another long string of characters provided by your OAuth2 provider~~',
+	'Class:OAuthClient/Attribute:refresh_token' => 'Refresh token~~',
+	'Class:OAuthClient/Attribute:refresh_token+' => '~~',
+	'Class:OAuthClient/Attribute:refresh_token_expiration' => 'Refresh token expiration~~',
+	'Class:OAuthClient/Attribute:refresh_token_expiration+' => '~~',
+	'Class:OAuthClient/Attribute:token' => 'Access token~~',
+	'Class:OAuthClient/Attribute:token+' => '~~',
+	'Class:OAuthClient/Attribute:token_expiration' => 'Access token expiration~~',
+	'Class:OAuthClient/Attribute:token_expiration+' => '~~',
+	'Class:OAuthClient/Attribute:redirect_url' => 'Redirect url~~',
+	'Class:OAuthClient/Attribute:redirect_url+' => 'This url must be copied in the OAuth2 configuration of the provider
+Erase the field to recalculate default value~~'
+,
+	'Class:OAuthClient/Attribute:mailbox_list' => 'Mailbox list~~',
+	'Class:OAuthClient/Attribute:mailbox_list+' => '~~',
+]);
+
+//
+// Class: OAuthClientAzure
+//
+
+Dict::Add('PL PL', 'Polish', 'Polski', array(
+	'Class:OAuthClientAzure' => 'OAuth client for Microsoft Azure~~',
+	'Class:OAuthClientAzure/Name' => '%1$s (%2$s)~~',
+	'Class:OAuthClientAzure/Attribute:scope' => 'Scope~~',
+	'Class:OAuthClientAzure/Attribute:scope+' => 'Usually default selection is appropriate~~',
+	'Class:OAuthClientAzure/Attribute:scope/Value:SMTP' => 'SMTP~~',
+	'Class:OAuthClientAzure/Attribute:scope/Value:SMTP+' => '~~',
+	'Class:OAuthClientAzure/Attribute:scope/Value:IMAP' => 'IMAP~~',
+	'Class:OAuthClientAzure/Attribute:scope/Value:IMAP+' => '~~',
+	'Class:OAuthClientAzure/Attribute:advanced_scope' => 'Advanced scope~~',
+	'Class:OAuthClientAzure/Attribute:advanced_scope+' => 'As soon as you enter something here it takes precedence on the “Scope” selection which is then ignored~~',
+	'Class:OAuthClientAzure/Attribute:used_scope' => 'Used scope~~',
+	'Class:OAuthClientAzure/Attribute:used_scope+' => '~~',
+	'Class:OAuthClientAzure/Attribute:used_scope/Value:simple' => 'Simple~~',
+	'Class:OAuthClientAzure/Attribute:used_scope/Value:simple+' => '~~',
+	'Class:OAuthClientAzure/Attribute:used_scope/Value:advanced' => 'Advanced~~',
+	'Class:OAuthClientAzure/Attribute:used_scope/Value:advanced+' => '~~',
+	'Class:OAuthClientAzure/Attribute:used_for_smtp' => 'Used for SMTP~~',
+	'Class:OAuthClientAzure/Attribute:used_for_smtp+' => 'At least one OAuth client must have this flag to “Yes”, if you want iTop to use it for sending mails~~',
+	'Class:OAuthClientAzure/Attribute:used_for_smtp/Value:yes' => 'Yes~~',
+	'Class:OAuthClientAzure/Attribute:used_for_smtp/Value:no' => 'No~~',
+));
+
+//
+// Class: OAuthClientGoogle
+//
+
+Dict::Add('PL PL', 'Polish', 'Polski', array(
+	'Class:OAuthClientGoogle' => 'OAuth client for Google~~',
+	'Class:OAuthClientGoogle/Name' => '%1$s (%2$s)~~',
+	'Class:OAuthClientGoogle/Attribute:scope' => 'Scope~~',
+	'Class:OAuthClientGoogle/Attribute:scope+' => 'Usually default selection is appropriate~~',
+	'Class:OAuthClientGoogle/Attribute:scope/Value:SMTP' => 'SMTP~~',
+	'Class:OAuthClientGoogle/Attribute:scope/Value:SMTP+' => '~~',
+	'Class:OAuthClientGoogle/Attribute:scope/Value:IMAP' => 'IMAP~~',
+	'Class:OAuthClientGoogle/Attribute:scope/Value:IMAP+' => '~~',
+	'Class:OAuthClientGoogle/Attribute:advanced_scope' => 'Advanced scope~~',
+	'Class:OAuthClientGoogle/Attribute:advanced_scope+' => 'As soon as you enter something here it takes precedence on the “Scope” selection which is then ignored~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope' => 'Used scope~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope+' => '~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope/Value:simple' => 'Simple~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope/Value:simple+' => '~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope/Value:advanced' => 'Advanced~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope/Value:advanced+' => '~~',
+	'Class:OAuthClientGoogle/Attribute:used_for_smtp' => 'Used for SMTP~~',
+	'Class:OAuthClientGoogle/Attribute:used_for_smtp+' => 'At least one OAuth client must have this flag to “Yes”, if you want iTop to use it for sending mails~~',
+	'Class:OAuthClientGoogle/Attribute:used_for_smtp/Value:yes' => 'Yes~~',
+	'Class:OAuthClientGoogle/Attribute:used_for_smtp/Value:no' => 'No~~',
+));
+//
+// Class: OAuthClient
+//
+Dict::Add('PL PL', 'Polish', 'Polski', array(
+	'Class:OAuthClient/Attribute:status/Value:
+              active
+              
+                $ibo-lifecycle-active-state-primary-color
+                $ibo-lifecycle-active-state-secondary-color
+	' => '
+              active
+              
+                $ibo-lifecycle-active-state-primary-color
+                $ibo-lifecycle-active-state-secondary-color
+                
+              
+            ~~',
+	'Class:OAuthClient/Attribute:status/Value:
+              active
+              
+                $ibo-lifecycle-active-state-primary-color
+                $ibo-lifecycle-active-state-secondary-color
+                
+              
+            +' => '~~',
+	'Class:OAuthClient/Attribute:status/Value:
+              inactive
+              
+                $ibo-lifecycle-inactive-state-primary-color
+                $ibo-lifecycle-inactive-state-secondary-color
+	' => '
+              inactive
+              
+                $ibo-lifecycle-inactive-state-primary-color
+                $ibo-lifecycle-inactive-state-secondary-color
+                
+              
+            ~~',
+	'Class:OAuthClient/Attribute:status/Value:
+              inactive
+              
+                $ibo-lifecycle-inactive-state-primary-color
+                $ibo-lifecycle-inactive-state-secondary-color
+                
+              
+            +' => '~~'
+));
+//
+// Class: OAuthClientAzure
+//
+Dict::Add('PL PL', 'Polish', 'Polski', array(
+	'Class:OAuthClientAzure/Attribute:scope/Value:
+              SMTP
+	' => '
+              SMTP
+            ~~',
+	'Class:OAuthClientAzure/Attribute:scope/Value:
+              SMTP
+            +' => '~~',
+	'Class:OAuthClientAzure/Attribute:scope/Value:
+              IMAP
+	' => '
+              IMAP
+            ~~',
+	'Class:OAuthClientAzure/Attribute:scope/Value:
+              IMAP
+            +' => '~~',
+	'Class:OAuthClientAzure/Attribute:used_scope/Value:
+              simple
+	' => '
+              simple
+            ~~',
+	'Class:OAuthClientAzure/Attribute:used_scope/Value:
+              simple
+            +' => '~~',
+	'Class:OAuthClientAzure/Attribute:used_scope/Value:
+              advanced
+	' => '
+              advanced
+            ~~',
+	'Class:OAuthClientAzure/Attribute:used_scope/Value:
+              advanced
+            +' => '~~',
+	'Class:OAuthClientAzure/Attribute:used_for_smtp/Value:
+              yes
+	' => '
+              yes
+            ~~',
+	'Class:OAuthClientAzure/Attribute:used_for_smtp/Value:
+              yes
+            +' => '~~',
+	'Class:OAuthClientAzure/Attribute:used_for_smtp/Value:
+              no
+	' => '
+              no
+            ~~',
+	'Class:OAuthClientAzure/Attribute:used_for_smtp/Value:
+              no
+            +' => '~~'
+));
+//
+// Class: OAuthClientGoogle
+//
+Dict::Add('PL PL', 'Polish', 'Polski', array(
+	'Class:OAuthClientGoogle/Attribute:scope/Value:
+              SMTP
+	' => '
+              SMTP
+            ~~',
+	'Class:OAuthClientGoogle/Attribute:scope/Value:
+              SMTP
+            +' => '~~',
+	'Class:OAuthClientGoogle/Attribute:scope/Value:
+              IMAP
+	' => '
+              IMAP
+            ~~',
+	'Class:OAuthClientGoogle/Attribute:scope/Value:
+              IMAP
+            +' => '~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope/Value:
+              simple
+	' => '
+              simple
+            ~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope/Value:
+              simple
+            +' => '~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope/Value:
+              advanced
+	' => '
+              advanced
+            ~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope/Value:
+              advanced
+            +' => '~~',
+	'Class:OAuthClientGoogle/Attribute:used_for_smtp/Value:
+              yes
+	' => '
+              yes
+            ~~',
+	'Class:OAuthClientGoogle/Attribute:used_for_smtp/Value:
+              yes
+            +' => '~~',
+	'Class:OAuthClientGoogle/Attribute:used_for_smtp/Value:
+              no
+	' => '
+              no
+            ~~',
+	'Class:OAuthClientGoogle/Attribute:used_for_smtp/Value:
+              no
+            +' => '~~'
+));
diff --git a/datamodels/2.x/itop-oauth-client/pt_br.dict.itop-oauth-client.php b/datamodels/2.x/itop-oauth-client/pt_br.dict.itop-oauth-client.php
index 7d468dca0b..21563f58f7 100644
--- a/datamodels/2.x/itop-oauth-client/pt_br.dict.itop-oauth-client.php
+++ b/datamodels/2.x/itop-oauth-client/pt_br.dict.itop-oauth-client.php
@@ -5,22 +5,24 @@
  * @copyright   Copyright (C) 2013 XXXXX
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
-
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', [
 	'Menu:CreateMailbox' => 'Create a mailbox...~~',
 	'Menu:OAuthClient' => 'OAuth client~~',
 	'Menu:OAuthClient+' => '~~',
 	'Menu:GenerateTokens' => 'Generate access tokens...~~',
 	'Menu:RegenerateTokens' => 'Regenerate access tokens...~~',
-
 	'itop-oauth-client/Operation:CreateMailBox/Title' => 'Mailbox creation~~',
-
 	'itop-oauth-client:UsedForSMTP' => 'This OAuth client is used for SMTP~~',
 	'itop-oauth-client:TestSMTP' => 'Email send test~~',
 	'itop-oauth-client:MissingOAuthClient' => 'Missing Oauth client for user name %1$s~~',
 	'itop-oauth-client:Message:MissingToken' => 'Generate access token before using this OAuth client~~',
+	'itop-oauth-client:Message:RegenerateToken' => 'Regenerate access token to to take into account the changes~~',
 	'itop-oauth-client:Message:TokenCreated' => 'Access token created~~',
 	'itop-oauth-client:Message:TokenRecreated' => 'Access token regenerated~~',
+	'itop-oauth-client:Message:TokenError' => 'Access token not generated due to server error~~',
+	'OAuthClient:Name/UseForSMTPMustBeUnique' => 'The combination Login (%1$s) and Use for SMTP (%2$s) has already be used for OAuth Client~~',
+	'OAuthClient:baseinfo' => 'Base Information~~',
+	'OAuthClient:scope' => 'Scope~~',
 ]);
 
 //
@@ -35,6 +37,10 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', [
 	'Class:OAuthClient/Attribute:name+' => '~~',
 	'Class:OAuthClient/Attribute:scope' => 'Scope~~',
 	'Class:OAuthClient/Attribute:scope+' => '~~',
+	'Class:OAuthClient/Attribute:status' => 'Status~~',
+	'Class:OAuthClient/Attribute:status+' => 'After creation, use the action “Generate access token” to be able to use this OAuth client~~',
+	'Class:OAuthClient/Attribute:status/Value:active' => 'Access token generated~~',
+	'Class:OAuthClient/Attribute:status/Value:inactive' => 'No Access token~~',
 	'Class:OAuthClient/Attribute:description' => 'Description~~',
 	'Class:OAuthClient/Attribute:description+' => '~~',
 	'Class:OAuthClient/Attribute:client_id' => 'Client id~~',
@@ -52,23 +58,59 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', [
 	'Class:OAuthClient/Attribute:redirect_url' => 'Redirect url~~',
 	'Class:OAuthClient/Attribute:redirect_url+' => '~~',
 	'Class:OAuthClient/Attribute:mailbox_list' => 'Mailbox list~~',
-	'Class:OAuthClient/Attribute:mailbox_list+' => '~~',
+	'Class:OAuthClient/Attribute:mailbox_list+' => '~~'
 ]);
 
 //
 // Class: OAuthClientAzure
 //
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', [
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:OAuthClientAzure' => 'OAuth client for Microsoft Azure~~',
 	'Class:OAuthClientAzure/Name' => '%1$s (%2$s)~~',
-
-]);
+	'Class:OAuthClientAzure/Attribute:scope' => 'Scope~~',
+	'Class:OAuthClientAzure/Attribute:scope+' => 'Usually default selection is appropriate~~',
+	'Class:OAuthClientAzure/Attribute:scope/Value:SMTP' => 'SMTP~~',
+	'Class:OAuthClientAzure/Attribute:scope/Value:SMTP+' => '~~',
+	'Class:OAuthClientAzure/Attribute:scope/Value:IMAP' => 'IMAP~~',
+	'Class:OAuthClientAzure/Attribute:scope/Value:IMAP+' => '~~',
+	'Class:OAuthClientAzure/Attribute:advanced_scope' => 'Advanced scope~~',
+	'Class:OAuthClientAzure/Attribute:advanced_scope+' => 'As soon as you enter something here it takes precedence on the “Scope” selection which is then ignored~~',
+	'Class:OAuthClientAzure/Attribute:used_scope' => 'Used scope~~',
+	'Class:OAuthClientAzure/Attribute:used_scope+' => '~~',
+	'Class:OAuthClientAzure/Attribute:used_scope/Value:simple' => 'Simple~~',
+	'Class:OAuthClientAzure/Attribute:used_scope/Value:simple+' => '~~',
+	'Class:OAuthClientAzure/Attribute:used_scope/Value:advanced' => 'Advanced~~',
+	'Class:OAuthClientAzure/Attribute:used_scope/Value:advanced+' => '~~',
+	'Class:OAuthClientAzure/Attribute:used_for_smtp' => 'Used for SMTP~~',
+	'Class:OAuthClientAzure/Attribute:used_for_smtp+' => 'At least one OAuth client must have this flag to “Yes”, if you want iTop to use it for sending mails~~',
+	'Class:OAuthClientAzure/Attribute:used_for_smtp/Value:yes' => 'Yes~~',
+	'Class:OAuthClientAzure/Attribute:used_for_smtp/Value:no' => 'No~~',
+));
 
 //
 // Class: OAuthClientGoogle
 //
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', [
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:OAuthClientGoogle' => 'OAuth client for Google~~',
 	'Class:OAuthClientGoogle/Name' => '%1$s (%2$s)~~',
-]);
-
+	'Class:OAuthClientGoogle/Attribute:scope' => 'Scope~~',
+	'Class:OAuthClientGoogle/Attribute:scope+' => 'Usually default selection is appropriate~~',
+	'Class:OAuthClientGoogle/Attribute:scope/Value:SMTP' => 'SMTP~~',
+	'Class:OAuthClientGoogle/Attribute:scope/Value:SMTP+' => '~~',
+	'Class:OAuthClientGoogle/Attribute:scope/Value:IMAP' => 'IMAP~~',
+	'Class:OAuthClientGoogle/Attribute:scope/Value:IMAP+' => '~~',
+	'Class:OAuthClientGoogle/Attribute:advanced_scope' => 'Advanced scope~~',
+	'Class:OAuthClientGoogle/Attribute:advanced_scope+' => 'As soon as you enter something here it takes precedence on the “Scope” selection which is then ignored~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope' => 'Used scope~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope+' => '~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope/Value:simple' => 'Simple~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope/Value:simple+' => '~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope/Value:advanced' => 'Advanced~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope/Value:advanced+' => '~~',
+	'Class:OAuthClientGoogle/Attribute:used_for_smtp' => 'Used for SMTP~~',
+	'Class:OAuthClientGoogle/Attribute:used_for_smtp+' => 'At least one OAuth client must have this flag to “Yes”, if you want iTop to use it for sending mails~~',
+	'Class:OAuthClientGoogle/Attribute:used_for_smtp/Value:yes' => 'Yes~~',
+	'Class:OAuthClientGoogle/Attribute:used_for_smtp/Value:no' => 'No~~',
+));
diff --git a/datamodels/2.x/itop-oauth-client/ru.dict.itop-oauth-client.php b/datamodels/2.x/itop-oauth-client/ru.dict.itop-oauth-client.php
index 90f0e2004f..1e5d707390 100644
--- a/datamodels/2.x/itop-oauth-client/ru.dict.itop-oauth-client.php
+++ b/datamodels/2.x/itop-oauth-client/ru.dict.itop-oauth-client.php
@@ -5,22 +5,24 @@
  * @copyright   Copyright (C) 2013 XXXXX
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
-
 Dict::Add('RU RU', 'Russian', 'Русский', [
 	'Menu:CreateMailbox' => 'Create a mailbox...~~',
 	'Menu:OAuthClient' => 'OAuth client~~',
 	'Menu:OAuthClient+' => '~~',
 	'Menu:GenerateTokens' => 'Generate access tokens...~~',
 	'Menu:RegenerateTokens' => 'Regenerate access tokens...~~',
-
 	'itop-oauth-client/Operation:CreateMailBox/Title' => 'Mailbox creation~~',
-
 	'itop-oauth-client:UsedForSMTP' => 'This OAuth client is used for SMTP~~',
 	'itop-oauth-client:TestSMTP' => 'Email send test~~',
 	'itop-oauth-client:MissingOAuthClient' => 'Missing Oauth client for user name %1$s~~',
 	'itop-oauth-client:Message:MissingToken' => 'Generate access token before using this OAuth client~~',
+	'itop-oauth-client:Message:RegenerateToken' => 'Regenerate access token to to take into account the changes~~',
 	'itop-oauth-client:Message:TokenCreated' => 'Access token created~~',
 	'itop-oauth-client:Message:TokenRecreated' => 'Access token regenerated~~',
+	'itop-oauth-client:Message:TokenError' => 'Access token not generated due to server error~~',
+	'OAuthClient:Name/UseForSMTPMustBeUnique' => 'The combination Login (%1$s) and Use for SMTP (%2$s) has already be used for OAuth Client~~',
+	'OAuthClient:baseinfo' => 'Base Information~~',
+	'OAuthClient:scope' => 'Scope~~',
 ]);
 
 //
@@ -35,6 +37,10 @@ Dict::Add('RU RU', 'Russian', 'Русский', [
 	'Class:OAuthClient/Attribute:name+' => '~~',
 	'Class:OAuthClient/Attribute:scope' => 'Scope~~',
 	'Class:OAuthClient/Attribute:scope+' => '~~',
+	'Class:OAuthClient/Attribute:status' => 'Status~~',
+	'Class:OAuthClient/Attribute:status+' => 'After creation, use the action “Generate access token” to be able to use this OAuth client~~',
+	'Class:OAuthClient/Attribute:status/Value:active' => 'Access token generated~~',
+	'Class:OAuthClient/Attribute:status/Value:inactive' => 'No Access token~~',
 	'Class:OAuthClient/Attribute:description' => 'Description~~',
 	'Class:OAuthClient/Attribute:description+' => '~~',
 	'Class:OAuthClient/Attribute:client_id' => 'Client id~~',
@@ -52,23 +58,59 @@ Dict::Add('RU RU', 'Russian', 'Русский', [
 	'Class:OAuthClient/Attribute:redirect_url' => 'Redirect url~~',
 	'Class:OAuthClient/Attribute:redirect_url+' => '~~',
 	'Class:OAuthClient/Attribute:mailbox_list' => 'Mailbox list~~',
-	'Class:OAuthClient/Attribute:mailbox_list+' => '~~',
+	'Class:OAuthClient/Attribute:mailbox_list+' => '~~'
 ]);
 
 //
 // Class: OAuthClientAzure
 //
-Dict::Add('RU RU', 'Russian', 'Русский', [
+
+Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:OAuthClientAzure' => 'OAuth client for Microsoft Azure~~',
 	'Class:OAuthClientAzure/Name' => '%1$s (%2$s)~~',
-
-]);
+	'Class:OAuthClientAzure/Attribute:scope' => 'Scope~~',
+	'Class:OAuthClientAzure/Attribute:scope+' => 'Usually default selection is appropriate~~',
+	'Class:OAuthClientAzure/Attribute:scope/Value:SMTP' => 'SMTP~~',
+	'Class:OAuthClientAzure/Attribute:scope/Value:SMTP+' => '~~',
+	'Class:OAuthClientAzure/Attribute:scope/Value:IMAP' => 'IMAP~~',
+	'Class:OAuthClientAzure/Attribute:scope/Value:IMAP+' => '~~',
+	'Class:OAuthClientAzure/Attribute:advanced_scope' => 'Advanced scope~~',
+	'Class:OAuthClientAzure/Attribute:advanced_scope+' => 'As soon as you enter something here it takes precedence on the “Scope” selection which is then ignored~~',
+	'Class:OAuthClientAzure/Attribute:used_scope' => 'Used scope~~',
+	'Class:OAuthClientAzure/Attribute:used_scope+' => '~~',
+	'Class:OAuthClientAzure/Attribute:used_scope/Value:simple' => 'Simple~~',
+	'Class:OAuthClientAzure/Attribute:used_scope/Value:simple+' => '~~',
+	'Class:OAuthClientAzure/Attribute:used_scope/Value:advanced' => 'Advanced~~',
+	'Class:OAuthClientAzure/Attribute:used_scope/Value:advanced+' => '~~',
+	'Class:OAuthClientAzure/Attribute:used_for_smtp' => 'Used for SMTP~~',
+	'Class:OAuthClientAzure/Attribute:used_for_smtp+' => 'At least one OAuth client must have this flag to “Yes”, if you want iTop to use it for sending mails~~',
+	'Class:OAuthClientAzure/Attribute:used_for_smtp/Value:yes' => 'Yes~~',
+	'Class:OAuthClientAzure/Attribute:used_for_smtp/Value:no' => 'No~~',
+));
 
 //
 // Class: OAuthClientGoogle
 //
-Dict::Add('RU RU', 'Russian', 'Русский', [
+
+Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:OAuthClientGoogle' => 'OAuth client for Google~~',
 	'Class:OAuthClientGoogle/Name' => '%1$s (%2$s)~~',
-]);
-
+	'Class:OAuthClientGoogle/Attribute:scope' => 'Scope~~',
+	'Class:OAuthClientGoogle/Attribute:scope+' => 'Usually default selection is appropriate~~',
+	'Class:OAuthClientGoogle/Attribute:scope/Value:SMTP' => 'SMTP~~',
+	'Class:OAuthClientGoogle/Attribute:scope/Value:SMTP+' => '~~',
+	'Class:OAuthClientGoogle/Attribute:scope/Value:IMAP' => 'IMAP~~',
+	'Class:OAuthClientGoogle/Attribute:scope/Value:IMAP+' => '~~',
+	'Class:OAuthClientGoogle/Attribute:advanced_scope' => 'Advanced scope~~',
+	'Class:OAuthClientGoogle/Attribute:advanced_scope+' => 'As soon as you enter something here it takes precedence on the “Scope” selection which is then ignored~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope' => 'Used scope~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope+' => '~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope/Value:simple' => 'Simple~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope/Value:simple+' => '~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope/Value:advanced' => 'Advanced~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope/Value:advanced+' => '~~',
+	'Class:OAuthClientGoogle/Attribute:used_for_smtp' => 'Used for SMTP~~',
+	'Class:OAuthClientGoogle/Attribute:used_for_smtp+' => 'At least one OAuth client must have this flag to “Yes”, if you want iTop to use it for sending mails~~',
+	'Class:OAuthClientGoogle/Attribute:used_for_smtp/Value:yes' => 'Yes~~',
+	'Class:OAuthClientGoogle/Attribute:used_for_smtp/Value:no' => 'No~~',
+));
diff --git a/datamodels/2.x/itop-oauth-client/sk.dict.itop-oauth-client.php b/datamodels/2.x/itop-oauth-client/sk.dict.itop-oauth-client.php
index 8e1d18d073..8778fe6176 100644
--- a/datamodels/2.x/itop-oauth-client/sk.dict.itop-oauth-client.php
+++ b/datamodels/2.x/itop-oauth-client/sk.dict.itop-oauth-client.php
@@ -5,22 +5,24 @@
  * @copyright   Copyright (C) 2013 XXXXX
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
-
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', [
 	'Menu:CreateMailbox' => 'Create a mailbox...~~',
 	'Menu:OAuthClient' => 'OAuth client~~',
 	'Menu:OAuthClient+' => '~~',
 	'Menu:GenerateTokens' => 'Generate access tokens...~~',
 	'Menu:RegenerateTokens' => 'Regenerate access tokens...~~',
-
 	'itop-oauth-client/Operation:CreateMailBox/Title' => 'Mailbox creation~~',
-
 	'itop-oauth-client:UsedForSMTP' => 'This OAuth client is used for SMTP~~',
 	'itop-oauth-client:TestSMTP' => 'Email send test~~',
 	'itop-oauth-client:MissingOAuthClient' => 'Missing Oauth client for user name %1$s~~',
 	'itop-oauth-client:Message:MissingToken' => 'Generate access token before using this OAuth client~~',
+	'itop-oauth-client:Message:RegenerateToken' => 'Regenerate access token to to take into account the changes~~',
 	'itop-oauth-client:Message:TokenCreated' => 'Access token created~~',
 	'itop-oauth-client:Message:TokenRecreated' => 'Access token regenerated~~',
+	'itop-oauth-client:Message:TokenError' => 'Access token not generated due to server error~~',
+	'OAuthClient:Name/UseForSMTPMustBeUnique' => 'The combination Login (%1$s) and Use for SMTP (%2$s) has already be used for OAuth Client~~',
+	'OAuthClient:baseinfo' => 'Base Information~~',
+	'OAuthClient:scope' => 'Scope~~',
 ]);
 
 //
@@ -35,6 +37,10 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', [
 	'Class:OAuthClient/Attribute:name+' => '~~',
 	'Class:OAuthClient/Attribute:scope' => 'Scope~~',
 	'Class:OAuthClient/Attribute:scope+' => '~~',
+	'Class:OAuthClient/Attribute:status' => 'Status~~',
+	'Class:OAuthClient/Attribute:status+' => 'After creation, use the action “Generate access token” to be able to use this OAuth client~~',
+	'Class:OAuthClient/Attribute:status/Value:active' => 'Access token generated~~',
+	'Class:OAuthClient/Attribute:status/Value:inactive' => 'No Access token~~',
 	'Class:OAuthClient/Attribute:description' => 'Description~~',
 	'Class:OAuthClient/Attribute:description+' => '~~',
 	'Class:OAuthClient/Attribute:client_id' => 'Client id~~',
@@ -52,23 +58,59 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', [
 	'Class:OAuthClient/Attribute:redirect_url' => 'Redirect url~~',
 	'Class:OAuthClient/Attribute:redirect_url+' => '~~',
 	'Class:OAuthClient/Attribute:mailbox_list' => 'Mailbox list~~',
-	'Class:OAuthClient/Attribute:mailbox_list+' => '~~',
+	'Class:OAuthClient/Attribute:mailbox_list+' => '~~'
 ]);
 
 //
 // Class: OAuthClientAzure
 //
-Dict::Add('SK SK', 'Slovak', 'Slovenčina', [
+
+Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:OAuthClientAzure' => 'OAuth client for Microsoft Azure~~',
 	'Class:OAuthClientAzure/Name' => '%1$s (%2$s)~~',
-
-]);
+	'Class:OAuthClientAzure/Attribute:scope' => 'Scope~~',
+	'Class:OAuthClientAzure/Attribute:scope+' => 'Usually default selection is appropriate~~',
+	'Class:OAuthClientAzure/Attribute:scope/Value:SMTP' => 'SMTP~~',
+	'Class:OAuthClientAzure/Attribute:scope/Value:SMTP+' => '~~',
+	'Class:OAuthClientAzure/Attribute:scope/Value:IMAP' => 'IMAP~~',
+	'Class:OAuthClientAzure/Attribute:scope/Value:IMAP+' => '~~',
+	'Class:OAuthClientAzure/Attribute:advanced_scope' => 'Advanced scope~~',
+	'Class:OAuthClientAzure/Attribute:advanced_scope+' => 'As soon as you enter something here it takes precedence on the “Scope” selection which is then ignored~~',
+	'Class:OAuthClientAzure/Attribute:used_scope' => 'Used scope~~',
+	'Class:OAuthClientAzure/Attribute:used_scope+' => '~~',
+	'Class:OAuthClientAzure/Attribute:used_scope/Value:simple' => 'Simple~~',
+	'Class:OAuthClientAzure/Attribute:used_scope/Value:simple+' => '~~',
+	'Class:OAuthClientAzure/Attribute:used_scope/Value:advanced' => 'Advanced~~',
+	'Class:OAuthClientAzure/Attribute:used_scope/Value:advanced+' => '~~',
+	'Class:OAuthClientAzure/Attribute:used_for_smtp' => 'Used for SMTP~~',
+	'Class:OAuthClientAzure/Attribute:used_for_smtp+' => 'At least one OAuth client must have this flag to “Yes”, if you want iTop to use it for sending mails~~',
+	'Class:OAuthClientAzure/Attribute:used_for_smtp/Value:yes' => 'Yes~~',
+	'Class:OAuthClientAzure/Attribute:used_for_smtp/Value:no' => 'No~~',
+));
 
 //
 // Class: OAuthClientGoogle
 //
-Dict::Add('SK SK', 'Slovak', 'Slovenčina', [
+
+Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:OAuthClientGoogle' => 'OAuth client for Google~~',
 	'Class:OAuthClientGoogle/Name' => '%1$s (%2$s)~~',
-]);
-
+	'Class:OAuthClientGoogle/Attribute:scope' => 'Scope~~',
+	'Class:OAuthClientGoogle/Attribute:scope+' => 'Usually default selection is appropriate~~',
+	'Class:OAuthClientGoogle/Attribute:scope/Value:SMTP' => 'SMTP~~',
+	'Class:OAuthClientGoogle/Attribute:scope/Value:SMTP+' => '~~',
+	'Class:OAuthClientGoogle/Attribute:scope/Value:IMAP' => 'IMAP~~',
+	'Class:OAuthClientGoogle/Attribute:scope/Value:IMAP+' => '~~',
+	'Class:OAuthClientGoogle/Attribute:advanced_scope' => 'Advanced scope~~',
+	'Class:OAuthClientGoogle/Attribute:advanced_scope+' => 'As soon as you enter something here it takes precedence on the “Scope” selection which is then ignored~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope' => 'Used scope~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope+' => '~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope/Value:simple' => 'Simple~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope/Value:simple+' => '~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope/Value:advanced' => 'Advanced~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope/Value:advanced+' => '~~',
+	'Class:OAuthClientGoogle/Attribute:used_for_smtp' => 'Used for SMTP~~',
+	'Class:OAuthClientGoogle/Attribute:used_for_smtp+' => 'At least one OAuth client must have this flag to “Yes”, if you want iTop to use it for sending mails~~',
+	'Class:OAuthClientGoogle/Attribute:used_for_smtp/Value:yes' => 'Yes~~',
+	'Class:OAuthClientGoogle/Attribute:used_for_smtp/Value:no' => 'No~~',
+));
diff --git a/datamodels/2.x/itop-oauth-client/tr.dict.itop-oauth-client.php b/datamodels/2.x/itop-oauth-client/tr.dict.itop-oauth-client.php
index b1d12d523f..fcd8de06b7 100644
--- a/datamodels/2.x/itop-oauth-client/tr.dict.itop-oauth-client.php
+++ b/datamodels/2.x/itop-oauth-client/tr.dict.itop-oauth-client.php
@@ -5,22 +5,24 @@
  * @copyright   Copyright (C) 2013 XXXXX
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
-
 Dict::Add('TR TR', 'Turkish', 'Türkçe', [
 	'Menu:CreateMailbox' => 'Create a mailbox...~~',
 	'Menu:OAuthClient' => 'OAuth client~~',
 	'Menu:OAuthClient+' => '~~',
 	'Menu:GenerateTokens' => 'Generate access tokens...~~',
 	'Menu:RegenerateTokens' => 'Regenerate access tokens...~~',
-
 	'itop-oauth-client/Operation:CreateMailBox/Title' => 'Mailbox creation~~',
-
 	'itop-oauth-client:UsedForSMTP' => 'This OAuth client is used for SMTP~~',
 	'itop-oauth-client:TestSMTP' => 'Email send test~~',
 	'itop-oauth-client:MissingOAuthClient' => 'Missing Oauth client for user name %1$s~~',
 	'itop-oauth-client:Message:MissingToken' => 'Generate access token before using this OAuth client~~',
+	'itop-oauth-client:Message:RegenerateToken' => 'Regenerate access token to to take into account the changes~~',
 	'itop-oauth-client:Message:TokenCreated' => 'Access token created~~',
 	'itop-oauth-client:Message:TokenRecreated' => 'Access token regenerated~~',
+	'itop-oauth-client:Message:TokenError' => 'Access token not generated due to server error~~',
+	'OAuthClient:Name/UseForSMTPMustBeUnique' => 'The combination Login (%1$s) and Use for SMTP (%2$s) has already be used for OAuth Client~~',
+	'OAuthClient:baseinfo' => 'Base Information~~',
+	'OAuthClient:scope' => 'Scope~~',
 ]);
 
 //
@@ -35,6 +37,10 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', [
 	'Class:OAuthClient/Attribute:name+' => '~~',
 	'Class:OAuthClient/Attribute:scope' => 'Scope~~',
 	'Class:OAuthClient/Attribute:scope+' => '~~',
+	'Class:OAuthClient/Attribute:status' => 'Status~~',
+	'Class:OAuthClient/Attribute:status+' => 'After creation, use the action “Generate access token” to be able to use this OAuth client~~',
+	'Class:OAuthClient/Attribute:status/Value:active' => 'Access token generated~~',
+	'Class:OAuthClient/Attribute:status/Value:inactive' => 'No Access token~~',
 	'Class:OAuthClient/Attribute:description' => 'Description~~',
 	'Class:OAuthClient/Attribute:description+' => '~~',
 	'Class:OAuthClient/Attribute:client_id' => 'Client id~~',
@@ -52,23 +58,59 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', [
 	'Class:OAuthClient/Attribute:redirect_url' => 'Redirect url~~',
 	'Class:OAuthClient/Attribute:redirect_url+' => '~~',
 	'Class:OAuthClient/Attribute:mailbox_list' => 'Mailbox list~~',
-	'Class:OAuthClient/Attribute:mailbox_list+' => '~~',
+	'Class:OAuthClient/Attribute:mailbox_list+' => '~~'
 ]);
 
 //
 // Class: OAuthClientAzure
 //
-Dict::Add('TR TR', 'Turkish', 'Türkçe', [
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:OAuthClientAzure' => 'OAuth client for Microsoft Azure~~',
 	'Class:OAuthClientAzure/Name' => '%1$s (%2$s)~~',
-
-]);
+	'Class:OAuthClientAzure/Attribute:scope' => 'Scope~~',
+	'Class:OAuthClientAzure/Attribute:scope+' => 'Usually default selection is appropriate~~',
+	'Class:OAuthClientAzure/Attribute:scope/Value:SMTP' => 'SMTP~~',
+	'Class:OAuthClientAzure/Attribute:scope/Value:SMTP+' => '~~',
+	'Class:OAuthClientAzure/Attribute:scope/Value:IMAP' => 'IMAP~~',
+	'Class:OAuthClientAzure/Attribute:scope/Value:IMAP+' => '~~',
+	'Class:OAuthClientAzure/Attribute:advanced_scope' => 'Advanced scope~~',
+	'Class:OAuthClientAzure/Attribute:advanced_scope+' => 'As soon as you enter something here it takes precedence on the “Scope” selection which is then ignored~~',
+	'Class:OAuthClientAzure/Attribute:used_scope' => 'Used scope~~',
+	'Class:OAuthClientAzure/Attribute:used_scope+' => '~~',
+	'Class:OAuthClientAzure/Attribute:used_scope/Value:simple' => 'Simple~~',
+	'Class:OAuthClientAzure/Attribute:used_scope/Value:simple+' => '~~',
+	'Class:OAuthClientAzure/Attribute:used_scope/Value:advanced' => 'Advanced~~',
+	'Class:OAuthClientAzure/Attribute:used_scope/Value:advanced+' => '~~',
+	'Class:OAuthClientAzure/Attribute:used_for_smtp' => 'Used for SMTP~~',
+	'Class:OAuthClientAzure/Attribute:used_for_smtp+' => 'At least one OAuth client must have this flag to “Yes”, if you want iTop to use it for sending mails~~',
+	'Class:OAuthClientAzure/Attribute:used_for_smtp/Value:yes' => 'Yes~~',
+	'Class:OAuthClientAzure/Attribute:used_for_smtp/Value:no' => 'No~~',
+));
 
 //
 // Class: OAuthClientGoogle
 //
-Dict::Add('TR TR', 'Turkish', 'Türkçe', [
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:OAuthClientGoogle' => 'OAuth client for Google~~',
 	'Class:OAuthClientGoogle/Name' => '%1$s (%2$s)~~',
-]);
-
+	'Class:OAuthClientGoogle/Attribute:scope' => 'Scope~~',
+	'Class:OAuthClientGoogle/Attribute:scope+' => 'Usually default selection is appropriate~~',
+	'Class:OAuthClientGoogle/Attribute:scope/Value:SMTP' => 'SMTP~~',
+	'Class:OAuthClientGoogle/Attribute:scope/Value:SMTP+' => '~~',
+	'Class:OAuthClientGoogle/Attribute:scope/Value:IMAP' => 'IMAP~~',
+	'Class:OAuthClientGoogle/Attribute:scope/Value:IMAP+' => '~~',
+	'Class:OAuthClientGoogle/Attribute:advanced_scope' => 'Advanced scope~~',
+	'Class:OAuthClientGoogle/Attribute:advanced_scope+' => 'As soon as you enter something here it takes precedence on the “Scope” selection which is then ignored~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope' => 'Used scope~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope+' => '~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope/Value:simple' => 'Simple~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope/Value:simple+' => '~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope/Value:advanced' => 'Advanced~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope/Value:advanced+' => '~~',
+	'Class:OAuthClientGoogle/Attribute:used_for_smtp' => 'Used for SMTP~~',
+	'Class:OAuthClientGoogle/Attribute:used_for_smtp+' => 'At least one OAuth client must have this flag to “Yes”, if you want iTop to use it for sending mails~~',
+	'Class:OAuthClientGoogle/Attribute:used_for_smtp/Value:yes' => 'Yes~~',
+	'Class:OAuthClientGoogle/Attribute:used_for_smtp/Value:no' => 'No~~',
+));
diff --git a/datamodels/2.x/itop-oauth-client/zh_cn.dict.itop-oauth-client.php b/datamodels/2.x/itop-oauth-client/zh_cn.dict.itop-oauth-client.php
index 6000de56f1..97d6b8a08a 100644
--- a/datamodels/2.x/itop-oauth-client/zh_cn.dict.itop-oauth-client.php
+++ b/datamodels/2.x/itop-oauth-client/zh_cn.dict.itop-oauth-client.php
@@ -5,22 +5,24 @@
  * @copyright   Copyright (C) 2013 XXXXX
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
-
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Menu:CreateMailbox' => 'Create a mailbox...~~',
 	'Menu:OAuthClient' => 'OAuth client~~',
 	'Menu:OAuthClient+' => '~~',
 	'Menu:GenerateTokens' => 'Generate access tokens...~~',
 	'Menu:RegenerateTokens' => 'Regenerate access tokens...~~',
-
 	'itop-oauth-client/Operation:CreateMailBox/Title' => 'Mailbox creation~~',
-
 	'itop-oauth-client:UsedForSMTP' => 'This OAuth client is used for SMTP~~',
 	'itop-oauth-client:TestSMTP' => 'Email send test~~',
 	'itop-oauth-client:MissingOAuthClient' => 'Missing Oauth client for user name %1$s~~',
 	'itop-oauth-client:Message:MissingToken' => 'Generate access token before using this OAuth client~~',
+	'itop-oauth-client:Message:RegenerateToken' => 'Regenerate access token to to take into account the changes~~',
 	'itop-oauth-client:Message:TokenCreated' => 'Access token created~~',
 	'itop-oauth-client:Message:TokenRecreated' => 'Access token regenerated~~',
+	'itop-oauth-client:Message:TokenError' => 'Access token not generated due to server error~~',
+	'OAuthClient:Name/UseForSMTPMustBeUnique' => 'The combination Login (%1$s) and Use for SMTP (%2$s) has already be used for OAuth Client~~',
+	'OAuthClient:baseinfo' => 'Base Information~~',
+	'OAuthClient:scope' => 'Scope~~',
 ]);
 
 //
@@ -35,6 +37,10 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:OAuthClient/Attribute:name+' => '~~',
 	'Class:OAuthClient/Attribute:scope' => 'Scope~~',
 	'Class:OAuthClient/Attribute:scope+' => '~~',
+	'Class:OAuthClient/Attribute:status' => 'Status~~',
+	'Class:OAuthClient/Attribute:status+' => 'After creation, use the action “Generate access token” to be able to use this OAuth client~~',
+	'Class:OAuthClient/Attribute:status/Value:active' => 'Access token generated~~',
+	'Class:OAuthClient/Attribute:status/Value:inactive' => 'No Access token~~',
 	'Class:OAuthClient/Attribute:description' => 'Description~~',
 	'Class:OAuthClient/Attribute:description+' => '~~',
 	'Class:OAuthClient/Attribute:client_id' => 'Client id~~',
@@ -52,23 +58,59 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:OAuthClient/Attribute:redirect_url' => 'Redirect url~~',
 	'Class:OAuthClient/Attribute:redirect_url+' => '~~',
 	'Class:OAuthClient/Attribute:mailbox_list' => 'Mailbox list~~',
-	'Class:OAuthClient/Attribute:mailbox_list+' => '~~',
+	'Class:OAuthClient/Attribute:mailbox_list+' => '~~'
 ]);
 
 //
 // Class: OAuthClientAzure
 //
-Dict::Add('ZH CN', 'Chinese', '简体中文', [
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:OAuthClientAzure' => 'OAuth client for Microsoft Azure~~',
 	'Class:OAuthClientAzure/Name' => '%1$s (%2$s)~~',
-
-]);
+	'Class:OAuthClientAzure/Attribute:scope' => 'Scope~~',
+	'Class:OAuthClientAzure/Attribute:scope+' => 'Usually default selection is appropriate~~',
+	'Class:OAuthClientAzure/Attribute:scope/Value:SMTP' => 'SMTP~~',
+	'Class:OAuthClientAzure/Attribute:scope/Value:SMTP+' => '~~',
+	'Class:OAuthClientAzure/Attribute:scope/Value:IMAP' => 'IMAP~~',
+	'Class:OAuthClientAzure/Attribute:scope/Value:IMAP+' => '~~',
+	'Class:OAuthClientAzure/Attribute:advanced_scope' => 'Advanced scope~~',
+	'Class:OAuthClientAzure/Attribute:advanced_scope+' => 'As soon as you enter something here it takes precedence on the “Scope” selection which is then ignored~~',
+	'Class:OAuthClientAzure/Attribute:used_scope' => 'Used scope~~',
+	'Class:OAuthClientAzure/Attribute:used_scope+' => '~~',
+	'Class:OAuthClientAzure/Attribute:used_scope/Value:simple' => 'Simple~~',
+	'Class:OAuthClientAzure/Attribute:used_scope/Value:simple+' => '~~',
+	'Class:OAuthClientAzure/Attribute:used_scope/Value:advanced' => 'Advanced~~',
+	'Class:OAuthClientAzure/Attribute:used_scope/Value:advanced+' => '~~',
+	'Class:OAuthClientAzure/Attribute:used_for_smtp' => 'Used for SMTP~~',
+	'Class:OAuthClientAzure/Attribute:used_for_smtp+' => 'At least one OAuth client must have this flag to “Yes”, if you want iTop to use it for sending mails~~',
+	'Class:OAuthClientAzure/Attribute:used_for_smtp/Value:yes' => 'Yes~~',
+	'Class:OAuthClientAzure/Attribute:used_for_smtp/Value:no' => 'No~~',
+));
 
 //
 // Class: OAuthClientGoogle
 //
-Dict::Add('ZH CN', 'Chinese', '简体中文', [
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:OAuthClientGoogle' => 'OAuth client for Google~~',
 	'Class:OAuthClientGoogle/Name' => '%1$s (%2$s)~~',
-]);
-
+	'Class:OAuthClientGoogle/Attribute:scope' => 'Scope~~',
+	'Class:OAuthClientGoogle/Attribute:scope+' => 'Usually default selection is appropriate~~',
+	'Class:OAuthClientGoogle/Attribute:scope/Value:SMTP' => 'SMTP~~',
+	'Class:OAuthClientGoogle/Attribute:scope/Value:SMTP+' => '~~',
+	'Class:OAuthClientGoogle/Attribute:scope/Value:IMAP' => 'IMAP~~',
+	'Class:OAuthClientGoogle/Attribute:scope/Value:IMAP+' => '~~',
+	'Class:OAuthClientGoogle/Attribute:advanced_scope' => 'Advanced scope~~',
+	'Class:OAuthClientGoogle/Attribute:advanced_scope+' => 'As soon as you enter something here it takes precedence on the “Scope” selection which is then ignored~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope' => 'Used scope~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope+' => '~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope/Value:simple' => 'Simple~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope/Value:simple+' => '~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope/Value:advanced' => 'Advanced~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope/Value:advanced+' => '~~',
+	'Class:OAuthClientGoogle/Attribute:used_for_smtp' => 'Used for SMTP~~',
+	'Class:OAuthClientGoogle/Attribute:used_for_smtp+' => 'At least one OAuth client must have this flag to “Yes”, if you want iTop to use it for sending mails~~',
+	'Class:OAuthClientGoogle/Attribute:used_for_smtp/Value:yes' => 'Yes~~',
+	'Class:OAuthClientGoogle/Attribute:used_for_smtp/Value:no' => 'No~~',
+));
diff --git a/datamodels/2.x/itop-portal-base/dictionaries/hu.dict.itop-portal-base.php b/datamodels/2.x/itop-portal-base/dictionaries/hu.dict.itop-portal-base.php
index 4f38dee1bf..693c53b819 100644
--- a/datamodels/2.x/itop-portal-base/dictionaries/hu.dict.itop-portal-base.php
+++ b/datamodels/2.x/itop-portal-base/dictionaries/hu.dict.itop-portal-base.php
@@ -18,137 +18,137 @@
  */
 // Portal
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Page:DefaultTitle' => '%1$s Felhasználói portál',
-    'Page:PleaseWait' => 'Kérem várjon...',
-    'Page:Home' => 'Kezdőlap',
-    'Page:GoPortalHome' => 'Kezdőlap',
-    'Page:GoPreviousPage' => 'Előző oldal',
-    'Page:ReloadPage' => 'Oldal újratöltése',
-    'Portal:Button:Submit' => 'Beküldés',
-    'Portal:Button:Apply' => 'Alkalmazás',
-    'Portal:Button:Cancel' => 'Mégsem',
-    'Portal:Button:Close' => 'Bezárás',
-    'Portal:Button:Add' => 'Hozzáadás',
-    'Portal:Button:Remove' => 'Eltávolítás',
-    'Portal:Button:Delete' => 'Törlés',
-    'Portal:EnvironmentBanner:Title' => 'Jelenleg <strong>%1$s</strong> módban van',
-    'Portal:EnvironmentBanner:GoToProduction' => 'Visszatérés az ÉLES módba',
-    'Error:HTTP:400' => 'Hibás kérelem',
-    'Error:HTTP:401' => 'Azonosítás',
-    'Error:HTTP:404' => 'Az oldal nem található',
-    'Error:HTTP:500' => 'Hopp! Valami hiba történt.',
-    'Error:HTTP:GetHelp' => 'Kérjük, lépjen kapcsolatba a %1$s rendszergazdával, ha a probléma továbbra is fennáll.',
-    'Error:XHR:Fail' => 'Nem sikerült betölteni az adatokat, kérjük, lépjen kapcsolatba a %1$s rendszergazdával',
-    'Portal:ErrorUserLoggedOut' => 'Kijelentkezett, és a folytatáshoz újra be kell jelentkeznie.',
-    'Portal:Datatables:Language:Processing' => 'Kérem várjon...',
-    'Portal:Datatables:Language:Search' => 'Szűrő:',
-    'Portal:Datatables:Language:LengthMenu' => '_MENU_ elemek kijelzése oldalanként',
-    'Portal:Datatables:Language:ZeroRecords' => 'Nincs eredmény',
-    'Portal:Datatables:Language:Info' => '_PAGE_ oldal a _PAGES_ oldalból',
-    'Portal:Datatables:Language:InfoEmpty' => 'Nincs információ',
-    'Portal:Datatables:Language:InfoFiltered' => 'leszűrve _MAX_ elemből',
-    'Portal:Datatables:Language:EmptyTable' => 'Nincs adat ehhez a táblázathoz',
-    'Portal:Datatables:Language:DisplayLength:All' => 'Összes',
-    'Portal:Datatables:Language:Paginate:First' => 'Első',
-    'Portal:Datatables:Language:Paginate:Previous' => 'Előző',
-    'Portal:Datatables:Language:Paginate:Next' => 'Következő',
-    'Portal:Datatables:Language:Paginate:Last' => 'Utolsó',
-    'Portal:Datatables:Language:Sort:Ascending' => 'Növekvő rendezés',
-    'Portal:Datatables:Language:Sort:Descending' => 'Csökkenő rendezés',
-    'Portal:Autocomplete:NoResult' => 'Nincs adat',
-    'Portal:Attachments:DropZone:Message' => 'Húzza ide a fájlokat, hogy csatolmányként hozzáadhassa őket',
-    'Portal:File:None' => 'Nincs fájl',
-    'Portal:File:DisplayInfo' => '<a href="%2$s" class="file_download_link">%1$s</a>',
-    'Portal:File:DisplayInfo+' => '%1$s (%2$s) <a href="%3$s" class="file_open_link" target="_blank">Megnyitás</a> / <a href="%4$s" class="file_download_link">Letöltés</a>',
-    'Portal:Calendar-FirstDayOfWeek' => 'hu', //work with moment.js locales
+	'Page:DefaultTitle' => '%1$s Felhasználói portál',
+	'Page:PleaseWait' => 'Kérem várjon...',
+	'Page:Home' => 'Kezdőlap',
+	'Page:GoPortalHome' => 'Kezdőlap',
+	'Page:GoPreviousPage' => 'Előző oldal',
+	'Page:ReloadPage' => 'Oldal újratöltése',
+	'Portal:Button:Submit' => 'Beküldés',
+	'Portal:Button:Apply' => 'Alkalmazás',
+	'Portal:Button:Cancel' => 'Mégsem',
+	'Portal:Button:Close' => 'Bezárás',
+	'Portal:Button:Add' => 'Hozzáadás',
+	'Portal:Button:Remove' => 'Eltávolítás',
+	'Portal:Button:Delete' => 'Törlés',
+	'Portal:EnvironmentBanner:Title' => 'Jelenleg <strong>%1$s</strong> módban van',
+	'Portal:EnvironmentBanner:GoToProduction' => 'Visszatérés az ÉLES módba',
+	'Error:HTTP:400' => 'Hibás kérelem',
+	'Error:HTTP:401' => 'Azonosítás',
+	'Error:HTTP:404' => 'Az oldal nem található',
+	'Error:HTTP:500' => 'Hopp! Valami hiba történt.',
+	'Error:HTTP:GetHelp' => 'Kérjük, lépjen kapcsolatba a %1$s rendszergazdával, ha a probléma továbbra is fennáll.',
+	'Error:XHR:Fail' => 'Nem sikerült betölteni az adatokat, kérjük, lépjen kapcsolatba a %1$s rendszergazdával',
+	'Portal:ErrorUserLoggedOut' => 'Kijelentkezett, és a folytatáshoz újra be kell jelentkeznie.',
+	'Portal:Datatables:Language:Processing' => 'Kérem várjon...',
+	'Portal:Datatables:Language:Search' => 'Szűrő:',
+	'Portal:Datatables:Language:LengthMenu' => '_MENU_ elemek kijelzése oldalanként',
+	'Portal:Datatables:Language:ZeroRecords' => 'Nincs eredmény',
+	'Portal:Datatables:Language:Info' => '_PAGE_ oldal a _PAGES_ oldalból',
+	'Portal:Datatables:Language:InfoEmpty' => 'Nincs információ',
+	'Portal:Datatables:Language:InfoFiltered' => 'leszűrve _MAX_ elemből',
+	'Portal:Datatables:Language:EmptyTable' => 'Nincs adat ehhez a táblázathoz',
+	'Portal:Datatables:Language:DisplayLength:All' => 'Összes',
+	'Portal:Datatables:Language:Paginate:First' => 'Első',
+	'Portal:Datatables:Language:Paginate:Previous' => 'Előző',
+	'Portal:Datatables:Language:Paginate:Next' => 'Következő',
+	'Portal:Datatables:Language:Paginate:Last' => 'Utolsó',
+	'Portal:Datatables:Language:Sort:Ascending' => 'Növekvő rendezés',
+	'Portal:Datatables:Language:Sort:Descending' => 'Csökkenő rendezés',
+	'Portal:Autocomplete:NoResult' => 'Nincs adat',
+	'Portal:Attachments:DropZone:Message' => 'Húzza ide a fájlokat, hogy csatolmányként hozzáadhassa őket',
+	'Portal:File:None' => 'Nincs fájl',
+	'Portal:File:DisplayInfo' => '<a href="%2$s" class="file_download_link">%1$s</a>',
+	'Portal:File:DisplayInfo+' => '%1$s (%2$s) <a href="%3$s" class="file_open_link" target="_blank">Megnyitás</a> / <a href="%4$s" class="file_download_link">Letöltés</a>',
+	'Portal:Calendar-FirstDayOfWeek' => 'hu', //work with moment.js locales
 ));
 
 // Object form
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Portal:Form:Caselog:Entry:Close:Tooltip' => 'Bejegyzés bezárása',
-    'Portal:Form:Close:Warning' => 'Szeretné elhagyni ezt az űrlapot? A megadott adatok elveszhetnek',
-    'Portal:Error:ObjectCannotBeCreated' => 'Hiba: az objektum nem hozható létre. Ellenőrizze a kapcsolódó objektumokat és mellékleteket, mielőtt újra elküldi ezt az űrlapot.',
-    'Portal:Error:ObjectCannotBeUpdated' => 'Hiba: az objektum nem frissíthető. Ellenőrizze a kapcsolódó objektumokat és mellékleteket, mielőtt újra elküldi ezt az űrlapot.',
+	'Portal:Form:Caselog:Entry:Close:Tooltip' => 'Bejegyzés bezárása',
+	'Portal:Form:Close:Warning' => 'Szeretné elhagyni ezt az űrlapot? A megadott adatok elveszhetnek',
+	'Portal:Error:ObjectCannotBeCreated' => 'Hiba: az objektum nem hozható létre. Ellenőrizze a kapcsolódó objektumokat és mellékleteket, mielőtt újra elküldi ezt az űrlapot.',
+	'Portal:Error:ObjectCannotBeUpdated' => 'Hiba: az objektum nem frissíthető. Ellenőrizze a kapcsolódó objektumokat és mellékleteket, mielőtt újra elküldi ezt az űrlapot.',
 ));
 
 // UserProfile brick
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Brick:Portal:UserProfile:Name' => 'Felhasználói profil',
-    'Brick:Portal:UserProfile:Navigation:Dropdown:MyProfil' => 'Saját profil',
-    'Brick:Portal:UserProfile:Navigation:Dropdown:Logout' => 'Kijelentkezés',
-    'Brick:Portal:UserProfile:Password:Title' => 'Jelszó',
-    'Brick:Portal:UserProfile:Password:ChoosePassword' => 'Új jelszó',
-    'Brick:Portal:UserProfile:Password:ConfirmPassword' => 'Jelszó megerősítése',
-    'Brick:Portal:UserProfile:Password:CantChangeContactAdministrator' => 'Jelszóváltoztatáshoz forduljon a %1$s rendszergazdához',
-    'Brick:Portal:UserProfile:Password:CantChangeForUnknownReason' => 'Nem tudja megváltoztatni a jelszót, lépjen kapcsolatba a %1$s rendszergazdával',
-    'Brick:Portal:UserProfile:PersonalInformations:Title' => 'Személyi adatok',
-    'Brick:Portal:UserProfile:Photo:Title' => 'Fénykép',
+	'Brick:Portal:UserProfile:Name' => 'Felhasználói profil',
+	'Brick:Portal:UserProfile:Navigation:Dropdown:MyProfil' => 'Saját profil',
+	'Brick:Portal:UserProfile:Navigation:Dropdown:Logout' => 'Kijelentkezés',
+	'Brick:Portal:UserProfile:Password:Title' => 'Jelszó',
+	'Brick:Portal:UserProfile:Password:ChoosePassword' => 'Új jelszó',
+	'Brick:Portal:UserProfile:Password:ConfirmPassword' => 'Jelszó megerősítése',
+	'Brick:Portal:UserProfile:Password:CantChangeContactAdministrator' => 'Jelszóváltoztatáshoz forduljon a %1$s rendszergazdához',
+	'Brick:Portal:UserProfile:Password:CantChangeForUnknownReason' => 'Nem tudja megváltoztatni a jelszót, lépjen kapcsolatba a %1$s rendszergazdával',
+	'Brick:Portal:UserProfile:PersonalInformations:Title' => 'Személyi adatok',
+	'Brick:Portal:UserProfile:Photo:Title' => 'Fénykép',
 ));
 
 // AggregatePageBrick
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Brick:Portal:AggregatePage:DefaultTitle' => 'Műszerfal',
+	'Brick:Portal:AggregatePage:DefaultTitle' => 'Műszerfal',
 ));
 
 // BrowseBrick brick
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Brick:Portal:Browse:Name' => 'Böngésszen az elemek között',
-    'Brick:Portal:Browse:Mode:List' => 'Lista',
-    'Brick:Portal:Browse:Mode:Tree' => 'Fa',
-    'Brick:Portal:Browse:Mode:Mosaic' => 'Mozaik',
-    'Brick:Portal:Browse:Action:Drilldown' => 'Lefúrás',
-    'Brick:Portal:Browse:Action:View' => 'Részletek',
-    'Brick:Portal:Browse:Action:Edit' => 'Szerkesztés',
-    'Brick:Portal:Browse:Action:Create' => 'Létrehozás',
-    'Brick:Portal:Browse:Action:CreateObjectFromThis' => 'Új %1$s',
-    'Brick:Portal:Browse:Tree:ExpandAll' => 'Összes kinyitása',
-    'Brick:Portal:Browse:Tree:CollapseAll' => 'Összecsukás',
-    'Brick:Portal:Browse:Filter:NoData' => 'Nincs elem',
+	'Brick:Portal:Browse:Name' => 'Böngésszen az elemek között',
+	'Brick:Portal:Browse:Mode:List' => 'Lista',
+	'Brick:Portal:Browse:Mode:Tree' => 'Fa',
+	'Brick:Portal:Browse:Mode:Mosaic' => 'Mozaik',
+	'Brick:Portal:Browse:Action:Drilldown' => 'Lefúrás',
+	'Brick:Portal:Browse:Action:View' => 'Részletek',
+	'Brick:Portal:Browse:Action:Edit' => 'Szerkesztés',
+	'Brick:Portal:Browse:Action:Create' => 'Létrehozás',
+	'Brick:Portal:Browse:Action:CreateObjectFromThis' => 'Új %1$s',
+	'Brick:Portal:Browse:Tree:ExpandAll' => 'Összes kinyitása',
+	'Brick:Portal:Browse:Tree:CollapseAll' => 'Összecsukás',
+	'Brick:Portal:Browse:Filter:NoData' => 'Nincs elem',
 ));
 
 // ManageBrick brick
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Brick:Portal:Manage:Name' => 'Elemek kezelése',
-    'Brick:Portal:Manage:Table:NoData' => 'Nincs elem',
-    'Brick:Portal:Manage:Table:ItemActions' => 'Műveletek',
-    'Brick:Portal:Manage:DisplayMode:list' => 'Lista',
-    'Brick:Portal:Manage:DisplayMode:pie-chart' => 'Tortadiagram',
-    'Brick:Portal:Manage:DisplayMode:bar-chart' => 'Oszlopdiagram',
-    'Brick:Portal:Manage:Others' => 'Egyéb',
-    'Brick:Portal:Manage:All' => 'Összes',
-    'Brick:Portal:Manage:Group' => 'Csoport',
-    'Brick:Portal:Manage:fct:count' => 'Összesen',
-    'Brick:Portal:Manage:fct:sum' => 'Összeg',
-    'Brick:Portal:Manage:fct:avg' => 'Átlag',
-    'Brick:Portal:Manage:fct:min' => 'Minimum',
-    'Brick:Portal:Manage:fct:max' => 'Maximum',
+	'Brick:Portal:Manage:Name' => 'Elemek kezelése',
+	'Brick:Portal:Manage:Table:NoData' => 'Nincs elem',
+	'Brick:Portal:Manage:Table:ItemActions' => 'Műveletek',
+	'Brick:Portal:Manage:DisplayMode:list' => 'Lista',
+	'Brick:Portal:Manage:DisplayMode:pie-chart' => 'Tortadiagram',
+	'Brick:Portal:Manage:DisplayMode:bar-chart' => 'Oszlopdiagram',
+	'Brick:Portal:Manage:Others' => 'Egyéb',
+	'Brick:Portal:Manage:All' => 'Összes',
+	'Brick:Portal:Manage:Group' => 'Csoport',
+	'Brick:Portal:Manage:fct:count' => 'Összesen',
+	'Brick:Portal:Manage:fct:sum' => 'Összeg',
+	'Brick:Portal:Manage:fct:avg' => 'Átlag',
+	'Brick:Portal:Manage:fct:min' => 'Minimum',
+	'Brick:Portal:Manage:fct:max' => 'Maximum',
 ));
 
 // ObjectBrick brick
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Brick:Portal:Object:Name' => 'Objektum',
-    'Brick:Portal:Object:Form:Create:Title' => 'Új %1$s',
-    'Brick:Portal:Object:Form:Edit:Title' => '%2$s frissítése (%1$s)',
-    'Brick:Portal:Object:Form:View:Title' => '%1$s : %2$s',
-    'Brick:Portal:Object:Form:Stimulus:Title' => 'Adja meg a következő információkat:',
-    'Brick:Portal:Object:Form:Message:Saved' => 'Mentve',
-    'Brick:Portal:Object:Form:Message:ObjectSaved' => '%1$s mentve',
-    'Brick:Portal:Object:Search:Regular:Title' => '%1$s kiválasztása (%2$s)',
-    'Brick:Portal:Object:Search:Hierarchy:Title' => '%1$s kiválasztása (%2$s)',
-    'Brick:Portal:Object:Copy:TextToCopy' => '%1$s: %2$s',
-    'Brick:Portal:Object:Copy:Tooltip' => 'Objektum hivatkozás másolása',
-    'Brick:Portal:Object:Copy:CopiedTooltip' => 'Másolva'
+	'Brick:Portal:Object:Name' => 'Objektum',
+	'Brick:Portal:Object:Form:Create:Title' => 'Új %1$s',
+	'Brick:Portal:Object:Form:Edit:Title' => '%2$s frissítése (%1$s)',
+	'Brick:Portal:Object:Form:View:Title' => '%1$s : %2$s',
+	'Brick:Portal:Object:Form:Stimulus:Title' => 'Adja meg a következő információkat:',
+	'Brick:Portal:Object:Form:Message:Saved' => 'Mentve',
+	'Brick:Portal:Object:Form:Message:ObjectSaved' => '%1$s mentve',
+	'Brick:Portal:Object:Search:Regular:Title' => '%1$s kiválasztása (%2$s)',
+	'Brick:Portal:Object:Search:Hierarchy:Title' => '%1$s kiválasztása (%2$s)',
+	'Brick:Portal:Object:Copy:TextToCopy' => '%1$s: %2$s',
+	'Brick:Portal:Object:Copy:Tooltip' => 'Objektum hivatkozás másolása',
+	'Brick:Portal:Object:Copy:CopiedTooltip' => 'Másolva'
 ));
 
 // CreateBrick brick
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Brick:Portal:Create:Name' => 'Gyors létrehozás',
-    'Brick:Portal:Create:ChooseType' => 'Válasszon típust',
+	'Brick:Portal:Create:Name' => 'Gyors létrehozás',
+	'Brick:Portal:Create:ChooseType' => 'Válasszon típust',
 ));
 
 // Filter brick
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Brick:Portal:Filter:Name' => 'Tégla előszűrése',
-    'Brick:Portal:Filter:SearchInput:Placeholder' => 'pl. wifi kapcsolat',
-    'Brick:Portal:Filter:SearchInput:Submit' => 'Keresés',
+	'Brick:Portal:Filter:Name' => 'Tégla előszűrése',
+	'Brick:Portal:Filter:SearchInput:Placeholder' => 'pl. wifi kapcsolat',
+	'Brick:Portal:Filter:SearchInput:Submit' => 'Keresés',
 ));
diff --git a/datamodels/2.x/itop-portal-base/dictionaries/zh_cn.dict.itop-portal-base.php b/datamodels/2.x/itop-portal-base/dictionaries/zh_cn.dict.itop-portal-base.php
index f35242fda4..ef341eddfb 100644
--- a/datamodels/2.x/itop-portal-base/dictionaries/zh_cn.dict.itop-portal-base.php
+++ b/datamodels/2.x/itop-portal-base/dictionaries/zh_cn.dict.itop-portal-base.php
@@ -36,17 +36,17 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Error:HTTP:400' => '请求错误',
 	'Error:HTTP:401' => '认证错误',
 	'Error:HTTP:404' => '页面找不到',
-	'Error:HTTP:500' => 'Oops! 发生了一个错误.',
+	'Error:HTTP:500' => 'Oops! 发生了错误.',
 	'Error:HTTP:GetHelp' => '如果问题仍然存在,请联系管理员.',
 	'Error:XHR:Fail' => '无法加载数据, 请联系管理员',
 	'Portal:ErrorUserLoggedOut' => '您已退出,请重新登录.',
 	'Portal:Datatables:Language:Processing' => '请稍后...',
-	'Portal:Datatables:Language:Search' => '过滤器:',
+	'Portal:Datatables:Language:Search' => '筛选器:',
 	'Portal:Datatables:Language:LengthMenu' => '每页显示 _MENU_ 项',
 	'Portal:Datatables:Language:ZeroRecords' => '没有结果',
 	'Portal:Datatables:Language:Info' => '第 _PAGE_ 页,共 _PAGES_ 页',
 	'Portal:Datatables:Language:InfoEmpty' => '没有信息',
-	'Portal:Datatables:Language:InfoFiltered' => '最多过滤 _MAX_ 项',
+	'Portal:Datatables:Language:InfoFiltered' => '最多筛选 _MAX_ 项',
 	'Portal:Datatables:Language:EmptyTable' => '表格中没有数据',
 	'Portal:Datatables:Language:DisplayLength:All' => '全部',
 	'Portal:Datatables:Language:Paginate:First' => '首页',
diff --git a/datamodels/2.x/itop-portal-base/portal/public/js/portal_form_handler.js b/datamodels/2.x/itop-portal-base/portal/public/js/portal_form_handler.js
index bd88971eee..cd2c198f1f 100644
--- a/datamodels/2.x/itop-portal-base/portal/public/js/portal_form_handler.js
+++ b/datamodels/2.x/itop-portal-base/portal/public/js/portal_form_handler.js
@@ -87,6 +87,12 @@ $(function()
 			// Submit event from the form should be treated as a click on the submit button
 			// as it processes things before sending the request
 			this.element.on('submit', function(oEvent) {
+				// N°6500 Abort if event doesn't come from this form
+				// eg. Extensions like "approval-base" add a sub (HTML) form in the buttons sections of this (conceptual) form, which can cause the submit of that sub form to be catched here first and therefore go to unexpected behavior.
+				if (oEvent.target !== oEvent.currentTarget) {
+					return;
+				}
+
 				me._onSubmitClick(oEvent);
 			});
 		},
diff --git a/datamodels/2.x/itop-portal-base/portal/src/Form/ObjectFormManager.php b/datamodels/2.x/itop-portal-base/portal/src/Form/ObjectFormManager.php
index 0a0833d8ec..d32822ac11 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/Form/ObjectFormManager.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/Form/ObjectFormManager.php
@@ -783,7 +783,7 @@ class ObjectFormManager extends FormManager
 					{
 						// Note: We can't do this in AttributeExternalKey::MakeFormField() in the Field::SetOnFinalizeCallback() because at this point we have no information about the portal scope and ignore_silos flag, hence it always applies silos.
 						// As a workaround we have to manually check if the field's current value is among the scope
-						$oField->VerifyCurrentValue();
+						$oField->ResetCurrentValueIfNotAmongAllowedValues();
 					}
 					// - Field that require processing on their subfields
 					if (in_array(get_class($oField), array('Combodo\\iTop\\Form\\Field\\SubFormField')))
@@ -820,7 +820,7 @@ class ObjectFormManager extends FormManager
 									if (in_array(get_class($oCustomField), array('Combodo\\iTop\\Form\\Field\\SelectObjectField')))
 									{
 										/** @var \Combodo\iTop\Form\Field\SelectObjectField $oCustomField */
-										$oCustomField->VerifyCurrentValue();
+										$oCustomField->ResetCurrentValueIfNotAmongAllowedValues();
 									}
 								}
 							}
@@ -1550,7 +1550,7 @@ class ObjectFormManager extends FormManager
 	}
 
 	/**
-	 * Inspired from MetaModel::GetZListAttDefsFilteredForIndirectLinkClass
+	 * Inspired from {@see \MetaModel::GetZListAttDefsFilteredForIndirectLinkClass}
 	 * Retrieve link attributes to display from portal configuration.
 	 *
 	 * @param string $sClass
@@ -1558,7 +1558,7 @@ class ObjectFormManager extends FormManager
 	 *
 	 * @return array
 	 * @throws \CoreException
-	 * @since 3.1
+	 * @since 3.1.0 N°6398
 	 *
 	 */
 	private function GetZListAttDefsFilteredForIndirectLinkClass(string $sClass, string $sAttCode): array
diff --git a/datamodels/2.x/itop-portal/dictionaries/zh_cn.dict.itop-portal.php b/datamodels/2.x/itop-portal/dictionaries/zh_cn.dict.itop-portal.php
index 1c82a2d863..60585d66ad 100644
--- a/datamodels/2.x/itop-portal/dictionaries/zh_cn.dict.itop-portal.php
+++ b/datamodels/2.x/itop-portal/dictionaries/zh_cn.dict.itop-portal.php
@@ -34,7 +34,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Brick:Portal:NewRequest:Title' => '新建工单',
 	'Brick:Portal:NewRequest:Title+' => '<p>需要帮助?</p><p>选择子服务,然后提交工单给我们的支持团队.</p>',
 	'Brick:Portal:OngoingRequests:Title' => '正在处理的工单',
-	'Brick:Portal:OngoingRequests:Title+' => '<p>跟踪正在处理的工单.</p><p>查询进度, 添加留言, 添加附件, 确认解决方案.</p>',
+	'Brick:Portal:OngoingRequests:Title+' => '<p>跟踪正在处理的工单.</p><p>查询进度, 添加评论, 添加附件, 确认解决方案.</p>',
 	'Brick:Portal:OngoingRequests:Tab:OnGoing' => '正在处理',
 	'Brick:Portal:OngoingRequests:Tab:Resolved' => '已解决',
 	'Brick:Portal:ClosedRequests:Title' => '已关闭的工单',
diff --git a/datamodels/2.x/itop-problem-mgmt/datamodel.itop-problem-mgmt.xml b/datamodels/2.x/itop-problem-mgmt/datamodel.itop-problem-mgmt.xml
index a182bfa870..6f90a11fae 100755
--- a/datamodels/2.x/itop-problem-mgmt/datamodel.itop-problem-mgmt.xml
+++ b/datamodels/2.x/itop-problem-mgmt/datamodel.itop-problem-mgmt.xml
@@ -215,8 +215,6 @@
           <edit_mode>add_only</edit_mode>
           <count_min>0</count_min>
           <count_max>0</count_max>
-          <relation_type>link</relation_type>
-          <read_only>false</read_only>
         </field>
         <field id="related_request_list" xsi:type="AttributeLinkedSet">
           <linked_class>UserRequest</linked_class>
@@ -224,8 +222,6 @@
           <edit_mode>add_remove</edit_mode>
           <count_min>0</count_min>
           <count_max>0</count_max>
-          <relation_type>link</relation_type>
-          <read_only>false</read_only>
         </field>
         <field id="related_incident_list" xsi:type="AttributeLinkedSet">
           <linked_class>Incident</linked_class>
@@ -233,8 +229,6 @@
           <edit_mode>add_remove</edit_mode>
           <count_min>0</count_min>
           <count_max>0</count_max>
-          <relation_type>link</relation_type>
-          <read_only>false</read_only>
         </field>
       </fields>
       <lifecycle>
diff --git a/datamodels/2.x/itop-problem-mgmt/dictionaries/de.dict.itop-problem-mgmt.php b/datamodels/2.x/itop-problem-mgmt/dictionaries/de.dict.itop-problem-mgmt.php
index 177839518f..a97709c86c 100644
--- a/datamodels/2.x/itop-problem-mgmt/dictionaries/de.dict.itop-problem-mgmt.php
+++ b/datamodels/2.x/itop-problem-mgmt/dictionaries/de.dict.itop-problem-mgmt.php
@@ -24,16 +24,16 @@
 */
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Menu:ProblemManagement' => 'Problem Management',
-	'Menu:ProblemManagement+' => 'Problem Management',
+	'Menu:ProblemManagement+' => '',
 	'Menu:Problem:Overview' => 'Übersicht',
-	'Menu:Problem:Overview+' => 'Übersicht',
+	'Menu:Problem:Overview+' => '',
 	'Menu:NewProblem' => 'Neues Problem',
-	'Menu:NewProblem+' => 'Neues Problem',
+	'Menu:NewProblem+' => '',
 	'Menu:SearchProblems' => 'Nach Problemen suchen',
-	'Menu:SearchProblems+' => 'Nach Problemen suchen',
+	'Menu:SearchProblems+' => '',
 	'Menu:Problem:Shortcuts' => 'Shortcuts',
 	'Menu:Problem:MyProblems' => 'Meine Probleme',
-	'Menu:Problem:MyProblems+' => 'Meine Probleme',
+	'Menu:Problem:MyProblems+' => '',
 	'Menu:Problem:OpenProblems' => 'Alle offenen Probleme',
 	'Menu:Problem:OpenProblems+' => 'Alle offenen (noch nicht geschlossenen) Probleme',
 	'UI-ProblemManagementOverview-ProblemByService' => 'Probleme nach Service',
@@ -110,11 +110,11 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:Problem/Attribute:resolution_date' => 'Datum der Lösung',
 	'Class:Problem/Attribute:resolution_date+' => '',
 	'Class:Problem/Attribute:knownerrors_list' => 'Bekannte Fehler',
-	'Class:Problem/Attribute:knownerrors_list+' => 'All the known errors that are linked to this problem~~',
+	'Class:Problem/Attribute:knownerrors_list+' => 'Alle bekannten Fehler verknüpft mit diesem Problem',
 	'Class:Problem/Attribute:related_request_list' => 'Verwandte Requests',
-	'Class:Problem/Attribute:related_request_list+' => 'All the requests that are related to this problem~~',
+	'Class:Problem/Attribute:related_request_list+' => 'Alle Benutzeranfragen verknüpft mit diesem Problem',
 	'Class:Problem/Attribute:related_incident_list' => 'Verknüpfte Incidents',
-	'Class:Problem/Attribute:related_incident_list+' => 'Alle Incidents, die mit diesem Problem verknüpft sind',
+	'Class:Problem/Attribute:related_incident_list+' => 'Alle Incidents verknüpft mit diesem Problem',
 	'Class:Problem/Stimulus:ev_assign' => 'Zuweisen',
 	'Class:Problem/Stimulus:ev_assign+' => '',
 	'Class:Problem/Stimulus:ev_reassign' => 'Neu zuweisen',
diff --git a/datamodels/2.x/itop-problem-mgmt/dictionaries/es_cr.dict.itop-problem-mgmt.php b/datamodels/2.x/itop-problem-mgmt/dictionaries/es_cr.dict.itop-problem-mgmt.php
index 5996a06ba5..7dc7ad783d 100644
--- a/datamodels/2.x/itop-problem-mgmt/dictionaries/es_cr.dict.itop-problem-mgmt.php
+++ b/datamodels/2.x/itop-problem-mgmt/dictionaries/es_cr.dict.itop-problem-mgmt.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
diff --git a/datamodels/2.x/itop-problem-mgmt/dictionaries/fr.dict.itop-problem-mgmt.php b/datamodels/2.x/itop-problem-mgmt/dictionaries/fr.dict.itop-problem-mgmt.php
index 3a9820be14..8ea2c662cd 100644
--- a/datamodels/2.x/itop-problem-mgmt/dictionaries/fr.dict.itop-problem-mgmt.php
+++ b/datamodels/2.x/itop-problem-mgmt/dictionaries/fr.dict.itop-problem-mgmt.php
@@ -124,8 +124,6 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:Problem/Stimulus:ev_close' => 'Fermer',
 	'Class:Problem/Stimulus:ev_close+' => '',
 ));
-
-
 // 1:n relations custom labels for tooltip and pop-up title
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:Problem/Attribute:knownerrors_list/UI:Links:Create:Button+' => 'Créer une %4$s',
@@ -145,5 +143,5 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:Problem/Attribute:related_request_list/UI:Links:Remove:Button+' => 'Retirer cette %4$s',
 	'Class:Problem/Attribute:related_request_list/UI:Links:Remove:Modal:Title' => 'Retirer cette %4$s de son %1$s',
 	'Class:Problem/Attribute:related_request_list/UI:Links:Delete:Button+' => 'Supprimer cette %4$s',
-	'Class:Problem/Attribute:related_request_list/UI:Links:Delete:Modal:Title' => 'Supprimer une %4$s',
+	'Class:Problem/Attribute:related_request_list/UI:Links:Delete:Modal:Title' => 'Supprimer une %4$s'
 ));
diff --git a/datamodels/2.x/itop-problem-mgmt/dictionaries/hu.dict.itop-problem-mgmt.php b/datamodels/2.x/itop-problem-mgmt/dictionaries/hu.dict.itop-problem-mgmt.php
index fdb6aa2588..d0c3b593f5 100644
--- a/datamodels/2.x/itop-problem-mgmt/dictionaries/hu.dict.itop-problem-mgmt.php
+++ b/datamodels/2.x/itop-problem-mgmt/dictionaries/hu.dict.itop-problem-mgmt.php
@@ -20,27 +20,27 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Menu:ProblemManagement' => 'Problémakezelés',
-    'Menu:ProblemManagement+' => '',
-    'Menu:Problem:Overview' => 'Áttekintő',
-    'Menu:Problem:Overview+' => '',
-    'Menu:NewProblem' => 'Új probléma',
-    'Menu:NewProblem+' => '',
-    'Menu:SearchProblems' => 'Probléma keresés',
-    'Menu:SearchProblems+' => '',
-    'Menu:Problem:Shortcuts' => 'Gyorsgombok',
-    'Menu:Problem:MyProblems' => 'Saját problémák',
-    'Menu:Problem:MyProblems+' => '',
-    'Menu:Problem:OpenProblems' => 'Összes nyitott probléma',
-    'Menu:Problem:OpenProblems+' => '',
-    'UI-ProblemManagementOverview-ProblemByService' => 'Problémák szolgáltatásonként',
-    'UI-ProblemManagementOverview-ProblemByService+' => '',
-    'UI-ProblemManagementOverview-ProblemByPriority' => 'Problémák prioritás szerint',
-    'UI-ProblemManagementOverview-ProblemByPriority+' => '',
-    'UI-ProblemManagementOverview-ProblemUnassigned' => 'Nem kiosztott problémák',
-    'UI-ProblemManagementOverview-ProblemUnassigned+' => '',
-    'UI:ProblemMgmtMenuOverview:Title' => 'Problémakezelés műszerfal',
-    'UI:ProblemMgmtMenuOverview:Title+' => '',
+	'Menu:ProblemManagement' => 'Problémakezelés',
+	'Menu:ProblemManagement+' => '',
+	'Menu:Problem:Overview' => 'Áttekintő',
+	'Menu:Problem:Overview+' => '',
+	'Menu:NewProblem' => 'Új probléma',
+	'Menu:NewProblem+' => '',
+	'Menu:SearchProblems' => 'Probléma keresés',
+	'Menu:SearchProblems+' => '',
+	'Menu:Problem:Shortcuts' => 'Gyorsgombok',
+	'Menu:Problem:MyProblems' => 'Saját problémák',
+	'Menu:Problem:MyProblems+' => '',
+	'Menu:Problem:OpenProblems' => 'Összes nyitott probléma',
+	'Menu:Problem:OpenProblems+' => '',
+	'UI-ProblemManagementOverview-ProblemByService' => 'Problémák szolgáltatásonként',
+	'UI-ProblemManagementOverview-ProblemByService+' => '',
+	'UI-ProblemManagementOverview-ProblemByPriority' => 'Problémák prioritás szerint',
+	'UI-ProblemManagementOverview-ProblemByPriority+' => '',
+	'UI-ProblemManagementOverview-ProblemUnassigned' => 'Nem kiosztott problémák',
+	'UI-ProblemManagementOverview-ProblemUnassigned+' => '',
+	'UI:ProblemMgmtMenuOverview:Title' => 'Problémakezelés műszerfal',
+	'UI:ProblemMgmtMenuOverview:Title+' => '',
 
 ));
 //
@@ -48,76 +48,76 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:Problem' => 'Probléma',
-    'Class:Problem+' => '',
-    'Class:Problem/Attribute:status' => 'Állapot',
-    'Class:Problem/Attribute:status+' => '',
-    'Class:Problem/Attribute:status/Value:new' => 'Új',
-    'Class:Problem/Attribute:status/Value:new+' => '',
-    'Class:Problem/Attribute:status/Value:assigned' => 'Kiosztott',
-    'Class:Problem/Attribute:status/Value:assigned+' => '',
-    'Class:Problem/Attribute:status/Value:resolved' => 'Megoldott',
-    'Class:Problem/Attribute:status/Value:resolved+' => '',
-    'Class:Problem/Attribute:status/Value:closed' => 'Lezárt',
-    'Class:Problem/Attribute:status/Value:closed+' => '',
-    'Class:Problem/Attribute:service_id' => 'Szolgáltatás',
-    'Class:Problem/Attribute:service_id+' => '',
-    'Class:Problem/Attribute:service_name' => 'Név',
-    'Class:Problem/Attribute:service_name+' => '',
-    'Class:Problem/Attribute:servicesubcategory_id' => 'Szolgáltatás kategória',
-    'Class:Problem/Attribute:servicesubcategory_id+' => '',
-    'Class:Problem/Attribute:servicesubcategory_name' => 'Név',
-    'Class:Problem/Attribute:servicesubcategory_name+' => '',
-    'Class:Problem/Attribute:product' => 'Termék',
-    'Class:Problem/Attribute:product+' => '',
-    'Class:Problem/Attribute:impact' => 'Hatása',
-    'Class:Problem/Attribute:impact+' => '',
-    'Class:Problem/Attribute:impact/Value:1' => 'Felhasználókra',
-    'Class:Problem/Attribute:impact/Value:1+' => '',
-    'Class:Problem/Attribute:impact/Value:2' => 'Szolgáltatásokra',
-    'Class:Problem/Attribute:impact/Value:2+' => '',
-    'Class:Problem/Attribute:impact/Value:3' => 'Szervezeti egységre',
-    'Class:Problem/Attribute:impact/Value:3+' => '',
-    'Class:Problem/Attribute:urgency' => 'Sűrgősség',
-    'Class:Problem/Attribute:urgency+' => '',
-    'Class:Problem/Attribute:urgency/Value:1' => 'Nem várhat',
-    'Class:Problem/Attribute:urgency/Value:1+' => '',
-    'Class:Problem/Attribute:urgency/Value:2' => 'Nagyon sürgős',
-    'Class:Problem/Attribute:urgency/Value:2+' => '',
-    'Class:Problem/Attribute:urgency/Value:3' => 'Sürgős',
-    'Class:Problem/Attribute:urgency/Value:3+' => '',
-    'Class:Problem/Attribute:urgency/Value:4' => 'Nem sürgős',
-    'Class:Problem/Attribute:urgency/Value:4+' => 'low~~',
-    'Class:Problem/Attribute:priority' => 'Prioritás',
-    'Class:Problem/Attribute:priority+' => '',
-    'Class:Problem/Attribute:priority/Value:1' => 'Kritikus',
-    'Class:Problem/Attribute:priority/Value:1+' => '',
-    'Class:Problem/Attribute:priority/Value:2' => 'Magas',
-    'Class:Problem/Attribute:priority/Value:2+' => '',
-    'Class:Problem/Attribute:priority/Value:3' => 'Közepes',
-    'Class:Problem/Attribute:priority/Value:3+' => '',
-    'Class:Problem/Attribute:priority/Value:4' => 'Alacsony',
-    'Class:Problem/Attribute:priority/Value:4+' => 'Low~~',
-    'Class:Problem/Attribute:related_change_id' => 'Kapcsolódó változások',
-    'Class:Problem/Attribute:related_change_id+' => '',
-    'Class:Problem/Attribute:related_change_ref' => 'Referencia',
-    'Class:Problem/Attribute:related_change_ref+' => '',
-    'Class:Problem/Attribute:assignment_date' => 'Felelőshöz rendelés',
-    'Class:Problem/Attribute:assignment_date+' => '',
-    'Class:Problem/Attribute:resolution_date' => 'Megoldás dátuma',
-    'Class:Problem/Attribute:resolution_date+' => '',
-    'Class:Problem/Attribute:knownerrors_list' => 'Ismert hibák',
+	'Class:Problem' => 'Probléma',
+	'Class:Problem+' => '',
+	'Class:Problem/Attribute:status' => 'Állapot',
+	'Class:Problem/Attribute:status+' => '',
+	'Class:Problem/Attribute:status/Value:new' => 'Új',
+	'Class:Problem/Attribute:status/Value:new+' => '',
+	'Class:Problem/Attribute:status/Value:assigned' => 'Kiosztott',
+	'Class:Problem/Attribute:status/Value:assigned+' => '',
+	'Class:Problem/Attribute:status/Value:resolved' => 'Megoldott',
+	'Class:Problem/Attribute:status/Value:resolved+' => '',
+	'Class:Problem/Attribute:status/Value:closed' => 'Lezárt',
+	'Class:Problem/Attribute:status/Value:closed+' => '',
+	'Class:Problem/Attribute:service_id' => 'Szolgáltatás',
+	'Class:Problem/Attribute:service_id+' => '',
+	'Class:Problem/Attribute:service_name' => 'Név',
+	'Class:Problem/Attribute:service_name+' => '',
+	'Class:Problem/Attribute:servicesubcategory_id' => 'Szolgáltatás kategória',
+	'Class:Problem/Attribute:servicesubcategory_id+' => '',
+	'Class:Problem/Attribute:servicesubcategory_name' => 'Név',
+	'Class:Problem/Attribute:servicesubcategory_name+' => '',
+	'Class:Problem/Attribute:product' => 'Termék',
+	'Class:Problem/Attribute:product+' => '',
+	'Class:Problem/Attribute:impact' => 'Hatása',
+	'Class:Problem/Attribute:impact+' => '',
+	'Class:Problem/Attribute:impact/Value:1' => 'Felhasználókra',
+	'Class:Problem/Attribute:impact/Value:1+' => '',
+	'Class:Problem/Attribute:impact/Value:2' => 'Szolgáltatásokra',
+	'Class:Problem/Attribute:impact/Value:2+' => '',
+	'Class:Problem/Attribute:impact/Value:3' => 'Szervezeti egységre',
+	'Class:Problem/Attribute:impact/Value:3+' => '',
+	'Class:Problem/Attribute:urgency' => 'Sűrgősség',
+	'Class:Problem/Attribute:urgency+' => '',
+	'Class:Problem/Attribute:urgency/Value:1' => 'Nem várhat',
+	'Class:Problem/Attribute:urgency/Value:1+' => '',
+	'Class:Problem/Attribute:urgency/Value:2' => 'Nagyon sürgős',
+	'Class:Problem/Attribute:urgency/Value:2+' => '',
+	'Class:Problem/Attribute:urgency/Value:3' => 'Sürgős',
+	'Class:Problem/Attribute:urgency/Value:3+' => '',
+	'Class:Problem/Attribute:urgency/Value:4' => 'Nem sürgős',
+	'Class:Problem/Attribute:urgency/Value:4+' => 'low~~',
+	'Class:Problem/Attribute:priority' => 'Prioritás',
+	'Class:Problem/Attribute:priority+' => '',
+	'Class:Problem/Attribute:priority/Value:1' => 'Kritikus',
+	'Class:Problem/Attribute:priority/Value:1+' => '',
+	'Class:Problem/Attribute:priority/Value:2' => 'Magas',
+	'Class:Problem/Attribute:priority/Value:2+' => '',
+	'Class:Problem/Attribute:priority/Value:3' => 'Közepes',
+	'Class:Problem/Attribute:priority/Value:3+' => '',
+	'Class:Problem/Attribute:priority/Value:4' => 'Alacsony',
+	'Class:Problem/Attribute:priority/Value:4+' => 'Low~~',
+	'Class:Problem/Attribute:related_change_id' => 'Kapcsolódó változások',
+	'Class:Problem/Attribute:related_change_id+' => '',
+	'Class:Problem/Attribute:related_change_ref' => 'Referencia',
+	'Class:Problem/Attribute:related_change_ref+' => '',
+	'Class:Problem/Attribute:assignment_date' => 'Felelőshöz rendelés',
+	'Class:Problem/Attribute:assignment_date+' => '',
+	'Class:Problem/Attribute:resolution_date' => 'Megoldás dátuma',
+	'Class:Problem/Attribute:resolution_date+' => '',
+	'Class:Problem/Attribute:knownerrors_list' => 'Ismert hibák',
 	'Class:Problem/Attribute:knownerrors_list+' => 'All the known errors that are linked to this problem~~',
-    'Class:Problem/Attribute:related_request_list' => 'Kapcsolódó kérelmek',
-    'Class:Problem/Attribute:related_request_list+' => 'Ehhez a kérelemhez kapcsolódó problémák',
-    'Class:Problem/Attribute:related_incident_list' => 'Kapcsolódó incidensek',
-    'Class:Problem/Attribute:related_incident_list+' => 'Ehhez az incidenshez kapcsolódó problémák',
-    'Class:Problem/Stimulus:ev_assign' => 'Hozzárendelés',
-    'Class:Problem/Stimulus:ev_assign+' => '',
-    'Class:Problem/Stimulus:ev_reassign' => 'Újra hozzárendelés',
-    'Class:Problem/Stimulus:ev_reassign+' => '',
-    'Class:Problem/Stimulus:ev_resolve' => 'Megoldás',
-    'Class:Problem/Stimulus:ev_resolve+' => '',
-    'Class:Problem/Stimulus:ev_close' => 'Lezárás',
-    'Class:Problem/Stimulus:ev_close+' => '',
+	'Class:Problem/Attribute:related_request_list' => 'Kapcsolódó kérelmek',
+	'Class:Problem/Attribute:related_request_list+' => 'Ehhez a kérelemhez kapcsolódó problémák',
+	'Class:Problem/Attribute:related_incident_list' => 'Kapcsolódó incidensek',
+	'Class:Problem/Attribute:related_incident_list+' => 'Ehhez az incidenshez kapcsolódó problémák',
+	'Class:Problem/Stimulus:ev_assign' => 'Hozzárendelés',
+	'Class:Problem/Stimulus:ev_assign+' => '',
+	'Class:Problem/Stimulus:ev_reassign' => 'Újra hozzárendelés',
+	'Class:Problem/Stimulus:ev_reassign+' => '',
+	'Class:Problem/Stimulus:ev_resolve' => 'Megoldás',
+	'Class:Problem/Stimulus:ev_resolve+' => '',
+	'Class:Problem/Stimulus:ev_close' => 'Lezárás',
+	'Class:Problem/Stimulus:ev_close+' => '',
 ));
diff --git a/datamodels/2.x/itop-problem-mgmt/dictionaries/pl.dict.itop-problem-mgmt.php b/datamodels/2.x/itop-problem-mgmt/dictionaries/pl.dict.itop-problem-mgmt.php
index 44343852c1..226021fab2 100644
--- a/datamodels/2.x/itop-problem-mgmt/dictionaries/pl.dict.itop-problem-mgmt.php
+++ b/datamodels/2.x/itop-problem-mgmt/dictionaries/pl.dict.itop-problem-mgmt.php
@@ -20,7 +20,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/>
  */
-
 // Dictionnay conventions
 // Class:<class_name>
 // Class:<class_name>+
@@ -30,12 +29,10 @@
 // Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
 // Class:<class_name>/Stimulus:<stimulus_code>
 // Class:<class_name>/Stimulus:<stimulus_code>+
-
 //////////////////////////////////////////////////////////////////////
 // Classes in 'bizmodel'
 //////////////////////////////////////////////////////////////////////
 //
-
 // Dictionnay conventions
 // Class:<class_name>
 // Class:<class_name>+
@@ -45,8 +42,6 @@
 // Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
 // Class:<class_name>/Stimulus:<stimulus_code>
 // Class:<class_name>/Stimulus:<stimulus_code>+
-
-
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Menu:ProblemManagement' => 'Zarządzanie problemami',
 	'Menu:ProblemManagement+' => 'Zarządzanie problemami',
diff --git a/datamodels/2.x/itop-problem-mgmt/dictionaries/zh_cn.dict.itop-problem-mgmt.php b/datamodels/2.x/itop-problem-mgmt/dictionaries/zh_cn.dict.itop-problem-mgmt.php
index 77eb3070d5..1879ab7503 100644
--- a/datamodels/2.x/itop-problem-mgmt/dictionaries/zh_cn.dict.itop-problem-mgmt.php
+++ b/datamodels/2.x/itop-problem-mgmt/dictionaries/zh_cn.dict.itop-problem-mgmt.php
@@ -20,7 +20,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/>
  */
-
 // Dictionnay conventions
 // Class:<class_name>
 // Class:<class_name>+
@@ -30,12 +29,10 @@
 // Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
 // Class:<class_name>/Stimulus:<stimulus_code>
 // Class:<class_name>/Stimulus:<stimulus_code>+
-
 //////////////////////////////////////////////////////////////////////
 // Classes in 'bizmodel'
 //////////////////////////////////////////////////////////////////////
 //
-
 // Dictionnay conventions
 // Class:<class_name>
 // Class:<class_name>+
@@ -45,8 +42,6 @@
 // Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
 // Class:<class_name>/Stimulus:<stimulus_code>
 // Class:<class_name>/Stimulus:<stimulus_code>+
-
-
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Menu:ProblemManagement' => '问题管理',
 	'Menu:ProblemManagement+' => '问题管理',
diff --git a/datamodels/2.x/itop-request-mgmt-itil/datamodel.itop-request-mgmt-itil.xml b/datamodels/2.x/itop-request-mgmt-itil/datamodel.itop-request-mgmt-itil.xml
index d564e8c04e..64a60d799b 100755
--- a/datamodels/2.x/itop-request-mgmt-itil/datamodel.itop-request-mgmt-itil.xml
+++ b/datamodels/2.x/itop-request-mgmt-itil/datamodel.itop-request-mgmt-itil.xml
@@ -519,8 +519,6 @@
           <edit_mode>add_remove</edit_mode>
           <count_min>0</count_min>
           <count_max>0</count_max>
-          <relation_type>link</relation_type>
-          <read_only>false</read_only>
         </field>
         <field id="public_log" xsi:type="AttributeCaseLog">
           <sql>public_log</sql>
diff --git a/datamodels/2.x/itop-request-mgmt-itil/dictionaries/cs.dict.itop-request-mgmt-itil.php b/datamodels/2.x/itop-request-mgmt-itil/dictionaries/cs.dict.itop-request-mgmt-itil.php
index 298b25d01c..a4d33d7ecc 100644
--- a/datamodels/2.x/itop-request-mgmt-itil/dictionaries/cs.dict.itop-request-mgmt-itil.php
+++ b/datamodels/2.x/itop-request-mgmt-itil/dictionaries/cs.dict.itop-request-mgmt-itil.php
@@ -38,6 +38,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'UI-RequestManagementOverview-OpenRequestByType' => 'Otevřené požadavky podle typu',
 	'UI-RequestManagementOverview-OpenRequestByCustomer' => 'Otevřené požadavky podle zákazníka',
 	'Class:UserRequest:KnownErrorList' => 'Známé chyby',
+	'Class:UserRequest:KnownErrorList+' => 'Known Errors related to Functional CI linked to the current ticket~~',
 ));
 
 // Dictionnay conventions
@@ -113,6 +114,10 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:UserRequest/Attribute:urgency/Value:4+' => '',
 	'Class:UserRequest/Attribute:origin' => 'Původ',
 	'Class:UserRequest/Attribute:origin+' => '',
+	'Class:UserRequest/Attribute:origin/Value:in_person' => 'In-person~~',
+	'Class:UserRequest/Attribute:origin/Value:in_person+' => 'Request created following a face-to-face discussion~~',
+	'Class:UserRequest/Attribute:origin/Value:chat' => 'Chat~~',
+	'Class:UserRequest/Attribute:origin/Value:chat+' => 'Request created following a chat discussion~~',
 	'Class:UserRequest/Attribute:origin/Value:mail' => 'email',
 	'Class:UserRequest/Attribute:origin/Value:mail+' => '',
 	'Class:UserRequest/Attribute:origin/Value:monitoring' => 'monitoring',
@@ -246,7 +251,6 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:UserRequest/Stimulus:ev_wait_for_approval' => 'Čeká na schválení',
 	'Class:UserRequest/Stimulus:ev_wait_for_approval+' => '',
 	'Class:UserRequest/Error:CannotAssignParentRequestIdToSelf' => 'Požadavek nemůže být nadřazený sám sobě',
-
 	'Class:UserRequest/Method:ResolveChildTickets' => 'Vyřešit podřízené tikety',
 	'Class:UserRequest/Method:ResolveChildTickets+' => 'Cascade the resolution to child requests (ev_autoresolve), and align the following characteristics of the request: service, team, agent, resolution info~~',
 ));
diff --git a/datamodels/2.x/itop-request-mgmt-itil/dictionaries/da.dict.itop-request-mgmt-itil.php b/datamodels/2.x/itop-request-mgmt-itil/dictionaries/da.dict.itop-request-mgmt-itil.php
index cc3a44994c..e0fd12abc8 100644
--- a/datamodels/2.x/itop-request-mgmt-itil/dictionaries/da.dict.itop-request-mgmt-itil.php
+++ b/datamodels/2.x/itop-request-mgmt-itil/dictionaries/da.dict.itop-request-mgmt-itil.php
@@ -37,6 +37,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'UI-RequestManagementOverview-OpenRequestByType' => 'Åbne brugerhenvendelser efter type',
 	'UI-RequestManagementOverview-OpenRequestByCustomer' => 'Åbne brugerhenvendelser efter bruger',
 	'Class:UserRequest:KnownErrorList' => 'Known Errors',
+	'Class:UserRequest:KnownErrorList+' => 'Known Errors related to Functional CI linked to the current ticket~~',
 ));
 
 // Dictionnay conventions
@@ -112,6 +113,10 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:UserRequest/Attribute:urgency/Value:4+' => '',
 	'Class:UserRequest/Attribute:origin' => 'Oprindelse',
 	'Class:UserRequest/Attribute:origin+' => '',
+	'Class:UserRequest/Attribute:origin/Value:in_person' => 'In-person~~',
+	'Class:UserRequest/Attribute:origin/Value:in_person+' => 'Request created following a face-to-face discussion~~',
+	'Class:UserRequest/Attribute:origin/Value:chat' => 'Chat~~',
+	'Class:UserRequest/Attribute:origin/Value:chat+' => 'Request created following a chat discussion~~',
 	'Class:UserRequest/Attribute:origin/Value:mail' => 'Mail',
 	'Class:UserRequest/Attribute:origin/Value:mail+' => '',
 	'Class:UserRequest/Attribute:origin/Value:monitoring' => 'Monitoring',
@@ -245,7 +250,6 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:UserRequest/Stimulus:ev_wait_for_approval' => 'Afventer godkendelse',
 	'Class:UserRequest/Stimulus:ev_wait_for_approval+' => '',
 	'Class:UserRequest/Error:CannotAssignParentRequestIdToSelf' => 'Cannot assign the Parent request to the request itself~~',
-
 	'Class:UserRequest/Method:ResolveChildTickets' => 'ResolveChildTickets~~',
 	'Class:UserRequest/Method:ResolveChildTickets+' => 'Cascade the resolution to child requests (ev_autoresolve), and align the following characteristics of the request: service, team, agent, resolution info~~',
 ));
diff --git a/datamodels/2.x/itop-request-mgmt-itil/dictionaries/de.dict.itop-request-mgmt-itil.php b/datamodels/2.x/itop-request-mgmt-itil/dictionaries/de.dict.itop-request-mgmt-itil.php
index fb85aef612..7d63801c85 100644
--- a/datamodels/2.x/itop-request-mgmt-itil/dictionaries/de.dict.itop-request-mgmt-itil.php
+++ b/datamodels/2.x/itop-request-mgmt-itil/dictionaries/de.dict.itop-request-mgmt-itil.php
@@ -8,27 +8,27 @@
  */
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Menu:RequestManagement' => 'Helpdesk',
-	'Menu:RequestManagement+' => '',
+	'Menu:RequestManagement+' => 'Verwaltung von Benutzeranfragen',
 	'Menu:RequestManagementProvider' => 'Helpdesk-Provider',
 	'Menu:RequestManagementProvider+' => '',
 	'Menu:UserRequest:Provider' => 'Offene Benutzeranfragen beim Provider',
 	'Menu:UserRequest:Provider+' => '',
 	'Menu:UserRequest:Overview' => 'Übersicht',
-	'Menu:UserRequest:Overview+' => '',
+	'Menu:UserRequest:Overview+' => 'Übersicht über Benutzeranfragen',
 	'Menu:NewUserRequest' => 'Neue Benutzeranfrage',
-	'Menu:NewUserRequest+' => '',
+	'Menu:NewUserRequest+' => 'Neue Benutzeranfrage erstellen',
 	'Menu:SearchUserRequests' => 'Nach Benutzeranfrage suchen',
-	'Menu:SearchUserRequests+' => '',
+	'Menu:SearchUserRequests+' => 'Nach bestehenden Benutzeranfragen suchen',
 	'Menu:UserRequest:Shortcuts' => 'Shortcuts',
 	'Menu:UserRequest:Shortcuts+' => '',
 	'Menu:UserRequest:MyRequests' => 'Mir zugewiesene Benutzeranfragen',
 	'Menu:UserRequest:MyRequests+' => '',
 	'Menu:UserRequest:MySupportRequests' => 'Von mir gestellte Anfragen',
-	'Menu:UserRequest:MySupportRequests+' => '',
+	'Menu:UserRequest:MySupportRequests+' => 'Benutzeranfragen die ich gemeldet habe',
 	'Menu:UserRequest:EscalatedRequests' => 'Eskalierte Benutzeranfragen',
-	'Menu:UserRequest:EscalatedRequests+' => '',
+	'Menu:UserRequest:EscalatedRequests+' => 'Eskalierte Benutzeranfragen',
 	'Menu:UserRequest:OpenRequests' => 'Alle offenen Benutzeranfragen',
-	'Menu:UserRequest:OpenRequests+' => '',
+	'Menu:UserRequest:OpenRequests+' => 'Alle offenen Benutzeranfragen',
 	'UI:WelcomeMenu:MyAssignedCalls' => 'Mir zugewiesene Benutzeranfragen',
 	'UI-RequestManagementOverview-RequestByType-last-14-days' => 'Benutzeranfragen der letzten 14 Tage nach Typ',
 	'UI-RequestManagementOverview-Last-14-days' => 'Anzahl Benutzeranfragen der letzten 14 Tage',
@@ -37,6 +37,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'UI-RequestManagementOverview-OpenRequestByType' => 'Offene Benutzeranfragen nach Typ',
 	'UI-RequestManagementOverview-OpenRequestByCustomer' => 'Offene Benutzeranfragen nach Kunde',
 	'Class:UserRequest:KnownErrorList' => 'Known Errors',
+	'Class:UserRequest:KnownErrorList+' => 'Dokumentiere Fehler im Zusammenhang mit CIs, die mit dem aktuellen Ticket verknüpft sind',
 ));
 
 // Dictionnay conventions
@@ -83,7 +84,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:UserRequest/Attribute:request_type/Value:service_request' => 'Service-Request',
 	'Class:UserRequest/Attribute:request_type/Value:service_request+' => '',
 	'Class:UserRequest/Attribute:impact' => 'Auswirkung',
-	'Class:UserRequest/Attribute:impact+' => '',
+	'Class:UserRequest/Attribute:impact+' => 'Die Auswirkung gibt die Schwere des Vorfalls an, oft geschätzt durch die Anzahl der Betroffenen',
 	'Class:UserRequest/Attribute:impact/Value:1' => 'Eine Abteilung',
 	'Class:UserRequest/Attribute:impact/Value:1+' => '',
 	'Class:UserRequest/Attribute:impact/Value:2' => 'Ein Service',
@@ -101,7 +102,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:UserRequest/Attribute:priority/Value:4' => 'Niedrig',
 	'Class:UserRequest/Attribute:priority/Value:4+' => '',
 	'Class:UserRequest/Attribute:urgency' => 'Dringlichkeit',
-	'Class:UserRequest/Attribute:urgency+' => '',
+	'Class:UserRequest/Attribute:urgency+' => 'Wie schnell der Vorfall behandelt werden muss',
 	'Class:UserRequest/Attribute:urgency/Value:1' => 'Kritisch',
 	'Class:UserRequest/Attribute:urgency/Value:1+' => '',
 	'Class:UserRequest/Attribute:urgency/Value:2' => 'Hoch',
@@ -112,14 +113,18 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:UserRequest/Attribute:urgency/Value:4+' => '',
 	'Class:UserRequest/Attribute:origin' => 'Herkunft',
 	'Class:UserRequest/Attribute:origin+' => '',
+	'Class:UserRequest/Attribute:origin/Value:in_person' => 'Persönlich',
+	'Class:UserRequest/Attribute:origin/Value:in_person+' => 'Benutzeranfrage auf Basis einer Diskussion im direkten Gespräch',
+	'Class:UserRequest/Attribute:origin/Value:chat' => 'Chat',
+	'Class:UserRequest/Attribute:origin/Value:chat+' => 'Benutzeranfrage auf Basis einer Diskussion in einem Chat',
 	'Class:UserRequest/Attribute:origin/Value:mail' => 'Mail',
-	'Class:UserRequest/Attribute:origin/Value:mail+' => '',
+	'Class:UserRequest/Attribute:origin/Value:mail+' => 'Benutzeranfrage auf Basis einer empfangenen Mail',
 	'Class:UserRequest/Attribute:origin/Value:monitoring' => 'Monitoring',
-	'Class:UserRequest/Attribute:origin/Value:monitoring+' => '',
+	'Class:UserRequest/Attribute:origin/Value:monitoring+' => 'Benutzeranfrage auf Basis eines Monitoring-Events',
 	'Class:UserRequest/Attribute:origin/Value:phone' => 'Telefon',
-	'Class:UserRequest/Attribute:origin/Value:phone+' => '',
+	'Class:UserRequest/Attribute:origin/Value:phone+' => 'Benutzeranfrage auf Basis eines Telefonanrufs',
 	'Class:UserRequest/Attribute:origin/Value:portal' => 'Portal',
-	'Class:UserRequest/Attribute:origin/Value:portal+' => '',
+	'Class:UserRequest/Attribute:origin/Value:portal+' => 'Benutzeranfrage, die über das Portal erstellt wurde',
 	'Class:UserRequest/Attribute:approver_id' => 'Genehmiger',
 	'Class:UserRequest/Attribute:approver_id+' => '',
 	'Class:UserRequest/Attribute:approver_email' => 'Gemehhmiger-E-Mail',
@@ -167,7 +172,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:UserRequest/Attribute:time_spent' => 'Lösungsdauer',
 	'Class:UserRequest/Attribute:time_spent+' => '',
 	'Class:UserRequest/Attribute:resolution_code' => 'Lösungs-Code',
-	'Class:UserRequest/Attribute:resolution_code+' => '',
+	'Class:UserRequest/Attribute:resolution_code+' => 'Was wurde unternommen, um die Anfrage zu lösen?',
 	'Class:UserRequest/Attribute:resolution_code/Value:assistance' => 'Unterstützung',
 	'Class:UserRequest/Attribute:resolution_code/Value:assistance+' => '',
 	'Class:UserRequest/Attribute:resolution_code/Value:bug fixed' => 'Bugfix',
@@ -203,7 +208,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:UserRequest/Attribute:parent_incident_ref' => 'Parent-Incident-Referenz',
 	'Class:UserRequest/Attribute:parent_incident_ref+' => '',
 	'Class:UserRequest/Attribute:related_request_list' => 'Abgeleitete Requests',
-	'Class:UserRequest/Attribute:related_request_list+' => 'All the requests that are linked to this parent request~~',
+	'Class:UserRequest/Attribute:related_request_list+' => 'Alle abgeleitete Anfragen, die mit dieser Benutzeranfrage verknüpft sind',
 	'Class:UserRequest/Attribute:public_log' => 'Öffentliches Log',
 	'Class:UserRequest/Attribute:public_log+' => '',
 	'Class:UserRequest/Attribute:user_satisfaction' => 'Benutzerzufriedenheit',
@@ -218,7 +223,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:UserRequest/Attribute:user_satisfaction/Value:4+' => '',
 	'Class:UserRequest/Attribute:user_comment' => 'Benutzer-Kommentar',
 	'Class:UserRequest/Attribute:user_comment+' => '',
-	'Class:UserRequest/Attribute:parent_request_id_friendlyname' => 'Parent-Benutzeranfrage-Id-Friendly Name',
+	'Class:UserRequest/Attribute:parent_request_id_friendlyname' => 'Parent-Benutzeranfrage-Anzeigename',
 	'Class:UserRequest/Attribute:parent_request_id_friendlyname+' => '',
 	'Class:UserRequest/Stimulus:ev_assign' => 'Zuweisen',
 	'Class:UserRequest/Stimulus:ev_assign+' => '',
@@ -245,7 +250,6 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:UserRequest/Stimulus:ev_wait_for_approval' => 'Auf Genehmigung warten',
 	'Class:UserRequest/Stimulus:ev_wait_for_approval+' => '',
 	'Class:UserRequest/Error:CannotAssignParentRequestIdToSelf' => 'Kann Ticket nicht als eigenes Parent-Ticket verwenden',
-
 	'Class:UserRequest/Method:ResolveChildTickets' => 'Kind-Tickets lösen',
 	'Class:UserRequest/Method:ResolveChildTickets+' => 'Lösung auf Kind-Tickets übertragen (ev_autoresolve), und folgende Ticket-Eigenschaften angleichen: Service, Team, Agent, Lösungsinformationen',
 ));
diff --git a/datamodels/2.x/itop-request-mgmt-itil/dictionaries/es_cr.dict.itop-request-mgmt-itil.php b/datamodels/2.x/itop-request-mgmt-itil/dictionaries/es_cr.dict.itop-request-mgmt-itil.php
index c1b9125a22..790ad69125 100644
--- a/datamodels/2.x/itop-request-mgmt-itil/dictionaries/es_cr.dict.itop-request-mgmt-itil.php
+++ b/datamodels/2.x/itop-request-mgmt-itil/dictionaries/es_cr.dict.itop-request-mgmt-itil.php
@@ -35,6 +35,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'UI-RequestManagementOverview-OpenRequestByType' => 'Requerimientos Abiertos por Tipo',
 	'UI-RequestManagementOverview-OpenRequestByCustomer' => 'Requerimientos Abiertos por Cliente',
 	'Class:UserRequest:KnownErrorList' => 'Errores Conocidos',
+	'Class:UserRequest:KnownErrorList+' => 'Known Errors related to Functional CI linked to the current ticket~~',
 ));
 
 // Dictionnay conventions
@@ -110,6 +111,10 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:UserRequest/Attribute:urgency/Value:4+' => 'Baja',
 	'Class:UserRequest/Attribute:origin' => 'Origen',
 	'Class:UserRequest/Attribute:origin+' => 'Origen',
+	'Class:UserRequest/Attribute:origin/Value:in_person' => 'In-person~~',
+	'Class:UserRequest/Attribute:origin/Value:in_person+' => 'Request created following a face-to-face discussion~~',
+	'Class:UserRequest/Attribute:origin/Value:chat' => 'Chat~~',
+	'Class:UserRequest/Attribute:origin/Value:chat+' => 'Request created following a chat discussion~~',
 	'Class:UserRequest/Attribute:origin/Value:mail' => 'Correo-e',
 	'Class:UserRequest/Attribute:origin/Value:mail+' => 'Correo-e',
 	'Class:UserRequest/Attribute:origin/Value:monitoring' => 'Monitoreo',
@@ -243,7 +248,6 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:UserRequest/Stimulus:ev_wait_for_approval' => 'Esperando Aprobación',
 	'Class:UserRequest/Stimulus:ev_wait_for_approval+' => 'Esperando Aprobación',
 	'Class:UserRequest/Error:CannotAssignParentRequestIdToSelf' => 'No puede asignarse el requerimiento Padre a si mismo',
-
 	'Class:UserRequest/Method:ResolveChildTickets' => 'Resolver tickets hijos',
 	'Class:UserRequest/Method:ResolveChildTickets+' => 'Cascadear la solución a los tickets hijos (ev_autoresolve), y alinear las siguientes características: servicio, equipo, agente, información de solución',
 ));
diff --git a/datamodels/2.x/itop-request-mgmt-itil/dictionaries/fr.dict.itop-request-mgmt-itil.php b/datamodels/2.x/itop-request-mgmt-itil/dictionaries/fr.dict.itop-request-mgmt-itil.php
index 1476a9e109..bc7030e2c2 100644
--- a/datamodels/2.x/itop-request-mgmt-itil/dictionaries/fr.dict.itop-request-mgmt-itil.php
+++ b/datamodels/2.x/itop-request-mgmt-itil/dictionaries/fr.dict.itop-request-mgmt-itil.php
@@ -250,7 +250,6 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:UserRequest/Stimulus:ev_wait_for_approval' => 'Attendre une approbation',
 	'Class:UserRequest/Stimulus:ev_wait_for_approval+' => '',
 	'Class:UserRequest/Error:CannotAssignParentRequestIdToSelf' => 'La demande parente ne peut pas être assignée à elle même',
-
 	'Class:UserRequest/Method:ResolveChildTickets' => 'ResolveChildTickets (résoudre les tickets fils)',
 	'Class:UserRequest/Method:ResolveChildTickets+' => 'Cascader l\'action de résolution de la demande (ev_autoresolve), et aligner les caractéristiques suivantes : service, équipe, agent, information de résolution',
 ));
@@ -261,7 +260,6 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Organization:Overview:MyUserRequests' => 'Mes Demandes Utilisateurs pour cette organisation',
 	'Organization:Overview:Tickets' => 'Les Tickets de cette organisation',
 ));
-
 // 1:n relations custom labels for tooltip and pop-up title
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:UserRequest/Attribute:related_request_list/UI:Links:Create:Button+' => 'Créer une %4$s',
@@ -269,6 +267,5 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:UserRequest/Attribute:related_request_list/UI:Links:Remove:Button+' => 'Retirer cette %4$s',
 	'Class:UserRequest/Attribute:related_request_list/UI:Links:Remove:Modal:Title' => 'Retirer cette %4$s de sa %1$s',
 	'Class:UserRequest/Attribute:related_request_list/UI:Links:Delete:Button+' => 'Supprimer cette %4$s',
-	'Class:UserRequest/Attribute:related_request_list/UI:Links:Delete:Modal:Title' => 'Supprimer une %4$s',
+	'Class:UserRequest/Attribute:related_request_list/UI:Links:Delete:Modal:Title' => 'Supprimer une %4$s'
 ));
-
diff --git a/datamodels/2.x/itop-request-mgmt-itil/dictionaries/hu.dict.itop-request-mgmt-itil.php b/datamodels/2.x/itop-request-mgmt-itil/dictionaries/hu.dict.itop-request-mgmt-itil.php
index 8610478aa0..104e7b6e92 100644
--- a/datamodels/2.x/itop-request-mgmt-itil/dictionaries/hu.dict.itop-request-mgmt-itil.php
+++ b/datamodels/2.x/itop-request-mgmt-itil/dictionaries/hu.dict.itop-request-mgmt-itil.php
@@ -4,36 +4,37 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Menu:RequestManagement' => 'Helpdesk',
-    'Menu:RequestManagement+' => 'Helpdesk~~',
-    'Menu:RequestManagementProvider' => 'Helpdesk szolgáltató',
-    'Menu:RequestManagementProvider+' => 'Helpdesk provider~~',
-    'Menu:UserRequest:Provider' => 'Szolgáltatónak továbbított nyitott kérelem',
-    'Menu:UserRequest:Provider+' => 'Open request transfered to provider~~',
-    'Menu:UserRequest:Overview' => 'Áttekintő',
-    'Menu:UserRequest:Overview+' => 'Overview~~',
-    'Menu:NewUserRequest' => 'Új felhasználói kérelem',
-    'Menu:NewUserRequest+' => 'Create a new user request ticket~~',
-    'Menu:SearchUserRequests' => 'Felhasználói kérelmek keresése',
-    'Menu:SearchUserRequests+' => 'Search for user request tickets~~',
-    'Menu:UserRequest:Shortcuts' => 'Gyorsgombok',
-    'Menu:UserRequest:Shortcuts+' => '~~',
-    'Menu:UserRequest:MyRequests' => 'Hozzám rendelt kérelmek',
-    'Menu:UserRequest:MyRequests+' => 'Requests assigned to me (as Agent)~~',
-    'Menu:UserRequest:MySupportRequests' => 'Támogatási kérelmeim',
-    'Menu:UserRequest:MySupportRequests+' => 'My support calls~~',
-    'Menu:UserRequest:EscalatedRequests' => 'Sürgős kérelmek',
-    'Menu:UserRequest:EscalatedRequests+' => 'Hot Requests~~',
-    'Menu:UserRequest:OpenRequests' => 'Minden nyitott kérelem',
-    'Menu:UserRequest:OpenRequests+' => 'All open requests~~',
-    'UI:WelcomeMenu:MyAssignedCalls' => 'Hozzám rendelt kérelmek',
-    'UI-RequestManagementOverview-RequestByType-last-14-days' => 'Az elmúlt 14 nap kérelmei típusonként',
-    'UI-RequestManagementOverview-Last-14-days' => 'Az elmúlt 14 napban érkezett kérelmek száma',
-    'UI-RequestManagementOverview-OpenRequestByStatus' => 'Nyitott kérelmek állapotuk szerint',
-    'UI-RequestManagementOverview-OpenRequestByAgent' => 'Nyitott kérelmek felelősönként',
-    'UI-RequestManagementOverview-OpenRequestByType' => 'Nyitott kérelmek típusonként',
-    'UI-RequestManagementOverview-OpenRequestByCustomer' => 'Nyitott kérelmek ügyfelenként',
-    'Class:UserRequest:KnownErrorList' => 'Ismert hibák',
+	'Menu:RequestManagement' => 'Helpdesk',
+	'Menu:RequestManagement+' => 'Helpdesk~~',
+	'Menu:RequestManagementProvider' => 'Helpdesk szolgáltató',
+	'Menu:RequestManagementProvider+' => 'Helpdesk provider~~',
+	'Menu:UserRequest:Provider' => 'Szolgáltatónak továbbított nyitott kérelem',
+	'Menu:UserRequest:Provider+' => 'Open request transfered to provider~~',
+	'Menu:UserRequest:Overview' => 'Áttekintő',
+	'Menu:UserRequest:Overview+' => 'Overview~~',
+	'Menu:NewUserRequest' => 'Új felhasználói kérelem',
+	'Menu:NewUserRequest+' => 'Create a new user request ticket~~',
+	'Menu:SearchUserRequests' => 'Felhasználói kérelmek keresése',
+	'Menu:SearchUserRequests+' => 'Search for user request tickets~~',
+	'Menu:UserRequest:Shortcuts' => 'Gyorsgombok',
+	'Menu:UserRequest:Shortcuts+' => '~~',
+	'Menu:UserRequest:MyRequests' => 'Hozzám rendelt kérelmek',
+	'Menu:UserRequest:MyRequests+' => 'Requests assigned to me (as Agent)~~',
+	'Menu:UserRequest:MySupportRequests' => 'Támogatási kérelmeim',
+	'Menu:UserRequest:MySupportRequests+' => 'My support calls~~',
+	'Menu:UserRequest:EscalatedRequests' => 'Sürgős kérelmek',
+	'Menu:UserRequest:EscalatedRequests+' => 'Hot Requests~~',
+	'Menu:UserRequest:OpenRequests' => 'Minden nyitott kérelem',
+	'Menu:UserRequest:OpenRequests+' => 'All open requests~~',
+	'UI:WelcomeMenu:MyAssignedCalls' => 'Hozzám rendelt kérelmek',
+	'UI-RequestManagementOverview-RequestByType-last-14-days' => 'Az elmúlt 14 nap kérelmei típusonként',
+	'UI-RequestManagementOverview-Last-14-days' => 'Az elmúlt 14 napban érkezett kérelmek száma',
+	'UI-RequestManagementOverview-OpenRequestByStatus' => 'Nyitott kérelmek állapotuk szerint',
+	'UI-RequestManagementOverview-OpenRequestByAgent' => 'Nyitott kérelmek felelősönként',
+	'UI-RequestManagementOverview-OpenRequestByType' => 'Nyitott kérelmek típusonként',
+	'UI-RequestManagementOverview-OpenRequestByCustomer' => 'Nyitott kérelmek ügyfelenként',
+	'Class:UserRequest:KnownErrorList' => 'Ismert hibák',
+	'Class:UserRequest:KnownErrorList+' => 'Known Errors related to Functional CI linked to the current ticket~~',
 ));
 
 // Dictionnay conventions
@@ -51,205 +52,208 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:UserRequest' => 'Felhasználói kérelem',
-    'Class:UserRequest+' => '~~',
-    'Class:UserRequest/Attribute:status' => 'Állapot',
-    'Class:UserRequest/Attribute:status+' => '~~',
-    'Class:UserRequest/Attribute:status/Value:new' => 'Új',
-    'Class:UserRequest/Attribute:status/Value:new+' => '~~',
-    'Class:UserRequest/Attribute:status/Value:escalated_tto' => 'Eszkalált TTO',
-    'Class:UserRequest/Attribute:status/Value:escalated_tto+' => '~~',
-    'Class:UserRequest/Attribute:status/Value:assigned' => 'Hozzárendelt',
-    'Class:UserRequest/Attribute:status/Value:assigned+' => '~~',
-    'Class:UserRequest/Attribute:status/Value:escalated_ttr' => 'Eszkalált TTR',
-    'Class:UserRequest/Attribute:status/Value:escalated_ttr+' => '~~',
-    'Class:UserRequest/Attribute:status/Value:waiting_for_approval' => 'Jóváhagyásra vár',
-    'Class:UserRequest/Attribute:status/Value:waiting_for_approval+' => '~~',
-    'Class:UserRequest/Attribute:status/Value:approved' => 'Jóváhagyva',
-    'Class:UserRequest/Attribute:status/Value:approved+' => '~~',
-    'Class:UserRequest/Attribute:status/Value:rejected' => 'Elutasítva',
-    'Class:UserRequest/Attribute:status/Value:rejected+' => '~~',
-    'Class:UserRequest/Attribute:status/Value:pending' => 'Folyamatban',
-    'Class:UserRequest/Attribute:status/Value:pending+' => '~~',
-    'Class:UserRequest/Attribute:status/Value:resolved' => 'Megoldva',
-    'Class:UserRequest/Attribute:status/Value:resolved+' => '~~',
-    'Class:UserRequest/Attribute:status/Value:closed' => 'Lezárt',
-    'Class:UserRequest/Attribute:status/Value:closed+' => '~~',
-    'Class:UserRequest/Attribute:request_type' => 'Kérelem típus',
-    'Class:UserRequest/Attribute:request_type+' => '~~',
-    'Class:UserRequest/Attribute:request_type/Value:service_request' => 'Szolgáltatás kérelem',
-    'Class:UserRequest/Attribute:request_type/Value:service_request+' => 'Service request~~',
-    'Class:UserRequest/Attribute:impact' => 'Hatása',
-    'Class:UserRequest/Attribute:impact+' => '~~',
-    'Class:UserRequest/Attribute:impact/Value:1' => 'Részlegre',
-    'Class:UserRequest/Attribute:impact/Value:1+' => '~~',
-    'Class:UserRequest/Attribute:impact/Value:2' => 'Szolgáltatásra',
-    'Class:UserRequest/Attribute:impact/Value:2+' => '~~',
-    'Class:UserRequest/Attribute:impact/Value:3' => 'Személyre',
-    'Class:UserRequest/Attribute:impact/Value:3+' => '~~',
-    'Class:UserRequest/Attribute:priority' => 'Prioritás',
-    'Class:UserRequest/Attribute:priority+' => '~~',
-    'Class:UserRequest/Attribute:priority/Value:1' => 'Kritikus',
-    'Class:UserRequest/Attribute:priority/Value:1+' => 'critical~~',
-    'Class:UserRequest/Attribute:priority/Value:2' => 'Magas',
-    'Class:UserRequest/Attribute:priority/Value:2+' => 'high~~',
-    'Class:UserRequest/Attribute:priority/Value:3' => 'Közepes',
-    'Class:UserRequest/Attribute:priority/Value:3+' => 'medium~~',
-    'Class:UserRequest/Attribute:priority/Value:4' => 'Alacsony',
-    'Class:UserRequest/Attribute:priority/Value:4+' => 'low~~',
-    'Class:UserRequest/Attribute:urgency' => 'Sürgősség',
-    'Class:UserRequest/Attribute:urgency+' => '~~',
-    'Class:UserRequest/Attribute:urgency/Value:1' => 'Nem várhat',
-    'Class:UserRequest/Attribute:urgency/Value:1+' => 'critical~~',
-    'Class:UserRequest/Attribute:urgency/Value:2' => 'Nagyon sürgős',
-    'Class:UserRequest/Attribute:urgency/Value:2+' => 'high~~',
-    'Class:UserRequest/Attribute:urgency/Value:3' => 'Sürgős',
-    'Class:UserRequest/Attribute:urgency/Value:3+' => 'medium~~',
-    'Class:UserRequest/Attribute:urgency/Value:4' => 'Nem sürgős',
-    'Class:UserRequest/Attribute:urgency/Value:4+' => 'low~~',
-    'Class:UserRequest/Attribute:origin' => 'Eredet',
-    'Class:UserRequest/Attribute:origin+' => '~~',
-    'Class:UserRequest/Attribute:origin/Value:mail' => 'Email',
-    'Class:UserRequest/Attribute:origin/Value:mail+' => 'email~~',
-    'Class:UserRequest/Attribute:origin/Value:monitoring' => 'Felügyelet',
-    'Class:UserRequest/Attribute:origin/Value:monitoring+' => 'monitoring~~',
-    'Class:UserRequest/Attribute:origin/Value:phone' => 'Telefon',
-    'Class:UserRequest/Attribute:origin/Value:phone+' => 'phone~~',
-    'Class:UserRequest/Attribute:origin/Value:portal' => 'Portál',
-    'Class:UserRequest/Attribute:origin/Value:portal+' => 'portal~~',
-    'Class:UserRequest/Attribute:approver_id' => 'Jóváhagyó',
-    'Class:UserRequest/Attribute:approver_id+' => '~~',
-    'Class:UserRequest/Attribute:approver_email' => 'Jóváhagyó email címe',
-    'Class:UserRequest/Attribute:approver_email+' => '~~',
-    'Class:UserRequest/Attribute:service_id' => 'Szolgáltatás',
-    'Class:UserRequest/Attribute:service_id+' => '~~',
-    'Class:UserRequest/Attribute:service_name' => 'Szolgáltatás név',
-    'Class:UserRequest/Attribute:service_name+' => '~~',
-    'Class:UserRequest/Attribute:servicesubcategory_id' => 'Szolgáltatás alkategória',
-    'Class:UserRequest/Attribute:servicesubcategory_id+' => '~~',
-    'Class:UserRequest/Attribute:servicesubcategory_name' => 'Szolgáltatás alkategória név',
-    'Class:UserRequest/Attribute:servicesubcategory_name+' => '~~',
-    'Class:UserRequest/Attribute:escalation_flag' => 'Sürgős jelzés',
-    'Class:UserRequest/Attribute:escalation_flag+' => '~~',
-    'Class:UserRequest/Attribute:escalation_flag/Value:no' => 'Nem',
-    'Class:UserRequest/Attribute:escalation_flag/Value:no+' => 'No~~',
-    'Class:UserRequest/Attribute:escalation_flag/Value:yes' => 'Igen',
-    'Class:UserRequest/Attribute:escalation_flag/Value:yes+' => 'Yes~~',
-    'Class:UserRequest/Attribute:escalation_reason' => 'Sürgősségi ok',
-    'Class:UserRequest/Attribute:escalation_reason+' => '~~',
-    'Class:UserRequest/Attribute:assignment_date' => 'Megbízási dátum',
-    'Class:UserRequest/Attribute:assignment_date+' => '~~',
-    'Class:UserRequest/Attribute:resolution_date' => 'Megoldási dátum',
-    'Class:UserRequest/Attribute:resolution_date+' => '~~',
-    'Class:UserRequest/Attribute:last_pending_date' => 'Utolsó függőben lévő dátum',
-    'Class:UserRequest/Attribute:last_pending_date+' => '~~',
-    'Class:UserRequest/Attribute:cumulatedpending' => 'Kumulált függőben lévő',
-    'Class:UserRequest/Attribute:cumulatedpending+' => '~~',
-    'Class:UserRequest/Attribute:tto' => 'TTO',
-    'Class:UserRequest/Attribute:tto+' => '~~',
-    'Class:UserRequest/Attribute:ttr' => 'TTR',
-    'Class:UserRequest/Attribute:ttr+' => '~~',
-    'Class:UserRequest/Attribute:tto_escalation_deadline' => 'TTO határidő',
-    'Class:UserRequest/Attribute:tto_escalation_deadline+' => '~~',
-    'Class:UserRequest/Attribute:sla_tto_passed' => 'SLA TTO letelt',
-    'Class:UserRequest/Attribute:sla_tto_passed+' => '~~',
-    'Class:UserRequest/Attribute:sla_tto_over' => 'SLA TTO túllépett',
-    'Class:UserRequest/Attribute:sla_tto_over+' => '~~',
-    'Class:UserRequest/Attribute:ttr_escalation_deadline' => 'TTR határidő',
-    'Class:UserRequest/Attribute:ttr_escalation_deadline+' => '~~',
-    'Class:UserRequest/Attribute:sla_ttr_passed' => 'SLA TTR letelt',
-    'Class:UserRequest/Attribute:sla_ttr_passed+' => '~~',
-    'Class:UserRequest/Attribute:sla_ttr_over' => 'SLA TTR túllépett',
-    'Class:UserRequest/Attribute:sla_ttr_over+' => '~~',
-    'Class:UserRequest/Attribute:time_spent' => 'Időráfordítás',
-    'Class:UserRequest/Attribute:time_spent+' => '~~',
-    'Class:UserRequest/Attribute:resolution_code' => 'Megoldás kód',
-    'Class:UserRequest/Attribute:resolution_code+' => '~~',
-    'Class:UserRequest/Attribute:resolution_code/Value:assistance' => 'Támogatás',
-    'Class:UserRequest/Attribute:resolution_code/Value:assistance+' => 'assistance~~',
-    'Class:UserRequest/Attribute:resolution_code/Value:bug fixed' => 'Programhiba javítás',
-    'Class:UserRequest/Attribute:resolution_code/Value:bug fixed+' => 'bug fixed~~',
-    'Class:UserRequest/Attribute:resolution_code/Value:hardware repair' => 'Hardver javítás',
-    'Class:UserRequest/Attribute:resolution_code/Value:hardware repair+' => 'hardware repair~~',
-    'Class:UserRequest/Attribute:resolution_code/Value:other' => 'Egyéb',
-    'Class:UserRequest/Attribute:resolution_code/Value:other+' => 'other~~',
-    'Class:UserRequest/Attribute:resolution_code/Value:software patch' => 'Szoftverfrissítés',
-    'Class:UserRequest/Attribute:resolution_code/Value:software patch+' => 'software patch~~',
-    'Class:UserRequest/Attribute:resolution_code/Value:system update' => 'Rendszerfrissítés',
-    'Class:UserRequest/Attribute:resolution_code/Value:system update+' => 'system update~~',
-    'Class:UserRequest/Attribute:resolution_code/Value:training' => 'Oktatás',
-    'Class:UserRequest/Attribute:resolution_code/Value:training+' => 'training~~',
-    'Class:UserRequest/Attribute:solution' => 'Megoldás',
-    'Class:UserRequest/Attribute:solution+' => '~~',
-    'Class:UserRequest/Attribute:pending_reason' => 'Függőben lévőség oka',
-    'Class:UserRequest/Attribute:pending_reason+' => '~~',
-    'Class:UserRequest/Attribute:parent_request_id' => 'Szülő kérelem',
-    'Class:UserRequest/Attribute:parent_request_id+' => '~~',
-    'Class:UserRequest/Attribute:parent_incident_id' => 'Szülő incidens',
-    'Class:UserRequest/Attribute:parent_incident_id+' => '~~',
-    'Class:UserRequest/Attribute:parent_request_ref' => 'Ref. kérelem',
-    'Class:UserRequest/Attribute:parent_request_ref+' => '~~',
-    'Class:UserRequest/Attribute:parent_problem_id' => 'Szülő probléma',
-    'Class:UserRequest/Attribute:parent_problem_id+' => '~~',
-    'Class:UserRequest/Attribute:parent_problem_ref' => 'Ref. probléma',
-    'Class:UserRequest/Attribute:parent_problem_ref+' => '~~',
-    'Class:UserRequest/Attribute:parent_change_id' => 'Szülő változás',
-    'Class:UserRequest/Attribute:parent_change_id+' => '~~',
-    'Class:UserRequest/Attribute:parent_change_ref' => 'Ref. változás',
-    'Class:UserRequest/Attribute:parent_change_ref+' => '~~',
-    'Class:UserRequest/Attribute:parent_incident_ref' => 'Szülő incidens ref.',
-    'Class:UserRequest/Attribute:parent_incident_ref+' => '~~',
-    'Class:UserRequest/Attribute:related_request_list' => 'Gyermek kérelmek',
-    'Class:UserRequest/Attribute:related_request_list+' => 'Ehhez a szülő kérelemhez kapcsolódó kérelmek',
-    'Class:UserRequest/Attribute:public_log' => 'Nyilvános napló',
-    'Class:UserRequest/Attribute:public_log+' => '~~',
-    'Class:UserRequest/Attribute:user_satisfaction' => 'Felhasználói elégedettség',
-    'Class:UserRequest/Attribute:user_satisfaction+' => '~~',
-    'Class:UserRequest/Attribute:user_satisfaction/Value:1' => 'Nagyon elégedett',
-    'Class:UserRequest/Attribute:user_satisfaction/Value:1+' => 'Very satisfied~~',
-    'Class:UserRequest/Attribute:user_satisfaction/Value:2' => 'Viszonylag elégedett',
-    'Class:UserRequest/Attribute:user_satisfaction/Value:2+' => 'Fairly statisfied~~',
-    'Class:UserRequest/Attribute:user_satisfaction/Value:3' => 'Inkább elégedetlen',
-    'Class:UserRequest/Attribute:user_satisfaction/Value:3+' => 'Inkább elégedetlen',
-    'Class:UserRequest/Attribute:user_satisfaction/Value:4' => 'Nagyon elégedetlen',
-    'Class:UserRequest/Attribute:user_satisfaction/Value:4+' => 'Very Dissatisfied~~',
-    'Class:UserRequest/Attribute:user_comment' => 'Felhasználói megjegyzés',
-    'Class:UserRequest/Attribute:user_comment+' => '~~',
-    'Class:UserRequest/Attribute:parent_request_id_friendlyname' => 'parent_request_id_friendlyname',
-    'Class:UserRequest/Attribute:parent_request_id_friendlyname+' => '~~',
-    'Class:UserRequest/Stimulus:ev_assign' => 'Hozzárendelés',
-    'Class:UserRequest/Stimulus:ev_assign+' => '~~',
-    'Class:UserRequest/Stimulus:ev_reassign' => 'Újra hozzárendelés',
-    'Class:UserRequest/Stimulus:ev_reassign+' => '~~',
-    'Class:UserRequest/Stimulus:ev_approve' => 'Jóváhagyás',
-    'Class:UserRequest/Stimulus:ev_approve+' => '~~',
-    'Class:UserRequest/Stimulus:ev_reject' => 'Elutasítás',
-    'Class:UserRequest/Stimulus:ev_reject+' => '~~',
-    'Class:UserRequest/Stimulus:ev_pending' => 'Függőben',
-    'Class:UserRequest/Stimulus:ev_pending+' => '~~',
-    'Class:UserRequest/Stimulus:ev_timeout' => 'Időtúllépés',
-    'Class:UserRequest/Stimulus:ev_timeout+' => '~~',
-    'Class:UserRequest/Stimulus:ev_autoresolve' => 'Automatikus megoldás',
-    'Class:UserRequest/Stimulus:ev_autoresolve+' => '~~',
-    'Class:UserRequest/Stimulus:ev_autoclose' => 'Automatikus lezárás',
-    'Class:UserRequest/Stimulus:ev_autoclose+' => '~~',
-    'Class:UserRequest/Stimulus:ev_resolve' => 'Megjelölve megoldottként',
-    'Class:UserRequest/Stimulus:ev_resolve+' => '~~',
-    'Class:UserRequest/Stimulus:ev_close' => 'Kérelem lezárása',
-    'Class:UserRequest/Stimulus:ev_close+' => '~~',
-    'Class:UserRequest/Stimulus:ev_reopen' => 'Újranyitás',
-    'Class:UserRequest/Stimulus:ev_reopen+' => '~~',
-    'Class:UserRequest/Stimulus:ev_wait_for_approval' => 'Jóváhagyásra vár',
-    'Class:UserRequest/Stimulus:ev_wait_for_approval+' => '~~',
-    'Class:UserRequest/Error:CannotAssignParentRequestIdToSelf' => 'Nem lehet hozzárendelni a szülő kérelmet magához a kérelemhez',
-
-    'Class:UserRequest/Method:ResolveChildTickets' => 'ResolveChildTickets',
-    'Class:UserRequest/Method:ResolveChildTickets+' => 'A felbontás kaszkádosítása a gyermek kérésekhez (ev_autoresolve), és a kérés következő jellemzőinek összehangolása: szolgáltatás, csapat, felelős, felbontási információ.',
+	'Class:UserRequest' => 'Felhasználói kérelem',
+	'Class:UserRequest+' => '~~',
+	'Class:UserRequest/Attribute:status' => 'Állapot',
+	'Class:UserRequest/Attribute:status+' => '~~',
+	'Class:UserRequest/Attribute:status/Value:new' => 'Új',
+	'Class:UserRequest/Attribute:status/Value:new+' => '~~',
+	'Class:UserRequest/Attribute:status/Value:escalated_tto' => 'Eszkalált TTO',
+	'Class:UserRequest/Attribute:status/Value:escalated_tto+' => '~~',
+	'Class:UserRequest/Attribute:status/Value:assigned' => 'Hozzárendelt',
+	'Class:UserRequest/Attribute:status/Value:assigned+' => '~~',
+	'Class:UserRequest/Attribute:status/Value:escalated_ttr' => 'Eszkalált TTR',
+	'Class:UserRequest/Attribute:status/Value:escalated_ttr+' => '~~',
+	'Class:UserRequest/Attribute:status/Value:waiting_for_approval' => 'Jóváhagyásra vár',
+	'Class:UserRequest/Attribute:status/Value:waiting_for_approval+' => '~~',
+	'Class:UserRequest/Attribute:status/Value:approved' => 'Jóváhagyva',
+	'Class:UserRequest/Attribute:status/Value:approved+' => '~~',
+	'Class:UserRequest/Attribute:status/Value:rejected' => 'Elutasítva',
+	'Class:UserRequest/Attribute:status/Value:rejected+' => '~~',
+	'Class:UserRequest/Attribute:status/Value:pending' => 'Folyamatban',
+	'Class:UserRequest/Attribute:status/Value:pending+' => '~~',
+	'Class:UserRequest/Attribute:status/Value:resolved' => 'Megoldva',
+	'Class:UserRequest/Attribute:status/Value:resolved+' => '~~',
+	'Class:UserRequest/Attribute:status/Value:closed' => 'Lezárt',
+	'Class:UserRequest/Attribute:status/Value:closed+' => '~~',
+	'Class:UserRequest/Attribute:request_type' => 'Kérelem típus',
+	'Class:UserRequest/Attribute:request_type+' => '~~',
+	'Class:UserRequest/Attribute:request_type/Value:service_request' => 'Szolgáltatás kérelem',
+	'Class:UserRequest/Attribute:request_type/Value:service_request+' => 'Service request~~',
+	'Class:UserRequest/Attribute:impact' => 'Hatása',
+	'Class:UserRequest/Attribute:impact+' => '~~',
+	'Class:UserRequest/Attribute:impact/Value:1' => 'Részlegre',
+	'Class:UserRequest/Attribute:impact/Value:1+' => '~~',
+	'Class:UserRequest/Attribute:impact/Value:2' => 'Szolgáltatásra',
+	'Class:UserRequest/Attribute:impact/Value:2+' => '~~',
+	'Class:UserRequest/Attribute:impact/Value:3' => 'Személyre',
+	'Class:UserRequest/Attribute:impact/Value:3+' => '~~',
+	'Class:UserRequest/Attribute:priority' => 'Prioritás',
+	'Class:UserRequest/Attribute:priority+' => '~~',
+	'Class:UserRequest/Attribute:priority/Value:1' => 'Kritikus',
+	'Class:UserRequest/Attribute:priority/Value:1+' => 'critical~~',
+	'Class:UserRequest/Attribute:priority/Value:2' => 'Magas',
+	'Class:UserRequest/Attribute:priority/Value:2+' => 'high~~',
+	'Class:UserRequest/Attribute:priority/Value:3' => 'Közepes',
+	'Class:UserRequest/Attribute:priority/Value:3+' => 'medium~~',
+	'Class:UserRequest/Attribute:priority/Value:4' => 'Alacsony',
+	'Class:UserRequest/Attribute:priority/Value:4+' => 'low~~',
+	'Class:UserRequest/Attribute:urgency' => 'Sürgősség',
+	'Class:UserRequest/Attribute:urgency+' => '~~',
+	'Class:UserRequest/Attribute:urgency/Value:1' => 'Nem várhat',
+	'Class:UserRequest/Attribute:urgency/Value:1+' => 'critical~~',
+	'Class:UserRequest/Attribute:urgency/Value:2' => 'Nagyon sürgős',
+	'Class:UserRequest/Attribute:urgency/Value:2+' => 'high~~',
+	'Class:UserRequest/Attribute:urgency/Value:3' => 'Sürgős',
+	'Class:UserRequest/Attribute:urgency/Value:3+' => 'medium~~',
+	'Class:UserRequest/Attribute:urgency/Value:4' => 'Nem sürgős',
+	'Class:UserRequest/Attribute:urgency/Value:4+' => 'low~~',
+	'Class:UserRequest/Attribute:origin' => 'Eredet',
+	'Class:UserRequest/Attribute:origin+' => '~~',
+	'Class:UserRequest/Attribute:origin/Value:in_person' => 'In-person~~',
+	'Class:UserRequest/Attribute:origin/Value:in_person+' => 'Request created following a face-to-face discussion~~',
+	'Class:UserRequest/Attribute:origin/Value:chat' => 'Chat~~',
+	'Class:UserRequest/Attribute:origin/Value:chat+' => 'Request created following a chat discussion~~',
+	'Class:UserRequest/Attribute:origin/Value:mail' => 'Email',
+	'Class:UserRequest/Attribute:origin/Value:mail+' => 'email~~',
+	'Class:UserRequest/Attribute:origin/Value:monitoring' => 'Felügyelet',
+	'Class:UserRequest/Attribute:origin/Value:monitoring+' => 'monitoring~~',
+	'Class:UserRequest/Attribute:origin/Value:phone' => 'Telefon',
+	'Class:UserRequest/Attribute:origin/Value:phone+' => 'phone~~',
+	'Class:UserRequest/Attribute:origin/Value:portal' => 'Portál',
+	'Class:UserRequest/Attribute:origin/Value:portal+' => 'portal~~',
+	'Class:UserRequest/Attribute:approver_id' => 'Jóváhagyó',
+	'Class:UserRequest/Attribute:approver_id+' => '~~',
+	'Class:UserRequest/Attribute:approver_email' => 'Jóváhagyó email címe',
+	'Class:UserRequest/Attribute:approver_email+' => '~~',
+	'Class:UserRequest/Attribute:service_id' => 'Szolgáltatás',
+	'Class:UserRequest/Attribute:service_id+' => '~~',
+	'Class:UserRequest/Attribute:service_name' => 'Szolgáltatás név',
+	'Class:UserRequest/Attribute:service_name+' => '~~',
+	'Class:UserRequest/Attribute:servicesubcategory_id' => 'Szolgáltatás alkategória',
+	'Class:UserRequest/Attribute:servicesubcategory_id+' => '~~',
+	'Class:UserRequest/Attribute:servicesubcategory_name' => 'Szolgáltatás alkategória név',
+	'Class:UserRequest/Attribute:servicesubcategory_name+' => '~~',
+	'Class:UserRequest/Attribute:escalation_flag' => 'Sürgős jelzés',
+	'Class:UserRequest/Attribute:escalation_flag+' => '~~',
+	'Class:UserRequest/Attribute:escalation_flag/Value:no' => 'Nem',
+	'Class:UserRequest/Attribute:escalation_flag/Value:no+' => 'No~~',
+	'Class:UserRequest/Attribute:escalation_flag/Value:yes' => 'Igen',
+	'Class:UserRequest/Attribute:escalation_flag/Value:yes+' => 'Yes~~',
+	'Class:UserRequest/Attribute:escalation_reason' => 'Sürgősségi ok',
+	'Class:UserRequest/Attribute:escalation_reason+' => '~~',
+	'Class:UserRequest/Attribute:assignment_date' => 'Megbízási dátum',
+	'Class:UserRequest/Attribute:assignment_date+' => '~~',
+	'Class:UserRequest/Attribute:resolution_date' => 'Megoldási dátum',
+	'Class:UserRequest/Attribute:resolution_date+' => '~~',
+	'Class:UserRequest/Attribute:last_pending_date' => 'Utolsó függőben lévő dátum',
+	'Class:UserRequest/Attribute:last_pending_date+' => '~~',
+	'Class:UserRequest/Attribute:cumulatedpending' => 'Kumulált függőben lévő',
+	'Class:UserRequest/Attribute:cumulatedpending+' => '~~',
+	'Class:UserRequest/Attribute:tto' => 'TTO',
+	'Class:UserRequest/Attribute:tto+' => '~~',
+	'Class:UserRequest/Attribute:ttr' => 'TTR',
+	'Class:UserRequest/Attribute:ttr+' => '~~',
+	'Class:UserRequest/Attribute:tto_escalation_deadline' => 'TTO határidő',
+	'Class:UserRequest/Attribute:tto_escalation_deadline+' => '~~',
+	'Class:UserRequest/Attribute:sla_tto_passed' => 'SLA TTO letelt',
+	'Class:UserRequest/Attribute:sla_tto_passed+' => '~~',
+	'Class:UserRequest/Attribute:sla_tto_over' => 'SLA TTO túllépett',
+	'Class:UserRequest/Attribute:sla_tto_over+' => '~~',
+	'Class:UserRequest/Attribute:ttr_escalation_deadline' => 'TTR határidő',
+	'Class:UserRequest/Attribute:ttr_escalation_deadline+' => '~~',
+	'Class:UserRequest/Attribute:sla_ttr_passed' => 'SLA TTR letelt',
+	'Class:UserRequest/Attribute:sla_ttr_passed+' => '~~',
+	'Class:UserRequest/Attribute:sla_ttr_over' => 'SLA TTR túllépett',
+	'Class:UserRequest/Attribute:sla_ttr_over+' => '~~',
+	'Class:UserRequest/Attribute:time_spent' => 'Időráfordítás',
+	'Class:UserRequest/Attribute:time_spent+' => '~~',
+	'Class:UserRequest/Attribute:resolution_code' => 'Megoldás kód',
+	'Class:UserRequest/Attribute:resolution_code+' => '~~',
+	'Class:UserRequest/Attribute:resolution_code/Value:assistance' => 'Támogatás',
+	'Class:UserRequest/Attribute:resolution_code/Value:assistance+' => 'assistance~~',
+	'Class:UserRequest/Attribute:resolution_code/Value:bug fixed' => 'Programhiba javítás',
+	'Class:UserRequest/Attribute:resolution_code/Value:bug fixed+' => 'bug fixed~~',
+	'Class:UserRequest/Attribute:resolution_code/Value:hardware repair' => 'Hardver javítás',
+	'Class:UserRequest/Attribute:resolution_code/Value:hardware repair+' => 'hardware repair~~',
+	'Class:UserRequest/Attribute:resolution_code/Value:other' => 'Egyéb',
+	'Class:UserRequest/Attribute:resolution_code/Value:other+' => 'other~~',
+	'Class:UserRequest/Attribute:resolution_code/Value:software patch' => 'Szoftverfrissítés',
+	'Class:UserRequest/Attribute:resolution_code/Value:software patch+' => 'software patch~~',
+	'Class:UserRequest/Attribute:resolution_code/Value:system update' => 'Rendszerfrissítés',
+	'Class:UserRequest/Attribute:resolution_code/Value:system update+' => 'system update~~',
+	'Class:UserRequest/Attribute:resolution_code/Value:training' => 'Oktatás',
+	'Class:UserRequest/Attribute:resolution_code/Value:training+' => 'training~~',
+	'Class:UserRequest/Attribute:solution' => 'Megoldás',
+	'Class:UserRequest/Attribute:solution+' => '~~',
+	'Class:UserRequest/Attribute:pending_reason' => 'Függőben lévőség oka',
+	'Class:UserRequest/Attribute:pending_reason+' => '~~',
+	'Class:UserRequest/Attribute:parent_request_id' => 'Szülő kérelem',
+	'Class:UserRequest/Attribute:parent_request_id+' => '~~',
+	'Class:UserRequest/Attribute:parent_incident_id' => 'Szülő incidens',
+	'Class:UserRequest/Attribute:parent_incident_id+' => '~~',
+	'Class:UserRequest/Attribute:parent_request_ref' => 'Ref. kérelem',
+	'Class:UserRequest/Attribute:parent_request_ref+' => '~~',
+	'Class:UserRequest/Attribute:parent_problem_id' => 'Szülő probléma',
+	'Class:UserRequest/Attribute:parent_problem_id+' => '~~',
+	'Class:UserRequest/Attribute:parent_problem_ref' => 'Ref. probléma',
+	'Class:UserRequest/Attribute:parent_problem_ref+' => '~~',
+	'Class:UserRequest/Attribute:parent_change_id' => 'Szülő változás',
+	'Class:UserRequest/Attribute:parent_change_id+' => '~~',
+	'Class:UserRequest/Attribute:parent_change_ref' => 'Ref. változás',
+	'Class:UserRequest/Attribute:parent_change_ref+' => '~~',
+	'Class:UserRequest/Attribute:parent_incident_ref' => 'Szülő incidens ref.',
+	'Class:UserRequest/Attribute:parent_incident_ref+' => '~~',
+	'Class:UserRequest/Attribute:related_request_list' => 'Gyermek kérelmek',
+	'Class:UserRequest/Attribute:related_request_list+' => 'Ehhez a szülő kérelemhez kapcsolódó kérelmek',
+	'Class:UserRequest/Attribute:public_log' => 'Nyilvános napló',
+	'Class:UserRequest/Attribute:public_log+' => '~~',
+	'Class:UserRequest/Attribute:user_satisfaction' => 'Felhasználói elégedettség',
+	'Class:UserRequest/Attribute:user_satisfaction+' => '~~',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:1' => 'Nagyon elégedett',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:1+' => 'Very satisfied~~',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:2' => 'Viszonylag elégedett',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:2+' => 'Fairly statisfied~~',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:3' => 'Inkább elégedetlen',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:3+' => 'Inkább elégedetlen',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:4' => 'Nagyon elégedetlen',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:4+' => 'Very Dissatisfied~~',
+	'Class:UserRequest/Attribute:user_comment' => 'Felhasználói megjegyzés',
+	'Class:UserRequest/Attribute:user_comment+' => '~~',
+	'Class:UserRequest/Attribute:parent_request_id_friendlyname' => 'parent_request_id_friendlyname',
+	'Class:UserRequest/Attribute:parent_request_id_friendlyname+' => '~~',
+	'Class:UserRequest/Stimulus:ev_assign' => 'Hozzárendelés',
+	'Class:UserRequest/Stimulus:ev_assign+' => '~~',
+	'Class:UserRequest/Stimulus:ev_reassign' => 'Újra hozzárendelés',
+	'Class:UserRequest/Stimulus:ev_reassign+' => '~~',
+	'Class:UserRequest/Stimulus:ev_approve' => 'Jóváhagyás',
+	'Class:UserRequest/Stimulus:ev_approve+' => '~~',
+	'Class:UserRequest/Stimulus:ev_reject' => 'Elutasítás',
+	'Class:UserRequest/Stimulus:ev_reject+' => '~~',
+	'Class:UserRequest/Stimulus:ev_pending' => 'Függőben',
+	'Class:UserRequest/Stimulus:ev_pending+' => '~~',
+	'Class:UserRequest/Stimulus:ev_timeout' => 'Időtúllépés',
+	'Class:UserRequest/Stimulus:ev_timeout+' => '~~',
+	'Class:UserRequest/Stimulus:ev_autoresolve' => 'Automatikus megoldás',
+	'Class:UserRequest/Stimulus:ev_autoresolve+' => '~~',
+	'Class:UserRequest/Stimulus:ev_autoclose' => 'Automatikus lezárás',
+	'Class:UserRequest/Stimulus:ev_autoclose+' => '~~',
+	'Class:UserRequest/Stimulus:ev_resolve' => 'Megjelölve megoldottként',
+	'Class:UserRequest/Stimulus:ev_resolve+' => '~~',
+	'Class:UserRequest/Stimulus:ev_close' => 'Kérelem lezárása',
+	'Class:UserRequest/Stimulus:ev_close+' => '~~',
+	'Class:UserRequest/Stimulus:ev_reopen' => 'Újranyitás',
+	'Class:UserRequest/Stimulus:ev_reopen+' => '~~',
+	'Class:UserRequest/Stimulus:ev_wait_for_approval' => 'Jóváhagyásra vár',
+	'Class:UserRequest/Stimulus:ev_wait_for_approval+' => '~~',
+	'Class:UserRequest/Error:CannotAssignParentRequestIdToSelf' => 'Nem lehet hozzárendelni a szülő kérelmet magához a kérelemhez',
+	'Class:UserRequest/Method:ResolveChildTickets' => 'ResolveChildTickets',
+	'Class:UserRequest/Method:ResolveChildTickets+' => 'A felbontás kaszkádosítása a gyermek kérésekhez (ev_autoresolve), és a kérés következő jellemzőinek összehangolása: szolgáltatás, csapat, felelős, felbontási információ.',
 ));
 
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Organization:Overview:UserRequests' => 'Felhasználói kérelmek ebből a szervezeti egységből',
-    'Organization:Overview:MyUserRequests' => 'Saját kérelmek ebből a szervezeti egységből',
-    'Organization:Overview:Tickets' => 'Hibajegyek ebből a szervezeti egységből',
+	'Organization:Overview:UserRequests' => 'Felhasználói kérelmek ebből a szervezeti egységből',
+	'Organization:Overview:MyUserRequests' => 'Saját kérelmek ebből a szervezeti egységből',
+	'Organization:Overview:Tickets' => 'Hibajegyek ebből a szervezeti egységből',
 ));
diff --git a/datamodels/2.x/itop-request-mgmt-itil/dictionaries/it.dict.itop-request-mgmt-itil.php b/datamodels/2.x/itop-request-mgmt-itil/dictionaries/it.dict.itop-request-mgmt-itil.php
index 64db8d7f06..d73d900c35 100644
--- a/datamodels/2.x/itop-request-mgmt-itil/dictionaries/it.dict.itop-request-mgmt-itil.php
+++ b/datamodels/2.x/itop-request-mgmt-itil/dictionaries/it.dict.itop-request-mgmt-itil.php
@@ -34,6 +34,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'UI-RequestManagementOverview-OpenRequestByType' => 'Richieste aperte per tipo',
 	'UI-RequestManagementOverview-OpenRequestByCustomer' => 'Richieste aperte dal cliente',
 	'Class:UserRequest:KnownErrorList' => 'Errori Conosiuti',
+	'Class:UserRequest:KnownErrorList+' => 'Known Errors related to Functional CI linked to the current ticket~~',
 ));
 
 // Dictionnay conventions
@@ -109,6 +110,10 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:UserRequest/Attribute:urgency/Value:4+' => 'Bassa',
 	'Class:UserRequest/Attribute:origin' => 'Origine',
 	'Class:UserRequest/Attribute:origin+' => '~~',
+	'Class:UserRequest/Attribute:origin/Value:in_person' => 'In-person~~',
+	'Class:UserRequest/Attribute:origin/Value:in_person+' => 'Request created following a face-to-face discussion~~',
+	'Class:UserRequest/Attribute:origin/Value:chat' => 'Chat~~',
+	'Class:UserRequest/Attribute:origin/Value:chat+' => 'Request created following a chat discussion~~',
 	'Class:UserRequest/Attribute:origin/Value:mail' => 'Mail',
 	'Class:UserRequest/Attribute:origin/Value:mail+' => 'Mail',
 	'Class:UserRequest/Attribute:origin/Value:monitoring' => 'Monitoring',
@@ -242,7 +247,6 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:UserRequest/Stimulus:ev_wait_for_approval' => 'In attesa di approvazione',
 	'Class:UserRequest/Stimulus:ev_wait_for_approval+' => '~~',
 	'Class:UserRequest/Error:CannotAssignParentRequestIdToSelf' => 'Non si può assegnare una richiesta padre a se stesso',
-
 	'Class:UserRequest/Method:ResolveChildTickets' => 'ResolveChildTickets~~',
 	'Class:UserRequest/Method:ResolveChildTickets+' => 'Risoluzione a cascata delle richieste figlie (ev_autoresolve), e allineare le seguenti caratteristiche: servizio, team, agente e risoluzione',
 ));
diff --git a/datamodels/2.x/itop-request-mgmt-itil/dictionaries/ja.dict.itop-request-mgmt-itil.php b/datamodels/2.x/itop-request-mgmt-itil/dictionaries/ja.dict.itop-request-mgmt-itil.php
index f39f9c864b..5175fb3d4e 100644
--- a/datamodels/2.x/itop-request-mgmt-itil/dictionaries/ja.dict.itop-request-mgmt-itil.php
+++ b/datamodels/2.x/itop-request-mgmt-itil/dictionaries/ja.dict.itop-request-mgmt-itil.php
@@ -34,6 +34,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'UI-RequestManagementOverview-OpenRequestByType' => 'タイプ別のオープンなリクエスト',
 	'UI-RequestManagementOverview-OpenRequestByCustomer' => '顧客別のオープンなリクエスト',
 	'Class:UserRequest:KnownErrorList' => '既知のエラー',
+	'Class:UserRequest:KnownErrorList+' => 'Known Errors related to Functional CI linked to the current ticket~~',
 ));
 
 // Dictionnay conventions
@@ -109,6 +110,10 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:UserRequest/Attribute:urgency/Value:4+' => '低',
 	'Class:UserRequest/Attribute:origin' => '起源',
 	'Class:UserRequest/Attribute:origin+' => '',
+	'Class:UserRequest/Attribute:origin/Value:in_person' => 'In-person~~',
+	'Class:UserRequest/Attribute:origin/Value:in_person+' => 'Request created following a face-to-face discussion~~',
+	'Class:UserRequest/Attribute:origin/Value:chat' => 'Chat~~',
+	'Class:UserRequest/Attribute:origin/Value:chat+' => 'Request created following a chat discussion~~',
 	'Class:UserRequest/Attribute:origin/Value:mail' => 'メール',
 	'Class:UserRequest/Attribute:origin/Value:mail+' => 'メール',
 	'Class:UserRequest/Attribute:origin/Value:monitoring' => 'モニタリング',
@@ -242,7 +247,6 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:UserRequest/Stimulus:ev_wait_for_approval' => '承認待ち',
 	'Class:UserRequest/Stimulus:ev_wait_for_approval+' => '',
 	'Class:UserRequest/Error:CannotAssignParentRequestIdToSelf' => 'Cannot assign the Parent request to the request itself~~',
-
 	'Class:UserRequest/Method:ResolveChildTickets' => 'ResolveChildTickets~~',
 	'Class:UserRequest/Method:ResolveChildTickets+' => 'Cascade the resolution to child requests (ev_autoresolve), and align the following characteristics of the request: service, team, agent, resolution info~~',
 ));
diff --git a/datamodels/2.x/itop-request-mgmt-itil/dictionaries/nl.dict.itop-request-mgmt-itil.php b/datamodels/2.x/itop-request-mgmt-itil/dictionaries/nl.dict.itop-request-mgmt-itil.php
index cb6b3dc892..88c0141c98 100644
--- a/datamodels/2.x/itop-request-mgmt-itil/dictionaries/nl.dict.itop-request-mgmt-itil.php
+++ b/datamodels/2.x/itop-request-mgmt-itil/dictionaries/nl.dict.itop-request-mgmt-itil.php
@@ -38,6 +38,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'UI-RequestManagementOverview-OpenRequestByType' => 'Open verzoeken per soort',
 	'UI-RequestManagementOverview-OpenRequestByCustomer' => 'Open verzoeken per organisatie',
 	'Class:UserRequest:KnownErrorList' => 'Gekende fouten',
+	'Class:UserRequest:KnownErrorList+' => 'Known Errors related to Functional CI linked to the current ticket~~',
 ));
 
 // Dictionnay conventions
@@ -250,7 +251,6 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:UserRequest/Stimulus:ev_wait_for_approval' => 'Wacht op goedkeuring',
 	'Class:UserRequest/Stimulus:ev_wait_for_approval+' => '',
 	'Class:UserRequest/Error:CannotAssignParentRequestIdToSelf' => 'Kan het verzoek niet aan zichzelf toewijzen als hoofdincident',
-
 	'Class:UserRequest/Method:ResolveChildTickets' => 'ResolveChildTickets (los subverzoeken op)',
 	'Class:UserRequest/Method:ResolveChildTickets+' => 'Pas de oplossing ook toe op subverzoeken (ev_autoresolve) en neem deze kenmerken over: service, team, agent, oplossing',
 ));
diff --git a/datamodels/2.x/itop-request-mgmt-itil/dictionaries/pl.dict.itop-request-mgmt-itil.php b/datamodels/2.x/itop-request-mgmt-itil/dictionaries/pl.dict.itop-request-mgmt-itil.php
index a05bf440ef..31d9af2c21 100644
--- a/datamodels/2.x/itop-request-mgmt-itil/dictionaries/pl.dict.itop-request-mgmt-itil.php
+++ b/datamodels/2.x/itop-request-mgmt-itil/dictionaries/pl.dict.itop-request-mgmt-itil.php
@@ -34,6 +34,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'UI-RequestManagementOverview-OpenRequestByType' => 'Otwarte zgłoszenia według typu',
 	'UI-RequestManagementOverview-OpenRequestByCustomer' => 'Otwarte zgłoszenia według klientów',
 	'Class:UserRequest:KnownErrorList' => 'Znane błędy',
+	'Class:UserRequest:KnownErrorList+' => 'Known Errors related to Functional CI linked to the current ticket~~',
 ));
 
 // Dictionnay conventions
@@ -109,6 +110,10 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:UserRequest/Attribute:urgency/Value:4+' => 'niska',
 	'Class:UserRequest/Attribute:origin' => 'Pochodzenie',
 	'Class:UserRequest/Attribute:origin+' => '',
+	'Class:UserRequest/Attribute:origin/Value:in_person' => 'In-person~~',
+	'Class:UserRequest/Attribute:origin/Value:in_person+' => 'Request created following a face-to-face discussion~~',
+	'Class:UserRequest/Attribute:origin/Value:chat' => 'Chat~~',
+	'Class:UserRequest/Attribute:origin/Value:chat+' => 'Request created following a chat discussion~~',
 	'Class:UserRequest/Attribute:origin/Value:mail' => 'e-mail',
 	'Class:UserRequest/Attribute:origin/Value:mail+' => 'e-mail',
 	'Class:UserRequest/Attribute:origin/Value:monitoring' => 'monitoring',
@@ -242,7 +247,6 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:UserRequest/Stimulus:ev_wait_for_approval' => 'Do zatwierdzenia',
 	'Class:UserRequest/Stimulus:ev_wait_for_approval+' => '',
 	'Class:UserRequest/Error:CannotAssignParentRequestIdToSelf' => 'Nie można przypisać zgłoszenia nadrzędnego do samego siebie',
-
 	'Class:UserRequest/Method:ResolveChildTickets' => 'ResolveChildTickets',
 	'Class:UserRequest/Method:ResolveChildTickets+' => 'Połącz rozwiązanie kaskadowo do żądań podrzędnych (ev_autoresolve) i dopasuj następujące cechy zgłoszenia: usługa, zespół, agent, informacje o rozwiązaniu',
 ));
diff --git a/datamodels/2.x/itop-request-mgmt-itil/dictionaries/pt_br.dict.itop-request-mgmt-itil.php b/datamodels/2.x/itop-request-mgmt-itil/dictionaries/pt_br.dict.itop-request-mgmt-itil.php
index b725ae1e3a..3cff3dcd39 100644
--- a/datamodels/2.x/itop-request-mgmt-itil/dictionaries/pt_br.dict.itop-request-mgmt-itil.php
+++ b/datamodels/2.x/itop-request-mgmt-itil/dictionaries/pt_br.dict.itop-request-mgmt-itil.php
@@ -34,6 +34,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'UI-RequestManagementOverview-OpenRequestByType' => 'Solicitações abertas por tipo',
 	'UI-RequestManagementOverview-OpenRequestByCustomer' => 'Solicitações abertas por cliente',
 	'Class:UserRequest:KnownErrorList' => 'Erros conhecidos',
+	'Class:UserRequest:KnownErrorList+' => 'Known Errors related to Functional CI linked to the current ticket~~',
 ));
 
 // Dictionnay conventions
@@ -109,6 +110,10 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:UserRequest/Attribute:urgency/Value:4+' => '',
 	'Class:UserRequest/Attribute:origin' => 'Origem',
 	'Class:UserRequest/Attribute:origin+' => '',
+	'Class:UserRequest/Attribute:origin/Value:in_person' => 'In-person~~',
+	'Class:UserRequest/Attribute:origin/Value:in_person+' => 'Request created following a face-to-face discussion~~',
+	'Class:UserRequest/Attribute:origin/Value:chat' => 'Chat~~',
+	'Class:UserRequest/Attribute:origin/Value:chat+' => 'Request created following a chat discussion~~',
 	'Class:UserRequest/Attribute:origin/Value:mail' => 'E-mail',
 	'Class:UserRequest/Attribute:origin/Value:mail+' => '',
 	'Class:UserRequest/Attribute:origin/Value:monitoring' => 'Monitoramento',
@@ -242,7 +247,6 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:UserRequest/Stimulus:ev_wait_for_approval' => 'Aguardar por aprovação',
 	'Class:UserRequest/Stimulus:ev_wait_for_approval+' => '',
 	'Class:UserRequest/Error:CannotAssignParentRequestIdToSelf' => 'Não é possível atribuir a solicitação pai a própria solicitação',
-
 	'Class:UserRequest/Method:ResolveChildTickets' => 'ResolveChildTickets',
 	'Class:UserRequest/Method:ResolveChildTickets+' => 'Conecte a solução a pedidos filhos (ev_autoresolve) e alinhe as seguintes características da requisição: serviço, equipe, agente, info de solução',
 ));
diff --git a/datamodels/2.x/itop-request-mgmt-itil/dictionaries/ru.dict.itop-request-mgmt-itil.php b/datamodels/2.x/itop-request-mgmt-itil/dictionaries/ru.dict.itop-request-mgmt-itil.php
index f8a56d673c..166abeb15d 100644
--- a/datamodels/2.x/itop-request-mgmt-itil/dictionaries/ru.dict.itop-request-mgmt-itil.php
+++ b/datamodels/2.x/itop-request-mgmt-itil/dictionaries/ru.dict.itop-request-mgmt-itil.php
@@ -43,6 +43,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'UI-RequestManagementOverview-OpenRequestByType' => 'Открытые запросы по типу',
 	'UI-RequestManagementOverview-OpenRequestByCustomer' => 'Открытые запросы по заказчику',
 	'Class:UserRequest:KnownErrorList' => 'Известные ошибки',
+	'Class:UserRequest:KnownErrorList+' => 'Known Errors related to Functional CI linked to the current ticket~~',
 ));
 
 // Dictionnay conventions
@@ -118,6 +119,10 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:UserRequest/Attribute:urgency/Value:4+' => 'Низкая',
 	'Class:UserRequest/Attribute:origin' => 'Источник',
 	'Class:UserRequest/Attribute:origin+' => '',
+	'Class:UserRequest/Attribute:origin/Value:in_person' => 'In-person~~',
+	'Class:UserRequest/Attribute:origin/Value:in_person+' => 'Request created following a face-to-face discussion~~',
+	'Class:UserRequest/Attribute:origin/Value:chat' => 'Chat~~',
+	'Class:UserRequest/Attribute:origin/Value:chat+' => 'Request created following a chat discussion~~',
 	'Class:UserRequest/Attribute:origin/Value:mail' => 'Почта',
 	'Class:UserRequest/Attribute:origin/Value:mail+' => 'Почта',
 	'Class:UserRequest/Attribute:origin/Value:monitoring' => 'Мониторинг',
@@ -251,7 +256,6 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:UserRequest/Stimulus:ev_wait_for_approval' => 'Ждать утверждения',
 	'Class:UserRequest/Stimulus:ev_wait_for_approval+' => '',
 	'Class:UserRequest/Error:CannotAssignParentRequestIdToSelf' => 'Невозможно назначить этот же запрос в качестве родительского',
-
 	'Class:UserRequest/Method:ResolveChildTickets' => 'ResolveChildTickets',
 	'Class:UserRequest/Method:ResolveChildTickets+' => 'Каскадное решение дочерних запросов (ev_autoresolve) с установкой следующих параметров: услуга, команда, агент, информация о решении.',
 ));
diff --git a/datamodels/2.x/itop-request-mgmt-itil/dictionaries/sk.dict.itop-request-mgmt-itil.php b/datamodels/2.x/itop-request-mgmt-itil/dictionaries/sk.dict.itop-request-mgmt-itil.php
index 633f8e97f3..b065f752eb 100644
--- a/datamodels/2.x/itop-request-mgmt-itil/dictionaries/sk.dict.itop-request-mgmt-itil.php
+++ b/datamodels/2.x/itop-request-mgmt-itil/dictionaries/sk.dict.itop-request-mgmt-itil.php
@@ -34,6 +34,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'UI-RequestManagementOverview-OpenRequestByType' => 'Otvorené požiadavky podľa typu',
 	'UI-RequestManagementOverview-OpenRequestByCustomer' => 'Otvorené požiadavky podľa organizácie',
 	'Class:UserRequest:KnownErrorList' => 'Známe chyby',
+	'Class:UserRequest:KnownErrorList+' => 'Known Errors related to Functional CI linked to the current ticket~~',
 ));
 
 // Dictionnay conventions
@@ -109,6 +110,10 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:UserRequest/Attribute:urgency/Value:4+' => '',
 	'Class:UserRequest/Attribute:origin' => 'Pôvod',
 	'Class:UserRequest/Attribute:origin+' => '',
+	'Class:UserRequest/Attribute:origin/Value:in_person' => 'In-person~~',
+	'Class:UserRequest/Attribute:origin/Value:in_person+' => 'Request created following a face-to-face discussion~~',
+	'Class:UserRequest/Attribute:origin/Value:chat' => 'Chat~~',
+	'Class:UserRequest/Attribute:origin/Value:chat+' => 'Request created following a chat discussion~~',
 	'Class:UserRequest/Attribute:origin/Value:mail' => 'Mail',
 	'Class:UserRequest/Attribute:origin/Value:mail+' => '',
 	'Class:UserRequest/Attribute:origin/Value:monitoring' => 'Dohľad',
@@ -242,7 +247,6 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:UserRequest/Stimulus:ev_wait_for_approval' => 'Počkať na schválenie',
 	'Class:UserRequest/Stimulus:ev_wait_for_approval+' => '',
 	'Class:UserRequest/Error:CannotAssignParentRequestIdToSelf' => 'Cannot assign the Parent request to the request itself~~',
-
 	'Class:UserRequest/Method:ResolveChildTickets' => 'ResolveChildTickets~~',
 	'Class:UserRequest/Method:ResolveChildTickets+' => 'Cascade the resolution to child requests (ev_autoresolve), and align the following characteristics of the request: service, team, agent, resolution info~~',
 ));
diff --git a/datamodels/2.x/itop-request-mgmt-itil/dictionaries/tr.dict.itop-request-mgmt-itil.php b/datamodels/2.x/itop-request-mgmt-itil/dictionaries/tr.dict.itop-request-mgmt-itil.php
index f332999fd8..4542b86fa6 100644
--- a/datamodels/2.x/itop-request-mgmt-itil/dictionaries/tr.dict.itop-request-mgmt-itil.php
+++ b/datamodels/2.x/itop-request-mgmt-itil/dictionaries/tr.dict.itop-request-mgmt-itil.php
@@ -34,6 +34,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'UI-RequestManagementOverview-OpenRequestByType' => 'Open requests by type~~',
 	'UI-RequestManagementOverview-OpenRequestByCustomer' => 'Open requests by customer~~',
 	'Class:UserRequest:KnownErrorList' => 'Known Errors~~',
+	'Class:UserRequest:KnownErrorList+' => 'Known Errors related to Functional CI linked to the current ticket~~',
 ));
 
 // Dictionnay conventions
@@ -109,6 +110,10 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:UserRequest/Attribute:urgency/Value:4+' => 'low~~',
 	'Class:UserRequest/Attribute:origin' => 'Origin~~',
 	'Class:UserRequest/Attribute:origin+' => '~~',
+	'Class:UserRequest/Attribute:origin/Value:in_person' => 'In-person~~',
+	'Class:UserRequest/Attribute:origin/Value:in_person+' => 'Request created following a face-to-face discussion~~',
+	'Class:UserRequest/Attribute:origin/Value:chat' => 'Chat~~',
+	'Class:UserRequest/Attribute:origin/Value:chat+' => 'Request created following a chat discussion~~',
 	'Class:UserRequest/Attribute:origin/Value:mail' => 'email~~',
 	'Class:UserRequest/Attribute:origin/Value:mail+' => 'email~~',
 	'Class:UserRequest/Attribute:origin/Value:monitoring' => 'monitoring~~',
@@ -242,7 +247,6 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:UserRequest/Stimulus:ev_wait_for_approval' => 'Wait for approval~~',
 	'Class:UserRequest/Stimulus:ev_wait_for_approval+' => '~~',
 	'Class:UserRequest/Error:CannotAssignParentRequestIdToSelf' => 'Cannot assign the Parent request to the request itself~~',
-
 	'Class:UserRequest/Method:ResolveChildTickets' => 'ResolveChildTickets~~',
 	'Class:UserRequest/Method:ResolveChildTickets+' => 'Cascade the resolution to child requests (ev_autoresolve), and align the following characteristics of the request: service, team, agent, resolution info~~',
 ));
diff --git a/datamodels/2.x/itop-request-mgmt-itil/dictionaries/zh_cn.dict.itop-request-mgmt-itil.php b/datamodels/2.x/itop-request-mgmt-itil/dictionaries/zh_cn.dict.itop-request-mgmt-itil.php
index 41766fbebe..0d0c50027d 100644
--- a/datamodels/2.x/itop-request-mgmt-itil/dictionaries/zh_cn.dict.itop-request-mgmt-itil.php
+++ b/datamodels/2.x/itop-request-mgmt-itil/dictionaries/zh_cn.dict.itop-request-mgmt-itil.php
@@ -3,7 +3,6 @@
  * @copyright   Copyright (C) 2010-2023 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
-
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Menu:RequestManagement' => '服务台',
 	'Menu:RequestManagement+' => '服务台',
@@ -35,6 +34,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'UI-RequestManagementOverview-OpenRequestByType' => '打开的需求(按类型)',
 	'UI-RequestManagementOverview-OpenRequestByCustomer' => '打开的需求(按客户)',
 	'Class:UserRequest:KnownErrorList' => '已知错误',
+	'Class:UserRequest:KnownErrorList+' => 'Known Errors related to Functional CI linked to the current ticket~~',
 ));
 
 // Dictionnay conventions
@@ -110,6 +110,10 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:UserRequest/Attribute:urgency/Value:4+' => '低',
 	'Class:UserRequest/Attribute:origin' => '来自',
 	'Class:UserRequest/Attribute:origin+' => '',
+	'Class:UserRequest/Attribute:origin/Value:in_person' => 'In-person~~',
+	'Class:UserRequest/Attribute:origin/Value:in_person+' => 'Request created following a face-to-face discussion~~',
+	'Class:UserRequest/Attribute:origin/Value:chat' => 'Chat~~',
+	'Class:UserRequest/Attribute:origin/Value:chat+' => 'Request created following a chat discussion~~',
 	'Class:UserRequest/Attribute:origin/Value:mail' => '邮件',
 	'Class:UserRequest/Attribute:origin/Value:mail+' => '邮件',
 	'Class:UserRequest/Attribute:origin/Value:monitoring' => '监控',
@@ -201,7 +205,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:UserRequest/Attribute:parent_incident_ref' => '父级事件编号',
 	'Class:UserRequest/Attribute:parent_incident_ref+' => '~~',
 	'Class:UserRequest/Attribute:related_request_list' => '子需求',
-	'Class:UserRequest/Attribute:related_request_list+' => '此父级需求相关的所有子需求',
+	'Class:UserRequest/Attribute:related_request_list+' => '此父级需求相关的所有衍生需求',
 	'Class:UserRequest/Attribute:public_log' => '评论',
 	'Class:UserRequest/Attribute:public_log+' => '',
 	'Class:UserRequest/Attribute:user_satisfaction' => '用户满意度',
@@ -214,7 +218,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:UserRequest/Attribute:user_satisfaction/Value:3+' => '不满意',
 	'Class:UserRequest/Attribute:user_satisfaction/Value:4' => '非常不满意',
 	'Class:UserRequest/Attribute:user_satisfaction/Value:4+' => '非常不满意',
-	'Class:UserRequest/Attribute:user_comment' => '用户留言',
+	'Class:UserRequest/Attribute:user_comment' => '用户评论',
 	'Class:UserRequest/Attribute:user_comment+' => '',
 	'Class:UserRequest/Attribute:parent_request_id_friendlyname' => 'parent_request_id_friendlyname',
 	'Class:UserRequest/Attribute:parent_request_id_friendlyname+' => '',
@@ -242,10 +246,9 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:UserRequest/Stimulus:ev_reopen+' => '',
 	'Class:UserRequest/Stimulus:ev_wait_for_approval' => '等待批准',
 	'Class:UserRequest/Stimulus:ev_wait_for_approval+' => '',
-	'Class:UserRequest/Error:CannotAssignParentRequestIdToSelf' => '无法分配父级需求到本身',
-
+	'Class:UserRequest/Error:CannotAssignParentRequestIdToSelf' => '无法分配父级需求给自己',
 	'Class:UserRequest/Method:ResolveChildTickets' => '解决子工单',
-	'Class:UserRequest/Method:ResolveChildTickets+' => '将此解决方案直接挪给子需求(自动解决), 包括下列字段: 服务, 团队, 办理人, 解决方案信息',
+	'Class:UserRequest/Method:ResolveChildTickets+' => '递归解决子工单(自动解决),并调整相关字段与父级工单保持一致: 服务, 团队, 办理人, 解决方案信息',
 ));
 
 
diff --git a/datamodels/2.x/itop-request-mgmt/datamodel.itop-request-mgmt.xml b/datamodels/2.x/itop-request-mgmt/datamodel.itop-request-mgmt.xml
index d44c662966..29c537ae94 100755
--- a/datamodels/2.x/itop-request-mgmt/datamodel.itop-request-mgmt.xml
+++ b/datamodels/2.x/itop-request-mgmt/datamodel.itop-request-mgmt.xml
@@ -546,8 +546,6 @@
           <edit_mode>add_remove</edit_mode>
           <count_min>0</count_min>
           <count_max>0</count_max>
-          <relation_type>link</relation_type>
-          <read_only>false</read_only>
         </field>
         <field id="public_log" xsi:type="AttributeCaseLog">
           <sql>public_log</sql>
diff --git a/datamodels/2.x/itop-request-mgmt/dictionaries/cs.dict.itop-request-mgmt.php b/datamodels/2.x/itop-request-mgmt/dictionaries/cs.dict.itop-request-mgmt.php
index ea80e8877b..b294874e1a 100644
--- a/datamodels/2.x/itop-request-mgmt/dictionaries/cs.dict.itop-request-mgmt.php
+++ b/datamodels/2.x/itop-request-mgmt/dictionaries/cs.dict.itop-request-mgmt.php
@@ -38,6 +38,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'UI-RequestManagementOverview-OpenRequestByType' => 'Otevřené požadavky podle typu',
 	'UI-RequestManagementOverview-OpenRequestByCustomer' => 'Otevřené požadavky podle organizace',
 	'Class:UserRequest:KnownErrorList' => 'Známé chyby',
+	'Class:UserRequest:KnownErrorList+' => 'Known Errors related to Functional CI linked to the current ticket~~',
 	'Menu:UserRequest:MyWorkOrders' => 'Pracovní příkazy přidělené mně',
 	'Menu:UserRequest:MyWorkOrders+' => 'Všechny pracovní příkazy přidělené mně',
 	'Class:Problem:KnownProblemList' => 'Známé problémy',
@@ -119,6 +120,10 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:UserRequest/Attribute:urgency/Value:4+' => '',
 	'Class:UserRequest/Attribute:origin' => 'Původ',
 	'Class:UserRequest/Attribute:origin+' => '',
+	'Class:UserRequest/Attribute:origin/Value:in_person' => 'In-person~~',
+	'Class:UserRequest/Attribute:origin/Value:in_person+' => 'Request created following a face-to-face discussion~~',
+	'Class:UserRequest/Attribute:origin/Value:chat' => 'Chat~~',
+	'Class:UserRequest/Attribute:origin/Value:chat+' => 'Request created following a chat discussion~~',
 	'Class:UserRequest/Attribute:origin/Value:mail' => 'email',
 	'Class:UserRequest/Attribute:origin/Value:mail+' => '',
 	'Class:UserRequest/Attribute:origin/Value:monitoring' => 'monitoring',
@@ -274,7 +279,6 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Portal:SelectLanguage' => 'Změnit jazyk',
 	'Portal:LanguageChangedTo_Lang' => 'Jazyk změněn na',
 	'Portal:ChooseYourFavoriteLanguage' => 'Vyberte svůj jazyk',
-
 	'Class:UserRequest/Method:ResolveChildTickets' => 'Vyřešit podřízené tikety',
 	'Class:UserRequest/Method:ResolveChildTickets+' => 'Cascade the resolution to child requests (ev_autoresolve), and align the following characteristics of the request: service, team, agent, resolution info~~',
 ));
diff --git a/datamodels/2.x/itop-request-mgmt/dictionaries/da.dict.itop-request-mgmt.php b/datamodels/2.x/itop-request-mgmt/dictionaries/da.dict.itop-request-mgmt.php
index b6459ac4a2..88cb23f3c7 100644
--- a/datamodels/2.x/itop-request-mgmt/dictionaries/da.dict.itop-request-mgmt.php
+++ b/datamodels/2.x/itop-request-mgmt/dictionaries/da.dict.itop-request-mgmt.php
@@ -37,6 +37,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'UI-RequestManagementOverview-OpenRequestByType' => 'Åbne brugerhenvendelser efter type',
 	'UI-RequestManagementOverview-OpenRequestByCustomer' => 'Åbne brugerhenvendelser efter bruger',
 	'Class:UserRequest:KnownErrorList' => 'KEndte fejl (Known Errors)',
+	'Class:UserRequest:KnownErrorList+' => 'Known Errors related to Functional CI linked to the current ticket~~',
 	'Menu:UserRequest:MyWorkOrders' => 'Mine tildelte arbejdsordre',
 	'Menu:UserRequest:MyWorkOrders+' => '',
 	'Class:Problem:KnownProblemList' => 'Kendte problemer',
@@ -118,6 +119,10 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:UserRequest/Attribute:urgency/Value:4+' => '',
 	'Class:UserRequest/Attribute:origin' => 'Oprindelse',
 	'Class:UserRequest/Attribute:origin+' => '',
+	'Class:UserRequest/Attribute:origin/Value:in_person' => 'In-person~~',
+	'Class:UserRequest/Attribute:origin/Value:in_person+' => 'Request created following a face-to-face discussion~~',
+	'Class:UserRequest/Attribute:origin/Value:chat' => 'Chat~~',
+	'Class:UserRequest/Attribute:origin/Value:chat+' => 'Request created following a chat discussion~~',
 	'Class:UserRequest/Attribute:origin/Value:mail' => 'Mail',
 	'Class:UserRequest/Attribute:origin/Value:mail+' => '',
 	'Class:UserRequest/Attribute:origin/Value:monitoring' => 'Monitoring',
@@ -273,7 +278,6 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Portal:SelectLanguage' => 'Skift sprogindstilling',
 	'Portal:LanguageChangedTo_Lang' => 'Sprogindstilling ændres til: ',
 	'Portal:ChooseYourFavoriteLanguage' => 'Vælg dit foretrukne sprog',
-
 	'Class:UserRequest/Method:ResolveChildTickets' => 'ResolveChildTickets~~',
 	'Class:UserRequest/Method:ResolveChildTickets+' => 'Cascade the resolution to child requests (ev_autoresolve), and align the following characteristics of the request: service, team, agent, resolution info~~',
 ));
diff --git a/datamodels/2.x/itop-request-mgmt/dictionaries/de.dict.itop-request-mgmt.php b/datamodels/2.x/itop-request-mgmt/dictionaries/de.dict.itop-request-mgmt.php
index bd63c227fb..897bd37087 100644
--- a/datamodels/2.x/itop-request-mgmt/dictionaries/de.dict.itop-request-mgmt.php
+++ b/datamodels/2.x/itop-request-mgmt/dictionaries/de.dict.itop-request-mgmt.php
@@ -8,27 +8,27 @@
  */
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Menu:RequestManagement' => 'Helpdesk',
-	'Menu:RequestManagement+' => '',
+	'Menu:RequestManagement+' => 'Verwaltung von Nutzeranfragen und Störungsmeldungen',
 	'Menu:RequestManagementProvider' => 'Helpdesk-Provider',
 	'Menu:RequestManagementProvider+' => '',
 	'Menu:UserRequest:Provider' => 'Offene Benutzeranfragen beim Provider',
 	'Menu:UserRequest:Provider+' => '',
 	'Menu:UserRequest:Overview' => 'Übersicht',
-	'Menu:UserRequest:Overview+' => '',
+	'Menu:UserRequest:Overview+' => 'Übersicht über Benutzeranfragen',
 	'Menu:NewUserRequest' => 'Neue Benutzeranfrage',
-	'Menu:NewUserRequest+' => '',
+	'Menu:NewUserRequest+' => 'Neue Benutzeranfrage erstellen',
 	'Menu:SearchUserRequests' => 'Nach Benutzeranfrage suchen',
-	'Menu:SearchUserRequests+' => '',
+	'Menu:SearchUserRequests+' => 'Nach bestehenden Benutzeranfragen suchen',
 	'Menu:UserRequest:Shortcuts' => 'Shortcuts',
 	'Menu:UserRequest:Shortcuts+' => '',
 	'Menu:UserRequest:MyRequests' => 'Mir zugewiesene Benutzeranfragen',
 	'Menu:UserRequest:MyRequests+' => '',
 	'Menu:UserRequest:MySupportRequests' => 'Von mir gestellte Anfragen',
-	'Menu:UserRequest:MySupportRequests+' => '',
+	'Menu:UserRequest:MySupportRequests+' => 'Benutzeranfragen die ich gemeldet habe',
 	'Menu:UserRequest:EscalatedRequests' => 'Eskalierte Benutzeranfragen',
-	'Menu:UserRequest:EscalatedRequests+' => '',
+	'Menu:UserRequest:EscalatedRequests+' => 'Eskalierte Benutzeranfragen',
 	'Menu:UserRequest:OpenRequests' => 'Alle offenen Benutzeranfragen',
-	'Menu:UserRequest:OpenRequests+' => '',
+	'Menu:UserRequest:OpenRequests+' => 'Alle offenen Benutzeranfragen',
 	'UI:WelcomeMenu:MyAssignedCalls' => 'Mir zugewiesene Benutzeranfragen',
 	'UI-RequestManagementOverview-RequestByType-last-14-days' => 'Benutzeranfragen der letzten 14  Tage nach Typ',
 	'UI-RequestManagementOverview-Last-14-days' => 'Benutzeranfragen der letzten 14  Tage nach Tag',
@@ -37,6 +37,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'UI-RequestManagementOverview-OpenRequestByType' => 'Offene Benutzeranfragen nach Typ',
 	'UI-RequestManagementOverview-OpenRequestByCustomer' => 'Offene Benutzeranfragen nach Organisation',
 	'Class:UserRequest:KnownErrorList' => 'Known Errors',
+	'Class:UserRequest:KnownErrorList+' => 'Dokumentiere Fehler im Zusammenhang mit CIs, die mit dem aktuellen Ticket verknüpft sind',
 	'Menu:UserRequest:MyWorkOrders' => 'Mir zugeordnete Arbeitsaufträge',
 	'Menu:UserRequest:MyWorkOrders+' => '',
 	'Class:Problem:KnownProblemList' => 'Bekannte Problems',
@@ -89,7 +90,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:UserRequest/Attribute:request_type/Value:service_request' => 'Service-Request',
 	'Class:UserRequest/Attribute:request_type/Value:service_request+' => '',
 	'Class:UserRequest/Attribute:impact' => 'Auswirkung',
-	'Class:UserRequest/Attribute:impact+' => '',
+	'Class:UserRequest/Attribute:impact+' => 'Die Auswirkung gibt die Schwere des Vorfalls an, oft geschätzt durch die Anzahl der Betroffenen',
 	'Class:UserRequest/Attribute:impact/Value:1' => 'Eine Abteilung',
 	'Class:UserRequest/Attribute:impact/Value:1+' => '',
 	'Class:UserRequest/Attribute:impact/Value:2' => 'Ein Service',
@@ -107,7 +108,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:UserRequest/Attribute:priority/Value:4' => 'Niedrig',
 	'Class:UserRequest/Attribute:priority/Value:4+' => '',
 	'Class:UserRequest/Attribute:urgency' => 'Dringlichkeit',
-	'Class:UserRequest/Attribute:urgency+' => '',
+	'Class:UserRequest/Attribute:urgency+' => 'Wie schnell der Vorfall behandelt werden muss',
 	'Class:UserRequest/Attribute:urgency/Value:1' => 'Kritisch',
 	'Class:UserRequest/Attribute:urgency/Value:1+' => '',
 	'Class:UserRequest/Attribute:urgency/Value:2' => 'Hoch',
@@ -118,14 +119,18 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:UserRequest/Attribute:urgency/Value:4+' => '',
 	'Class:UserRequest/Attribute:origin' => 'Herkunft',
 	'Class:UserRequest/Attribute:origin+' => '',
+	'Class:UserRequest/Attribute:origin/Value:in_person' => 'Persönlich',
+	'Class:UserRequest/Attribute:origin/Value:in_person+' => 'Benutzeranfrage auf Basis einer Diskussion im direkten Gespräch',
+	'Class:UserRequest/Attribute:origin/Value:chat' => 'Chat',
+	'Class:UserRequest/Attribute:origin/Value:chat+' => 'Benutzeranfrage auf Basis einer Diskussion in einem Chat',
 	'Class:UserRequest/Attribute:origin/Value:mail' => 'Mail',
-	'Class:UserRequest/Attribute:origin/Value:mail+' => '',
+	'Class:UserRequest/Attribute:origin/Value:mail+' => 'Benutzeranfrage auf Basis einer empfangenen Mail',
 	'Class:UserRequest/Attribute:origin/Value:monitoring' => 'Monitoring',
-	'Class:UserRequest/Attribute:origin/Value:monitoring+' => '',
+	'Class:UserRequest/Attribute:origin/Value:monitoring+' => 'Benutzeranfrage auf Basis eines Monitoring-Events',
 	'Class:UserRequest/Attribute:origin/Value:phone' => 'Telefon',
-	'Class:UserRequest/Attribute:origin/Value:phone+' => '',
+	'Class:UserRequest/Attribute:origin/Value:phone+' => 'Benutzeranfrage auf Basis eines Telefonanrufs',
 	'Class:UserRequest/Attribute:origin/Value:portal' => 'Portal',
-	'Class:UserRequest/Attribute:origin/Value:portal+' => '',
+	'Class:UserRequest/Attribute:origin/Value:portal+' => 'Benutzeranfrage, die über das Portal erstellt wurde',
 	'Class:UserRequest/Attribute:approver_id' => 'Genehmiger',
 	'Class:UserRequest/Attribute:approver_id+' => '',
 	'Class:UserRequest/Attribute:approver_email' => 'Genehmiger-E-Mail',
@@ -173,7 +178,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:UserRequest/Attribute:time_spent' => 'Lösungsdauer',
 	'Class:UserRequest/Attribute:time_spent+' => '',
 	'Class:UserRequest/Attribute:resolution_code' => 'Lösungs-Code',
-	'Class:UserRequest/Attribute:resolution_code+' => '',
+	'Class:UserRequest/Attribute:resolution_code+' => 'Was wurde unternommen, um die Anfrage zu lösen?',
 	'Class:UserRequest/Attribute:resolution_code/Value:assistance' => 'Unterstützung',
 	'Class:UserRequest/Attribute:resolution_code/Value:assistance+' => '',
 	'Class:UserRequest/Attribute:resolution_code/Value:bug fixed' => 'Bugfix',
@@ -205,7 +210,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:UserRequest/Attribute:parent_change_ref' => 'Referenz Change',
 	'Class:UserRequest/Attribute:parent_change_ref+' => '',
 	'Class:UserRequest/Attribute:related_request_list' => 'Abgeleitete Requests',
-	'Class:UserRequest/Attribute:related_request_list+' => 'All the requests that are linked to this parent request~~',
+	'Class:UserRequest/Attribute:related_request_list+' => 'Alle abgeleitete Anfragen, die mit dieser Benutzeranfrage verknüpft sind',
 	'Class:UserRequest/Attribute:public_log' => 'Öffentliches Log',
 	'Class:UserRequest/Attribute:public_log+' => '',
 	'Class:UserRequest/Attribute:user_satisfaction' => 'Benutzerzufriedenheit',
@@ -220,7 +225,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:UserRequest/Attribute:user_satisfaction/Value:4+' => '',
 	'Class:UserRequest/Attribute:user_comment' => 'Benutzer-Kommentar',
 	'Class:UserRequest/Attribute:user_comment+' => '',
-	'Class:UserRequest/Attribute:parent_request_id_friendlyname' => 'Parent Request ID Friendly Name',
+	'Class:UserRequest/Attribute:parent_request_id_friendlyname' => 'Parent-Benutzeranfrage-Anzeigename',
 	'Class:UserRequest/Attribute:parent_request_id_friendlyname+' => '',
 	'Class:UserRequest/Stimulus:ev_assign' => 'Zuweisen',
 	'Class:UserRequest/Stimulus:ev_assign+' => '',
@@ -273,7 +278,6 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Portal:SelectLanguage' => 'Ändern Sie Ihre Spracheinstellung',
 	'Portal:LanguageChangedTo_Lang' => 'Spracheinstellung geändert auf: ',
 	'Portal:ChooseYourFavoriteLanguage' => 'Wählen Sie Ihre bevorzugte Sprache',
-
 	'Class:UserRequest/Method:ResolveChildTickets' => 'Kind-Tickets lösen',
 	'Class:UserRequest/Method:ResolveChildTickets+' => 'Lösung auf Kind-Tickets übertragen (ev_autoresolve), und folgende Ticket-Eigenschaften angleichen: Service, Team, Agent, Lösungsinformationen',
 ));
diff --git a/datamodels/2.x/itop-request-mgmt/dictionaries/es_cr.dict.itop-request-mgmt.php b/datamodels/2.x/itop-request-mgmt/dictionaries/es_cr.dict.itop-request-mgmt.php
index 45adc58720..6733315938 100644
--- a/datamodels/2.x/itop-request-mgmt/dictionaries/es_cr.dict.itop-request-mgmt.php
+++ b/datamodels/2.x/itop-request-mgmt/dictionaries/es_cr.dict.itop-request-mgmt.php
@@ -35,6 +35,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'UI-RequestManagementOverview-OpenRequestByType' => 'Requerimientos Abiertos por Tipo',
 	'UI-RequestManagementOverview-OpenRequestByCustomer' => 'Requerimientos Abiertos por Cliente',
 	'Class:UserRequest:KnownErrorList' => 'Errores Conocidos',
+	'Class:UserRequest:KnownErrorList+' => 'Known Errors related to Functional CI linked to the current ticket~~',
 	'Menu:UserRequest:MyWorkOrders' => 'Ordenes de Trabajo asignadas a Mí',
 	'Menu:UserRequest:MyWorkOrders+' => 'Ordenes de Trabajo asignadas a Mí',
 	'Class:Problem:KnownProblemList' => 'Problemas Conocidos',
@@ -116,6 +117,10 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:UserRequest/Attribute:urgency/Value:4+' => 'Baja',
 	'Class:UserRequest/Attribute:origin' => 'Origen',
 	'Class:UserRequest/Attribute:origin+' => 'Origen',
+	'Class:UserRequest/Attribute:origin/Value:in_person' => 'In-person~~',
+	'Class:UserRequest/Attribute:origin/Value:in_person+' => 'Request created following a face-to-face discussion~~',
+	'Class:UserRequest/Attribute:origin/Value:chat' => 'Chat~~',
+	'Class:UserRequest/Attribute:origin/Value:chat+' => 'Request created following a chat discussion~~',
 	'Class:UserRequest/Attribute:origin/Value:mail' => 'Correo-e',
 	'Class:UserRequest/Attribute:origin/Value:mail+' => 'Correo-e',
 	'Class:UserRequest/Attribute:origin/Value:monitoring' => 'Monitoreo',
@@ -271,7 +276,6 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Portal:SelectLanguage' => 'Seleccione un Idioma',
 	'Portal:LanguageChangedTo_Lang' => 'Idioma Cambiado a ',
 	'Portal:ChooseYourFavoriteLanguage' => 'Seleccione su Idioma Favorito',
-
 	'Class:UserRequest/Method:ResolveChildTickets' => 'Resolver tickets hijos',
 	'Class:UserRequest/Method:ResolveChildTickets+' => 'Cascadear la solución a los tickets hijos (ev_autoresolve), y alinear las siguientes características: servicio, equipo, agente, información de solución',
 ));
diff --git a/datamodels/2.x/itop-request-mgmt/dictionaries/fr.dict.itop-request-mgmt.php b/datamodels/2.x/itop-request-mgmt/dictionaries/fr.dict.itop-request-mgmt.php
index f16c39ce57..ed44bbf7d6 100644
--- a/datamodels/2.x/itop-request-mgmt/dictionaries/fr.dict.itop-request-mgmt.php
+++ b/datamodels/2.x/itop-request-mgmt/dictionaries/fr.dict.itop-request-mgmt.php
@@ -278,7 +278,6 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Portal:SelectLanguage' => 'Changer ma langue',
 	'Portal:LanguageChangedTo_Lang' => 'Langue changée en',
 	'Portal:ChooseYourFavoriteLanguage' => 'Choisissez votre langue',
-
 	'Class:UserRequest/Method:ResolveChildTickets' => 'ResolveChildTickets (résoudre les tickets fils)',
 	'Class:UserRequest/Method:ResolveChildTickets+' => 'Cascader l\'action de résolution de la demande (ev_autoresolve), et aligner les caractéristiques suivantes : service, équipe, agent, information de résolution',
 ));
@@ -289,8 +288,6 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Organization:Overview:MyUserRequests' => 'Mes Demandes Utilisateurs pour cette organisation',
 	'Organization:Overview:Tickets' => 'Les Tickets de cette organisation',
 ));
-
-
 // 1:n relations custom labels for tooltip and pop-up title
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:UserRequest/Attribute:related_request_list/UI:Links:Create:Button+' => 'Créer une %4$s',
@@ -298,5 +295,5 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:UserRequest/Attribute:related_request_list/UI:Links:Remove:Button+' => 'Retirer cette %4$s',
 	'Class:UserRequest/Attribute:related_request_list/UI:Links:Remove:Modal:Title' => 'Retirer cette %4$s de sa %1$s',
 	'Class:UserRequest/Attribute:related_request_list/UI:Links:Delete:Button+' => 'Supprimer cette %4$s',
-	'Class:UserRequest/Attribute:related_request_list/UI:Links:Delete:Modal:Title' => 'Supprimer une %4$s',
+	'Class:UserRequest/Attribute:related_request_list/UI:Links:Delete:Modal:Title' => 'Supprimer une %4$s'
 ));
diff --git a/datamodels/2.x/itop-request-mgmt/dictionaries/hu.dict.itop-request-mgmt.php b/datamodels/2.x/itop-request-mgmt/dictionaries/hu.dict.itop-request-mgmt.php
index 1b77f87849..1d93d7c29b 100644
--- a/datamodels/2.x/itop-request-mgmt/dictionaries/hu.dict.itop-request-mgmt.php
+++ b/datamodels/2.x/itop-request-mgmt/dictionaries/hu.dict.itop-request-mgmt.php
@@ -4,40 +4,41 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Menu:RequestManagement' => 'Helpdesk',
-    'Menu:RequestManagement+' => 'Kérelmek kezelése',
-    'Menu:RequestManagementProvider' => 'Helpdesk szolgáltató',
-    'Menu:RequestManagementProvider+' => 'Helpdesk provider~~',
-    'Menu:UserRequest:Provider' => 'Szolgáltatónak átadott nyitott kérelmek',
-    'Menu:UserRequest:Provider+' => 'Open requests transfered to provider~~',
-    'Menu:UserRequest:Overview' => 'Áttekintő',
-    'Menu:UserRequest:Overview+' => 'Overview~~',
-    'Menu:NewUserRequest' => 'Új felhasználói kérelem',
-    'Menu:NewUserRequest+' => 'Create a new user request ticket~~',
-    'Menu:SearchUserRequests' => 'Felhasználó kérelem keresése',
-    'Menu:SearchUserRequests+' => 'Search for user request tickets~~',
-    'Menu:UserRequest:Shortcuts' => 'Gyorsgombok',
-    'Menu:UserRequest:Shortcuts+' => '~~',
-    'Menu:UserRequest:MyRequests' => 'Hozzám rendelt kérelmek',
-    'Menu:UserRequest:MyRequests+' => 'Requests assigned to me (as Agent)~~',
-    'Menu:UserRequest:MySupportRequests' => 'Támogatói kérelmeim',
-    'Menu:UserRequest:MySupportRequests+' => 'My support calls~~',
-    'Menu:UserRequest:EscalatedRequests' => 'Sürgős kérelmek',
-    'Menu:UserRequest:EscalatedRequests+' => 'Hot requests~~',
-    'Menu:UserRequest:OpenRequests' => 'Minden nyitott kérelem',
-    'Menu:UserRequest:OpenRequests+' => 'All open requests~~',
-    'UI:WelcomeMenu:MyAssignedCalls' => 'Hozzám rendelt kérelmek',
-    'UI-RequestManagementOverview-RequestByType-last-14-days' => 'Az utóbbi 14 nap kérelmei típusonként',
-    'UI-RequestManagementOverview-Last-14-days' => 'Az utóbbi 14 nap kérelmei napi bontásban',
-    'UI-RequestManagementOverview-OpenRequestByStatus' => 'Nyitott kérelmek állapotuk szerint',
-    'UI-RequestManagementOverview-OpenRequestByAgent' => 'Nyitott kérelmek felelősönként',
-    'UI-RequestManagementOverview-OpenRequestByType' => 'Nyitott kérelmek típusonként',
-    'UI-RequestManagementOverview-OpenRequestByCustomer' => 'Nyitott kérelmek szervezetenként',
-    'Class:UserRequest:KnownErrorList' => 'Ismert hibák',
-    'Menu:UserRequest:MyWorkOrders' => 'Hozzám rendelt munkautasítások',
-    'Menu:UserRequest:MyWorkOrders+' => 'All work orders assigned to me~~',
-    'Class:Problem:KnownProblemList' => 'Ismert problémák',
-    'Tickets:Related:OpenIncidents' => 'Nyitott incidensek',
+	'Menu:RequestManagement' => 'Helpdesk',
+	'Menu:RequestManagement+' => 'Kérelmek kezelése',
+	'Menu:RequestManagementProvider' => 'Helpdesk szolgáltató',
+	'Menu:RequestManagementProvider+' => 'Helpdesk provider~~',
+	'Menu:UserRequest:Provider' => 'Szolgáltatónak átadott nyitott kérelmek',
+	'Menu:UserRequest:Provider+' => 'Open requests transfered to provider~~',
+	'Menu:UserRequest:Overview' => 'Áttekintő',
+	'Menu:UserRequest:Overview+' => 'Overview~~',
+	'Menu:NewUserRequest' => 'Új felhasználói kérelem',
+	'Menu:NewUserRequest+' => 'Create a new user request ticket~~',
+	'Menu:SearchUserRequests' => 'Felhasználó kérelem keresése',
+	'Menu:SearchUserRequests+' => 'Search for user request tickets~~',
+	'Menu:UserRequest:Shortcuts' => 'Gyorsgombok',
+	'Menu:UserRequest:Shortcuts+' => '~~',
+	'Menu:UserRequest:MyRequests' => 'Hozzám rendelt kérelmek',
+	'Menu:UserRequest:MyRequests+' => 'Requests assigned to me (as Agent)~~',
+	'Menu:UserRequest:MySupportRequests' => 'Támogatói kérelmeim',
+	'Menu:UserRequest:MySupportRequests+' => 'My support calls~~',
+	'Menu:UserRequest:EscalatedRequests' => 'Sürgős kérelmek',
+	'Menu:UserRequest:EscalatedRequests+' => 'Hot requests~~',
+	'Menu:UserRequest:OpenRequests' => 'Minden nyitott kérelem',
+	'Menu:UserRequest:OpenRequests+' => 'All open requests~~',
+	'UI:WelcomeMenu:MyAssignedCalls' => 'Hozzám rendelt kérelmek',
+	'UI-RequestManagementOverview-RequestByType-last-14-days' => 'Az utóbbi 14 nap kérelmei típusonként',
+	'UI-RequestManagementOverview-Last-14-days' => 'Az utóbbi 14 nap kérelmei napi bontásban',
+	'UI-RequestManagementOverview-OpenRequestByStatus' => 'Nyitott kérelmek állapotuk szerint',
+	'UI-RequestManagementOverview-OpenRequestByAgent' => 'Nyitott kérelmek felelősönként',
+	'UI-RequestManagementOverview-OpenRequestByType' => 'Nyitott kérelmek típusonként',
+	'UI-RequestManagementOverview-OpenRequestByCustomer' => 'Nyitott kérelmek szervezetenként',
+	'Class:UserRequest:KnownErrorList' => 'Ismert hibák',
+	'Class:UserRequest:KnownErrorList+' => 'Known Errors related to Functional CI linked to the current ticket~~',
+	'Menu:UserRequest:MyWorkOrders' => 'Hozzám rendelt munkautasítások',
+	'Menu:UserRequest:MyWorkOrders+' => 'All work orders assigned to me~~',
+	'Class:Problem:KnownProblemList' => 'Ismert problémák',
+	'Tickets:Related:OpenIncidents' => 'Nyitott incidensek',
 ));
 
 // Dictionnay conventions
@@ -55,230 +56,232 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:UserRequest' => 'Felhasználói kérelem',
-    'Class:UserRequest+' => '~~',
-    'Class:UserRequest/Attribute:status' => 'Állapot',
-    'Class:UserRequest/Attribute:status+' => '~~',
-    'Class:UserRequest/Attribute:status/Value:new' => 'Új',
-    'Class:UserRequest/Attribute:status/Value:new+' => '~~',
-    'Class:UserRequest/Attribute:status/Value:escalated_tto' => 'Eszkalált TTO',
-    'Class:UserRequest/Attribute:status/Value:escalated_tto+' => '~~',
-    'Class:UserRequest/Attribute:status/Value:assigned' => 'Hozzárendelt',
-    'Class:UserRequest/Attribute:status/Value:assigned+' => '~~',
-    'Class:UserRequest/Attribute:status/Value:escalated_ttr' => 'Eszkalált TTR',
-    'Class:UserRequest/Attribute:status/Value:escalated_ttr+' => '~~',
-    'Class:UserRequest/Attribute:status/Value:waiting_for_approval' => 'Jóváhagyásra vár',
-    'Class:UserRequest/Attribute:status/Value:waiting_for_approval+' => '~~',
-    'Class:UserRequest/Attribute:status/Value:approved' => 'Jóváhagyva',
-    'Class:UserRequest/Attribute:status/Value:approved+' => '~~',
-    'Class:UserRequest/Attribute:status/Value:rejected' => 'Elutasítva',
-    'Class:UserRequest/Attribute:status/Value:rejected+' => '~~',
-    'Class:UserRequest/Attribute:status/Value:pending' => 'Folyamatban',
-    'Class:UserRequest/Attribute:status/Value:pending+' => '~~',
-    'Class:UserRequest/Attribute:status/Value:resolved' => 'Megoldva',
-    'Class:UserRequest/Attribute:status/Value:resolved+' => '~~',
-    'Class:UserRequest/Attribute:status/Value:closed' => 'Lezárt',
-    'Class:UserRequest/Attribute:status/Value:closed+' => '~~',
-    'Class:UserRequest/Attribute:request_type' => 'Kérelem típus',
-    'Class:UserRequest/Attribute:request_type+' => '~~',
-    'Class:UserRequest/Attribute:request_type/Value:incident' => 'Incidens',
-    'Class:UserRequest/Attribute:request_type/Value:incident+' => 'Incident~~',
-    'Class:UserRequest/Attribute:request_type/Value:service_request' => 'Szolgáltatás kérelem',
-    'Class:UserRequest/Attribute:request_type/Value:service_request+' => 'Service request~~',
-    'Class:UserRequest/Attribute:impact' => 'Hatása',
-    'Class:UserRequest/Attribute:impact+' => '~~',
-    'Class:UserRequest/Attribute:impact/Value:1' => 'Részlegre',
-    'Class:UserRequest/Attribute:impact/Value:1+' => '~~',
-    'Class:UserRequest/Attribute:impact/Value:2' => 'Szolgáltatásra',
-    'Class:UserRequest/Attribute:impact/Value:2+' => '~~',
-    'Class:UserRequest/Attribute:impact/Value:3' => 'Személyre',
-    'Class:UserRequest/Attribute:impact/Value:3+' => '~~',
-    'Class:UserRequest/Attribute:priority' => 'Prioritás',
-    'Class:UserRequest/Attribute:priority+' => '~~',
-    'Class:UserRequest/Attribute:priority/Value:1' => 'Kritikus',
-    'Class:UserRequest/Attribute:priority/Value:1+' => 'critical~~',
-    'Class:UserRequest/Attribute:priority/Value:2' => 'Magas',
-    'Class:UserRequest/Attribute:priority/Value:2+' => 'high~~',
-    'Class:UserRequest/Attribute:priority/Value:3' => 'Közepes',
-    'Class:UserRequest/Attribute:priority/Value:3+' => 'medium~~',
-    'Class:UserRequest/Attribute:priority/Value:4' => 'Alacsony',
-    'Class:UserRequest/Attribute:priority/Value:4+' => 'low~~',
-    'Class:UserRequest/Attribute:urgency' => 'Sürgősség',
-    'Class:UserRequest/Attribute:urgency+' => '~~',
-    'Class:UserRequest/Attribute:urgency/Value:1' => 'Nem várhat',
-    'Class:UserRequest/Attribute:urgency/Value:1+' => 'critical~~',
-    'Class:UserRequest/Attribute:urgency/Value:2' => 'Nagyon sürgős',
-    'Class:UserRequest/Attribute:urgency/Value:2+' => 'high~~',
-    'Class:UserRequest/Attribute:urgency/Value:3' => 'Sürgős',
-    'Class:UserRequest/Attribute:urgency/Value:3+' => 'medium~~',
-    'Class:UserRequest/Attribute:urgency/Value:4' => 'Nem sürgős',
-    'Class:UserRequest/Attribute:urgency/Value:4+' => 'low~~',
-    'Class:UserRequest/Attribute:origin' => 'Eredet',
-    'Class:UserRequest/Attribute:origin+' => '~~',
-    'Class:UserRequest/Attribute:origin/Value:mail' => 'Email',
-    'Class:UserRequest/Attribute:origin/Value:mail+' => 'email~~',
-    'Class:UserRequest/Attribute:origin/Value:monitoring' => 'Felügyelet',
-    'Class:UserRequest/Attribute:origin/Value:monitoring+' => 'monitoring~~',
-    'Class:UserRequest/Attribute:origin/Value:phone' => 'Telefon',
-    'Class:UserRequest/Attribute:origin/Value:phone+' => 'phone~~',
-    'Class:UserRequest/Attribute:origin/Value:portal' => 'Portál',
-    'Class:UserRequest/Attribute:origin/Value:portal+' => 'portal~~',
-    'Class:UserRequest/Attribute:approver_id' => 'Jóváhagyó',
-    'Class:UserRequest/Attribute:approver_id+' => '~~',
-    'Class:UserRequest/Attribute:approver_email' => 'Jóváhagyó email címe',
-    'Class:UserRequest/Attribute:approver_email+' => '~~',
-    'Class:UserRequest/Attribute:service_id' => 'Szolgáltatás',
-    'Class:UserRequest/Attribute:service_id+' => '~~',
-    'Class:UserRequest/Attribute:service_name' => 'Szolgáltatás név',
-    'Class:UserRequest/Attribute:service_name+' => '~~',
-    'Class:UserRequest/Attribute:servicesubcategory_id' => 'Szolgáltatás alkategória',
-    'Class:UserRequest/Attribute:servicesubcategory_id+' => '~~',
-    'Class:UserRequest/Attribute:servicesubcategory_name' => 'Szolgáltatás alkategória név',
-    'Class:UserRequest/Attribute:servicesubcategory_name+' => '~~',
-    'Class:UserRequest/Attribute:escalation_flag' => 'Sürgős jelzés',
-    'Class:UserRequest/Attribute:escalation_flag+' => '~~',
-    'Class:UserRequest/Attribute:escalation_flag/Value:no' => 'Nem',
-    'Class:UserRequest/Attribute:escalation_flag/Value:no+' => 'No~~',
-    'Class:UserRequest/Attribute:escalation_flag/Value:yes' => 'Igen',
-    'Class:UserRequest/Attribute:escalation_flag/Value:yes+' => 'Yes~~',
-    'Class:UserRequest/Attribute:escalation_reason' => 'Sürgősségi ok',
-    'Class:UserRequest/Attribute:escalation_reason+' => '~~',
-    'Class:UserRequest/Attribute:assignment_date' => 'Megbízási dátum',
-    'Class:UserRequest/Attribute:assignment_date+' => '~~',
-    'Class:UserRequest/Attribute:resolution_date' => 'Megoldási dátum',
-    'Class:UserRequest/Attribute:resolution_date+' => '~~',
-    'Class:UserRequest/Attribute:last_pending_date' => 'Utolsó függőben lévő dátum',
-    'Class:UserRequest/Attribute:last_pending_date+' => '~~',
-    'Class:UserRequest/Attribute:cumulatedpending' => 'Kumulált függőben lévő',
-    'Class:UserRequest/Attribute:cumulatedpending+' => '~~',
-    'Class:UserRequest/Attribute:tto' => 'TTO',
-    'Class:UserRequest/Attribute:tto+' => '~~',
-    'Class:UserRequest/Attribute:ttr' => 'TTR',
-    'Class:UserRequest/Attribute:ttr+' => '~~',
-    'Class:UserRequest/Attribute:tto_escalation_deadline' => 'TTO határidő',
-    'Class:UserRequest/Attribute:tto_escalation_deadline+' => '~~',
-    'Class:UserRequest/Attribute:sla_tto_passed' => 'SLA TTO letelt',
-    'Class:UserRequest/Attribute:sla_tto_passed+' => '~~',
-    'Class:UserRequest/Attribute:sla_tto_over' => 'SLA TTO túllépett',
-    'Class:UserRequest/Attribute:sla_tto_over+' => '~~',
-    'Class:UserRequest/Attribute:ttr_escalation_deadline' => 'TTR határidő',
-    'Class:UserRequest/Attribute:ttr_escalation_deadline+' => '~~',
-    'Class:UserRequest/Attribute:sla_ttr_passed' => 'SLA TTR letelt',
-    'Class:UserRequest/Attribute:sla_ttr_passed+' => '~~',
-    'Class:UserRequest/Attribute:sla_ttr_over' => 'SLA TTR túllépett',
-    'Class:UserRequest/Attribute:sla_ttr_over+' => '~~',
-    'Class:UserRequest/Attribute:time_spent' => 'Időráfordítás',
-    'Class:UserRequest/Attribute:time_spent+' => '~~',
-    'Class:UserRequest/Attribute:resolution_code' => 'Megoldás kód',
-    'Class:UserRequest/Attribute:resolution_code+' => '~~',
-    'Class:UserRequest/Attribute:resolution_code/Value:assistance' => 'Támogatás',
-    'Class:UserRequest/Attribute:resolution_code/Value:assistance+' => 'assistance~~',
-    'Class:UserRequest/Attribute:resolution_code/Value:bug fixed' => 'Programhiba javítás',
-    'Class:UserRequest/Attribute:resolution_code/Value:bug fixed+' => 'bug fixed~~',
-    'Class:UserRequest/Attribute:resolution_code/Value:hardware repair' => 'Hardver javítás',
-    'Class:UserRequest/Attribute:resolution_code/Value:hardware repair+' => 'hardware repair~~',
-    'Class:UserRequest/Attribute:resolution_code/Value:other' => 'egyéb',
-    'Class:UserRequest/Attribute:resolution_code/Value:other+' => 'other~~',
-    'Class:UserRequest/Attribute:resolution_code/Value:software patch' => 'Szoftverfrissítés',
-    'Class:UserRequest/Attribute:resolution_code/Value:software patch+' => 'software patch~~',
-    'Class:UserRequest/Attribute:resolution_code/Value:system update' => 'Rendszerfrissítés',
-    'Class:UserRequest/Attribute:resolution_code/Value:system update+' => 'system update~~',
-    'Class:UserRequest/Attribute:resolution_code/Value:training' => 'Oktatás',
-    'Class:UserRequest/Attribute:resolution_code/Value:training+' => 'training~~',
-    'Class:UserRequest/Attribute:solution' => 'Megoldás',
-    'Class:UserRequest/Attribute:solution+' => '~~',
-    'Class:UserRequest/Attribute:pending_reason' => 'Függőben lévőség oka',
-    'Class:UserRequest/Attribute:pending_reason+' => '~~',
-    'Class:UserRequest/Attribute:parent_request_id' => 'Szülő kérelem',
-    'Class:UserRequest/Attribute:parent_request_id+' => '~~',
-    'Class:UserRequest/Attribute:parent_request_ref' => 'Ref. kérelem',
-    'Class:UserRequest/Attribute:parent_request_ref+' => '~~',
-    'Class:UserRequest/Attribute:parent_problem_id' => 'Szülő probléma',
-    'Class:UserRequest/Attribute:parent_problem_id+' => '~~',
-    'Class:UserRequest/Attribute:parent_problem_ref' => 'Ref. probléma',
-    'Class:UserRequest/Attribute:parent_problem_ref+' => '~~',
-    'Class:UserRequest/Attribute:parent_change_id' => 'Szülő változás',
-    'Class:UserRequest/Attribute:parent_change_id+' => '~~',
-    'Class:UserRequest/Attribute:parent_change_ref' => 'Ref. változás',
-    'Class:UserRequest/Attribute:parent_change_ref+' => '~~',
-    'Class:UserRequest/Attribute:related_request_list' => 'Gyermek kérelem',
-    'Class:UserRequest/Attribute:related_request_list+' => 'All the requests that are linked to this parent request~~',
-    'Class:UserRequest/Attribute:public_log' => 'Nyilvános napló',
-    'Class:UserRequest/Attribute:public_log+' => '~~',
-    'Class:UserRequest/Attribute:user_satisfaction' => 'Felhasználói elégedettség',
-    'Class:UserRequest/Attribute:user_satisfaction+' => '~~',
-    'Class:UserRequest/Attribute:user_satisfaction/Value:1' => 'Nagyon elégedett',
-    'Class:UserRequest/Attribute:user_satisfaction/Value:1+' => 'Very satisfied~~',
-    'Class:UserRequest/Attribute:user_satisfaction/Value:2' => 'Viszonylag elégedett',
-    'Class:UserRequest/Attribute:user_satisfaction/Value:2+' => 'Fairly statisfied~~',
-    'Class:UserRequest/Attribute:user_satisfaction/Value:3' => 'Inkább elégedetlen',
-    'Class:UserRequest/Attribute:user_satisfaction/Value:3+' => 'Inkább elégedetlen',
-    'Class:UserRequest/Attribute:user_satisfaction/Value:4' => 'Nagyon elégedetlen',
-    'Class:UserRequest/Attribute:user_satisfaction/Value:4+' => 'Very Dissatisfied~~',
-    'Class:UserRequest/Attribute:user_comment' => 'Felhasználói megjegyzés',
-    'Class:UserRequest/Attribute:user_comment+' => '~~',
-    'Class:UserRequest/Attribute:parent_request_id_friendlyname' => 'parent_request_id_friendlyname',
-    'Class:UserRequest/Attribute:parent_request_id_friendlyname+' => '~~',
-    'Class:UserRequest/Stimulus:ev_assign' => 'Hozzárendelés',
-    'Class:UserRequest/Stimulus:ev_assign+' => '~~',
-    'Class:UserRequest/Stimulus:ev_reassign' => 'Újra hozzárendelés',
-    'Class:UserRequest/Stimulus:ev_reassign+' => '~~',
-    'Class:UserRequest/Stimulus:ev_approve' => 'Jóváhagyás',
-    'Class:UserRequest/Stimulus:ev_approve+' => '~~',
-    'Class:UserRequest/Stimulus:ev_reject' => 'Elutasítás',
-    'Class:UserRequest/Stimulus:ev_reject+' => '~~',
-    'Class:UserRequest/Stimulus:ev_pending' => 'Függőben',
-    'Class:UserRequest/Stimulus:ev_pending+' => '~~',
-    'Class:UserRequest/Stimulus:ev_timeout' => 'Időtúllépés',
-    'Class:UserRequest/Stimulus:ev_timeout+' => '~~',
-    'Class:UserRequest/Stimulus:ev_autoresolve' => 'Automatikus megoldás',
-    'Class:UserRequest/Stimulus:ev_autoresolve+' => '~~',
-    'Class:UserRequest/Stimulus:ev_autoclose' => 'Automatikus lezárás',
-    'Class:UserRequest/Stimulus:ev_autoclose+' => '~~',
-    'Class:UserRequest/Stimulus:ev_resolve' => 'Megjelölve megoldottként',
-    'Class:UserRequest/Stimulus:ev_resolve+' => '~~',
-    'Class:UserRequest/Stimulus:ev_close' => 'Kérelem lezárása',
-    'Class:UserRequest/Stimulus:ev_close+' => '~~',
-    'Class:UserRequest/Stimulus:ev_reopen' => 'Újranyitás',
-    'Class:UserRequest/Stimulus:ev_reopen+' => '~~',
-    'Class:UserRequest/Stimulus:ev_wait_for_approval' => 'Jóváhagyásra vár',
-    'Class:UserRequest/Stimulus:ev_wait_for_approval+' => '~~',
-    'Class:UserRequest/Error:CannotAssignParentRequestIdToSelf' => 'Nem lehet hozzárendelni a szülő kérelmet magához a kérelemhez',
+	'Class:UserRequest' => 'Felhasználói kérelem',
+	'Class:UserRequest+' => '~~',
+	'Class:UserRequest/Attribute:status' => 'Állapot',
+	'Class:UserRequest/Attribute:status+' => '~~',
+	'Class:UserRequest/Attribute:status/Value:new' => 'Új',
+	'Class:UserRequest/Attribute:status/Value:new+' => '~~',
+	'Class:UserRequest/Attribute:status/Value:escalated_tto' => 'Eszkalált TTO',
+	'Class:UserRequest/Attribute:status/Value:escalated_tto+' => '~~',
+	'Class:UserRequest/Attribute:status/Value:assigned' => 'Hozzárendelt',
+	'Class:UserRequest/Attribute:status/Value:assigned+' => '~~',
+	'Class:UserRequest/Attribute:status/Value:escalated_ttr' => 'Eszkalált TTR',
+	'Class:UserRequest/Attribute:status/Value:escalated_ttr+' => '~~',
+	'Class:UserRequest/Attribute:status/Value:waiting_for_approval' => 'Jóváhagyásra vár',
+	'Class:UserRequest/Attribute:status/Value:waiting_for_approval+' => '~~',
+	'Class:UserRequest/Attribute:status/Value:approved' => 'Jóváhagyva',
+	'Class:UserRequest/Attribute:status/Value:approved+' => '~~',
+	'Class:UserRequest/Attribute:status/Value:rejected' => 'Elutasítva',
+	'Class:UserRequest/Attribute:status/Value:rejected+' => '~~',
+	'Class:UserRequest/Attribute:status/Value:pending' => 'Folyamatban',
+	'Class:UserRequest/Attribute:status/Value:pending+' => '~~',
+	'Class:UserRequest/Attribute:status/Value:resolved' => 'Megoldva',
+	'Class:UserRequest/Attribute:status/Value:resolved+' => '~~',
+	'Class:UserRequest/Attribute:status/Value:closed' => 'Lezárt',
+	'Class:UserRequest/Attribute:status/Value:closed+' => '~~',
+	'Class:UserRequest/Attribute:request_type' => 'Kérelem típus',
+	'Class:UserRequest/Attribute:request_type+' => '~~',
+	'Class:UserRequest/Attribute:request_type/Value:incident' => 'Incidens',
+	'Class:UserRequest/Attribute:request_type/Value:incident+' => 'Incident~~',
+	'Class:UserRequest/Attribute:request_type/Value:service_request' => 'Szolgáltatás kérelem',
+	'Class:UserRequest/Attribute:request_type/Value:service_request+' => 'Service request~~',
+	'Class:UserRequest/Attribute:impact' => 'Hatása',
+	'Class:UserRequest/Attribute:impact+' => '~~',
+	'Class:UserRequest/Attribute:impact/Value:1' => 'Részlegre',
+	'Class:UserRequest/Attribute:impact/Value:1+' => '~~',
+	'Class:UserRequest/Attribute:impact/Value:2' => 'Szolgáltatásra',
+	'Class:UserRequest/Attribute:impact/Value:2+' => '~~',
+	'Class:UserRequest/Attribute:impact/Value:3' => 'Személyre',
+	'Class:UserRequest/Attribute:impact/Value:3+' => '~~',
+	'Class:UserRequest/Attribute:priority' => 'Prioritás',
+	'Class:UserRequest/Attribute:priority+' => '~~',
+	'Class:UserRequest/Attribute:priority/Value:1' => 'Kritikus',
+	'Class:UserRequest/Attribute:priority/Value:1+' => 'critical~~',
+	'Class:UserRequest/Attribute:priority/Value:2' => 'Magas',
+	'Class:UserRequest/Attribute:priority/Value:2+' => 'high~~',
+	'Class:UserRequest/Attribute:priority/Value:3' => 'Közepes',
+	'Class:UserRequest/Attribute:priority/Value:3+' => 'medium~~',
+	'Class:UserRequest/Attribute:priority/Value:4' => 'Alacsony',
+	'Class:UserRequest/Attribute:priority/Value:4+' => 'low~~',
+	'Class:UserRequest/Attribute:urgency' => 'Sürgősség',
+	'Class:UserRequest/Attribute:urgency+' => '~~',
+	'Class:UserRequest/Attribute:urgency/Value:1' => 'Nem várhat',
+	'Class:UserRequest/Attribute:urgency/Value:1+' => 'critical~~',
+	'Class:UserRequest/Attribute:urgency/Value:2' => 'Nagyon sürgős',
+	'Class:UserRequest/Attribute:urgency/Value:2+' => 'high~~',
+	'Class:UserRequest/Attribute:urgency/Value:3' => 'Sürgős',
+	'Class:UserRequest/Attribute:urgency/Value:3+' => 'medium~~',
+	'Class:UserRequest/Attribute:urgency/Value:4' => 'Nem sürgős',
+	'Class:UserRequest/Attribute:urgency/Value:4+' => 'low~~',
+	'Class:UserRequest/Attribute:origin' => 'Eredet',
+	'Class:UserRequest/Attribute:origin+' => '~~',
+	'Class:UserRequest/Attribute:origin/Value:in_person' => 'In-person~~',
+	'Class:UserRequest/Attribute:origin/Value:in_person+' => 'Request created following a face-to-face discussion~~',
+	'Class:UserRequest/Attribute:origin/Value:chat' => 'Chat~~',
+	'Class:UserRequest/Attribute:origin/Value:chat+' => 'Request created following a chat discussion~~',
+	'Class:UserRequest/Attribute:origin/Value:mail' => 'Email',
+	'Class:UserRequest/Attribute:origin/Value:mail+' => 'email~~',
+	'Class:UserRequest/Attribute:origin/Value:monitoring' => 'Felügyelet',
+	'Class:UserRequest/Attribute:origin/Value:monitoring+' => 'monitoring~~',
+	'Class:UserRequest/Attribute:origin/Value:phone' => 'Telefon',
+	'Class:UserRequest/Attribute:origin/Value:phone+' => 'phone~~',
+	'Class:UserRequest/Attribute:origin/Value:portal' => 'Portál',
+	'Class:UserRequest/Attribute:origin/Value:portal+' => 'portal~~',
+	'Class:UserRequest/Attribute:approver_id' => 'Jóváhagyó',
+	'Class:UserRequest/Attribute:approver_id+' => '~~',
+	'Class:UserRequest/Attribute:approver_email' => 'Jóváhagyó email címe',
+	'Class:UserRequest/Attribute:approver_email+' => '~~',
+	'Class:UserRequest/Attribute:service_id' => 'Szolgáltatás',
+	'Class:UserRequest/Attribute:service_id+' => '~~',
+	'Class:UserRequest/Attribute:service_name' => 'Szolgáltatás név',
+	'Class:UserRequest/Attribute:service_name+' => '~~',
+	'Class:UserRequest/Attribute:servicesubcategory_id' => 'Szolgáltatás alkategória',
+	'Class:UserRequest/Attribute:servicesubcategory_id+' => '~~',
+	'Class:UserRequest/Attribute:servicesubcategory_name' => 'Szolgáltatás alkategória név',
+	'Class:UserRequest/Attribute:servicesubcategory_name+' => '~~',
+	'Class:UserRequest/Attribute:escalation_flag' => 'Sürgős jelzés',
+	'Class:UserRequest/Attribute:escalation_flag+' => '~~',
+	'Class:UserRequest/Attribute:escalation_flag/Value:no' => 'Nem',
+	'Class:UserRequest/Attribute:escalation_flag/Value:no+' => 'No~~',
+	'Class:UserRequest/Attribute:escalation_flag/Value:yes' => 'Igen',
+	'Class:UserRequest/Attribute:escalation_flag/Value:yes+' => 'Yes~~',
+	'Class:UserRequest/Attribute:escalation_reason' => 'Sürgősségi ok',
+	'Class:UserRequest/Attribute:escalation_reason+' => '~~',
+	'Class:UserRequest/Attribute:assignment_date' => 'Megbízási dátum',
+	'Class:UserRequest/Attribute:assignment_date+' => '~~',
+	'Class:UserRequest/Attribute:resolution_date' => 'Megoldási dátum',
+	'Class:UserRequest/Attribute:resolution_date+' => '~~',
+	'Class:UserRequest/Attribute:last_pending_date' => 'Utolsó függőben lévő dátum',
+	'Class:UserRequest/Attribute:last_pending_date+' => '~~',
+	'Class:UserRequest/Attribute:cumulatedpending' => 'Kumulált függőben lévő',
+	'Class:UserRequest/Attribute:cumulatedpending+' => '~~',
+	'Class:UserRequest/Attribute:tto' => 'TTO',
+	'Class:UserRequest/Attribute:tto+' => '~~',
+	'Class:UserRequest/Attribute:ttr' => 'TTR',
+	'Class:UserRequest/Attribute:ttr+' => '~~',
+	'Class:UserRequest/Attribute:tto_escalation_deadline' => 'TTO határidő',
+	'Class:UserRequest/Attribute:tto_escalation_deadline+' => '~~',
+	'Class:UserRequest/Attribute:sla_tto_passed' => 'SLA TTO letelt',
+	'Class:UserRequest/Attribute:sla_tto_passed+' => '~~',
+	'Class:UserRequest/Attribute:sla_tto_over' => 'SLA TTO túllépett',
+	'Class:UserRequest/Attribute:sla_tto_over+' => '~~',
+	'Class:UserRequest/Attribute:ttr_escalation_deadline' => 'TTR határidő',
+	'Class:UserRequest/Attribute:ttr_escalation_deadline+' => '~~',
+	'Class:UserRequest/Attribute:sla_ttr_passed' => 'SLA TTR letelt',
+	'Class:UserRequest/Attribute:sla_ttr_passed+' => '~~',
+	'Class:UserRequest/Attribute:sla_ttr_over' => 'SLA TTR túllépett',
+	'Class:UserRequest/Attribute:sla_ttr_over+' => '~~',
+	'Class:UserRequest/Attribute:time_spent' => 'Időráfordítás',
+	'Class:UserRequest/Attribute:time_spent+' => '~~',
+	'Class:UserRequest/Attribute:resolution_code' => 'Megoldás kód',
+	'Class:UserRequest/Attribute:resolution_code+' => '~~',
+	'Class:UserRequest/Attribute:resolution_code/Value:assistance' => 'Támogatás',
+	'Class:UserRequest/Attribute:resolution_code/Value:assistance+' => 'assistance~~',
+	'Class:UserRequest/Attribute:resolution_code/Value:bug fixed' => 'Programhiba javítás',
+	'Class:UserRequest/Attribute:resolution_code/Value:bug fixed+' => 'bug fixed~~',
+	'Class:UserRequest/Attribute:resolution_code/Value:hardware repair' => 'Hardver javítás',
+	'Class:UserRequest/Attribute:resolution_code/Value:hardware repair+' => 'hardware repair~~',
+	'Class:UserRequest/Attribute:resolution_code/Value:other' => 'egyéb',
+	'Class:UserRequest/Attribute:resolution_code/Value:other+' => 'other~~',
+	'Class:UserRequest/Attribute:resolution_code/Value:software patch' => 'Szoftverfrissítés',
+	'Class:UserRequest/Attribute:resolution_code/Value:software patch+' => 'software patch~~',
+	'Class:UserRequest/Attribute:resolution_code/Value:system update' => 'Rendszerfrissítés',
+	'Class:UserRequest/Attribute:resolution_code/Value:system update+' => 'system update~~',
+	'Class:UserRequest/Attribute:resolution_code/Value:training' => 'Oktatás',
+	'Class:UserRequest/Attribute:resolution_code/Value:training+' => 'training~~',
+	'Class:UserRequest/Attribute:solution' => 'Megoldás',
+	'Class:UserRequest/Attribute:solution+' => '~~',
+	'Class:UserRequest/Attribute:pending_reason' => 'Függőben lévőség oka',
+	'Class:UserRequest/Attribute:pending_reason+' => '~~',
+	'Class:UserRequest/Attribute:parent_request_id' => 'Szülő kérelem',
+	'Class:UserRequest/Attribute:parent_request_id+' => '~~',
+	'Class:UserRequest/Attribute:parent_request_ref' => 'Ref. kérelem',
+	'Class:UserRequest/Attribute:parent_request_ref+' => '~~',
+	'Class:UserRequest/Attribute:parent_problem_id' => 'Szülő probléma',
+	'Class:UserRequest/Attribute:parent_problem_id+' => '~~',
+	'Class:UserRequest/Attribute:parent_problem_ref' => 'Ref. probléma',
+	'Class:UserRequest/Attribute:parent_problem_ref+' => '~~',
+	'Class:UserRequest/Attribute:parent_change_id' => 'Szülő változás',
+	'Class:UserRequest/Attribute:parent_change_id+' => '~~',
+	'Class:UserRequest/Attribute:parent_change_ref' => 'Ref. változás',
+	'Class:UserRequest/Attribute:parent_change_ref+' => '~~',
+	'Class:UserRequest/Attribute:related_request_list' => 'Gyermek kérelem',
+	'Class:UserRequest/Attribute:related_request_list+' => 'All the requests that are linked to this parent request~~',
+	'Class:UserRequest/Attribute:public_log' => 'Nyilvános napló',
+	'Class:UserRequest/Attribute:public_log+' => '~~',
+	'Class:UserRequest/Attribute:user_satisfaction' => 'Felhasználói elégedettség',
+	'Class:UserRequest/Attribute:user_satisfaction+' => '~~',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:1' => 'Nagyon elégedett',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:1+' => 'Very satisfied~~',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:2' => 'Viszonylag elégedett',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:2+' => 'Fairly statisfied~~',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:3' => 'Inkább elégedetlen',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:3+' => 'Inkább elégedetlen',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:4' => 'Nagyon elégedetlen',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:4+' => 'Very Dissatisfied~~',
+	'Class:UserRequest/Attribute:user_comment' => 'Felhasználói megjegyzés',
+	'Class:UserRequest/Attribute:user_comment+' => '~~',
+	'Class:UserRequest/Attribute:parent_request_id_friendlyname' => 'parent_request_id_friendlyname',
+	'Class:UserRequest/Attribute:parent_request_id_friendlyname+' => '~~',
+	'Class:UserRequest/Stimulus:ev_assign' => 'Hozzárendelés',
+	'Class:UserRequest/Stimulus:ev_assign+' => '~~',
+	'Class:UserRequest/Stimulus:ev_reassign' => 'Újra hozzárendelés',
+	'Class:UserRequest/Stimulus:ev_reassign+' => '~~',
+	'Class:UserRequest/Stimulus:ev_approve' => 'Jóváhagyás',
+	'Class:UserRequest/Stimulus:ev_approve+' => '~~',
+	'Class:UserRequest/Stimulus:ev_reject' => 'Elutasítás',
+	'Class:UserRequest/Stimulus:ev_reject+' => '~~',
+	'Class:UserRequest/Stimulus:ev_pending' => 'Függőben',
+	'Class:UserRequest/Stimulus:ev_pending+' => '~~',
+	'Class:UserRequest/Stimulus:ev_timeout' => 'Időtúllépés',
+	'Class:UserRequest/Stimulus:ev_timeout+' => '~~',
+	'Class:UserRequest/Stimulus:ev_autoresolve' => 'Automatikus megoldás',
+	'Class:UserRequest/Stimulus:ev_autoresolve+' => '~~',
+	'Class:UserRequest/Stimulus:ev_autoclose' => 'Automatikus lezárás',
+	'Class:UserRequest/Stimulus:ev_autoclose+' => '~~',
+	'Class:UserRequest/Stimulus:ev_resolve' => 'Megjelölve megoldottként',
+	'Class:UserRequest/Stimulus:ev_resolve+' => '~~',
+	'Class:UserRequest/Stimulus:ev_close' => 'Kérelem lezárása',
+	'Class:UserRequest/Stimulus:ev_close+' => '~~',
+	'Class:UserRequest/Stimulus:ev_reopen' => 'Újranyitás',
+	'Class:UserRequest/Stimulus:ev_reopen+' => '~~',
+	'Class:UserRequest/Stimulus:ev_wait_for_approval' => 'Jóváhagyásra vár',
+	'Class:UserRequest/Stimulus:ev_wait_for_approval+' => '~~',
+	'Class:UserRequest/Error:CannotAssignParentRequestIdToSelf' => 'Nem lehet hozzárendelni a szülő kérelmet magához a kérelemhez',
 ));
 
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Portal:TitleDetailsFor_Request' => 'Kérelem részletei',
-    'Portal:ButtonUpdate' => 'Frissítés',
-    'Portal:ButtonClose' => 'Lezárás',
-    'Portal:ButtonReopen' => 'Újranyitás',
-    'Portal:ShowServices' => 'Szolgáltatáskatalógus',
-    'Portal:SelectRequestType' => 'Válasszon egy kérelem típust',
-    'Portal:SelectServiceElementFrom_Service' => 'Válasszon egy szolgáltatás elemet %1$s -hez',
-    'Portal:ListServices' => 'Szolgáltatások listája',
-    'Portal:TitleDetailsFor_Service' => 'Szolgáltatások részletei',
-    'Portal:Button:CreateRequestFromService' => 'Kérelem létrehozása ehhez a szolgáltatáshoz',
-    'Portal:ListOpenRequests' => 'Nyitott kérelmek listája',
-    'Portal:UserRequest:MoreInfo' => 'További információ',
-    'Portal:Details-Service-Element' => 'Szolgáltatás elemek',
-    'Portal:NoClosedTicket' => 'Nincs lezárt kérelem',
-    'Portal:NoService' => '~~',
-    'Portal:ListOpenProblems' => 'Folyamatban lévő problémák',
-    'Portal:ShowProblem' => 'Problémák',
-    'Portal:ShowFaqs' => 'Tudástárak',
-    'Portal:NoOpenProblem' => 'Nincs nyitott probléma',
-    'Portal:SelectLanguage' => 'Nyelv megváltoztatása',
-    'Portal:LanguageChangedTo_Lang' => 'A nyelv átváltva',
-    'Portal:ChooseYourFavoriteLanguage' => 'Válassza ki a kívánt nyelvet',
-
-    'Class:UserRequest/Method:ResolveChildTickets' => 'ResolveChildTickets',
-    'Class:UserRequest/Method:ResolveChildTickets+' => 'A felbontás kaszkádosítása a gyermek kérésekhez (ev_autoresolve), és a kérés következő jellemzőinek összehangolása: szolgáltatás, csapat, felelős, felbontási információ.',
+	'Portal:TitleDetailsFor_Request' => 'Kérelem részletei',
+	'Portal:ButtonUpdate' => 'Frissítés',
+	'Portal:ButtonClose' => 'Lezárás',
+	'Portal:ButtonReopen' => 'Újranyitás',
+	'Portal:ShowServices' => 'Szolgáltatáskatalógus',
+	'Portal:SelectRequestType' => 'Válasszon egy kérelem típust',
+	'Portal:SelectServiceElementFrom_Service' => 'Válasszon egy szolgáltatás elemet %1$s -hez',
+	'Portal:ListServices' => 'Szolgáltatások listája',
+	'Portal:TitleDetailsFor_Service' => 'Szolgáltatások részletei',
+	'Portal:Button:CreateRequestFromService' => 'Kérelem létrehozása ehhez a szolgáltatáshoz',
+	'Portal:ListOpenRequests' => 'Nyitott kérelmek listája',
+	'Portal:UserRequest:MoreInfo' => 'További információ',
+	'Portal:Details-Service-Element' => 'Szolgáltatás elemek',
+	'Portal:NoClosedTicket' => 'Nincs lezárt kérelem',
+	'Portal:NoService' => '~~',
+	'Portal:ListOpenProblems' => 'Folyamatban lévő problémák',
+	'Portal:ShowProblem' => 'Problémák',
+	'Portal:ShowFaqs' => 'Tudástárak',
+	'Portal:NoOpenProblem' => 'Nincs nyitott probléma',
+	'Portal:SelectLanguage' => 'Nyelv megváltoztatása',
+	'Portal:LanguageChangedTo_Lang' => 'A nyelv átváltva',
+	'Portal:ChooseYourFavoriteLanguage' => 'Válassza ki a kívánt nyelvet',
+	'Class:UserRequest/Method:ResolveChildTickets' => 'ResolveChildTickets',
+	'Class:UserRequest/Method:ResolveChildTickets+' => 'A felbontás kaszkádosítása a gyermek kérésekhez (ev_autoresolve), és a kérés következő jellemzőinek összehangolása: szolgáltatás, csapat, felelős, felbontási információ.',
 ));
 
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Organization:Overview:UserRequests' => 'Felhasználói kérelmek ebből a szervezeti egységből',
-    'Organization:Overview:MyUserRequests' => 'Saját kérelmek ebből a szervezeti egységből',
-    'Organization:Overview:Tickets' => 'Hibajegyek ebből a szervezeti egységből',
+	'Organization:Overview:UserRequests' => 'Felhasználói kérelmek ebből a szervezeti egységből',
+	'Organization:Overview:MyUserRequests' => 'Saját kérelmek ebből a szervezeti egységből',
+	'Organization:Overview:Tickets' => 'Hibajegyek ebből a szervezeti egységből',
 ));
-
diff --git a/datamodels/2.x/itop-request-mgmt/dictionaries/it.dict.itop-request-mgmt.php b/datamodels/2.x/itop-request-mgmt/dictionaries/it.dict.itop-request-mgmt.php
index a673515f99..06bced330c 100644
--- a/datamodels/2.x/itop-request-mgmt/dictionaries/it.dict.itop-request-mgmt.php
+++ b/datamodels/2.x/itop-request-mgmt/dictionaries/it.dict.itop-request-mgmt.php
@@ -34,6 +34,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'UI-RequestManagementOverview-OpenRequestByType' => 'Richeiste aperte per tipo',
 	'UI-RequestManagementOverview-OpenRequestByCustomer' => 'Richeiste aperte per organizzazione',
 	'Class:UserRequest:KnownErrorList' => 'Errori conosciuti',
+	'Class:UserRequest:KnownErrorList+' => 'Known Errors related to Functional CI linked to the current ticket~~',
 	'Menu:UserRequest:MyWorkOrders' => 'Work Order assegnati a me',
 	'Menu:UserRequest:MyWorkOrders+' => 'Tutti i work order assegnati a me',
 	'Class:Problem:KnownProblemList' => 'Problemi conosciuti',
@@ -115,6 +116,10 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:UserRequest/Attribute:urgency/Value:4+' => 'Bassa',
 	'Class:UserRequest/Attribute:origin' => 'Origine',
 	'Class:UserRequest/Attribute:origin+' => '~~',
+	'Class:UserRequest/Attribute:origin/Value:in_person' => 'In-person~~',
+	'Class:UserRequest/Attribute:origin/Value:in_person+' => 'Request created following a face-to-face discussion~~',
+	'Class:UserRequest/Attribute:origin/Value:chat' => 'Chat~~',
+	'Class:UserRequest/Attribute:origin/Value:chat+' => 'Request created following a chat discussion~~',
 	'Class:UserRequest/Attribute:origin/Value:mail' => 'Mail',
 	'Class:UserRequest/Attribute:origin/Value:mail+' => 'Mail',
 	'Class:UserRequest/Attribute:origin/Value:monitoring' => 'Monitoring',
@@ -270,7 +275,6 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Portal:SelectLanguage' => 'Cambiare lingua',
 	'Portal:LanguageChangedTo_Lang' => 'Lingua cambiata in',
 	'Portal:ChooseYourFavoriteLanguage' => 'Selezionate la vostra lingua preferita',
-
 	'Class:UserRequest/Method:ResolveChildTickets' => 'Risolve ticket figli',
 	'Class:UserRequest/Method:ResolveChildTickets+' => 'Inoltra la risolzuione ai ticket collegati ev_autosolve), e allinea le caratteriche della richiesta: Servizio, team , agente e informazioni della risoluzione',
 ));
diff --git a/datamodels/2.x/itop-request-mgmt/dictionaries/ja.dict.itop-request-mgmt.php b/datamodels/2.x/itop-request-mgmt/dictionaries/ja.dict.itop-request-mgmt.php
index ce48dbcbe7..ed380f27de 100644
--- a/datamodels/2.x/itop-request-mgmt/dictionaries/ja.dict.itop-request-mgmt.php
+++ b/datamodels/2.x/itop-request-mgmt/dictionaries/ja.dict.itop-request-mgmt.php
@@ -34,6 +34,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'UI-RequestManagementOverview-OpenRequestByType' => 'タイプ別のオープンな要求',
 	'UI-RequestManagementOverview-OpenRequestByCustomer' => '組織別のオープンな要求',
 	'Class:UserRequest:KnownErrorList' => '既知のエラー',
+	'Class:UserRequest:KnownErrorList+' => 'Known Errors related to Functional CI linked to the current ticket~~',
 	'Menu:UserRequest:MyWorkOrders' => '私に割り当てられた作業指示',
 	'Menu:UserRequest:MyWorkOrders+' => '',
 	'Class:Problem:KnownProblemList' => '既知の問題',
@@ -115,6 +116,10 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:UserRequest/Attribute:urgency/Value:4+' => '',
 	'Class:UserRequest/Attribute:origin' => '起源',
 	'Class:UserRequest/Attribute:origin+' => '',
+	'Class:UserRequest/Attribute:origin/Value:in_person' => 'In-person~~',
+	'Class:UserRequest/Attribute:origin/Value:in_person+' => 'Request created following a face-to-face discussion~~',
+	'Class:UserRequest/Attribute:origin/Value:chat' => 'Chat~~',
+	'Class:UserRequest/Attribute:origin/Value:chat+' => 'Request created following a chat discussion~~',
 	'Class:UserRequest/Attribute:origin/Value:mail' => 'メール',
 	'Class:UserRequest/Attribute:origin/Value:mail+' => '',
 	'Class:UserRequest/Attribute:origin/Value:monitoring' => 'モニタリング',
@@ -270,7 +275,6 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Portal:SelectLanguage' => '言語変更',
 	'Portal:LanguageChangedTo_Lang' => '言語を変更',
 	'Portal:ChooseYourFavoriteLanguage' => 'お好みの言語を選択ください',
-
 	'Class:UserRequest/Method:ResolveChildTickets' => 'ResolveChildTickets~~',
 	'Class:UserRequest/Method:ResolveChildTickets+' => 'Cascade the resolution to child requests (ev_autoresolve), and align the following characteristics of the request: service, team, agent, resolution info~~',
 ));
diff --git a/datamodels/2.x/itop-request-mgmt/dictionaries/nl.dict.itop-request-mgmt.php b/datamodels/2.x/itop-request-mgmt/dictionaries/nl.dict.itop-request-mgmt.php
index cb79c3148e..7d92fee60e 100644
--- a/datamodels/2.x/itop-request-mgmt/dictionaries/nl.dict.itop-request-mgmt.php
+++ b/datamodels/2.x/itop-request-mgmt/dictionaries/nl.dict.itop-request-mgmt.php
@@ -42,6 +42,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'UI-RequestManagementOverview-OpenRequestByType' => 'Open verzoeken per soort',
 	'UI-RequestManagementOverview-OpenRequestByCustomer' => 'Open verzoeken per organisatie',
 	'Class:UserRequest:KnownErrorList' => 'Gekende fouten',
+	'Class:UserRequest:KnownErrorList+' => 'Known Errors related to Functional CI linked to the current ticket~~',
 	'Menu:UserRequest:MyWorkOrders' => 'Werkopdrachten toegewezen aan mij',
 	'Menu:UserRequest:MyWorkOrders+' => 'Alle werkopdrachten toegewezen aan mij',
 	'Class:Problem:KnownProblemList' => 'Gekende fouten',
@@ -282,7 +283,6 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Portal:SelectLanguage' => 'Verander je taal',
 	'Portal:LanguageChangedTo_Lang' => 'Taal veranderd naar',
 	'Portal:ChooseYourFavoriteLanguage' => 'Kies je voorkeurstaal',
-
 	'Class:UserRequest/Method:ResolveChildTickets' => 'Los subverzoeken op',
 	'Class:UserRequest/Method:ResolveChildTickets+' => 'Pas de oplossing ook toe op subverzoeken (ev_autoresolve) en neem de kenmerken over wat betreft service, team, agent, oplossing',
 ));
diff --git a/datamodels/2.x/itop-request-mgmt/dictionaries/pl.dict.itop-request-mgmt.php b/datamodels/2.x/itop-request-mgmt/dictionaries/pl.dict.itop-request-mgmt.php
index 0879e3b8c1..0c728ae90a 100644
--- a/datamodels/2.x/itop-request-mgmt/dictionaries/pl.dict.itop-request-mgmt.php
+++ b/datamodels/2.x/itop-request-mgmt/dictionaries/pl.dict.itop-request-mgmt.php
@@ -34,6 +34,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'UI-RequestManagementOverview-OpenRequestByType' => 'Otwarte zgłoszenia według typu',
 	'UI-RequestManagementOverview-OpenRequestByCustomer' => 'Otwarte zgłoszenia według organizacji',
 	'Class:UserRequest:KnownErrorList' => 'Znane błędy',
+	'Class:UserRequest:KnownErrorList+' => 'Known Errors related to Functional CI linked to the current ticket~~',
 	'Menu:UserRequest:MyWorkOrders' => 'Zlecenia pracy przydzielone do mnie',
 	'Menu:UserRequest:MyWorkOrders+' => 'Wszystkie zlecenia pracy przydzielone do mnie',
 	'Class:Problem:KnownProblemList' => 'Znane problemy',
@@ -115,6 +116,10 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:UserRequest/Attribute:urgency/Value:4+' => 'niska',
 	'Class:UserRequest/Attribute:origin' => 'OPochodzenierigin',
 	'Class:UserRequest/Attribute:origin+' => '',
+	'Class:UserRequest/Attribute:origin/Value:in_person' => 'In-person~~',
+	'Class:UserRequest/Attribute:origin/Value:in_person+' => 'Request created following a face-to-face discussion~~',
+	'Class:UserRequest/Attribute:origin/Value:chat' => 'Chat~~',
+	'Class:UserRequest/Attribute:origin/Value:chat+' => 'Request created following a chat discussion~~',
 	'Class:UserRequest/Attribute:origin/Value:mail' => 'e-mail',
 	'Class:UserRequest/Attribute:origin/Value:mail+' => 'e-mail',
 	'Class:UserRequest/Attribute:origin/Value:monitoring' => 'monitoring',
@@ -270,7 +275,6 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Portal:SelectLanguage' => 'Zmień język',
 	'Portal:LanguageChangedTo_Lang' => 'Język został zmieniony na',
 	'Portal:ChooseYourFavoriteLanguage' => 'Wybierz swój ulubiony język',
-
 	'Class:UserRequest/Method:ResolveChildTickets' => 'Rozpatrz zgłoszenia podrzędne',
 	'Class:UserRequest/Method:ResolveChildTickets+' => 'Połącz rozwiązanie kaskadowo do żądań podrzędnych (ev_autoresolve) i dopasuj następujące cechy zgłoszenia: usługa, zespół, agent, informacje o rozwiązaniu',
 ));
diff --git a/datamodels/2.x/itop-request-mgmt/dictionaries/pt_br.dict.itop-request-mgmt.php b/datamodels/2.x/itop-request-mgmt/dictionaries/pt_br.dict.itop-request-mgmt.php
index 743cd08d3f..a91a46f16b 100644
--- a/datamodels/2.x/itop-request-mgmt/dictionaries/pt_br.dict.itop-request-mgmt.php
+++ b/datamodels/2.x/itop-request-mgmt/dictionaries/pt_br.dict.itop-request-mgmt.php
@@ -34,6 +34,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'UI-RequestManagementOverview-OpenRequestByType' => 'Solicitações abertas por tipo',
 	'UI-RequestManagementOverview-OpenRequestByCustomer' => 'Solicitações abertas por organização',
 	'Class:UserRequest:KnownErrorList' => 'Erros conhecidos',
+	'Class:UserRequest:KnownErrorList+' => 'Known Errors related to Functional CI linked to the current ticket~~',
 	'Menu:UserRequest:MyWorkOrders' => 'Ordens de serviço atribuídas a mim',
 	'Menu:UserRequest:MyWorkOrders+' => 'Todas as ordens de serviço atribuídas a mim',
 	'Class:Problem:KnownProblemList' => 'Problemas conhecidos',
@@ -115,6 +116,10 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:UserRequest/Attribute:urgency/Value:4+' => '',
 	'Class:UserRequest/Attribute:origin' => 'Origem',
 	'Class:UserRequest/Attribute:origin+' => '',
+	'Class:UserRequest/Attribute:origin/Value:in_person' => 'In-person~~',
+	'Class:UserRequest/Attribute:origin/Value:in_person+' => 'Request created following a face-to-face discussion~~',
+	'Class:UserRequest/Attribute:origin/Value:chat' => 'Chat~~',
+	'Class:UserRequest/Attribute:origin/Value:chat+' => 'Request created following a chat discussion~~',
 	'Class:UserRequest/Attribute:origin/Value:mail' => 'E-mail',
 	'Class:UserRequest/Attribute:origin/Value:mail+' => '',
 	'Class:UserRequest/Attribute:origin/Value:monitoring' => 'Monitoramento',
@@ -270,7 +275,6 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Portal:SelectLanguage' => 'Alterar idioma',
 	'Portal:LanguageChangedTo_Lang' => 'Idioma alterado para',
 	'Portal:ChooseYourFavoriteLanguage' => 'Escolha seu idioma favorito',
-
 	'Class:UserRequest/Method:ResolveChildTickets' => 'ResolveChildTickets',
 	'Class:UserRequest/Method:ResolveChildTickets+' => 'Conecte a solução a pedidos filhos (ev_autoresolve) e alinhe as seguintes características da requisição: serviço, equipe, agente, info de solução',
 ));
diff --git a/datamodels/2.x/itop-request-mgmt/dictionaries/ru.dict.itop-request-mgmt.php b/datamodels/2.x/itop-request-mgmt/dictionaries/ru.dict.itop-request-mgmt.php
index f3b8f27c0f..91b8d71996 100644
--- a/datamodels/2.x/itop-request-mgmt/dictionaries/ru.dict.itop-request-mgmt.php
+++ b/datamodels/2.x/itop-request-mgmt/dictionaries/ru.dict.itop-request-mgmt.php
@@ -43,6 +43,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'UI-RequestManagementOverview-OpenRequestByType' => 'Открытые запросы по типу',
 	'UI-RequestManagementOverview-OpenRequestByCustomer' => 'Открытые запросы по заказчику',
 	'Class:UserRequest:KnownErrorList' => 'Известные ошибки',
+	'Class:UserRequest:KnownErrorList+' => 'Known Errors related to Functional CI linked to the current ticket~~',
 	'Menu:UserRequest:MyWorkOrders' => 'Назначенные мне наряды на работу',
 	'Menu:UserRequest:MyWorkOrders+' => 'Назначенные мне наряды на работу',
 	'Class:Problem:KnownProblemList' => 'Известные проблемы',
@@ -124,6 +125,10 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:UserRequest/Attribute:urgency/Value:4+' => 'Низкая',
 	'Class:UserRequest/Attribute:origin' => 'Источник',
 	'Class:UserRequest/Attribute:origin+' => '',
+	'Class:UserRequest/Attribute:origin/Value:in_person' => 'In-person~~',
+	'Class:UserRequest/Attribute:origin/Value:in_person+' => 'Request created following a face-to-face discussion~~',
+	'Class:UserRequest/Attribute:origin/Value:chat' => 'Chat~~',
+	'Class:UserRequest/Attribute:origin/Value:chat+' => 'Request created following a chat discussion~~',
 	'Class:UserRequest/Attribute:origin/Value:mail' => 'Почта',
 	'Class:UserRequest/Attribute:origin/Value:mail+' => 'Почта',
 	'Class:UserRequest/Attribute:origin/Value:monitoring' => 'Мониторинг',
@@ -279,7 +284,6 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Portal:SelectLanguage' => 'Изменить язык',
 	'Portal:LanguageChangedTo_Lang' => 'Язык изменен на',
 	'Portal:ChooseYourFavoriteLanguage' => 'Выберите язык',
-
 	'Class:UserRequest/Method:ResolveChildTickets' => 'ResolveChildTickets',
 	'Class:UserRequest/Method:ResolveChildTickets+' => 'Каскадное решение дочерних запросов (ev_autoresolve) с установкой следующих параметров: услуга, команда, агент, информация о решении.',
 ));
diff --git a/datamodels/2.x/itop-request-mgmt/dictionaries/sk.dict.itop-request-mgmt.php b/datamodels/2.x/itop-request-mgmt/dictionaries/sk.dict.itop-request-mgmt.php
index 5ebd0068d5..e3750a001b 100644
--- a/datamodels/2.x/itop-request-mgmt/dictionaries/sk.dict.itop-request-mgmt.php
+++ b/datamodels/2.x/itop-request-mgmt/dictionaries/sk.dict.itop-request-mgmt.php
@@ -34,6 +34,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'UI-RequestManagementOverview-OpenRequestByType' => 'Otvorené požiadavky podľa typu',
 	'UI-RequestManagementOverview-OpenRequestByCustomer' => 'Otvorené požiadavky podľa organizácie',
 	'Class:UserRequest:KnownErrorList' => 'Známe chyby',
+	'Class:UserRequest:KnownErrorList+' => 'Known Errors related to Functional CI linked to the current ticket~~',
 	'Menu:UserRequest:MyWorkOrders' => 'Pracovné príkazy pridelené mne',
 	'Menu:UserRequest:MyWorkOrders+' => '',
 	'Class:Problem:KnownProblemList' => 'Známe problémy',
@@ -115,6 +116,10 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:UserRequest/Attribute:urgency/Value:4+' => '',
 	'Class:UserRequest/Attribute:origin' => 'Pôvod',
 	'Class:UserRequest/Attribute:origin+' => '',
+	'Class:UserRequest/Attribute:origin/Value:in_person' => 'In-person~~',
+	'Class:UserRequest/Attribute:origin/Value:in_person+' => 'Request created following a face-to-face discussion~~',
+	'Class:UserRequest/Attribute:origin/Value:chat' => 'Chat~~',
+	'Class:UserRequest/Attribute:origin/Value:chat+' => 'Request created following a chat discussion~~',
 	'Class:UserRequest/Attribute:origin/Value:mail' => 'Mail',
 	'Class:UserRequest/Attribute:origin/Value:mail+' => '',
 	'Class:UserRequest/Attribute:origin/Value:monitoring' => 'Dohľad',
@@ -270,7 +275,6 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Portal:SelectLanguage' => 'Zmeň svoj jazyk',
 	'Portal:LanguageChangedTo_Lang' => 'Jazyk zmenený na',
 	'Portal:ChooseYourFavoriteLanguage' => 'Vyberte si svoj obľúbený jazyk',
-
 	'Class:UserRequest/Method:ResolveChildTickets' => 'ResolveChildTickets~~',
 	'Class:UserRequest/Method:ResolveChildTickets+' => 'Cascade the resolution to child requests (ev_autoresolve), and align the following characteristics of the request: service, team, agent, resolution info~~',
 ));
diff --git a/datamodels/2.x/itop-request-mgmt/dictionaries/tr.dict.itop-request-mgmt.php b/datamodels/2.x/itop-request-mgmt/dictionaries/tr.dict.itop-request-mgmt.php
index cab018d5fd..7e7d6f6d88 100644
--- a/datamodels/2.x/itop-request-mgmt/dictionaries/tr.dict.itop-request-mgmt.php
+++ b/datamodels/2.x/itop-request-mgmt/dictionaries/tr.dict.itop-request-mgmt.php
@@ -34,6 +34,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'UI-RequestManagementOverview-OpenRequestByType' => 'Open requests by type~~',
 	'UI-RequestManagementOverview-OpenRequestByCustomer' => 'Open requests by organization~~',
 	'Class:UserRequest:KnownErrorList' => 'Known Errors~~',
+	'Class:UserRequest:KnownErrorList+' => 'Known Errors related to Functional CI linked to the current ticket~~',
 	'Menu:UserRequest:MyWorkOrders' => 'Work orders assigned to me~~',
 	'Menu:UserRequest:MyWorkOrders+' => 'All work orders assigned to me~~',
 	'Class:Problem:KnownProblemList' => 'Known problems~~',
@@ -115,6 +116,10 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:UserRequest/Attribute:urgency/Value:4+' => 'low~~',
 	'Class:UserRequest/Attribute:origin' => 'Origin~~',
 	'Class:UserRequest/Attribute:origin+' => '~~',
+	'Class:UserRequest/Attribute:origin/Value:in_person' => 'In-person~~',
+	'Class:UserRequest/Attribute:origin/Value:in_person+' => 'Request created following a face-to-face discussion~~',
+	'Class:UserRequest/Attribute:origin/Value:chat' => 'Chat~~',
+	'Class:UserRequest/Attribute:origin/Value:chat+' => 'Request created following a chat discussion~~',
 	'Class:UserRequest/Attribute:origin/Value:mail' => 'email~~',
 	'Class:UserRequest/Attribute:origin/Value:mail+' => 'email~~',
 	'Class:UserRequest/Attribute:origin/Value:monitoring' => 'monitoring~~',
@@ -270,7 +275,6 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Portal:SelectLanguage' => 'Change you language~~',
 	'Portal:LanguageChangedTo_Lang' => 'Language changed to~~',
 	'Portal:ChooseYourFavoriteLanguage' => 'Choose your favorite language~~',
-
 	'Class:UserRequest/Method:ResolveChildTickets' => 'ResolveChildTickets~~',
 	'Class:UserRequest/Method:ResolveChildTickets+' => 'Cascade the resolution to child requests (ev_autoresolve), and align the following characteristics of the request: service, team, agent, resolution info~~',
 ));
diff --git a/datamodels/2.x/itop-request-mgmt/dictionaries/zh_cn.dict.itop-request-mgmt.php b/datamodels/2.x/itop-request-mgmt/dictionaries/zh_cn.dict.itop-request-mgmt.php
index cc050e81b6..fc25d53a73 100644
--- a/datamodels/2.x/itop-request-mgmt/dictionaries/zh_cn.dict.itop-request-mgmt.php
+++ b/datamodels/2.x/itop-request-mgmt/dictionaries/zh_cn.dict.itop-request-mgmt.php
@@ -3,7 +3,6 @@
  * @copyright   Copyright (C) 2010-2023 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
-
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Menu:RequestManagement' => '服务台',
 	'Menu:RequestManagement+' => '服务台',
@@ -35,6 +34,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'UI-RequestManagementOverview-OpenRequestByType' => '打开的需求(按类型)',
 	'UI-RequestManagementOverview-OpenRequestByCustomer' => '打开的需求(按客户)',
 	'Class:UserRequest:KnownErrorList' => '已知错误',
+	'Class:UserRequest:KnownErrorList+' => 'Known Errors related to Functional CI linked to the current ticket~~',
 	'Menu:UserRequest:MyWorkOrders' => '分配给我的工作任务',
 	'Menu:UserRequest:MyWorkOrders+' => '分配给我的所有工单',
 	'Class:Problem:KnownProblemList' => '已知问题',
@@ -116,6 +116,10 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:UserRequest/Attribute:urgency/Value:4+' => '低',
 	'Class:UserRequest/Attribute:origin' => '来源',
 	'Class:UserRequest/Attribute:origin+' => '',
+	'Class:UserRequest/Attribute:origin/Value:in_person' => 'In-person~~',
+	'Class:UserRequest/Attribute:origin/Value:in_person+' => 'Request created following a face-to-face discussion~~',
+	'Class:UserRequest/Attribute:origin/Value:chat' => 'Chat~~',
+	'Class:UserRequest/Attribute:origin/Value:chat+' => 'Request created following a chat discussion~~',
 	'Class:UserRequest/Attribute:origin/Value:mail' => '邮件',
 	'Class:UserRequest/Attribute:origin/Value:mail+' => '邮件',
 	'Class:UserRequest/Attribute:origin/Value:monitoring' => '监控',
@@ -271,9 +275,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Portal:SelectLanguage' => '更改您的语言',
 	'Portal:LanguageChangedTo_Lang' => '语言更改为',
 	'Portal:ChooseYourFavoriteLanguage' => '选择您喜欢的语言',
-
 	'Class:UserRequest/Method:ResolveChildTickets' => '解决子工单',
-	'Class:UserRequest/Method:ResolveChildTickets+' => '级联解决子需求(需求自动解决),并使用以下需求的内容:服务,团队,办理人,解决方案',
+	'Class:UserRequest/Method:ResolveChildTickets+' => '递归解决子工单(自动解决),并调整相关字段与父级工单保持一致: 服务,团队,办理人,解决方案',
 ));
 
 
diff --git a/datamodels/2.x/itop-service-mgmt-provider/datamodel.itop-service-mgmt-provider.xml b/datamodels/2.x/itop-service-mgmt-provider/datamodel.itop-service-mgmt-provider.xml
index 3fe8114e56..7be80fb6b6 100755
--- a/datamodels/2.x/itop-service-mgmt-provider/datamodel.itop-service-mgmt-provider.xml
+++ b/datamodels/2.x/itop-service-mgmt-provider/datamodel.itop-service-mgmt-provider.xml
@@ -100,7 +100,6 @@
           <count_max>0</count_max>
           <ext_key_to_remote>contact_id</ext_key_to_remote>
           <duplicates/>
-          <read_only>false</read_only>
         </field>
         <field id="documents_list" xsi:type="AttributeLinkedSetIndirect">
           <linked_class>lnkContractToDocument</linked_class>
@@ -109,7 +108,6 @@
           <count_max>0</count_max>
           <ext_key_to_remote>document_id</ext_key_to_remote>
           <duplicates/>
-          <read_only>false</read_only>
         </field>
         <field id="description" xsi:type="AttributeText">
           <sql>description</sql>
@@ -439,7 +437,6 @@ public function PrefillSearchForm(&$aContextParam)
           <count_max>0</count_max>
           <ext_key_to_remote>service_id</ext_key_to_remote>
           <duplicates/>
-          <read_only>false</read_only>
         </field>
         <field id="functionalcis_list" xsi:type="AttributeLinkedSetIndirect">
           <linked_class>lnkCustomerContractToFunctionalCI</linked_class>
@@ -448,7 +445,6 @@ public function PrefillSearchForm(&$aContextParam)
           <count_max>0</count_max>
           <ext_key_to_remote>functionalci_id</ext_key_to_remote>
           <duplicates/>
-          <read_only>false</read_only>
         </field>
         <field id="providercontracts_list" xsi:type="AttributeLinkedSetIndirect">
           <linked_class>lnkCustomerContractToProviderContract</linked_class>
@@ -457,7 +453,6 @@ public function PrefillSearchForm(&$aContextParam)
           <count_max>0</count_max>
           <ext_key_to_remote>providercontract_id</ext_key_to_remote>
           <duplicates/>
-          <read_only>false</read_only>
         </field>
       </fields>
       <methods/>
@@ -640,7 +635,6 @@ public function PrefillSearchForm(&$aContextParam)
           <count_max>0</count_max>
           <ext_key_to_remote>functionalci_id</ext_key_to_remote>
           <duplicates/>
-          <read_only>false</read_only>
         </field>
         <field id="sla" xsi:type="AttributeString">
           <sql>sla</sql>
@@ -1067,8 +1061,6 @@ public function PrefillSearchForm(&$aContextParam)
           <count_min>0</count_min>
           <count_max>0</count_max>
           <duplicates/>
-          <relation_type>link</relation_type>
-          <read_only>false</read_only>
         </field>
       </fields>
       <methods/>
@@ -1180,7 +1172,6 @@ public function PrefillSearchForm(&$aContextParam)
           <count_max>0</count_max>
           <ext_key_to_remote>document_id</ext_key_to_remote>
           <duplicates/>
-          <read_only>false</read_only>
         </field>
         <field id="contacts_list" xsi:type="AttributeLinkedSetIndirect">
           <linked_class>lnkContactToService</linked_class>
@@ -1189,7 +1180,6 @@ public function PrefillSearchForm(&$aContextParam)
           <count_max>0</count_max>
           <ext_key_to_remote>contact_id</ext_key_to_remote>
           <duplicates/>
-          <read_only>false</read_only>
         </field>
         <field id="status" xsi:type="AttributeEnum">
           <sort_type>rank</sort_type>
@@ -1227,7 +1217,6 @@ public function PrefillSearchForm(&$aContextParam)
           <count_max>0</count_max>
           <ext_key_to_remote>customercontract_id</ext_key_to_remote>
           <duplicates/>
-          <read_only>false</read_only>
         </field>
         <field id="servicesubcategories_list" xsi:type="AttributeLinkedSet">
           <linked_class>ServiceSubcategory</linked_class>
@@ -1236,8 +1225,6 @@ public function PrefillSearchForm(&$aContextParam)
           <count_min>0</count_min>
           <count_max>0</count_max>
           <duplicates/>
-          <relation_type>link</relation_type>
-          <read_only>false</read_only>
         </field>
       </fields>
       <methods/>
@@ -1760,7 +1747,6 @@ public function PrefillSearchForm(&$aContextParam)
           <count_max>0</count_max>
           <ext_key_to_remote>slt_id</ext_key_to_remote>
           <duplicates/>
-          <read_only>false</read_only>
         </field>
         <field id="customercontracts_list" xsi:type="AttributeLinkedSetIndirect">
           <linked_class>lnkCustomerContractToService</linked_class>
@@ -1769,7 +1755,6 @@ public function PrefillSearchForm(&$aContextParam)
           <count_max>0</count_max>
           <ext_key_to_remote>customercontract_id</ext_key_to_remote>
           <duplicates>true</duplicates>
-          <read_only>false</read_only>
         </field>
       </fields>
       <methods>
@@ -2506,7 +2491,6 @@ public function PrefillSearchForm(&$aContextParam)
           <count_max>0</count_max>
           <ext_key_to_remote>contact_id</ext_key_to_remote>
           <duplicates/>
-          <read_only>false</read_only>
         </field>
         <field id="customers_list" xsi:type="AttributeLinkedSet">
           <linked_class>Organization</linked_class>
@@ -2515,8 +2499,6 @@ public function PrefillSearchForm(&$aContextParam)
           <count_min>0</count_min>
           <count_max>0</count_max>
           <duplicates/>
-          <relation_type>link</relation_type>
-          <read_only>false</read_only>
         </field>
       </fields>
       <methods/>
diff --git a/datamodels/2.x/itop-service-mgmt-provider/dictionaries/cs.dict.itop-service-mgmt-provider.php b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/cs.dict.itop-service-mgmt-provider.php
index a8cf1b8a0a..83f88a257a 100644
--- a/datamodels/2.x/itop-service-mgmt-provider/dictionaries/cs.dict.itop-service-mgmt-provider.php
+++ b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/cs.dict.itop-service-mgmt-provider.php
@@ -40,7 +40,6 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Smlouvy podle úrovně služeb',
 	'UI-ServiceManagementMenu-ContractsByStatus' => 'Smlouvy podle stavu',
 	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Smlouvy končící během 30 dní',
-
 	'Menu:ProviderContract' => 'Smlouvy s poskytovateli',
 	'Menu:ProviderContract+' => 'Smlouvy s poskytovateli',
 	'Menu:CustomerContract' => 'Smlouvy se zákazníky',
@@ -59,9 +58,11 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Menu:DeliveryModel+' => 'Modely poskytování služeb',
 	'Menu:ServiceFamily' => 'Balíčky (kategorie) služeb',
 	'Menu:ServiceFamily+' => 'Balíčky (kategorie) služeb',
+	'Contract:baseinfo' => 'General information~~',
+	'Contract:moreinfo' => 'Contractual information~~',
+	'Contract:cost' => 'Cost information~~',
 ));
 
-
 /*
 	'UI:ServiceManagementMenu' => 'Gestion des Services',
 	'UI:ServiceManagementMenu+' => 'Gestion des Services',
@@ -186,6 +187,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:lnkContactToContract' => 'Spojení (Kontakt / Smlouva)',
 	'Class:lnkContactToContract+' => '',
+	'Class:lnkContactToContract/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToContract/Attribute:contract_id' => 'Smlouva',
 	'Class:lnkContactToContract/Attribute:contract_id+' => '',
 	'Class:lnkContactToContract/Attribute:contract_name' => 'Název smlouvy',
@@ -203,6 +205,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:lnkContractToDocument' => 'Spojení (Smlouva / Dokument)',
 	'Class:lnkContractToDocument+' => '',
+	'Class:lnkContractToDocument/Name' => '%1$s / %2$s~~',
 	'Class:lnkContractToDocument/Attribute:contract_id' => 'Smlouva',
 	'Class:lnkContractToDocument/Attribute:contract_id+' => '',
 	'Class:lnkContractToDocument/Attribute:contract_name' => 'Název smlouvy',
@@ -220,6 +223,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:lnkFunctionalCIToProviderContract' => 'Spojení (Funkční konfigurační položka / Smlouva s poskytovatelem)',
 	'Class:lnkFunctionalCIToProviderContract+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Name' => '%1$s / %2$s~~',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Smlouva s poskytovatelem',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Název smlouvy s poskytovatelem',
@@ -252,6 +256,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:Service' => 'Služba',
 	'Class:Service+' => '',
+	'Class:Service/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Service/Attribute:name' => 'Název',
 	'Class:Service/Attribute:name+' => '',
 	'Class:Service/Attribute:org_id' => 'Poskytovatel',
@@ -291,6 +296,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:lnkDocumentToService' => 'Spojení (Dokument / Služba)',
 	'Class:lnkDocumentToService+' => '',
+	'Class:lnkDocumentToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToService/Attribute:service_id' => 'Služba',
 	'Class:lnkDocumentToService/Attribute:service_id+' => '',
 	'Class:lnkDocumentToService/Attribute:service_name' => 'Název služby',
@@ -308,6 +314,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:lnkContactToService' => 'Spojení (Kontakt / Služba)',
 	'Class:lnkContactToService+' => '',
+	'Class:lnkContactToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToService/Attribute:service_id' => 'Služba',
 	'Class:lnkContactToService/Attribute:service_id+' => '',
 	'Class:lnkContactToService/Attribute:service_name' => 'Název služby',
@@ -325,6 +332,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:ServiceSubcategory' => 'Podkategorie služeb',
 	'Class:ServiceSubcategory+' => '',
+	'Class:ServiceSubcategory/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:ServiceSubcategory/Attribute:name' => 'Název',
 	'Class:ServiceSubcategory/Attribute:name+' => '',
 	'Class:ServiceSubcategory/Attribute:description' => 'Popis',
@@ -421,6 +429,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:lnkSLAToSLT' => 'Spojení (SLA / SLT)',
 	'Class:lnkSLAToSLT+' => '',
+	'Class:lnkSLAToSLT/Name' => '%1$s / %2$s~~',
 	'Class:lnkSLAToSLT/Attribute:sla_id' => 'SLA',
 	'Class:lnkSLAToSLT/Attribute:sla_id+' => '',
 	'Class:lnkSLAToSLT/Attribute:sla_name' => 'Název SLA',
@@ -448,6 +457,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:lnkCustomerContractToService' => 'Spojení (Smlouva se zákazníkem / Služba)',
 	'Class:lnkCustomerContractToService+' => '',
+	'Class:lnkCustomerContractToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_id' => 'Smlouva se zákazníkem',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_id+' => '',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_name' => 'Název smlouvy se zákazníkem',
@@ -469,6 +479,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:lnkCustomerContractToProviderContract' => 'Spojení (Smlouva se zákazníkem / Smlouva s poskytovatelem)',
 	'Class:lnkCustomerContractToProviderContract+' => '',
+	'Class:lnkCustomerContractToProviderContract/Name' => '%1$s / %2$s~~',
 	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_id' => 'Smlouva se zákazníkem',
 	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_id+' => '',
 	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_name' => 'Název smlouvy se zákazníkem',
@@ -486,6 +497,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:lnkCustomerContractToFunctionalCI' => 'Spojení (Smlouva se zákazníkem / Funkční konfigurační položka)',
 	'Class:lnkCustomerContractToFunctionalCI+' => '',
+	'Class:lnkCustomerContractToFunctionalCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_id' => 'Smlouva se zákazníkem',
 	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_id+' => '',
 	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_name' => 'Název smlouvy se zákazníkem',
@@ -524,6 +536,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:lnkDeliveryModelToContact' => 'Spojení (Model poskytování služeb / Kontakt)',
 	'Class:lnkDeliveryModelToContact+' => '',
+	'Class:lnkDeliveryModelToContact/Name' => '%1$s / %2$s~~',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id' => 'Model poskytování služeb',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id+' => '',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name' => 'Název modelu poskytování služeb',
diff --git a/datamodels/2.x/itop-service-mgmt-provider/dictionaries/da.dict.itop-service-mgmt-provider.php b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/da.dict.itop-service-mgmt-provider.php
index a7ae572300..839e71d4f8 100644
--- a/datamodels/2.x/itop-service-mgmt-provider/dictionaries/da.dict.itop-service-mgmt-provider.php
+++ b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/da.dict.itop-service-mgmt-provider.php
@@ -28,7 +28,6 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Kontrakter efter Service Level',
 	'UI-ServiceManagementMenu-ContractsByStatus' => 'Kontrakter efter Status',
 	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Kontrakter som udløber om mindre end 30 dage',
-
 	'Menu:ProviderContract' => 'Leverandørkontrakter',
 	'Menu:ProviderContract+' => '',
 	'Menu:CustomerContract' => 'Kundekontrakter',
@@ -47,9 +46,11 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Menu:DeliveryModel+' => '',
 	'Menu:ServiceFamily' => 'Ydelses familie(r)',
 	'Menu:ServiceFamily+' => '',
+	'Contract:baseinfo' => 'General information~~',
+	'Contract:moreinfo' => 'Contractual information~~',
+	'Contract:cost' => 'Cost information~~',
 ));
 
-
 /*
 	'UI:ServiceManagementMenu' => 'Gestion des Services',
 	'UI:ServiceManagementMenu+' => 'Gestion des Services',
@@ -174,6 +175,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:lnkContactToContract' => 'Sammenhæng Kontakt/Kontrakt',
 	'Class:lnkContactToContract+' => '',
+	'Class:lnkContactToContract/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToContract/Attribute:contract_id' => 'Kontrakt',
 	'Class:lnkContactToContract/Attribute:contract_id+' => '',
 	'Class:lnkContactToContract/Attribute:contract_name' => 'Kontrakt navn',
@@ -191,6 +193,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:lnkContractToDocument' => 'Sammenhæng Kontrakt/Dokument',
 	'Class:lnkContractToDocument+' => '',
+	'Class:lnkContractToDocument/Name' => '%1$s / %2$s~~',
 	'Class:lnkContractToDocument/Attribute:contract_id' => 'Kontrakt',
 	'Class:lnkContractToDocument/Attribute:contract_id+' => '',
 	'Class:lnkContractToDocument/Attribute:contract_name' => 'Kontrakt navn',
@@ -208,6 +211,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:lnkFunctionalCIToProviderContract' => 'Sammenhæng FunctionalCI/Leverandørkontrakt',
 	'Class:lnkFunctionalCIToProviderContract+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Name' => '%1$s / %2$s~~',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Leverandørkontrakt',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Leverandørkontrakt navn',
@@ -240,6 +244,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:Service' => 'Ydelse',
 	'Class:Service+' => '',
+	'Class:Service/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Service/Attribute:name' => 'Navn',
 	'Class:Service/Attribute:name+' => '',
 	'Class:Service/Attribute:org_id' => 'Organisation',
@@ -279,6 +284,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:lnkDocumentToService' => 'Sammenhæng Dokument/Ydelse',
 	'Class:lnkDocumentToService+' => '',
+	'Class:lnkDocumentToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToService/Attribute:service_id' => 'Ydelse',
 	'Class:lnkDocumentToService/Attribute:service_id+' => '',
 	'Class:lnkDocumentToService/Attribute:service_name' => 'Ydelses navn',
@@ -296,6 +302,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:lnkContactToService' => 'Sammenhæng Kontakt/Ydelse',
 	'Class:lnkContactToService+' => '',
+	'Class:lnkContactToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToService/Attribute:service_id' => 'Ydelse',
 	'Class:lnkContactToService/Attribute:service_id+' => '',
 	'Class:lnkContactToService/Attribute:service_name' => 'Ydelses navn',
@@ -313,6 +320,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:ServiceSubcategory' => 'Ydelses underkategori',
 	'Class:ServiceSubcategory+' => '',
+	'Class:ServiceSubcategory/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:ServiceSubcategory/Attribute:name' => 'Navn',
 	'Class:ServiceSubcategory/Attribute:name+' => '',
 	'Class:ServiceSubcategory/Attribute:description' => 'Beskrivelse',
@@ -409,6 +417,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:lnkSLAToSLT' => 'Sammenhæng SLA/SLT',
 	'Class:lnkSLAToSLT+' => '',
+	'Class:lnkSLAToSLT/Name' => '%1$s / %2$s~~',
 	'Class:lnkSLAToSLT/Attribute:sla_id' => 'SLA',
 	'Class:lnkSLAToSLT/Attribute:sla_id+' => '',
 	'Class:lnkSLAToSLT/Attribute:sla_name' => 'SLA navn',
@@ -436,6 +445,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:lnkCustomerContractToService' => 'Sammenhæng Kundekontrakt/Ydelse',
 	'Class:lnkCustomerContractToService+' => '',
+	'Class:lnkCustomerContractToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_id' => 'Kundekontrakt',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_id+' => '',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_name' => 'Kundekontrakt navn',
@@ -457,6 +467,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:lnkCustomerContractToProviderContract' => 'Sammenhæng Kundekontrakt/Leverandørkontrakt',
 	'Class:lnkCustomerContractToProviderContract+' => '',
+	'Class:lnkCustomerContractToProviderContract/Name' => '%1$s / %2$s~~',
 	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_id' => 'Kundekontrakt',
 	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_id+' => '',
 	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_name' => 'Kundekontrakt navn',
@@ -474,6 +485,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:lnkCustomerContractToFunctionalCI' => 'Sammenhæng Kundekontrakt/FunctionalCI',
 	'Class:lnkCustomerContractToFunctionalCI+' => '',
+	'Class:lnkCustomerContractToFunctionalCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_id' => 'Kundekontrakt',
 	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_id+' => '',
 	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_name' => 'Kundekontrakt navn',
@@ -512,6 +524,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:lnkDeliveryModelToContact' => 'Sammenhæng Leveringsmodel/Kontakt',
 	'Class:lnkDeliveryModelToContact+' => '',
+	'Class:lnkDeliveryModelToContact/Name' => '%1$s / %2$s~~',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id' => 'Leverings model',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id+' => '',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name' => 'Leveringsmodel navn',
diff --git a/datamodels/2.x/itop-service-mgmt-provider/dictionaries/de.dict.itop-service-mgmt-provider.php b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/de.dict.itop-service-mgmt-provider.php
index 9546178b1e..6608f196e5 100644
--- a/datamodels/2.x/itop-service-mgmt-provider/dictionaries/de.dict.itop-service-mgmt-provider.php
+++ b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/de.dict.itop-service-mgmt-provider.php
@@ -23,35 +23,36 @@
 *
 */
 Dict::Add('DE DE', 'German', 'Deutsch', array(
-	'Menu:ServiceManagement' => 'Service-Management',
-	'Menu:ServiceManagement+' => '',
+	'Menu:ServiceManagement' => 'Service Management',
+	'Menu:ServiceManagement+' => 'Service-Management-Übersicht',
 	'Menu:Service:Overview' => 'Übersicht',
-	'Menu:Service:Overview+' => '',
+	'Menu:Service:Overview+' => 'Überblick über das Service-Management',
 	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Verträge nach Service-Level',
 	'UI-ServiceManagementMenu-ContractsByStatus' => 'Verträge nach Status',
 	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Verträge, die in weniger als 30 Tagen auslaufen',
-
 	'Menu:ProviderContract' => 'Provider-Verträge',
-	'Menu:ProviderContract+' => '',
-	'Menu:CustomerContract' => 'Kunden-Verträge',
-	'Menu:CustomerContract+' => '',
-	'Menu:ServiceSubcategory' => 'Service-Unterkategorie',
-	'Menu:ServiceSubcategory+' => '',
+	'Menu:ProviderContract+' => 'Provider-Verträge',
+	'Menu:CustomerContract' => 'Kundenverträge',
+	'Menu:CustomerContract+' => 'Kundenverträge',
+	'Menu:ServiceSubcategory' => 'Service-Unterkategorien',
+	'Menu:ServiceSubcategory+' => 'Service-Unterkategorien',
 	'Menu:Service' => 'Services',
-	'Menu:Service+' => '',
+	'Menu:Service+' => 'Services',
 	'Menu:ServiceElement' => 'Service-Elemente',
-	'Menu:ServiceElement+' => '',
+	'Menu:ServiceElement+' => 'Service-Elemente',
 	'Menu:SLA' => 'SLAs',
-	'Menu:SLA+' => '',
+	'Menu:SLA+' => 'Service Level Agreements (SLAs)',
 	'Menu:SLT' => 'SLTs',
-	'Menu:SLT+' => '',
+	'Menu:SLT+' => 'Service Level Targets (SLTs)',
 	'Menu:DeliveryModel' => 'Delivery-Modelle',
-	'Menu:DeliveryModel+' => '',
+	'Menu:DeliveryModel+' => 'Delivery-Modelle',
 	'Menu:ServiceFamily' => 'Service-Familien',
-	'Menu:ServiceFamily+' => '',
+	'Menu:ServiceFamily+' => 'Service-Familien',
+	'Contract:baseinfo' => 'Allgemeine Informationen',
+	'Contract:moreinfo' => 'Vertragliche Informationen',
+	'Contract:cost' => 'Kosteninformation',
 ));
 
-
 /*
 	'UI:ServiceManagementMenu' => 'Gestion des Services',
 	'UI:ServiceManagementMenu+' => 'Gestion des Services',
@@ -98,9 +99,9 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:Contract/Attribute:organization_name' => 'Organizations-Name',
 	'Class:Contract/Attribute:organization_name+' => '',
 	'Class:Contract/Attribute:contacts_list' => 'Kontakte',
-	'Class:Contract/Attribute:contacts_list+' => 'All the contacts for this customer contract~~',
+	'Class:Contract/Attribute:contacts_list+' => 'Alle Kontakte, die mit diesen Kundenvertrag verknüpft sind',
 	'Class:Contract/Attribute:documents_list' => 'Dokumente',
-	'Class:Contract/Attribute:documents_list+' => 'All the documents for this customer contract~~',
+	'Class:Contract/Attribute:documents_list+' => 'Alle Dokumente, die mit diesen Kundenvertrag verknüpft sind',
 	'Class:Contract/Attribute:description' => 'Beschreibung',
 	'Class:Contract/Attribute:description+' => '',
 	'Class:Contract/Attribute:start_date' => 'Startdatum',
@@ -147,11 +148,11 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:CustomerContract' => 'Kundenvertrag',
 	'Class:CustomerContract+' => '',
 	'Class:CustomerContract/Attribute:services_list' => 'Services',
-	'Class:CustomerContract/Attribute:services_list+' => 'All the services purchased for this contract~~',
+	'Class:CustomerContract/Attribute:services_list+' => 'Alle für diesen Vertrag erworbenen Services',
 	'Class:CustomerContract/Attribute:functionalcis_list' => 'CIs',
-	'Class:CustomerContract/Attribute:functionalcis_list+' => 'All the configuration items covered by this contract~~',
+	'Class:CustomerContract/Attribute:functionalcis_list+' => 'Alle unter diesen Vertrag fallenden CIs',
 	'Class:CustomerContract/Attribute:providercontracts_list' => 'Provider-Verträge',
-	'Class:CustomerContract/Attribute:providercontracts_list+' => 'All the provider contracts to deliver the services for this contract (underpinning contract)~~',
+	'Class:CustomerContract/Attribute:providercontracts_list+' => 'Alle Provider-Verträge zur Erbringung der Dienstleistungen für diesen Vertrag (Underpinning Contracts)',
 ));
 
 //
@@ -162,7 +163,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:ProviderContract' => 'Provider-Vertrag',
 	'Class:ProviderContract+' => '',
 	'Class:ProviderContract/Attribute:functionalcis_list' => 'CIs',
-	'Class:ProviderContract/Attribute:functionalcis_list+' => 'All the configuration items covered by this provider contract~~',
+	'Class:ProviderContract/Attribute:functionalcis_list+' => 'Alle CIs, die von diesem Provider-Vertrag abgedeckt werden',
 	'Class:ProviderContract/Attribute:sla' => 'SLA',
 	'Class:ProviderContract/Attribute:sla+' => '',
 	'Class:ProviderContract/Attribute:coverage' => 'Servicezeiten',
@@ -176,6 +177,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:lnkContactToContract' => 'Verknüpfung Kontakt/Vertrag',
 	'Class:lnkContactToContract+' => '',
+	'Class:lnkContactToContract/Name' => '%1$s / %2$s',
 	'Class:lnkContactToContract/Attribute:contract_id' => 'Vertrag',
 	'Class:lnkContactToContract/Attribute:contract_id+' => '',
 	'Class:lnkContactToContract/Attribute:contract_name' => 'Vertragsname',
@@ -193,6 +195,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:lnkContractToDocument' => 'Verknüpfung Vertrag/Dokument',
 	'Class:lnkContractToDocument+' => '',
+	'Class:lnkContractToDocument/Name' => '%1$s / %2$s',
 	'Class:lnkContractToDocument/Attribute:contract_id' => 'Vertrag',
 	'Class:lnkContractToDocument/Attribute:contract_id+' => '',
 	'Class:lnkContractToDocument/Attribute:contract_name' => 'Vertragsname',
@@ -210,6 +213,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:lnkFunctionalCIToProviderContract' => 'Verknüpfung FunctionalCI/Provider-Vertrag',
 	'Class:lnkFunctionalCIToProviderContract+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Name' => '%1$s / %2$s',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Provider-Vertrag',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Provider-Vertrags-Name',
@@ -232,7 +236,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:ServiceFamily/Attribute:icon' => 'Icon',
 	'Class:ServiceFamily/Attribute:icon+' => '',
 	'Class:ServiceFamily/Attribute:services_list' => 'Services',
-	'Class:ServiceFamily/Attribute:services_list+' => 'All the services in this category~~',
+	'Class:ServiceFamily/Attribute:services_list+' => 'Alle Services dieser Kategorie',
 ));
 
 //
@@ -242,6 +246,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:Service' => 'Service',
 	'Class:Service+' => '',
+	'Class:Service/ComplementaryName' => '%1$s - %2$s',
 	'Class:Service/Attribute:name' => 'Name',
 	'Class:Service/Attribute:name+' => '',
 	'Class:Service/Attribute:org_id' => 'Provider',
@@ -255,9 +260,9 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:Service/Attribute:servicefamily_name' => 'Service-Familien-Name',
 	'Class:Service/Attribute:servicefamily_name+' => '',
 	'Class:Service/Attribute:documents_list' => 'Dokumente',
-	'Class:Service/Attribute:documents_list+' => 'All the documents linked to the service~~',
+	'Class:Service/Attribute:documents_list+' => 'Alle mit dem Service verknüpften Dokumente',
 	'Class:Service/Attribute:contacts_list' => 'Kontakte',
-	'Class:Service/Attribute:contacts_list+' => 'All the contacts for this service~~',
+	'Class:Service/Attribute:contacts_list+' => 'Alle mit dem Service verknüpften Kontakte',
 	'Class:Service/Attribute:status' => 'Status',
 	'Class:Service/Attribute:status+' => '',
 	'Class:Service/Attribute:status/Value:implementation' => 'Implementierung',
@@ -269,9 +274,9 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:Service/Attribute:icon' => 'Icon',
 	'Class:Service/Attribute:icon+' => '',
 	'Class:Service/Attribute:customercontracts_list' => 'Kunden-Verträge',
-	'Class:Service/Attribute:customercontracts_list+' => 'All the customer contracts that have purchased this service~~',
+	'Class:Service/Attribute:customercontracts_list+' => 'Alle Kundenverträge, die diesen Service erworben haben',
 	'Class:Service/Attribute:servicesubcategories_list' => 'Service-Unterkategorien',
-	'Class:Service/Attribute:servicesubcategories_list+' => 'All the sub categories for this service~~',
+	'Class:Service/Attribute:servicesubcategories_list+' => 'Alle Service-Unterkategorien für diesen Service',
 ));
 
 //
@@ -281,6 +286,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:lnkDocumentToService' => 'Verknüpfung Dokument/Service',
 	'Class:lnkDocumentToService+' => '',
+	'Class:lnkDocumentToService/Name' => '%1$s / %2$s',
 	'Class:lnkDocumentToService/Attribute:service_id' => 'Service',
 	'Class:lnkDocumentToService/Attribute:service_id+' => '',
 	'Class:lnkDocumentToService/Attribute:service_name' => 'Service-Name',
@@ -298,6 +304,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:lnkContactToService' => 'Verknüpfung Kontakt/Service',
 	'Class:lnkContactToService+' => '',
+	'Class:lnkContactToService/Name' => '%1$s / %2$s',
 	'Class:lnkContactToService/Attribute:service_id' => 'Service',
 	'Class:lnkContactToService/Attribute:service_id+' => '',
 	'Class:lnkContactToService/Attribute:service_name' => 'Service-Name',
@@ -315,6 +322,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:ServiceSubcategory' => 'Service-Unterkategorie',
 	'Class:ServiceSubcategory+' => '',
+	'Class:ServiceSubcategory/ComplementaryName' => '%1$s - %2$s',
 	'Class:ServiceSubcategory/Attribute:name' => 'Name',
 	'Class:ServiceSubcategory/Attribute:name+' => '',
 	'Class:ServiceSubcategory/Attribute:description' => 'Beschreibung',
@@ -357,10 +365,10 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:SLA/Attribute:organization_name' => 'Organisations-Name',
 	'Class:SLA/Attribute:organization_name+' => '',
 	'Class:SLA/Attribute:slts_list' => 'SLTs',
-	'Class:SLA/Attribute:slts_list+' => 'All the service level targets for this SLA~~',
-	'Class:SLA/Attribute:customercontracts_list' => 'Kunden-Verträge',
-	'Class:SLA/Attribute:customercontracts_list+' => 'All the customer contracts using this SLA~~',
-	'Class:SLA/Error:UniqueLnkCustomerContractToService' => 'Konnte Link zwischen Kundevertrag %1$s und Service %2$s nicht speichern: SLA existiert bereits',
+	'Class:SLA/Attribute:slts_list+' => 'Alle Service Level Tagrget für dieses SLA',
+	'Class:SLA/Attribute:customercontracts_list' => 'Kundenverträge',
+	'Class:SLA/Attribute:customercontracts_list+' => 'Alle Kundenverträge, die diese SLA verwenden',
+	'Class:SLA/Error:UniqueLnkCustomerContractToService' => 'Die Verknüpfung zwischen Kundenvertrag %1$s und Service %2$s konnte nicht gespeichert werden: SLA existiert bereits',
 ));
 
 //
@@ -411,6 +419,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:lnkSLAToSLT' => 'Verknüpfung SLA/SLT',
 	'Class:lnkSLAToSLT+' => '',
+	'Class:lnkSLAToSLT/Name' => '%1$s / %2$s',
 	'Class:lnkSLAToSLT/Attribute:sla_id' => 'SLA',
 	'Class:lnkSLAToSLT/Attribute:sla_id+' => '',
 	'Class:lnkSLAToSLT/Attribute:sla_name' => 'SLA-Name',
@@ -438,6 +447,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:lnkCustomerContractToService' => 'Verknüpfung Kundenvertrag/Service',
 	'Class:lnkCustomerContractToService+' => '',
+	'Class:lnkCustomerContractToService/Name' => '%1$s / %2$s',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_id' => 'Kundenvertrag',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_id+' => '',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_name' => 'Kunden-Vertrags-Name',
@@ -459,6 +469,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:lnkCustomerContractToProviderContract' => 'Verknüpfung Kunden-Vertrag/Provider-Vertrag',
 	'Class:lnkCustomerContractToProviderContract+' => '',
+	'Class:lnkCustomerContractToProviderContract/Name' => '%1$s / %2$s',
 	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_id' => 'Kunden-Vertrag',
 	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_id+' => '',
 	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_name' => 'Kundenvertrags-Name',
@@ -476,6 +487,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:lnkCustomerContractToFunctionalCI' => 'Verknüpfung Kunden-Vertrag/FunctionalCI',
 	'Class:lnkCustomerContractToFunctionalCI+' => '',
+	'Class:lnkCustomerContractToFunctionalCI/Name' => '%1$s / %2$s',
 	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_id' => 'Kunden-Vertrag',
 	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_id+' => '',
 	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_name' => 'Kundenvertrags-Name',
@@ -502,9 +514,9 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:DeliveryModel/Attribute:description' => 'Beschreibung',
 	'Class:DeliveryModel/Attribute:description+' => '',
 	'Class:DeliveryModel/Attribute:contacts_list' => 'Kontakte',
-	'Class:DeliveryModel/Attribute:contacts_list+' => 'All the contacts (Teams and Person) for this delivery model~~',
+	'Class:DeliveryModel/Attribute:contacts_list+' => 'Alle Kontakte (Teams and Person) für dieses Delivery-Modell',
 	'Class:DeliveryModel/Attribute:customers_list' => 'Kunden',
-	'Class:DeliveryModel/Attribute:customers_list+' => 'All the customers having this delivering model~~',
+	'Class:DeliveryModel/Attribute:customers_list+' => 'Alle Kunden mit diesem Delivery-Modell',
 ));
 
 //
@@ -514,6 +526,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:lnkDeliveryModelToContact' => 'Verknüpfung Delivery-Modell/Kontakt',
 	'Class:lnkDeliveryModelToContact+' => '',
+	'Class:lnkDeliveryModelToContact/Name' => '%1$s / %2$s',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id' => 'Delivery-Modell',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id+' => '',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name' => 'Delivery-Modell-Name',
diff --git a/datamodels/2.x/itop-service-mgmt-provider/dictionaries/es_cr.dict.itop-service-mgmt-provider.php b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/es_cr.dict.itop-service-mgmt-provider.php
index 9a9ef97c01..0fa21c94e1 100644
--- a/datamodels/2.x/itop-service-mgmt-provider/dictionaries/es_cr.dict.itop-service-mgmt-provider.php
+++ b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/es_cr.dict.itop-service-mgmt-provider.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
@@ -39,7 +39,6 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Contratos por Nivel de Servicio',
 	'UI-ServiceManagementMenu-ContractsByStatus' => 'Contratos por Estatus',
 	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contratos Finalizando en menos de 30 días',
-
 	'Menu:ProviderContract' => 'Contratos con Proveedores',
 	'Menu:ProviderContract+' => 'Contratos con Proveedores',
 	'Menu:CustomerContract' => 'Acuerdos con Clientes',
@@ -58,9 +57,11 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Menu:DeliveryModel+' => 'Modelos de Entrega',
 	'Menu:ServiceFamily' => 'Familias de Servicio',
 	'Menu:ServiceFamily+' => 'Familias de Servicio',
+	'Contract:baseinfo' => 'General information~~',
+	'Contract:moreinfo' => 'Contractual information~~',
+	'Contract:cost' => 'Cost information~~',
 ));
 
-
 /*
 	'UI:ServiceManagementMenu' => 'Gestion des Services',
 	'UI:ServiceManagementMenu+' => 'Gestion des Services',
@@ -185,6 +186,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkContactToContract' => 'Relación Contacto y Contrato',
 	'Class:lnkContactToContract+' => 'Relación Contacto y Contrato',
+	'Class:lnkContactToContract/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToContract/Attribute:contract_id' => 'Contrato',
 	'Class:lnkContactToContract/Attribute:contract_id+' => 'Contrato',
 	'Class:lnkContactToContract/Attribute:contract_name' => 'Contrato',
@@ -202,6 +204,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkContractToDocument' => 'Relación Contrato y Documento',
 	'Class:lnkContractToDocument+' => 'Relación Contrato y Documento',
+	'Class:lnkContractToDocument/Name' => '%1$s / %2$s~~',
 	'Class:lnkContractToDocument/Attribute:contract_id' => 'Contrato',
 	'Class:lnkContractToDocument/Attribute:contract_id+' => 'Contrato',
 	'Class:lnkContractToDocument/Attribute:contract_name' => 'Contrato',
@@ -219,6 +222,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkFunctionalCIToProviderContract' => 'Relación EC Funcional y Contrato con Proveedor',
 	'Class:lnkFunctionalCIToProviderContract+' => 'Relación EC Funcional y Contrato con Proveedor',
+	'Class:lnkFunctionalCIToProviderContract/Name' => '%1$s / %2$s~~',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Contrato con Proveedor',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => 'Contrato con Proveedor',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Contrato con Proveedor',
@@ -251,6 +255,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Service' => 'Servicio',
 	'Class:Service+' => 'Servicio',
+	'Class:Service/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Service/Attribute:name' => 'Nombre',
 	'Class:Service/Attribute:name+' => 'Nombre del Servicio',
 	'Class:Service/Attribute:org_id' => 'Proveedor',
@@ -290,6 +295,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkDocumentToService' => 'Relación Documento y Servicio',
 	'Class:lnkDocumentToService+' => 'Relación Documento y Servicio',
+	'Class:lnkDocumentToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToService/Attribute:service_id' => 'Servicio',
 	'Class:lnkDocumentToService/Attribute:service_id+' => 'Servicio',
 	'Class:lnkDocumentToService/Attribute:service_name' => 'Servicio',
@@ -307,6 +313,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkContactToService' => 'Relación Contacto y Servicio',
 	'Class:lnkContactToService+' => 'Relación Contacto y Servicio',
+	'Class:lnkContactToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToService/Attribute:service_id' => 'Servicio',
 	'Class:lnkContactToService/Attribute:service_id+' => 'Servicio',
 	'Class:lnkContactToService/Attribute:service_name' => 'Servicio',
@@ -324,6 +331,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:ServiceSubcategory' => 'Subcategoría',
 	'Class:ServiceSubcategory+' => 'Subcategoría',
+	'Class:ServiceSubcategory/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:ServiceSubcategory/Attribute:name' => 'Nombre',
 	'Class:ServiceSubcategory/Attribute:name+' => 'Nombre de Subcategoría',
 	'Class:ServiceSubcategory/Attribute:description' => 'Descripción',
@@ -420,6 +428,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkSLAToSLT' => 'Relación SLA y SLT',
 	'Class:lnkSLAToSLT+' => 'Relación SLA y SLT',
+	'Class:lnkSLAToSLT/Name' => '%1$s / %2$s~~',
 	'Class:lnkSLAToSLT/Attribute:sla_id' => 'SLA',
 	'Class:lnkSLAToSLT/Attribute:sla_id+' => 'SLA',
 	'Class:lnkSLAToSLT/Attribute:sla_name' => 'SLA',
@@ -447,6 +456,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkCustomerContractToService' => 'Relación Acuerdo con Cliente y Servicio',
 	'Class:lnkCustomerContractToService+' => 'Relación Acuerdo con Cliente y Servicio',
+	'Class:lnkCustomerContractToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_id' => 'Acuerdo con Cliente',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_id+' => 'Acuerdo con Cliente',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_name' => 'Acuerdo con Cliente',
@@ -468,6 +478,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkCustomerContractToProviderContract' => 'Relación Acuerdo con Cliente y Contrato con Proveedor',
 	'Class:lnkCustomerContractToProviderContract+' => 'Relación Acuerdo con Cliente y Contrato con Proveedor',
+	'Class:lnkCustomerContractToProviderContract/Name' => '%1$s / %2$s~~',
 	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_id' => 'Acuerdo con Cliente',
 	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_id+' => 'Acuerdo con Cliente',
 	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_name' => 'Acuerdo con Cliente',
@@ -485,6 +496,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkCustomerContractToFunctionalCI' => 'Relación Acuerdo con Cliente y EC Funcional',
 	'Class:lnkCustomerContractToFunctionalCI+' => 'Relación Acuerdo con Cliente y EC Funcional',
+	'Class:lnkCustomerContractToFunctionalCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_id' => 'Acuerdo con Cliente',
 	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_id+' => 'Acuerdo con Cliente',
 	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_name' => 'Acuerdo con Cliente',
@@ -523,6 +535,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkDeliveryModelToContact' => 'Relación Modelo de Entrega y Contacto',
 	'Class:lnkDeliveryModelToContact+' => 'Relación Modelo de Entrega y Contacto',
+	'Class:lnkDeliveryModelToContact/Name' => '%1$s / %2$s~~',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id' => 'Modelo de Entrega',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id+' => 'Modelo de Entrega',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name' => 'Modelo de Entrega',
diff --git a/datamodels/2.x/itop-service-mgmt-provider/dictionaries/fr.dict.itop-service-mgmt-provider.php b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/fr.dict.itop-service-mgmt-provider.php
index f47622772f..b1247c6dbf 100644
--- a/datamodels/2.x/itop-service-mgmt-provider/dictionaries/fr.dict.itop-service-mgmt-provider.php
+++ b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/fr.dict.itop-service-mgmt-provider.php
@@ -30,7 +30,6 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Contrats, par niveau de service',
 	'UI-ServiceManagementMenu-ContractsByStatus' => 'Contrats, par état',
 	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contrats se terminant dans moins d\'un mois',
-
 	'Menu:ProviderContract' => 'Contrats fournisseurs',
 	'Menu:ProviderContract+' => 'Contrats fournisseurs',
 	'Menu:CustomerContract' => 'Contrats clients',
@@ -49,10 +48,9 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Menu:DeliveryModel+' => 'Modèles de support',
 	'Menu:ServiceFamily' => 'Familles de service',
 	'Menu:ServiceFamily+' => 'Familles de service',
-
 	'Contract:baseinfo' => 'Information générale',
 	'Contract:moreinfo' => 'Aspects contractuels',
-	'Contract:cost'     => 'Coûts',
+	'Contract:cost' => 'Coûts',
 ));
 
 /*
@@ -179,6 +177,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:lnkContactToContract' => 'Lien Contact / Contrat',
 	'Class:lnkContactToContract+' => '',
+	'Class:lnkContactToContract/Name' => '%1$s / %2$s',
 	'Class:lnkContactToContract/Attribute:contract_id' => 'Contrat',
 	'Class:lnkContactToContract/Attribute:contract_id+' => '',
 	'Class:lnkContactToContract/Attribute:contract_name' => 'Nom contrat',
@@ -196,6 +195,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:lnkContractToDocument' => 'Lien Contract / Document',
 	'Class:lnkContractToDocument+' => '',
+	'Class:lnkContractToDocument/Name' => '%1$s / %2$s',
 	'Class:lnkContractToDocument/Attribute:contract_id' => 'Contrat',
 	'Class:lnkContractToDocument/Attribute:contract_id+' => '',
 	'Class:lnkContractToDocument/Attribute:contract_name' => 'Nom contrat',
@@ -213,6 +213,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:lnkFunctionalCIToProviderContract' => 'Lien CI / Contrat fournisseur',
 	'Class:lnkFunctionalCIToProviderContract+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Name' => '%1$s / %2$s',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Contrat fournisseur',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Nom contrat fournisseur',
@@ -245,6 +246,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:Service' => 'Service',
 	'Class:Service+' => '',
+	'Class:Service/ComplementaryName' => '%1$s - %2$s',
 	'Class:Service/Attribute:name' => 'Nom',
 	'Class:Service/Attribute:name+' => '',
 	'Class:Service/Attribute:org_id' => 'Fournisseur',
@@ -284,6 +286,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:lnkDocumentToService' => 'Lien Document / Service',
 	'Class:lnkDocumentToService+' => '',
+	'Class:lnkDocumentToService/Name' => '%1$s / %2$s',
 	'Class:lnkDocumentToService/Attribute:service_id' => 'Service',
 	'Class:lnkDocumentToService/Attribute:service_id+' => '',
 	'Class:lnkDocumentToService/Attribute:service_name' => 'Nom service',
@@ -301,6 +304,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:lnkContactToService' => 'Lien Contact / Service',
 	'Class:lnkContactToService+' => '',
+	'Class:lnkContactToService/Name' => '%1$s / %2$s',
 	'Class:lnkContactToService/Attribute:service_id' => 'Service',
 	'Class:lnkContactToService/Attribute:service_id+' => '',
 	'Class:lnkContactToService/Attribute:service_name' => 'Nom service',
@@ -318,6 +322,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:ServiceSubcategory' => 'Sous catégorie de service',
 	'Class:ServiceSubcategory+' => '',
+	'Class:ServiceSubcategory/ComplementaryName' => '%1$s - %2$s',
 	'Class:ServiceSubcategory/Attribute:name' => 'Nom',
 	'Class:ServiceSubcategory/Attribute:name+' => '',
 	'Class:ServiceSubcategory/Attribute:description' => 'Description',
@@ -414,6 +419,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:lnkSLAToSLT' => 'Lien SLA / SLT',
 	'Class:lnkSLAToSLT+' => '',
+	'Class:lnkSLAToSLT/Name' => '%1$s / %2$s',
 	'Class:lnkSLAToSLT/Attribute:sla_id' => 'SLA',
 	'Class:lnkSLAToSLT/Attribute:sla_id+' => '',
 	'Class:lnkSLAToSLT/Attribute:sla_name' => 'Nom SLA',
@@ -441,6 +447,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:lnkCustomerContractToService' => 'Lien Contrat client / Service',
 	'Class:lnkCustomerContractToService+' => '',
+	'Class:lnkCustomerContractToService/Name' => '%1$s / %2$s',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_id' => 'Contrat client',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_id+' => '',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_name' => 'Nom contrat client',
@@ -462,6 +469,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:lnkCustomerContractToProviderContract' => 'Lien Contrat client / Contrat fournisseur',
 	'Class:lnkCustomerContractToProviderContract+' => '',
+	'Class:lnkCustomerContractToProviderContract/Name' => '%1$s / %2$s',
 	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_id' => 'Contrat client',
 	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_id+' => '',
 	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_name' => 'Contrat client',
@@ -479,6 +487,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:lnkCustomerContractToFunctionalCI' => 'Lien Contrat client / CI',
 	'Class:lnkCustomerContractToFunctionalCI+' => '',
+	'Class:lnkCustomerContractToFunctionalCI/Name' => '%1$s / %2$s',
 	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_id' => 'Contrat client',
 	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_id+' => '',
 	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_name' => 'Contrat client',
@@ -517,6 +526,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:lnkDeliveryModelToContact' => 'Lien Modèle de support / Contact',
 	'Class:lnkDeliveryModelToContact+' => '',
+	'Class:lnkDeliveryModelToContact/Name' => '%1$s / %2$s',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id' => 'Modèle de support',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id+' => '',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name' => 'Nom Modèle de support',
@@ -530,8 +540,6 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:lnkDeliveryModelToContact/Attribute:role_name' => 'Nom Rôle',
 	'Class:lnkDeliveryModelToContact/Attribute:role_name+' => '',
 ));
-
-
 // 1:n relations custom labels for tooltip and pop-up title
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:DeliveryModel/Attribute:customers_list/UI:Links:Create:Button+' => 'Créer un %4$s',
@@ -551,5 +559,5 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:ServiceFamily/Attribute:services_list/UI:Links:Remove:Button+' => 'Retirer ce %4$s',
 	'Class:ServiceFamily/Attribute:services_list/UI:Links:Remove:Modal:Title' => 'Retirer ce %4$s de sa %1$s',
 	'Class:ServiceFamily/Attribute:services_list/UI:Links:Delete:Button+' => 'Supprimer ce %4$s',
-	'Class:ServiceFamily/Attribute:services_list/UI:Links:Delete:Modal:Title' => 'Supprimer un %4$s',
+	'Class:ServiceFamily/Attribute:services_list/UI:Links:Delete:Modal:Title' => 'Supprimer un %4$s'
 ));
diff --git a/datamodels/2.x/itop-service-mgmt-provider/dictionaries/hu.dict.itop-service-mgmt-provider.php b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/hu.dict.itop-service-mgmt-provider.php
index 1332afe98b..81ea110ab0 100644
--- a/datamodels/2.x/itop-service-mgmt-provider/dictionaries/hu.dict.itop-service-mgmt-provider.php
+++ b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/hu.dict.itop-service-mgmt-provider.php
@@ -30,42 +30,43 @@
 // Class:<class_name>/Stimulus:<stimulus_code>
 // Class:<class_name>/Stimulus:<stimulus_code>+
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Menu:ServiceManagement' => 'Szolgáltatáskezelés',
-    'Menu:ServiceManagement+' => '~~',
-    'Menu:Service:Overview' => 'Áttekintő',
-    'Menu:Service:Overview+' => '~~',
-    'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Szerződések szolgáltatásszintek szerint',
-    'UI-ServiceManagementMenu-ContractsByStatus' => 'Szerződések állapotuk szerint',
-    'UI-ServiceManagementMenu-ContractsEndingIn30Days' => '30 napon belül lejáró szerződések',
-
-    'Menu:ProviderContract' => 'Szállítói szerződés',
-    'Menu:ProviderContract+' => '~~',
-    'Menu:CustomerContract' => 'Ügyfélszerződés',
-    'Menu:CustomerContract+' => '~~',
-    'Menu:ServiceSubcategory' => 'Szolgáltatás alkategóriák',
-    'Menu:ServiceSubcategory+' => '~~',
-    'Menu:Service' => 'Szolgáltatások',
-    'Menu:Service+' => '~~',
-    'Menu:ServiceElement' => 'Szolgáltatáselemek',
-    'Menu:ServiceElement+' => 'Sevice elements~~',
-    'Menu:SLA' => 'SLA-k',
-    'Menu:SLA+' => '~~',
-    'Menu:SLT' => 'SLT-k',
-    'Menu:SLT+' => '~~',
-    'Menu:DeliveryModel' => 'Teljesítési modellek',
-    'Menu:DeliveryModel+' => 'Delivery models~~',
-    'Menu:ServiceFamily' => 'Szolgáltatáscsaládok',
-    'Menu:ServiceFamily+' => 'Service families~~',
+	'Menu:ServiceManagement' => 'Szolgáltatáskezelés',
+	'Menu:ServiceManagement+' => '~~',
+	'Menu:Service:Overview' => 'Áttekintő',
+	'Menu:Service:Overview+' => '~~',
+	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Szerződések szolgáltatásszintek szerint',
+	'UI-ServiceManagementMenu-ContractsByStatus' => 'Szerződések állapotuk szerint',
+	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => '30 napon belül lejáró szerződések',
+	'Menu:ProviderContract' => 'Szállítói szerződés',
+	'Menu:ProviderContract+' => '~~',
+	'Menu:CustomerContract' => 'Ügyfélszerződés',
+	'Menu:CustomerContract+' => '~~',
+	'Menu:ServiceSubcategory' => 'Szolgáltatás alkategóriák',
+	'Menu:ServiceSubcategory+' => '~~',
+	'Menu:Service' => 'Szolgáltatások',
+	'Menu:Service+' => '~~',
+	'Menu:ServiceElement' => 'Szolgáltatáselemek',
+	'Menu:ServiceElement+' => 'Sevice elements~~',
+	'Menu:SLA' => 'SLA-k',
+	'Menu:SLA+' => '~~',
+	'Menu:SLT' => 'SLT-k',
+	'Menu:SLT+' => '~~',
+	'Menu:DeliveryModel' => 'Teljesítési modellek',
+	'Menu:DeliveryModel+' => 'Delivery models~~',
+	'Menu:ServiceFamily' => 'Szolgáltatáscsaládok',
+	'Menu:ServiceFamily+' => 'Service families~~',
+	'Contract:baseinfo' => 'General information~~',
+	'Contract:moreinfo' => 'Contractual information~~',
+	'Contract:cost' => 'Cost information~~',
 ));
 
-
 /*
-    'UI:ServiceManagementMenu' => 'Gestion des Services',
-    'UI:ServiceManagementMenu+' => 'Gestion des Services',
-    'UI:ServiceManagementMenu:Title' => 'Résumé des services & contrats',
-    'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Contrats par niveau de service',
-    'UI-ServiceManagementMenu-ContractsByStatus' => 'Contrats par état',
-    'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contrats se terminant dans moins de 30 jours',
+	'UI:ServiceManagementMenu' => 'Gestion des Services',
+	'UI:ServiceManagementMenu+' => 'Gestion des Services',
+	'UI:ServiceManagementMenu:Title' => 'Résumé des services & contrats',
+	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Contrats par niveau de service',
+	'UI-ServiceManagementMenu-ContractsByStatus' => 'Contrats par état',
+	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contrats se terminant dans moins de 30 jours',
 */
 
 //
@@ -73,10 +74,10 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:Organization/Attribute:deliverymodel_id' => 'Teljesítési modell',
-    'Class:Organization/Attribute:deliverymodel_id+' => '~~',
-    'Class:Organization/Attribute:deliverymodel_name' => 'Teljesítési modell név',
-    'Class:Organization/Attribute:deliverymodel_name+' => '~~',
+	'Class:Organization/Attribute:deliverymodel_id' => 'Teljesítési modell',
+	'Class:Organization/Attribute:deliverymodel_id+' => '~~',
+	'Class:Organization/Attribute:deliverymodel_name' => 'Teljesítési modell név',
+	'Class:Organization/Attribute:deliverymodel_name+' => '~~',
 ));
 
 
@@ -86,8 +87,8 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:ContractType' => 'Szerződés típus',
-    'Class:ContractType+' => '~~',
+	'Class:ContractType' => 'Szerződés típus',
+	'Class:ContractType+' => '~~',
 ));
 
 
@@ -96,54 +97,54 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:Contract' => 'Szerződés',
-    'Class:Contract+' => '~~',
-    'Class:Contract/Attribute:name' => 'Név',
-    'Class:Contract/Attribute:name+' => '~~',
-    'Class:Contract/Attribute:org_id' => 'Ügyfél',
-    'Class:Contract/Attribute:org_id+' => '~~',
-    'Class:Contract/Attribute:organization_name' => 'Szervezeti egység név',
-    'Class:Contract/Attribute:organization_name+' => 'Általános név',
-    'Class:Contract/Attribute:contacts_list' => 'Kapcsolattartók',
-    'Class:Contract/Attribute:contacts_list+' => 'All the contacts for this customer contract~~',
-    'Class:Contract/Attribute:documents_list' => 'Dokumentumok',
-    'Class:Contract/Attribute:documents_list+' => 'All the documents for this customer contract~~',
-    'Class:Contract/Attribute:description' => 'Leírás',
-    'Class:Contract/Attribute:description+' => '~~',
-    'Class:Contract/Attribute:start_date' => 'Érvényesség kezdete',
-    'Class:Contract/Attribute:start_date+' => '~~',
-    'Class:Contract/Attribute:end_date' => 'Érvényesség vége',
-    'Class:Contract/Attribute:end_date+' => '~~',
-    'Class:Contract/Attribute:cost' => 'Költség',
-    'Class:Contract/Attribute:cost+' => '~~',
-    'Class:Contract/Attribute:cost_currency' => 'Költség pénznem',
-    'Class:Contract/Attribute:cost_currency+' => '~~',
-    'Class:Contract/Attribute:cost_currency/Value:dollars' => 'Forint',
-    'Class:Contract/Attribute:cost_currency/Value:dollars+' => '~~',
-    'Class:Contract/Attribute:cost_currency/Value:euros' => 'Euró',
-    'Class:Contract/Attribute:cost_currency/Value:euros+' => '~~',
-    'Class:Contract/Attribute:contracttype_id' => 'Szerződés típus',
-    'Class:Contract/Attribute:contracttype_id+' => '~~',
-    'Class:Contract/Attribute:contracttype_name' => 'Szerződés típus név',
-    'Class:Contract/Attribute:contracttype_name+' => '~~',
-    'Class:Contract/Attribute:billing_frequency' => 'Számlázási gyakoriság',
-    'Class:Contract/Attribute:billing_frequency+' => '~~',
-    'Class:Contract/Attribute:cost_unit' => 'Költség egység',
-    'Class:Contract/Attribute:cost_unit+' => '~~',
-    'Class:Contract/Attribute:provider_id' => 'Szolgáltató',
-    'Class:Contract/Attribute:provider_id+' => '~~',
-    'Class:Contract/Attribute:provider_name' => 'Szolgáltató név',
-    'Class:Contract/Attribute:provider_name+' => 'Általános név',
-    'Class:Contract/Attribute:status' => 'Státusz',
-    'Class:Contract/Attribute:status+' => '~~',
-    'Class:Contract/Attribute:status/Value:implementation' => 'Megvalósítás alatt',
-    'Class:Contract/Attribute:status/Value:implementation+' => 'implementation~~',
-    'Class:Contract/Attribute:status/Value:obsolete' => 'Elavult',
-    'Class:Contract/Attribute:status/Value:obsolete+' => 'obsolete~~',
-    'Class:Contract/Attribute:status/Value:production' => 'Használatban',
-    'Class:Contract/Attribute:status/Value:production+' => 'production~~',
-    'Class:Contract/Attribute:finalclass' => 'Típus',
-    'Class:Contract/Attribute:finalclass+' => '~~',
+	'Class:Contract' => 'Szerződés',
+	'Class:Contract+' => '~~',
+	'Class:Contract/Attribute:name' => 'Név',
+	'Class:Contract/Attribute:name+' => '~~',
+	'Class:Contract/Attribute:org_id' => 'Ügyfél',
+	'Class:Contract/Attribute:org_id+' => '~~',
+	'Class:Contract/Attribute:organization_name' => 'Szervezeti egység név',
+	'Class:Contract/Attribute:organization_name+' => 'Általános név',
+	'Class:Contract/Attribute:contacts_list' => 'Kapcsolattartók',
+	'Class:Contract/Attribute:contacts_list+' => 'All the contacts for this customer contract~~',
+	'Class:Contract/Attribute:documents_list' => 'Dokumentumok',
+	'Class:Contract/Attribute:documents_list+' => 'All the documents for this customer contract~~',
+	'Class:Contract/Attribute:description' => 'Leírás',
+	'Class:Contract/Attribute:description+' => '~~',
+	'Class:Contract/Attribute:start_date' => 'Érvényesség kezdete',
+	'Class:Contract/Attribute:start_date+' => '~~',
+	'Class:Contract/Attribute:end_date' => 'Érvényesség vége',
+	'Class:Contract/Attribute:end_date+' => '~~',
+	'Class:Contract/Attribute:cost' => 'Költség',
+	'Class:Contract/Attribute:cost+' => '~~',
+	'Class:Contract/Attribute:cost_currency' => 'Költség pénznem',
+	'Class:Contract/Attribute:cost_currency+' => '~~',
+	'Class:Contract/Attribute:cost_currency/Value:dollars' => 'Forint',
+	'Class:Contract/Attribute:cost_currency/Value:dollars+' => '~~',
+	'Class:Contract/Attribute:cost_currency/Value:euros' => 'Euró',
+	'Class:Contract/Attribute:cost_currency/Value:euros+' => '~~',
+	'Class:Contract/Attribute:contracttype_id' => 'Szerződés típus',
+	'Class:Contract/Attribute:contracttype_id+' => '~~',
+	'Class:Contract/Attribute:contracttype_name' => 'Szerződés típus név',
+	'Class:Contract/Attribute:contracttype_name+' => '~~',
+	'Class:Contract/Attribute:billing_frequency' => 'Számlázási gyakoriság',
+	'Class:Contract/Attribute:billing_frequency+' => '~~',
+	'Class:Contract/Attribute:cost_unit' => 'Költség egység',
+	'Class:Contract/Attribute:cost_unit+' => '~~',
+	'Class:Contract/Attribute:provider_id' => 'Szolgáltató',
+	'Class:Contract/Attribute:provider_id+' => '~~',
+	'Class:Contract/Attribute:provider_name' => 'Szolgáltató név',
+	'Class:Contract/Attribute:provider_name+' => 'Általános név',
+	'Class:Contract/Attribute:status' => 'Státusz',
+	'Class:Contract/Attribute:status+' => '~~',
+	'Class:Contract/Attribute:status/Value:implementation' => 'Megvalósítás alatt',
+	'Class:Contract/Attribute:status/Value:implementation+' => 'implementation~~',
+	'Class:Contract/Attribute:status/Value:obsolete' => 'Elavult',
+	'Class:Contract/Attribute:status/Value:obsolete+' => 'obsolete~~',
+	'Class:Contract/Attribute:status/Value:production' => 'Használatban',
+	'Class:Contract/Attribute:status/Value:production+' => 'production~~',
+	'Class:Contract/Attribute:finalclass' => 'Típus',
+	'Class:Contract/Attribute:finalclass+' => '~~',
 ));
 
 //
@@ -151,14 +152,14 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:CustomerContract' => 'Ügyfél kapcsolattartó',
-    'Class:CustomerContract+' => '~~',
-    'Class:CustomerContract/Attribute:services_list' => 'Szolgáltatások',
-    'Class:CustomerContract/Attribute:services_list+' => 'All the services purchased for this contract~~',
-    'Class:CustomerContract/Attribute:functionalcis_list' => 'CI-k',
-    'Class:CustomerContract/Attribute:functionalcis_list+' => 'All the configuration items covered by this contract~~',
-    'Class:CustomerContract/Attribute:providercontracts_list' => 'Szolgáltatói szerződések',
-    'Class:CustomerContract/Attribute:providercontracts_list+' => 'All the provider contracts to deliver the services for this contract (underpinning contract)~~',
+	'Class:CustomerContract' => 'Ügyfél kapcsolattartó',
+	'Class:CustomerContract+' => '~~',
+	'Class:CustomerContract/Attribute:services_list' => 'Szolgáltatások',
+	'Class:CustomerContract/Attribute:services_list+' => 'All the services purchased for this contract~~',
+	'Class:CustomerContract/Attribute:functionalcis_list' => 'CI-k',
+	'Class:CustomerContract/Attribute:functionalcis_list+' => 'All the configuration items covered by this contract~~',
+	'Class:CustomerContract/Attribute:providercontracts_list' => 'Szolgáltatói szerződések',
+	'Class:CustomerContract/Attribute:providercontracts_list+' => 'All the provider contracts to deliver the services for this contract (underpinning contract)~~',
 ));
 
 //
@@ -166,14 +167,14 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:ProviderContract' => 'Szolgáltatói szerződés',
-    'Class:ProviderContract+' => '~~',
-    'Class:ProviderContract/Attribute:functionalcis_list' => 'CI-k',
-    'Class:ProviderContract/Attribute:functionalcis_list+' => 'All the configuration items covered by this contract~~',
-    'Class:ProviderContract/Attribute:sla' => 'SLA',
-    'Class:ProviderContract/Attribute:sla+' => 'Service Level Agreement',
-    'Class:ProviderContract/Attribute:coverage' => 'Szolgáltatási időtartam',
-    'Class:ProviderContract/Attribute:coverage+' => '~~',
+	'Class:ProviderContract' => 'Szolgáltatói szerződés',
+	'Class:ProviderContract+' => '~~',
+	'Class:ProviderContract/Attribute:functionalcis_list' => 'CI-k',
+	'Class:ProviderContract/Attribute:functionalcis_list+' => 'All the configuration items covered by this contract~~',
+	'Class:ProviderContract/Attribute:sla' => 'SLA',
+	'Class:ProviderContract/Attribute:sla+' => 'Service Level Agreement',
+	'Class:ProviderContract/Attribute:coverage' => 'Szolgáltatási időtartam',
+	'Class:ProviderContract/Attribute:coverage+' => '~~',
 ));
 
 //
@@ -181,16 +182,17 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:lnkContactToContract' => 'Kapcsolattartó / Szerződés',
-    'Class:lnkContactToContract+' => '~~',
-    'Class:lnkContactToContract/Attribute:contract_id' => 'Szerződés',
-    'Class:lnkContactToContract/Attribute:contract_id+' => '~~',
-    'Class:lnkContactToContract/Attribute:contract_name' => 'Szerződés név',
-    'Class:lnkContactToContract/Attribute:contract_name+' => '~~',
-    'Class:lnkContactToContract/Attribute:contact_id' => 'Kapcsolattartó',
-    'Class:lnkContactToContract/Attribute:contact_id+' => '~~',
-    'Class:lnkContactToContract/Attribute:contact_name' => 'Kapcsolattartó név',
-    'Class:lnkContactToContract/Attribute:contact_name+' => '~~',
+	'Class:lnkContactToContract' => 'Kapcsolattartó / Szerződés',
+	'Class:lnkContactToContract+' => '~~',
+	'Class:lnkContactToContract/Name' => '%1$s / %2$s~~',
+	'Class:lnkContactToContract/Attribute:contract_id' => 'Szerződés',
+	'Class:lnkContactToContract/Attribute:contract_id+' => '~~',
+	'Class:lnkContactToContract/Attribute:contract_name' => 'Szerződés név',
+	'Class:lnkContactToContract/Attribute:contract_name+' => '~~',
+	'Class:lnkContactToContract/Attribute:contact_id' => 'Kapcsolattartó',
+	'Class:lnkContactToContract/Attribute:contact_id+' => '~~',
+	'Class:lnkContactToContract/Attribute:contact_name' => 'Kapcsolattartó név',
+	'Class:lnkContactToContract/Attribute:contact_name+' => '~~',
 ));
 
 //
@@ -198,16 +200,17 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:lnkContractToDocument' => 'Szerződés / Dokumentum',
-    'Class:lnkContractToDocument+' => '~~',
-    'Class:lnkContractToDocument/Attribute:contract_id' => 'Szerződés',
-    'Class:lnkContractToDocument/Attribute:contract_id+' => '~~',
-    'Class:lnkContractToDocument/Attribute:contract_name' => 'Szerződés név',
-    'Class:lnkContractToDocument/Attribute:contract_name+' => '~~',
-    'Class:lnkContractToDocument/Attribute:document_id' => 'Dokumentum',
-    'Class:lnkContractToDocument/Attribute:document_id+' => '~~',
-    'Class:lnkContractToDocument/Attribute:document_name' => 'Dokumentum név',
-    'Class:lnkContractToDocument/Attribute:document_name+' => '~~',
+	'Class:lnkContractToDocument' => 'Szerződés / Dokumentum',
+	'Class:lnkContractToDocument+' => '~~',
+	'Class:lnkContractToDocument/Name' => '%1$s / %2$s~~',
+	'Class:lnkContractToDocument/Attribute:contract_id' => 'Szerződés',
+	'Class:lnkContractToDocument/Attribute:contract_id+' => '~~',
+	'Class:lnkContractToDocument/Attribute:contract_name' => 'Szerződés név',
+	'Class:lnkContractToDocument/Attribute:contract_name+' => '~~',
+	'Class:lnkContractToDocument/Attribute:document_id' => 'Dokumentum',
+	'Class:lnkContractToDocument/Attribute:document_id+' => '~~',
+	'Class:lnkContractToDocument/Attribute:document_name' => 'Dokumentum név',
+	'Class:lnkContractToDocument/Attribute:document_name+' => '~~',
 ));
 
 //
@@ -215,16 +218,17 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:lnkFunctionalCIToProviderContract' => 'Funkcionális CI / Szolgáltatói szerződés',
-    'Class:lnkFunctionalCIToProviderContract+' => '~~',
-    'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Szolgáltatói szerződés',
-    'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '~~',
-    'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Szolgáltatói szerződés név',
-    'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '~~',
-    'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'CI',
-    'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '~~',
-    'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'CI név',
-    'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '~~',
+	'Class:lnkFunctionalCIToProviderContract' => 'Funkcionális CI / Szolgáltatói szerződés',
+	'Class:lnkFunctionalCIToProviderContract+' => '~~',
+	'Class:lnkFunctionalCIToProviderContract/Name' => '%1$s / %2$s~~',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Szolgáltatói szerződés',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '~~',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Szolgáltatói szerződés név',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '~~',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'CI',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '~~',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'CI név',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '~~',
 ));
 
 //
@@ -232,14 +236,14 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:ServiceFamily' => 'Szolgáltatáscsalád',
-    'Class:ServiceFamily+' => '~~',
-    'Class:ServiceFamily/Attribute:name' => 'Név',
-    'Class:ServiceFamily/Attribute:name+' => '~~',
-    'Class:ServiceFamily/Attribute:icon' => 'Ikon',
-    'Class:ServiceFamily/Attribute:icon+' => '~~',
-    'Class:ServiceFamily/Attribute:services_list' => 'Szolgáltatások',
-    'Class:ServiceFamily/Attribute:services_list+' => 'All the services in this category~~',
+	'Class:ServiceFamily' => 'Szolgáltatáscsalád',
+	'Class:ServiceFamily+' => '~~',
+	'Class:ServiceFamily/Attribute:name' => 'Név',
+	'Class:ServiceFamily/Attribute:name+' => '~~',
+	'Class:ServiceFamily/Attribute:icon' => 'Ikon',
+	'Class:ServiceFamily/Attribute:icon+' => '~~',
+	'Class:ServiceFamily/Attribute:services_list' => 'Szolgáltatások',
+	'Class:ServiceFamily/Attribute:services_list+' => 'All the services in this category~~',
 ));
 
 //
@@ -247,38 +251,39 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:Service' => 'Szolgáltatás',
-    'Class:Service+' => '~~',
-    'Class:Service/Attribute:name' => 'Név',
-    'Class:Service/Attribute:name+' => '~~',
-    'Class:Service/Attribute:org_id' => 'Szolgáltató',
-    'Class:Service/Attribute:org_id+' => '~~',
-    'Class:Service/Attribute:organization_name' => 'Szolgáltató név',
-    'Class:Service/Attribute:organization_name+' => '~~',
-    'Class:Service/Attribute:description' => 'Leírás',
-    'Class:Service/Attribute:description+' => '~~',
-    'Class:Service/Attribute:servicefamily_id' => 'Szolgáltatáscsalád',
-    'Class:Service/Attribute:servicefamily_id+' => '~~',
-    'Class:Service/Attribute:servicefamily_name' => 'Szolgáltatáscsalád név',
-    'Class:Service/Attribute:servicefamily_name+' => '~~',
-    'Class:Service/Attribute:documents_list' => 'Dokumentumok',
-    'Class:Service/Attribute:documents_list+' => 'All the documents linked to the service~~',
-    'Class:Service/Attribute:contacts_list' => 'Kapcsolattartók',
-    'Class:Service/Attribute:contacts_list+' => 'All the contacts for this service~~',
-    'Class:Service/Attribute:status' => 'Állapot',
-    'Class:Service/Attribute:status+' => '~~',
-    'Class:Service/Attribute:status/Value:implementation' => 'Megvalósítás alatt',
-    'Class:Service/Attribute:status/Value:implementation+' => 'implementation~~',
-    'Class:Service/Attribute:status/Value:obsolete' => 'Elavult',
-    'Class:Service/Attribute:status/Value:obsolete+' => '~~',
-    'Class:Service/Attribute:status/Value:production' => 'Használatban',
-    'Class:Service/Attribute:status/Value:production+' => '~~',
-    'Class:Service/Attribute:icon' => 'Ikon',
-    'Class:Service/Attribute:icon+' => '~~',
-    'Class:Service/Attribute:customercontracts_list' => 'Ügyfélszerződések',
-    'Class:Service/Attribute:customercontracts_list+' => 'All the customer contracts that have purchased this service~~',
-    'Class:Service/Attribute:servicesubcategories_list' => 'Szolgáltatás alkategóriák',
-    'Class:Service/Attribute:servicesubcategories_list+' => 'All the sub categories for this service~~',
+	'Class:Service' => 'Szolgáltatás',
+	'Class:Service+' => '~~',
+	'Class:Service/ComplementaryName' => '%1$s - %2$s~~',
+	'Class:Service/Attribute:name' => 'Név',
+	'Class:Service/Attribute:name+' => '~~',
+	'Class:Service/Attribute:org_id' => 'Szolgáltató',
+	'Class:Service/Attribute:org_id+' => '~~',
+	'Class:Service/Attribute:organization_name' => 'Szolgáltató név',
+	'Class:Service/Attribute:organization_name+' => '~~',
+	'Class:Service/Attribute:description' => 'Leírás',
+	'Class:Service/Attribute:description+' => '~~',
+	'Class:Service/Attribute:servicefamily_id' => 'Szolgáltatáscsalád',
+	'Class:Service/Attribute:servicefamily_id+' => '~~',
+	'Class:Service/Attribute:servicefamily_name' => 'Szolgáltatáscsalád név',
+	'Class:Service/Attribute:servicefamily_name+' => '~~',
+	'Class:Service/Attribute:documents_list' => 'Dokumentumok',
+	'Class:Service/Attribute:documents_list+' => 'All the documents linked to the service~~',
+	'Class:Service/Attribute:contacts_list' => 'Kapcsolattartók',
+	'Class:Service/Attribute:contacts_list+' => 'All the contacts for this service~~',
+	'Class:Service/Attribute:status' => 'Állapot',
+	'Class:Service/Attribute:status+' => '~~',
+	'Class:Service/Attribute:status/Value:implementation' => 'Megvalósítás alatt',
+	'Class:Service/Attribute:status/Value:implementation+' => 'implementation~~',
+	'Class:Service/Attribute:status/Value:obsolete' => 'Elavult',
+	'Class:Service/Attribute:status/Value:obsolete+' => '~~',
+	'Class:Service/Attribute:status/Value:production' => 'Használatban',
+	'Class:Service/Attribute:status/Value:production+' => '~~',
+	'Class:Service/Attribute:icon' => 'Ikon',
+	'Class:Service/Attribute:icon+' => '~~',
+	'Class:Service/Attribute:customercontracts_list' => 'Ügyfélszerződések',
+	'Class:Service/Attribute:customercontracts_list+' => 'All the customer contracts that have purchased this service~~',
+	'Class:Service/Attribute:servicesubcategories_list' => 'Szolgáltatás alkategóriák',
+	'Class:Service/Attribute:servicesubcategories_list+' => 'All the sub categories for this service~~',
 ));
 
 //
@@ -286,16 +291,17 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:lnkDocumentToService' => 'Dokumentum / Szolgáltatás',
-    'Class:lnkDocumentToService+' => '~~',
-    'Class:lnkDocumentToService/Attribute:service_id' => 'Szolgáltatás',
-    'Class:lnkDocumentToService/Attribute:service_id+' => '~~',
-    'Class:lnkDocumentToService/Attribute:service_name' => 'Szolgáltatás név',
-    'Class:lnkDocumentToService/Attribute:service_name+' => '~~',
-    'Class:lnkDocumentToService/Attribute:document_id' => 'Dokumentum',
-    'Class:lnkDocumentToService/Attribute:document_id+' => '~~',
-    'Class:lnkDocumentToService/Attribute:document_name' => 'Dokumentum név',
-    'Class:lnkDocumentToService/Attribute:document_name+' => '~~',
+	'Class:lnkDocumentToService' => 'Dokumentum / Szolgáltatás',
+	'Class:lnkDocumentToService+' => '~~',
+	'Class:lnkDocumentToService/Name' => '%1$s / %2$s~~',
+	'Class:lnkDocumentToService/Attribute:service_id' => 'Szolgáltatás',
+	'Class:lnkDocumentToService/Attribute:service_id+' => '~~',
+	'Class:lnkDocumentToService/Attribute:service_name' => 'Szolgáltatás név',
+	'Class:lnkDocumentToService/Attribute:service_name+' => '~~',
+	'Class:lnkDocumentToService/Attribute:document_id' => 'Dokumentum',
+	'Class:lnkDocumentToService/Attribute:document_id+' => '~~',
+	'Class:lnkDocumentToService/Attribute:document_name' => 'Dokumentum név',
+	'Class:lnkDocumentToService/Attribute:document_name+' => '~~',
 ));
 
 //
@@ -303,16 +309,17 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:lnkContactToService' => 'Kapcsolattartó / Szolgáltatás',
-    'Class:lnkContactToService+' => '~~',
-    'Class:lnkContactToService/Attribute:service_id' => 'Szolgáltatás',
-    'Class:lnkContactToService/Attribute:service_id+' => '~~',
-    'Class:lnkContactToService/Attribute:service_name' => 'Szolgáltatás név',
-    'Class:lnkContactToService/Attribute:service_name+' => '~~',
-    'Class:lnkContactToService/Attribute:contact_id' => 'Kapcsolattartó',
-    'Class:lnkContactToService/Attribute:contact_id+' => '~~',
-    'Class:lnkContactToService/Attribute:contact_name' => 'Kapcsolattartó név',
-    'Class:lnkContactToService/Attribute:contact_name+' => '~~',
+	'Class:lnkContactToService' => 'Kapcsolattartó / Szolgáltatás',
+	'Class:lnkContactToService+' => '~~',
+	'Class:lnkContactToService/Name' => '%1$s / %2$s~~',
+	'Class:lnkContactToService/Attribute:service_id' => 'Szolgáltatás',
+	'Class:lnkContactToService/Attribute:service_id+' => '~~',
+	'Class:lnkContactToService/Attribute:service_name' => 'Szolgáltatás név',
+	'Class:lnkContactToService/Attribute:service_name+' => '~~',
+	'Class:lnkContactToService/Attribute:contact_id' => 'Kapcsolattartó',
+	'Class:lnkContactToService/Attribute:contact_id+' => '~~',
+	'Class:lnkContactToService/Attribute:contact_name' => 'Kapcsolattartó név',
+	'Class:lnkContactToService/Attribute:contact_name+' => '~~',
 ));
 
 //
@@ -320,32 +327,33 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:ServiceSubcategory' => 'Szolgáltatás alkategória',
-    'Class:ServiceSubcategory+' => '~~',
-    'Class:ServiceSubcategory/Attribute:name' => 'Név',
-    'Class:ServiceSubcategory/Attribute:name+' => '~~',
-    'Class:ServiceSubcategory/Attribute:description' => 'Leírás',
-    'Class:ServiceSubcategory/Attribute:description+' => '~~',
-    'Class:ServiceSubcategory/Attribute:service_id' => 'Szolgáltatás',
-    'Class:ServiceSubcategory/Attribute:service_id+' => '~~',
-    'Class:ServiceSubcategory/Attribute:service_name' => 'Szolgáltatás név',
-    'Class:ServiceSubcategory/Attribute:service_name+' => '~~',
-    'Class:ServiceSubcategory/Attribute:status' => 'Állapot',
-    'Class:ServiceSubcategory/Attribute:status+' => '~~',
-    'Class:ServiceSubcategory/Attribute:status/Value:implementation' => 'Megvalósítás alatt',
-    'Class:ServiceSubcategory/Attribute:status/Value:implementation+' => 'implementation~~',
-    'Class:ServiceSubcategory/Attribute:status/Value:obsolete' => 'Elavult',
-    'Class:ServiceSubcategory/Attribute:status/Value:obsolete+' => 'obsolete~~',
-    'Class:ServiceSubcategory/Attribute:status/Value:production' => 'Használatban',
-    'Class:ServiceSubcategory/Attribute:status/Value:production+' => 'production~~',
-    'Class:ServiceSubcategory/Attribute:request_type' => 'Kérelem típus',
-    'Class:ServiceSubcategory/Attribute:request_type+' => '~~',
-    'Class:ServiceSubcategory/Attribute:request_type/Value:incident' => 'Incidens',
-    'Class:ServiceSubcategory/Attribute:request_type/Value:incident+' => 'incident~~',
-    'Class:ServiceSubcategory/Attribute:request_type/Value:service_request' => 'Szolgáltatás kérelem',
-    'Class:ServiceSubcategory/Attribute:request_type/Value:service_request+' => 'service request~~',
-    'Class:ServiceSubcategory/Attribute:service_provider' => 'Szolgáltató név',
-    'Class:ServiceSubcategory/Attribute:service_org_id' => 'Szolgáltató',
+	'Class:ServiceSubcategory' => 'Szolgáltatás alkategória',
+	'Class:ServiceSubcategory+' => '~~',
+	'Class:ServiceSubcategory/ComplementaryName' => '%1$s - %2$s~~',
+	'Class:ServiceSubcategory/Attribute:name' => 'Név',
+	'Class:ServiceSubcategory/Attribute:name+' => '~~',
+	'Class:ServiceSubcategory/Attribute:description' => 'Leírás',
+	'Class:ServiceSubcategory/Attribute:description+' => '~~',
+	'Class:ServiceSubcategory/Attribute:service_id' => 'Szolgáltatás',
+	'Class:ServiceSubcategory/Attribute:service_id+' => '~~',
+	'Class:ServiceSubcategory/Attribute:service_name' => 'Szolgáltatás név',
+	'Class:ServiceSubcategory/Attribute:service_name+' => '~~',
+	'Class:ServiceSubcategory/Attribute:status' => 'Állapot',
+	'Class:ServiceSubcategory/Attribute:status+' => '~~',
+	'Class:ServiceSubcategory/Attribute:status/Value:implementation' => 'Megvalósítás alatt',
+	'Class:ServiceSubcategory/Attribute:status/Value:implementation+' => 'implementation~~',
+	'Class:ServiceSubcategory/Attribute:status/Value:obsolete' => 'Elavult',
+	'Class:ServiceSubcategory/Attribute:status/Value:obsolete+' => 'obsolete~~',
+	'Class:ServiceSubcategory/Attribute:status/Value:production' => 'Használatban',
+	'Class:ServiceSubcategory/Attribute:status/Value:production+' => 'production~~',
+	'Class:ServiceSubcategory/Attribute:request_type' => 'Kérelem típus',
+	'Class:ServiceSubcategory/Attribute:request_type+' => '~~',
+	'Class:ServiceSubcategory/Attribute:request_type/Value:incident' => 'Incidens',
+	'Class:ServiceSubcategory/Attribute:request_type/Value:incident+' => 'incident~~',
+	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request' => 'Szolgáltatás kérelem',
+	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request+' => 'service request~~',
+	'Class:ServiceSubcategory/Attribute:service_provider' => 'Szolgáltató név',
+	'Class:ServiceSubcategory/Attribute:service_org_id' => 'Szolgáltató',
 ));
 
 //
@@ -353,21 +361,21 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:SLA' => 'SLA',
-    'Class:SLA+' => '',
-    'Class:SLA/Attribute:name' => 'Név',
-    'Class:SLA/Attribute:name+' => '',
-    'Class:SLA/Attribute:description' => 'Leírás',
-    'Class:SLA/Attribute:description+' => '~~',
-    'Class:SLA/Attribute:org_id' => 'Szervezeti egység',
-    'Class:SLA/Attribute:org_id+' => '~~',
-    'Class:SLA/Attribute:organization_name' => 'Szervezeti egység név',
-    'Class:SLA/Attribute:organization_name+' => '~~',
-    'Class:SLA/Attribute:slts_list' => 'SLT-k',
-    'Class:SLA/Attribute:slts_list+' => 'All the service level targets for this SLA~~',
-    'Class:SLA/Attribute:customercontracts_list' => 'Ügyfélszerződések',
-    'Class:SLA/Attribute:customercontracts_list+' => 'All the customer contracts using this SLA~~',
-    'Class:SLA/Error:UniqueLnkCustomerContractToService' => 'Nem sikerült elmenteni a linket az Ügyfél szerződés %1$s és szolgáltatás %2$s : SLA már létezik',
+	'Class:SLA' => 'SLA',
+	'Class:SLA+' => '',
+	'Class:SLA/Attribute:name' => 'Név',
+	'Class:SLA/Attribute:name+' => '',
+	'Class:SLA/Attribute:description' => 'Leírás',
+	'Class:SLA/Attribute:description+' => '~~',
+	'Class:SLA/Attribute:org_id' => 'Szervezeti egység',
+	'Class:SLA/Attribute:org_id+' => '~~',
+	'Class:SLA/Attribute:organization_name' => 'Szervezeti egység név',
+	'Class:SLA/Attribute:organization_name+' => '~~',
+	'Class:SLA/Attribute:slts_list' => 'SLT-k',
+	'Class:SLA/Attribute:slts_list+' => 'All the service level targets for this SLA~~',
+	'Class:SLA/Attribute:customercontracts_list' => 'Ügyfélszerződések',
+	'Class:SLA/Attribute:customercontracts_list+' => 'All the customer contracts using this SLA~~',
+	'Class:SLA/Error:UniqueLnkCustomerContractToService' => 'Nem sikerült elmenteni a linket az Ügyfél szerződés %1$s és szolgáltatás %2$s : SLA már létezik',
 ));
 
 //
@@ -375,40 +383,40 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:SLT' => 'SLT',
-    'Class:SLT+' => '',
-    'Class:SLT/Attribute:name' => 'Név',
-    'Class:SLT/Attribute:name+' => '',
-    'Class:SLT/Attribute:priority' => 'Prioritás',
-    'Class:SLT/Attribute:priority+' => '~~',
-    'Class:SLT/Attribute:priority/Value:1' => 'Kritikus',
-    'Class:SLT/Attribute:priority/Value:1+' => 'critical~~',
-    'Class:SLT/Attribute:priority/Value:2' => 'Magas',
-    'Class:SLT/Attribute:priority/Value:2+' => 'high~~',
-    'Class:SLT/Attribute:priority/Value:3' => 'Közepes',
-    'Class:SLT/Attribute:priority/Value:3+' => 'medium~~',
-    'Class:SLT/Attribute:priority/Value:4' => 'Alacsony',
-    'Class:SLT/Attribute:priority/Value:4+' => 'low~~',
-    'Class:SLT/Attribute:request_type' => 'Kérelem típus',
-    'Class:SLT/Attribute:request_type+' => '~~',
-    'Class:SLT/Attribute:request_type/Value:incident' => 'Incidens',
-    'Class:SLT/Attribute:request_type/Value:incident+' => 'incident~~',
-    'Class:SLT/Attribute:request_type/Value:service_request' => 'Szolgáltatás kérelem',
-    'Class:SLT/Attribute:request_type/Value:service_request+' => 'service request~~',
-    'Class:SLT/Attribute:metric' => 'Metrika',
-    'Class:SLT/Attribute:metric+' => '',
-    'Class:SLT/Attribute:metric/Value:tto' => 'TTO',
-    'Class:SLT/Attribute:metric/Value:tto+' => 'TTO~~',
-    'Class:SLT/Attribute:metric/Value:ttr' => 'TTR',
-    'Class:SLT/Attribute:metric/Value:ttr+' => 'TTR~~',
-    'Class:SLT/Attribute:value' => 'Érték',
-    'Class:SLT/Attribute:value+' => '',
-    'Class:SLT/Attribute:unit' => 'Egység',
-    'Class:SLT/Attribute:unit+' => '~~',
-    'Class:SLT/Attribute:unit/Value:hours' => 'óra',
-    'Class:SLT/Attribute:unit/Value:hours+' => 'hours~~',
-    'Class:SLT/Attribute:unit/Value:minutes' => 'perc',
-    'Class:SLT/Attribute:unit/Value:minutes+' => 'minutes~~',
+	'Class:SLT' => 'SLT',
+	'Class:SLT+' => '',
+	'Class:SLT/Attribute:name' => 'Név',
+	'Class:SLT/Attribute:name+' => '',
+	'Class:SLT/Attribute:priority' => 'Prioritás',
+	'Class:SLT/Attribute:priority+' => '~~',
+	'Class:SLT/Attribute:priority/Value:1' => 'Kritikus',
+	'Class:SLT/Attribute:priority/Value:1+' => 'critical~~',
+	'Class:SLT/Attribute:priority/Value:2' => 'Magas',
+	'Class:SLT/Attribute:priority/Value:2+' => 'high~~',
+	'Class:SLT/Attribute:priority/Value:3' => 'Közepes',
+	'Class:SLT/Attribute:priority/Value:3+' => 'medium~~',
+	'Class:SLT/Attribute:priority/Value:4' => 'Alacsony',
+	'Class:SLT/Attribute:priority/Value:4+' => 'low~~',
+	'Class:SLT/Attribute:request_type' => 'Kérelem típus',
+	'Class:SLT/Attribute:request_type+' => '~~',
+	'Class:SLT/Attribute:request_type/Value:incident' => 'Incidens',
+	'Class:SLT/Attribute:request_type/Value:incident+' => 'incident~~',
+	'Class:SLT/Attribute:request_type/Value:service_request' => 'Szolgáltatás kérelem',
+	'Class:SLT/Attribute:request_type/Value:service_request+' => 'service request~~',
+	'Class:SLT/Attribute:metric' => 'Metrika',
+	'Class:SLT/Attribute:metric+' => '',
+	'Class:SLT/Attribute:metric/Value:tto' => 'TTO',
+	'Class:SLT/Attribute:metric/Value:tto+' => 'TTO~~',
+	'Class:SLT/Attribute:metric/Value:ttr' => 'TTR',
+	'Class:SLT/Attribute:metric/Value:ttr+' => 'TTR~~',
+	'Class:SLT/Attribute:value' => 'Érték',
+	'Class:SLT/Attribute:value+' => '',
+	'Class:SLT/Attribute:unit' => 'Egység',
+	'Class:SLT/Attribute:unit+' => '~~',
+	'Class:SLT/Attribute:unit/Value:hours' => 'óra',
+	'Class:SLT/Attribute:unit/Value:hours+' => 'hours~~',
+	'Class:SLT/Attribute:unit/Value:minutes' => 'perc',
+	'Class:SLT/Attribute:unit/Value:minutes+' => 'minutes~~',
 ));
 
 //
@@ -416,26 +424,27 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:lnkSLAToSLT' => 'SLA / SLT',
-    'Class:lnkSLAToSLT+' => '~~',
-    'Class:lnkSLAToSLT/Attribute:sla_id' => 'SLA',
-    'Class:lnkSLAToSLT/Attribute:sla_id+' => '~~',
-    'Class:lnkSLAToSLT/Attribute:sla_name' => 'SLA név',
-    'Class:lnkSLAToSLT/Attribute:sla_name+' => '~~',
-    'Class:lnkSLAToSLT/Attribute:slt_id' => 'SLT',
-    'Class:lnkSLAToSLT/Attribute:slt_id+' => '~~',
-    'Class:lnkSLAToSLT/Attribute:slt_name' => 'SLT név',
-    'Class:lnkSLAToSLT/Attribute:slt_name+' => '~~',
-    'Class:lnkSLAToSLT/Attribute:slt_metric' => 'SLT metrika',
-    'Class:lnkSLAToSLT/Attribute:slt_metric+' => '~~',
-    'Class:lnkSLAToSLT/Attribute:slt_request_type' => 'SLT kérelem típus',
-    'Class:lnkSLAToSLT/Attribute:slt_request_type+' => '~~',
-    'Class:lnkSLAToSLT/Attribute:slt_ticket_priority' => 'SLT hibajegy prioritás',
-    'Class:lnkSLAToSLT/Attribute:slt_ticket_priority+' => '~~',
-    'Class:lnkSLAToSLT/Attribute:slt_value' => 'SLT érték',
-    'Class:lnkSLAToSLT/Attribute:slt_value+' => '~~',
-    'Class:lnkSLAToSLT/Attribute:slt_value_unit' => 'SLT érték egység',
-    'Class:lnkSLAToSLT/Attribute:slt_value_unit+' => '~~',
+	'Class:lnkSLAToSLT' => 'SLA / SLT',
+	'Class:lnkSLAToSLT+' => '~~',
+	'Class:lnkSLAToSLT/Name' => '%1$s / %2$s~~',
+	'Class:lnkSLAToSLT/Attribute:sla_id' => 'SLA',
+	'Class:lnkSLAToSLT/Attribute:sla_id+' => '~~',
+	'Class:lnkSLAToSLT/Attribute:sla_name' => 'SLA név',
+	'Class:lnkSLAToSLT/Attribute:sla_name+' => '~~',
+	'Class:lnkSLAToSLT/Attribute:slt_id' => 'SLT',
+	'Class:lnkSLAToSLT/Attribute:slt_id+' => '~~',
+	'Class:lnkSLAToSLT/Attribute:slt_name' => 'SLT név',
+	'Class:lnkSLAToSLT/Attribute:slt_name+' => '~~',
+	'Class:lnkSLAToSLT/Attribute:slt_metric' => 'SLT metrika',
+	'Class:lnkSLAToSLT/Attribute:slt_metric+' => '~~',
+	'Class:lnkSLAToSLT/Attribute:slt_request_type' => 'SLT kérelem típus',
+	'Class:lnkSLAToSLT/Attribute:slt_request_type+' => '~~',
+	'Class:lnkSLAToSLT/Attribute:slt_ticket_priority' => 'SLT hibajegy prioritás',
+	'Class:lnkSLAToSLT/Attribute:slt_ticket_priority+' => '~~',
+	'Class:lnkSLAToSLT/Attribute:slt_value' => 'SLT érték',
+	'Class:lnkSLAToSLT/Attribute:slt_value+' => '~~',
+	'Class:lnkSLAToSLT/Attribute:slt_value_unit' => 'SLT érték egység',
+	'Class:lnkSLAToSLT/Attribute:slt_value_unit+' => '~~',
 ));
 
 //
@@ -443,20 +452,21 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:lnkCustomerContractToService' => 'Ügyfélszerződés / Szolgáltatás',
-    'Class:lnkCustomerContractToService+' => '~~',
-    'Class:lnkCustomerContractToService/Attribute:customercontract_id' => 'Ügyfélszerződés',
-    'Class:lnkCustomerContractToService/Attribute:customercontract_id+' => '~~',
-    'Class:lnkCustomerContractToService/Attribute:customercontract_name' => 'Ügyfélszerződés név',
-    'Class:lnkCustomerContractToService/Attribute:customercontract_name+' => '~~',
-    'Class:lnkCustomerContractToService/Attribute:service_id' => 'Szolgáltatás',
-    'Class:lnkCustomerContractToService/Attribute:service_id+' => '~~',
-    'Class:lnkCustomerContractToService/Attribute:service_name' => 'Szolgáltatás név',
-    'Class:lnkCustomerContractToService/Attribute:service_name+' => '~~',
-    'Class:lnkCustomerContractToService/Attribute:sla_id' => 'SLA',
-    'Class:lnkCustomerContractToService/Attribute:sla_id+' => '~~',
-    'Class:lnkCustomerContractToService/Attribute:sla_name' => 'SLA név',
-    'Class:lnkCustomerContractToService/Attribute:sla_name+' => '~~',
+	'Class:lnkCustomerContractToService' => 'Ügyfélszerződés / Szolgáltatás',
+	'Class:lnkCustomerContractToService+' => '~~',
+	'Class:lnkCustomerContractToService/Name' => '%1$s / %2$s~~',
+	'Class:lnkCustomerContractToService/Attribute:customercontract_id' => 'Ügyfélszerződés',
+	'Class:lnkCustomerContractToService/Attribute:customercontract_id+' => '~~',
+	'Class:lnkCustomerContractToService/Attribute:customercontract_name' => 'Ügyfélszerződés név',
+	'Class:lnkCustomerContractToService/Attribute:customercontract_name+' => '~~',
+	'Class:lnkCustomerContractToService/Attribute:service_id' => 'Szolgáltatás',
+	'Class:lnkCustomerContractToService/Attribute:service_id+' => '~~',
+	'Class:lnkCustomerContractToService/Attribute:service_name' => 'Szolgáltatás név',
+	'Class:lnkCustomerContractToService/Attribute:service_name+' => '~~',
+	'Class:lnkCustomerContractToService/Attribute:sla_id' => 'SLA',
+	'Class:lnkCustomerContractToService/Attribute:sla_id+' => '~~',
+	'Class:lnkCustomerContractToService/Attribute:sla_name' => 'SLA név',
+	'Class:lnkCustomerContractToService/Attribute:sla_name+' => '~~',
 ));
 
 //
@@ -464,16 +474,17 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:lnkCustomerContractToProviderContract' => 'Ügyfélszerződés / Szolgáltatói szerződés',
-    'Class:lnkCustomerContractToProviderContract+' => '',
-    'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_id' => 'Ügyfélszerződés',
-    'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_id+' => '~~',
-    'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_name' => 'Ügyfélszerződés név',
-    'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_name+' => '~~',
-    'Class:lnkCustomerContractToProviderContract/Attribute:providercontract_id' => 'Szolgáltatói szerződés',
-    'Class:lnkCustomerContractToProviderContract/Attribute:providercontract_id+' => '~~',
-    'Class:lnkCustomerContractToProviderContract/Attribute:providercontract_name' => 'Szolgáltatói szerződés név',
-    'Class:lnkCustomerContractToProviderContract/Attribute:providercontract_name+' => '~~',
+	'Class:lnkCustomerContractToProviderContract' => 'Ügyfélszerződés / Szolgáltatói szerződés',
+	'Class:lnkCustomerContractToProviderContract+' => '',
+	'Class:lnkCustomerContractToProviderContract/Name' => '%1$s / %2$s~~',
+	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_id' => 'Ügyfélszerződés',
+	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_id+' => '~~',
+	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_name' => 'Ügyfélszerződés név',
+	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_name+' => '~~',
+	'Class:lnkCustomerContractToProviderContract/Attribute:providercontract_id' => 'Szolgáltatói szerződés',
+	'Class:lnkCustomerContractToProviderContract/Attribute:providercontract_id+' => '~~',
+	'Class:lnkCustomerContractToProviderContract/Attribute:providercontract_name' => 'Szolgáltatói szerződés név',
+	'Class:lnkCustomerContractToProviderContract/Attribute:providercontract_name+' => '~~',
 ));
 
 //
@@ -481,16 +492,17 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:lnkCustomerContractToFunctionalCI' => 'Ügyfélszerződés / Funkcionális CI',
-    'Class:lnkCustomerContractToFunctionalCI+' => '~~',
-    'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_id' => 'Ügyfélszerződés',
-    'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_id+' => '~~',
-    'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_name' => 'Ügyfélszerződés név',
-    'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_name+' => '~~',
-    'Class:lnkCustomerContractToFunctionalCI/Attribute:functionalci_id' => 'CI',
-    'Class:lnkCustomerContractToFunctionalCI/Attribute:functionalci_id+' => '~~',
-    'Class:lnkCustomerContractToFunctionalCI/Attribute:functionalci_name' => 'CI név',
-    'Class:lnkCustomerContractToFunctionalCI/Attribute:functionalci_name+' => '~~',
+	'Class:lnkCustomerContractToFunctionalCI' => 'Ügyfélszerződés / Funkcionális CI',
+	'Class:lnkCustomerContractToFunctionalCI+' => '~~',
+	'Class:lnkCustomerContractToFunctionalCI/Name' => '%1$s / %2$s~~',
+	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_id' => 'Ügyfélszerződés',
+	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_id+' => '~~',
+	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_name' => 'Ügyfélszerződés név',
+	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_name+' => '~~',
+	'Class:lnkCustomerContractToFunctionalCI/Attribute:functionalci_id' => 'CI',
+	'Class:lnkCustomerContractToFunctionalCI/Attribute:functionalci_id+' => '~~',
+	'Class:lnkCustomerContractToFunctionalCI/Attribute:functionalci_name' => 'CI név',
+	'Class:lnkCustomerContractToFunctionalCI/Attribute:functionalci_name+' => '~~',
 ));
 
 //
@@ -498,20 +510,20 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:DeliveryModel' => 'Teljesítési modell',
-    'Class:DeliveryModel+' => '~~',
-    'Class:DeliveryModel/Attribute:name' => 'Név',
-    'Class:DeliveryModel/Attribute:name+' => '~~',
-    'Class:DeliveryModel/Attribute:org_id' => 'Szervezeti egység',
-    'Class:DeliveryModel/Attribute:org_id+' => '~~',
-    'Class:DeliveryModel/Attribute:organization_name' => 'Szervezeti egység név',
-    'Class:DeliveryModel/Attribute:organization_name+' => '~~',
-    'Class:DeliveryModel/Attribute:description' => 'Leírás',
-    'Class:DeliveryModel/Attribute:description+' => '~~',
-    'Class:DeliveryModel/Attribute:contacts_list' => 'Kapcsolattartók',
-    'Class:DeliveryModel/Attribute:contacts_list+' => 'All the contacts (Teams and Person) for this delivery model~~',
-    'Class:DeliveryModel/Attribute:customers_list' => 'Ügyfelek',
-    'Class:DeliveryModel/Attribute:customers_list+' => 'All the customers having this delivering model~~',
+	'Class:DeliveryModel' => 'Teljesítési modell',
+	'Class:DeliveryModel+' => '~~',
+	'Class:DeliveryModel/Attribute:name' => 'Név',
+	'Class:DeliveryModel/Attribute:name+' => '~~',
+	'Class:DeliveryModel/Attribute:org_id' => 'Szervezeti egység',
+	'Class:DeliveryModel/Attribute:org_id+' => '~~',
+	'Class:DeliveryModel/Attribute:organization_name' => 'Szervezeti egység név',
+	'Class:DeliveryModel/Attribute:organization_name+' => '~~',
+	'Class:DeliveryModel/Attribute:description' => 'Leírás',
+	'Class:DeliveryModel/Attribute:description+' => '~~',
+	'Class:DeliveryModel/Attribute:contacts_list' => 'Kapcsolattartók',
+	'Class:DeliveryModel/Attribute:contacts_list+' => 'All the contacts (Teams and Person) for this delivery model~~',
+	'Class:DeliveryModel/Attribute:customers_list' => 'Ügyfelek',
+	'Class:DeliveryModel/Attribute:customers_list+' => 'All the customers having this delivering model~~',
 ));
 
 //
@@ -519,19 +531,19 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:lnkDeliveryModelToContact' => 'Teljesítési modell / Kapcsolattartó',
-    'Class:lnkDeliveryModelToContact+' => '~~',
-    'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id' => 'Teljesítési modell',
-    'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id+' => '~~',
-    'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name' => 'Teljesítési modell név',
-    'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name+' => '~~',
-    'Class:lnkDeliveryModelToContact/Attribute:contact_id' => 'Kapcsolattartó',
-    'Class:lnkDeliveryModelToContact/Attribute:contact_id+' => '~~',
-    'Class:lnkDeliveryModelToContact/Attribute:contact_name' => 'Kapcsolattartó név',
-    'Class:lnkDeliveryModelToContact/Attribute:contact_name+' => '~~',
-    'Class:lnkDeliveryModelToContact/Attribute:role_id' => 'Beosztás',
-    'Class:lnkDeliveryModelToContact/Attribute:role_id+' => '~~',
-    'Class:lnkDeliveryModelToContact/Attribute:role_name' => 'Beosztás név',
-    'Class:lnkDeliveryModelToContact/Attribute:role_name+' => '~~',
+	'Class:lnkDeliveryModelToContact' => 'Teljesítési modell / Kapcsolattartó',
+	'Class:lnkDeliveryModelToContact+' => '~~',
+	'Class:lnkDeliveryModelToContact/Name' => '%1$s / %2$s~~',
+	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id' => 'Teljesítési modell',
+	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id+' => '~~',
+	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name' => 'Teljesítési modell név',
+	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name+' => '~~',
+	'Class:lnkDeliveryModelToContact/Attribute:contact_id' => 'Kapcsolattartó',
+	'Class:lnkDeliveryModelToContact/Attribute:contact_id+' => '~~',
+	'Class:lnkDeliveryModelToContact/Attribute:contact_name' => 'Kapcsolattartó név',
+	'Class:lnkDeliveryModelToContact/Attribute:contact_name+' => '~~',
+	'Class:lnkDeliveryModelToContact/Attribute:role_id' => 'Beosztás',
+	'Class:lnkDeliveryModelToContact/Attribute:role_id+' => '~~',
+	'Class:lnkDeliveryModelToContact/Attribute:role_name' => 'Beosztás név',
+	'Class:lnkDeliveryModelToContact/Attribute:role_name+' => '~~',
 ));
-
diff --git a/datamodels/2.x/itop-service-mgmt-provider/dictionaries/it.dict.itop-service-mgmt-provider.php b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/it.dict.itop-service-mgmt-provider.php
index 21dc91fafe..2d076ccdb5 100644
--- a/datamodels/2.x/itop-service-mgmt-provider/dictionaries/it.dict.itop-service-mgmt-provider.php
+++ b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/it.dict.itop-service-mgmt-provider.php
@@ -37,7 +37,6 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Contratti per livello di servizio',
 	'UI-ServiceManagementMenu-ContractsByStatus' => 'Contratti per stato',
 	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contratti che terminano in meno di 30 giorni',
-
 	'Menu:ProviderContract' => 'Contratti con Provider',
 	'Menu:ProviderContract+' => 'Contratti con Provider',
 	'Menu:CustomerContract' => 'Contratti con Clienti',
@@ -56,9 +55,11 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Menu:DeliveryModel+' => 'Delivery models~~',
 	'Menu:ServiceFamily' => 'Service families~~',
 	'Menu:ServiceFamily+' => 'Service families~~',
+	'Contract:baseinfo' => 'General information~~',
+	'Contract:moreinfo' => 'Contractual information~~',
+	'Contract:cost' => 'Cost information~~',
 ));
 
-
 /*
 	'UI:ServiceManagementMenu' => 'Gestion des Services',
 	'UI:ServiceManagementMenu+' => 'Gestion des Services',
@@ -183,6 +184,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:lnkContactToContract' => 'Link Contact / Contract~~',
 	'Class:lnkContactToContract+' => '~~',
+	'Class:lnkContactToContract/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToContract/Attribute:contract_id' => 'Contract~~',
 	'Class:lnkContactToContract/Attribute:contract_id+' => '~~',
 	'Class:lnkContactToContract/Attribute:contract_name' => 'Contract Name~~',
@@ -200,6 +202,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:lnkContractToDocument' => 'Link Contract / Document~~',
 	'Class:lnkContractToDocument+' => '~~',
+	'Class:lnkContractToDocument/Name' => '%1$s / %2$s~~',
 	'Class:lnkContractToDocument/Attribute:contract_id' => 'Contract~~',
 	'Class:lnkContractToDocument/Attribute:contract_id+' => '~~',
 	'Class:lnkContractToDocument/Attribute:contract_name' => 'Contract Name~~',
@@ -217,6 +220,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:lnkFunctionalCIToProviderContract' => 'Link FunctionalCI / ProviderContract~~',
 	'Class:lnkFunctionalCIToProviderContract+' => '~~',
+	'Class:lnkFunctionalCIToProviderContract/Name' => '%1$s / %2$s~~',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Provider contract~~',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '~~',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Provider contract Name~~',
@@ -249,6 +253,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:Service' => 'Servizio',
 	'Class:Service+' => '',
+	'Class:Service/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Service/Attribute:name' => 'Nome',
 	'Class:Service/Attribute:name+' => '',
 	'Class:Service/Attribute:org_id' => 'Provider',
@@ -288,6 +293,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:lnkDocumentToService' => 'Link Document / Service~~',
 	'Class:lnkDocumentToService+' => '~~',
+	'Class:lnkDocumentToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToService/Attribute:service_id' => 'Service~~',
 	'Class:lnkDocumentToService/Attribute:service_id+' => '~~',
 	'Class:lnkDocumentToService/Attribute:service_name' => 'Service Name~~',
@@ -305,6 +311,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:lnkContactToService' => 'Link Contact / Service~~',
 	'Class:lnkContactToService+' => '~~',
+	'Class:lnkContactToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToService/Attribute:service_id' => 'Service~~',
 	'Class:lnkContactToService/Attribute:service_id+' => '~~',
 	'Class:lnkContactToService/Attribute:service_name' => 'Service Name~~',
@@ -322,6 +329,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:ServiceSubcategory' => 'Sottocategorie del servizio',
 	'Class:ServiceSubcategory+' => '',
+	'Class:ServiceSubcategory/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:ServiceSubcategory/Attribute:name' => 'Nome',
 	'Class:ServiceSubcategory/Attribute:name+' => '',
 	'Class:ServiceSubcategory/Attribute:description' => 'Descrizione',
@@ -418,6 +426,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:lnkSLAToSLT' => 'Link SLA / SLT~~',
 	'Class:lnkSLAToSLT+' => '~~',
+	'Class:lnkSLAToSLT/Name' => '%1$s / %2$s~~',
 	'Class:lnkSLAToSLT/Attribute:sla_id' => 'SLA~~',
 	'Class:lnkSLAToSLT/Attribute:sla_id+' => '~~',
 	'Class:lnkSLAToSLT/Attribute:sla_name' => 'SLA Name~~',
@@ -445,6 +454,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:lnkCustomerContractToService' => 'Link Customer Contract / Service~~',
 	'Class:lnkCustomerContractToService+' => '~~',
+	'Class:lnkCustomerContractToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_id' => 'Customer contract~~',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_id+' => '~~',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_name' => 'Customer contract Name~~',
@@ -466,6 +476,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:lnkCustomerContractToProviderContract' => 'Link Customer Contract / Provider Contract~~',
 	'Class:lnkCustomerContractToProviderContract+' => '~~',
+	'Class:lnkCustomerContractToProviderContract/Name' => '%1$s / %2$s~~',
 	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_id' => 'Customer contract~~',
 	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_id+' => '~~',
 	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_name' => 'Customer contract Name~~',
@@ -483,6 +494,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:lnkCustomerContractToFunctionalCI' => 'Link Customer Contract / FunctionalCI~~',
 	'Class:lnkCustomerContractToFunctionalCI+' => '~~',
+	'Class:lnkCustomerContractToFunctionalCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_id' => 'Customer contract~~',
 	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_id+' => '~~',
 	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_name' => 'Customer contract Name~~',
@@ -521,6 +533,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:lnkDeliveryModelToContact' => 'Link DeliveryModel / Contact~~',
 	'Class:lnkDeliveryModelToContact+' => '~~',
+	'Class:lnkDeliveryModelToContact/Name' => '%1$s / %2$s~~',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id' => 'Delivery model~~',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id+' => '~~',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name' => 'Delivery model name~~',
diff --git a/datamodels/2.x/itop-service-mgmt-provider/dictionaries/ja.dict.itop-service-mgmt-provider.php b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/ja.dict.itop-service-mgmt-provider.php
index 7a4ea0fe10..bb50676152 100644
--- a/datamodels/2.x/itop-service-mgmt-provider/dictionaries/ja.dict.itop-service-mgmt-provider.php
+++ b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/ja.dict.itop-service-mgmt-provider.php
@@ -27,7 +27,6 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'サービスレベル別の契約',
 	'UI-ServiceManagementMenu-ContractsByStatus' => '状態別の契約',
 	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => '30日以内に終わる契約',
-
 	'Menu:ProviderContract' => 'プロバイダー契約',
 	'Menu:ProviderContract+' => '',
 	'Menu:CustomerContract' => '顧客契約',
@@ -46,9 +45,11 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Menu:DeliveryModel+' => '',
 	'Menu:ServiceFamily' => 'サービスファミリ',
 	'Menu:ServiceFamily+' => 'サービスファミリ',
+	'Contract:baseinfo' => 'General information~~',
+	'Contract:moreinfo' => 'Contractual information~~',
+	'Contract:cost' => 'Cost information~~',
 ));
 
-
 /*
 	'UI:ServiceManagementMenu' => 'Gestion des Services',
 	'UI:ServiceManagementMenu+' => 'Gestion des Services',
@@ -173,6 +174,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:lnkContactToContract' => 'リンク 連絡先/契約',
 	'Class:lnkContactToContract+' => '',
+	'Class:lnkContactToContract/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToContract/Attribute:contract_id' => '契約',
 	'Class:lnkContactToContract/Attribute:contract_id+' => '',
 	'Class:lnkContactToContract/Attribute:contract_name' => '契約名',
@@ -190,6 +192,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:lnkContractToDocument' => 'リンク 契約/文書',
 	'Class:lnkContractToDocument+' => '',
+	'Class:lnkContractToDocument/Name' => '%1$s / %2$s~~',
 	'Class:lnkContractToDocument/Attribute:contract_id' => '契約',
 	'Class:lnkContractToDocument/Attribute:contract_id+' => '',
 	'Class:lnkContractToDocument/Attribute:contract_name' => '契約名',
@@ -207,6 +210,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:lnkFunctionalCIToProviderContract' => 'リンク 機能的CI/プロバイダー契約',
 	'Class:lnkFunctionalCIToProviderContract+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Name' => '%1$s / %2$s~~',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'プロバイダー契約',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'プロバイダー契約名',
@@ -239,6 +243,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:Service' => 'サービス',
 	'Class:Service+' => '',
+	'Class:Service/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Service/Attribute:name' => '名前',
 	'Class:Service/Attribute:name+' => '',
 	'Class:Service/Attribute:org_id' => '組織',
@@ -278,6 +283,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:lnkDocumentToService' => 'リンク 文書/サービス',
 	'Class:lnkDocumentToService+' => '',
+	'Class:lnkDocumentToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToService/Attribute:service_id' => 'サービス',
 	'Class:lnkDocumentToService/Attribute:service_id+' => '',
 	'Class:lnkDocumentToService/Attribute:service_name' => 'サービス名',
@@ -295,6 +301,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:lnkContactToService' => 'リンク 連絡先/サービス',
 	'Class:lnkContactToService+' => '',
+	'Class:lnkContactToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToService/Attribute:service_id' => 'サービス',
 	'Class:lnkContactToService/Attribute:service_id+' => '',
 	'Class:lnkContactToService/Attribute:service_name' => 'サービス名',
@@ -312,6 +319,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:ServiceSubcategory' => 'サービスサブカテゴリ',
 	'Class:ServiceSubcategory+' => '',
+	'Class:ServiceSubcategory/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:ServiceSubcategory/Attribute:name' => '名前',
 	'Class:ServiceSubcategory/Attribute:name+' => '',
 	'Class:ServiceSubcategory/Attribute:description' => '説明',
@@ -408,6 +416,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:lnkSLAToSLT' => 'リンク SLA/SLT',
 	'Class:lnkSLAToSLT+' => '',
+	'Class:lnkSLAToSLT/Name' => '%1$s / %2$s~~',
 	'Class:lnkSLAToSLT/Attribute:sla_id' => 'SLA',
 	'Class:lnkSLAToSLT/Attribute:sla_id+' => '',
 	'Class:lnkSLAToSLT/Attribute:sla_name' => 'SLA名',
@@ -435,6 +444,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:lnkCustomerContractToService' => 'リンク 顧客契約/サービス',
 	'Class:lnkCustomerContractToService+' => '',
+	'Class:lnkCustomerContractToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_id' => '顧客契約',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_id+' => '',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_name' => '顧客契約名',
@@ -456,6 +466,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:lnkCustomerContractToProviderContract' => 'リンク 顧客契約/プロバイダー契約',
 	'Class:lnkCustomerContractToProviderContract+' => '',
+	'Class:lnkCustomerContractToProviderContract/Name' => '%1$s / %2$s~~',
 	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_id' => '顧客契約',
 	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_id+' => '',
 	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_name' => '顧客契約名',
@@ -473,6 +484,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:lnkCustomerContractToFunctionalCI' => 'リンク 顧客契約/機能的CI',
 	'Class:lnkCustomerContractToFunctionalCI+' => '',
+	'Class:lnkCustomerContractToFunctionalCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_id' => '顧客契約',
 	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_id+' => '',
 	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_name' => '顧客契約名',
@@ -511,6 +523,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:lnkDeliveryModelToContact' => 'リンク 提供モデル/契約',
 	'Class:lnkDeliveryModelToContact+' => '',
+	'Class:lnkDeliveryModelToContact/Name' => '%1$s / %2$s~~',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id' => '提供モデル',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id+' => '',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name' => '提供モデル名',
diff --git a/datamodels/2.x/itop-service-mgmt-provider/dictionaries/nl.dict.itop-service-mgmt-provider.php b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/nl.dict.itop-service-mgmt-provider.php
index e0d0d3e8b3..5da8003dc6 100644
--- a/datamodels/2.x/itop-service-mgmt-provider/dictionaries/nl.dict.itop-service-mgmt-provider.php
+++ b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/nl.dict.itop-service-mgmt-provider.php
@@ -42,7 +42,6 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Contracten per servicelevel',
 	'UI-ServiceManagementMenu-ContractsByStatus' => 'Contracten per status',
 	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contracten die in minder dan 30 dagen verlopen',
-
 	'Menu:ProviderContract' => 'Leverancierscontracten',
 	'Menu:ProviderContract+' => 'Leverancierscontracten',
 	'Menu:CustomerContract' => 'Klantencontracten',
@@ -61,9 +60,11 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Menu:DeliveryModel+' => 'Leveringsmodellen',
 	'Menu:ServiceFamily' => 'Servicecategorieën',
 	'Menu:ServiceFamily+' => 'Servicecategorieën',
+	'Contract:baseinfo' => 'General information~~',
+	'Contract:moreinfo' => 'Contractual information~~',
+	'Contract:cost' => 'Cost information~~',
 ));
 
-
 /*
 	'UI:ServiceManagementMenu' => 'Gestion des Services',
 	'UI:ServiceManagementMenu+' => 'Gestion des Services',
@@ -188,6 +189,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:lnkContactToContract' => 'Link Contact / Contract',
 	'Class:lnkContactToContract+' => '',
+	'Class:lnkContactToContract/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToContract/Attribute:contract_id' => 'Contract',
 	'Class:lnkContactToContract/Attribute:contract_id+' => '',
 	'Class:lnkContactToContract/Attribute:contract_name' => 'Naam contract',
@@ -205,6 +207,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:lnkContractToDocument' => 'Link Contract / Document',
 	'Class:lnkContractToDocument+' => '',
+	'Class:lnkContractToDocument/Name' => '%1$s / %2$s~~',
 	'Class:lnkContractToDocument/Attribute:contract_id' => 'Contract',
 	'Class:lnkContractToDocument/Attribute:contract_id+' => '',
 	'Class:lnkContractToDocument/Attribute:contract_name' => 'Naam contract',
@@ -222,6 +225,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:lnkFunctionalCIToProviderContract' => 'Link Functioneel CI / Leverancierscontract',
 	'Class:lnkFunctionalCIToProviderContract+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Name' => '%1$s / %2$s~~',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Leverancierscontract',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Naam Leverancierscontract',
@@ -254,6 +258,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:Service' => 'Service',
 	'Class:Service+' => '',
+	'Class:Service/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Service/Attribute:name' => 'Naam',
 	'Class:Service/Attribute:name+' => '',
 	'Class:Service/Attribute:org_id' => 'Leverancier',
@@ -293,6 +298,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:lnkDocumentToService' => 'Link Document / Service',
 	'Class:lnkDocumentToService+' => '',
+	'Class:lnkDocumentToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToService/Attribute:service_id' => 'Service',
 	'Class:lnkDocumentToService/Attribute:service_id+' => '',
 	'Class:lnkDocumentToService/Attribute:service_name' => 'Naam service',
@@ -310,6 +316,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:lnkContactToService' => 'Link Contact / Service',
 	'Class:lnkContactToService+' => '',
+	'Class:lnkContactToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToService/Attribute:service_id' => 'Service',
 	'Class:lnkContactToService/Attribute:service_id+' => '',
 	'Class:lnkContactToService/Attribute:service_name' => 'Naam service',
@@ -327,6 +334,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:ServiceSubcategory' => 'Subcategorie service',
 	'Class:ServiceSubcategory+' => '',
+	'Class:ServiceSubcategory/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:ServiceSubcategory/Attribute:name' => 'Naam',
 	'Class:ServiceSubcategory/Attribute:name+' => '',
 	'Class:ServiceSubcategory/Attribute:description' => 'Omschrijving',
@@ -423,6 +431,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:lnkSLAToSLT' => 'Link SLA / SLT',
 	'Class:lnkSLAToSLT+' => '',
+	'Class:lnkSLAToSLT/Name' => '%1$s / %2$s~~',
 	'Class:lnkSLAToSLT/Attribute:sla_id' => 'SLA',
 	'Class:lnkSLAToSLT/Attribute:sla_id+' => '',
 	'Class:lnkSLAToSLT/Attribute:sla_name' => 'Naam SLA',
@@ -450,6 +459,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:lnkCustomerContractToService' => 'Link Klantencontract / Service',
 	'Class:lnkCustomerContractToService+' => '',
+	'Class:lnkCustomerContractToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_id' => 'Klantencontract',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_id+' => '',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_name' => 'Naam klantencontract',
@@ -471,6 +481,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:lnkCustomerContractToProviderContract' => 'Link Klantencontract / Leverancierscontract',
 	'Class:lnkCustomerContractToProviderContract+' => '',
+	'Class:lnkCustomerContractToProviderContract/Name' => '%1$s / %2$s~~',
 	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_id' => 'Klantencontract',
 	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_id+' => '',
 	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_name' => 'Naam klantencontract',
@@ -488,6 +499,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:lnkCustomerContractToFunctionalCI' => 'Link Klantencontract / Functioneel CI',
 	'Class:lnkCustomerContractToFunctionalCI+' => '',
+	'Class:lnkCustomerContractToFunctionalCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_id' => 'Klantencontract',
 	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_id+' => '',
 	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_name' => 'Naam klantencontract',
@@ -526,6 +538,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:lnkDeliveryModelToContact' => 'Link Leveringsmodel / Contact',
 	'Class:lnkDeliveryModelToContact+' => '',
+	'Class:lnkDeliveryModelToContact/Name' => '%1$s / %2$s~~',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id' => 'Leveringsmodel',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id+' => '',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name' => 'Naam leveringsmodel',
diff --git a/datamodels/2.x/itop-service-mgmt-provider/dictionaries/pl.dict.itop-service-mgmt-provider.php b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/pl.dict.itop-service-mgmt-provider.php
index 4c83be56c2..b8f315b052 100644
--- a/datamodels/2.x/itop-service-mgmt-provider/dictionaries/pl.dict.itop-service-mgmt-provider.php
+++ b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/pl.dict.itop-service-mgmt-provider.php
@@ -20,7 +20,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/>
  */
-
 // Dictionnay conventions
 // Class:<class_name>
 // Class:<class_name>+
@@ -30,8 +29,6 @@
 // Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
 // Class:<class_name>/Stimulus:<stimulus_code>
 // Class:<class_name>/Stimulus:<stimulus_code>+
-
-
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Menu:ServiceManagement' => 'Zarządzanie usługami',
 	'Menu:ServiceManagement+' => 'Omówienie zarządzania usługami',
@@ -40,7 +37,6 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Umowy według poziomu usług',
 	'UI-ServiceManagementMenu-ContractsByStatus' => 'Umowy według statusu',
 	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Umowy kończące się za mniej niż 30 dni',
-
 	'Menu:ProviderContract' => 'Umowy z dostawcami',
 	'Menu:ProviderContract+' => 'Umowy z dostawcami',
 	'Menu:CustomerContract' => 'Umowy z klientami',
@@ -59,9 +55,11 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Menu:DeliveryModel+' => 'Modele obsługi',
 	'Menu:ServiceFamily' => 'Rodziny usług',
 	'Menu:ServiceFamily+' => 'Rodziny usług',
+	'Contract:baseinfo' => 'General information~~',
+	'Contract:moreinfo' => 'Contractual information~~',
+	'Contract:cost' => 'Cost information~~',
 ));
 
-
 /*
 	'UI:ServiceManagementMenu' => 'Gestion des Services',
 	'UI:ServiceManagementMenu+' => 'Gestion des Services',
@@ -186,6 +184,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:lnkContactToContract' => 'Połączenie Kontakt / Umowa',
 	'Class:lnkContactToContract+' => '',
+	'Class:lnkContactToContract/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToContract/Attribute:contract_id' => 'Umowa',
 	'Class:lnkContactToContract/Attribute:contract_id+' => '',
 	'Class:lnkContactToContract/Attribute:contract_name' => 'Nazwa umowy',
@@ -203,6 +202,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:lnkContractToDocument' => 'Połączenie Umowa / Dokument',
 	'Class:lnkContractToDocument+' => '',
+	'Class:lnkContractToDocument/Name' => '%1$s / %2$s~~',
 	'Class:lnkContractToDocument/Attribute:contract_id' => 'Umowa',
 	'Class:lnkContractToDocument/Attribute:contract_id+' => '',
 	'Class:lnkContractToDocument/Attribute:contract_name' => 'Nazwa umowy',
@@ -220,6 +220,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:lnkFunctionalCIToProviderContract' => 'Połączenie Konfiguracja / Umowa z dostawcą',
 	'Class:lnkFunctionalCIToProviderContract+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Name' => '%1$s / %2$s~~',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Umowa z dostawcą',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Nazwa umowy z dostawcą',
@@ -252,6 +253,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:Service' => 'Usługa',
 	'Class:Service+' => '',
+	'Class:Service/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Service/Attribute:name' => 'Nazwa',
 	'Class:Service/Attribute:name+' => '',
 	'Class:Service/Attribute:org_id' => 'Dostawca',
@@ -291,6 +293,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:lnkDocumentToService' => 'Połączenie Dokument / Usługa',
 	'Class:lnkDocumentToService+' => '',
+	'Class:lnkDocumentToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToService/Attribute:service_id' => 'Usługa',
 	'Class:lnkDocumentToService/Attribute:service_id+' => '',
 	'Class:lnkDocumentToService/Attribute:service_name' => 'Nazwa usługi',
@@ -308,6 +311,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:lnkContactToService' => 'Połączenie Kontakt / Usługa',
 	'Class:lnkContactToService+' => '',
+	'Class:lnkContactToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToService/Attribute:service_id' => 'Usługa',
 	'Class:lnkContactToService/Attribute:service_id+' => '',
 	'Class:lnkContactToService/Attribute:service_name' => 'Nazwa usługi',
@@ -325,6 +329,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:ServiceSubcategory' => 'Podkategoria usługi',
 	'Class:ServiceSubcategory+' => '',
+	'Class:ServiceSubcategory/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:ServiceSubcategory/Attribute:name' => 'Nazwa',
 	'Class:ServiceSubcategory/Attribute:name+' => '',
 	'Class:ServiceSubcategory/Attribute:description' => 'Opis',
@@ -421,6 +426,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:lnkSLAToSLT' => 'Połączenie SLA / SLT',
 	'Class:lnkSLAToSLT+' => '',
+	'Class:lnkSLAToSLT/Name' => '%1$s / %2$s~~',
 	'Class:lnkSLAToSLT/Attribute:sla_id' => 'Umowa SLA',
 	'Class:lnkSLAToSLT/Attribute:sla_id+' => '',
 	'Class:lnkSLAToSLT/Attribute:sla_name' => 'Nazwa umowy SLA',
@@ -448,6 +454,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:lnkCustomerContractToService' => 'Połączenie Umowa z klientem / Usługa',
 	'Class:lnkCustomerContractToService+' => '',
+	'Class:lnkCustomerContractToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_id' => 'Umowa z klientem',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_id+' => '',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_name' => 'Nazwa umowy z klientem',
@@ -469,6 +476,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:lnkCustomerContractToProviderContract' => 'Połączenie Umowa z klientem / Umowa z dostawcą',
 	'Class:lnkCustomerContractToProviderContract+' => '',
+	'Class:lnkCustomerContractToProviderContract/Name' => '%1$s / %2$s~~',
 	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_id' => 'Umowa z klientem',
 	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_id+' => '',
 	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_name' => 'Nazwa umowy z klientem',
@@ -486,6 +494,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:lnkCustomerContractToFunctionalCI' => 'Połączenie Umowa z klientem / Konfiguracja',
 	'Class:lnkCustomerContractToFunctionalCI+' => '',
+	'Class:lnkCustomerContractToFunctionalCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_id' => 'Umowa z klientem',
 	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_id+' => '',
 	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_name' => 'Nazwa umowy z klientem',
@@ -524,6 +533,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:lnkDeliveryModelToContact' => 'Połączenie Model obsługi / Kontakt',
 	'Class:lnkDeliveryModelToContact+' => '',
+	'Class:lnkDeliveryModelToContact/Name' => '%1$s / %2$s~~',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id' => 'Model obsługi',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id+' => '',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name' => 'Nazwa modelu obsługi',
diff --git a/datamodels/2.x/itop-service-mgmt-provider/dictionaries/pt_br.dict.itop-service-mgmt-provider.php b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/pt_br.dict.itop-service-mgmt-provider.php
index d412ae7f04..f99decf7f8 100644
--- a/datamodels/2.x/itop-service-mgmt-provider/dictionaries/pt_br.dict.itop-service-mgmt-provider.php
+++ b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/pt_br.dict.itop-service-mgmt-provider.php
@@ -38,7 +38,6 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Contratos por nível serviço',
 	'UI-ServiceManagementMenu-ContractsByStatus' => 'Contratos por status',
 	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contratos terminando em menos de 30 dias',
-
 	'Menu:ProviderContract' => 'Contratos de provedores',
 	'Menu:ProviderContract+' => '',
 	'Menu:CustomerContract' => 'Contratos de clientes',
@@ -57,9 +56,11 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Menu:DeliveryModel+' => '',
 	'Menu:ServiceFamily' => 'Família de serviços',
 	'Menu:ServiceFamily+' => '',
+	'Contract:baseinfo' => 'General information~~',
+	'Contract:moreinfo' => 'Contractual information~~',
+	'Contract:cost' => 'Cost information~~',
 ));
 
-
 /*
 	'UI:ServiceManagementMenu' => 'Gestion des Services',
 	'UI:ServiceManagementMenu+' => 'Gestion des Services',
@@ -184,6 +185,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:lnkContactToContract' => 'Link Contato / Contrato',
 	'Class:lnkContactToContract+' => '',
+	'Class:lnkContactToContract/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToContract/Attribute:contract_id' => 'Contrato',
 	'Class:lnkContactToContract/Attribute:contract_id+' => '',
 	'Class:lnkContactToContract/Attribute:contract_name' => 'Nome do contrato',
@@ -201,6 +203,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:lnkContractToDocument' => 'Link Contrato / Documento',
 	'Class:lnkContractToDocument+' => '',
+	'Class:lnkContractToDocument/Name' => '%1$s / %2$s~~',
 	'Class:lnkContractToDocument/Attribute:contract_id' => 'Contrato',
 	'Class:lnkContractToDocument/Attribute:contract_id+' => '',
 	'Class:lnkContractToDocument/Attribute:contract_name' => 'Nome do contrato',
@@ -218,6 +221,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:lnkFunctionalCIToProviderContract' => 'Link IC / Contrato de provedor',
 	'Class:lnkFunctionalCIToProviderContract+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Name' => '%1$s / %2$s~~',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Contrato de provedor',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Nome do contrato de provedor',
@@ -250,6 +254,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:Service' => 'Serviço',
 	'Class:Service+' => '',
+	'Class:Service/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Service/Attribute:name' => 'Nome',
 	'Class:Service/Attribute:name+' => '',
 	'Class:Service/Attribute:org_id' => 'Organização',
@@ -289,6 +294,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:lnkDocumentToService' => 'Link Documento / Serviço',
 	'Class:lnkDocumentToService+' => '',
+	'Class:lnkDocumentToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToService/Attribute:service_id' => 'Serviço',
 	'Class:lnkDocumentToService/Attribute:service_id+' => '',
 	'Class:lnkDocumentToService/Attribute:service_name' => 'Nome do serviço',
@@ -306,6 +312,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:lnkContactToService' => 'Link Contato / Serviço',
 	'Class:lnkContactToService+' => '',
+	'Class:lnkContactToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToService/Attribute:service_id' => 'Serviço',
 	'Class:lnkContactToService/Attribute:service_id+' => '',
 	'Class:lnkContactToService/Attribute:service_name' => 'Nome do serviço',
@@ -323,6 +330,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:ServiceSubcategory' => 'Subcategorias de serviço',
 	'Class:ServiceSubcategory+' => '',
+	'Class:ServiceSubcategory/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:ServiceSubcategory/Attribute:name' => 'Nome',
 	'Class:ServiceSubcategory/Attribute:name+' => '',
 	'Class:ServiceSubcategory/Attribute:description' => 'Descrição',
@@ -419,6 +427,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:lnkSLAToSLT' => 'Link SLA / SLT',
 	'Class:lnkSLAToSLT+' => '',
+	'Class:lnkSLAToSLT/Name' => '%1$s / %2$s~~',
 	'Class:lnkSLAToSLT/Attribute:sla_id' => 'SLA',
 	'Class:lnkSLAToSLT/Attribute:sla_id+' => '',
 	'Class:lnkSLAToSLT/Attribute:sla_name' => 'Nome do SLA',
@@ -446,6 +455,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:lnkCustomerContractToService' => 'Link Contrato de cliente / Serviço',
 	'Class:lnkCustomerContractToService+' => '',
+	'Class:lnkCustomerContractToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_id' => 'Contrato de cliente',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_id+' => '',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_name' => 'Nome do contrato de cliente',
@@ -467,6 +477,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:lnkCustomerContractToProviderContract' => 'Link Contrato de cliente / Contrato de provedor',
 	'Class:lnkCustomerContractToProviderContract+' => '',
+	'Class:lnkCustomerContractToProviderContract/Name' => '%1$s / %2$s~~',
 	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_id' => 'Contrato de cliente',
 	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_id+' => '',
 	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_name' => 'Nome do contrato de cliente',
@@ -484,6 +495,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:lnkCustomerContractToFunctionalCI' => 'Link Contrato de cliente / IC',
 	'Class:lnkCustomerContractToFunctionalCI+' => '',
+	'Class:lnkCustomerContractToFunctionalCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_id' => 'Contrato de cliente',
 	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_id+' => '',
 	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_name' => 'Nome do contrato de cliente',
@@ -522,6 +534,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:lnkDeliveryModelToContact' => 'Link Modelo de entrega / Contato',
 	'Class:lnkDeliveryModelToContact+' => '',
+	'Class:lnkDeliveryModelToContact/Name' => '%1$s / %2$s~~',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id' => 'Modelo de entrega',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id+' => '',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name' => 'Nome do Modelo de entrega',
diff --git a/datamodels/2.x/itop-service-mgmt-provider/dictionaries/ru.dict.itop-service-mgmt-provider.php b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/ru.dict.itop-service-mgmt-provider.php
index f87cac961d..5581919be1 100644
--- a/datamodels/2.x/itop-service-mgmt-provider/dictionaries/ru.dict.itop-service-mgmt-provider.php
+++ b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/ru.dict.itop-service-mgmt-provider.php
@@ -16,7 +16,6 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Договоры по уровню услуги',
 	'UI-ServiceManagementMenu-ContractsByStatus' => 'Договоры по статусу',
 	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Договоры, оканчивающиеся в течение 30-ти дней',
-
 	'Menu:ProviderContract' => 'Договоры с поставщиками',
 	'Menu:ProviderContract+' => 'Договоры с поставщиками',
 	'Menu:CustomerContract' => 'Договоры с заказчиками',
@@ -35,9 +34,11 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Menu:DeliveryModel+' => 'Модели предоставления услуг (Delivery Models)',
 	'Menu:ServiceFamily' => 'Пакеты услуг',
 	'Menu:ServiceFamily+' => 'Пакеты услуг',
+	'Contract:baseinfo' => 'General information~~',
+	'Contract:moreinfo' => 'Contractual information~~',
+	'Contract:cost' => 'Cost information~~',
 ));
 
-
 /*
 	'UI:ServiceManagementMenu' => 'Gestion des Services',
 	'UI:ServiceManagementMenu+' => 'Gestion des Services',
@@ -162,6 +163,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:lnkContactToContract' => 'Связь Контакт/Договор',
 	'Class:lnkContactToContract+' => '',
+	'Class:lnkContactToContract/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToContract/Attribute:contract_id' => 'Договор',
 	'Class:lnkContactToContract/Attribute:contract_id+' => '',
 	'Class:lnkContactToContract/Attribute:contract_name' => 'Договор',
@@ -179,6 +181,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:lnkContractToDocument' => 'Связь Договор/Документ',
 	'Class:lnkContractToDocument+' => '',
+	'Class:lnkContractToDocument/Name' => '%1$s / %2$s~~',
 	'Class:lnkContractToDocument/Attribute:contract_id' => 'Договор',
 	'Class:lnkContractToDocument/Attribute:contract_id+' => '',
 	'Class:lnkContractToDocument/Attribute:contract_name' => 'Договор',
@@ -196,6 +199,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:lnkFunctionalCIToProviderContract' => 'Связь Функциональная КЕ/Договор с поставщиком',
 	'Class:lnkFunctionalCIToProviderContract+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Name' => '%1$s / %2$s~~',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Договор с поставщиком',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Договор с поставщиком',
@@ -228,6 +232,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:Service' => 'Услуга',
 	'Class:Service+' => '',
+	'Class:Service/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Service/Attribute:name' => 'Название',
 	'Class:Service/Attribute:name+' => '',
 	'Class:Service/Attribute:org_id' => 'Поставщик',
@@ -267,6 +272,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:lnkDocumentToService' => 'Связь Документ/Услуга',
 	'Class:lnkDocumentToService+' => '',
+	'Class:lnkDocumentToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToService/Attribute:service_id' => 'Услуга',
 	'Class:lnkDocumentToService/Attribute:service_id+' => '',
 	'Class:lnkDocumentToService/Attribute:service_name' => 'Услуга',
@@ -284,6 +290,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:lnkContactToService' => 'Связь Контакт/Услуга',
 	'Class:lnkContactToService+' => '',
+	'Class:lnkContactToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToService/Attribute:service_id' => 'Услуга',
 	'Class:lnkContactToService/Attribute:service_id+' => '',
 	'Class:lnkContactToService/Attribute:service_name' => 'Услуга',
@@ -301,6 +308,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:ServiceSubcategory' => 'Подкатегория услуги',
 	'Class:ServiceSubcategory+' => '',
+	'Class:ServiceSubcategory/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:ServiceSubcategory/Attribute:name' => 'Название',
 	'Class:ServiceSubcategory/Attribute:name+' => '',
 	'Class:ServiceSubcategory/Attribute:description' => 'Описание',
@@ -397,6 +405,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:lnkSLAToSLT' => 'Связь SLA/SLT',
 	'Class:lnkSLAToSLT+' => '',
+	'Class:lnkSLAToSLT/Name' => '%1$s / %2$s~~',
 	'Class:lnkSLAToSLT/Attribute:sla_id' => 'SLA',
 	'Class:lnkSLAToSLT/Attribute:sla_id+' => '',
 	'Class:lnkSLAToSLT/Attribute:sla_name' => 'SLA',
@@ -424,6 +433,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:lnkCustomerContractToService' => 'Связь Договор с заказчиком/Услуга',
 	'Class:lnkCustomerContractToService+' => '',
+	'Class:lnkCustomerContractToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_id' => 'Договор с заказчиком',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_id+' => '',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_name' => 'Договор с заказчиком',
@@ -445,6 +455,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:lnkCustomerContractToProviderContract' => 'Связь Договор с заказчиком/Договор с поставщиком',
 	'Class:lnkCustomerContractToProviderContract+' => '',
+	'Class:lnkCustomerContractToProviderContract/Name' => '%1$s / %2$s~~',
 	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_id' => 'Договор с заказчиком',
 	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_id+' => '',
 	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_name' => 'Договор с заказчиком',
@@ -462,6 +473,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:lnkCustomerContractToFunctionalCI' => 'Связь Договор с заказчиком/Функциональная КЕ',
 	'Class:lnkCustomerContractToFunctionalCI+' => '',
+	'Class:lnkCustomerContractToFunctionalCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_id' => 'Договор с заказчиком',
 	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_id+' => '',
 	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_name' => 'Договор с заказчиком',
@@ -500,6 +512,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:lnkDeliveryModelToContact' => 'Связь Модель предоставления услуг/Контакт',
 	'Class:lnkDeliveryModelToContact+' => '',
+	'Class:lnkDeliveryModelToContact/Name' => '%1$s / %2$s~~',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id' => 'Модель предоставления услуг',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id+' => '',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name' => 'Модель предоставления услуг',
diff --git a/datamodels/2.x/itop-service-mgmt-provider/dictionaries/sk.dict.itop-service-mgmt-provider.php b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/sk.dict.itop-service-mgmt-provider.php
index f2e6dbd210..771d2d2931 100644
--- a/datamodels/2.x/itop-service-mgmt-provider/dictionaries/sk.dict.itop-service-mgmt-provider.php
+++ b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/sk.dict.itop-service-mgmt-provider.php
@@ -37,7 +37,6 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'zmluvy podľa úrovne služby',
 	'UI-ServiceManagementMenu-ContractsByStatus' => 'zmluvy podla stavu',
 	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'zmluvy končiace za menej ako 30 dní',
-
 	'Menu:ProviderContract' => 'Poskytovateľské zmluvy',
 	'Menu:ProviderContract+' => '',
 	'Menu:CustomerContract' => 'Zákaznícke zmluvy',
@@ -56,9 +55,11 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Menu:DeliveryModel+' => '',
 	'Menu:ServiceFamily' => 'Rodiny služieb',
 	'Menu:ServiceFamily+' => '',
+	'Contract:baseinfo' => 'General information~~',
+	'Contract:moreinfo' => 'Contractual information~~',
+	'Contract:cost' => 'Cost information~~',
 ));
 
-
 /*
 	'UI:ServiceManagementMenu' => 'Gestion des Services',
 	'UI:ServiceManagementMenu+' => 'Gestion des Services',
@@ -183,6 +184,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:lnkContactToContract' => 'väzba - Kontakt / zmluva',
 	'Class:lnkContactToContract+' => '',
+	'Class:lnkContactToContract/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToContract/Attribute:contract_id' => 'zmluva',
 	'Class:lnkContactToContract/Attribute:contract_id+' => '',
 	'Class:lnkContactToContract/Attribute:contract_name' => 'Názov zmluvy',
@@ -200,6 +202,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:lnkContractToDocument' => 'väzba - zmluva / Dokument',
 	'Class:lnkContractToDocument+' => '',
+	'Class:lnkContractToDocument/Name' => '%1$s / %2$s~~',
 	'Class:lnkContractToDocument/Attribute:contract_id' => 'zmluva',
 	'Class:lnkContractToDocument/Attribute:contract_id+' => '',
 	'Class:lnkContractToDocument/Attribute:contract_name' => 'Názov zmluvy',
@@ -217,6 +220,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:lnkFunctionalCIToProviderContract' => 'väzba - Komponent / Poskytovateľská zmluva',
 	'Class:lnkFunctionalCIToProviderContract+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Name' => '%1$s / %2$s~~',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Poskytovateľská zmluva',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Názov poskytovateľského zmluvy',
@@ -249,6 +253,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:Service' => 'Služby',
 	'Class:Service+' => '',
+	'Class:Service/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Service/Attribute:name' => 'Názov',
 	'Class:Service/Attribute:name+' => '',
 	'Class:Service/Attribute:org_id' => 'Poskytovateľ',
@@ -288,6 +293,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:lnkDocumentToService' => 'väzba - Dokument / Služba',
 	'Class:lnkDocumentToService+' => '',
+	'Class:lnkDocumentToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToService/Attribute:service_id' => 'Služba',
 	'Class:lnkDocumentToService/Attribute:service_id+' => '',
 	'Class:lnkDocumentToService/Attribute:service_name' => 'Názov služby',
@@ -305,6 +311,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:lnkContactToService' => 'väzba - Kontakt / Služba',
 	'Class:lnkContactToService+' => '',
+	'Class:lnkContactToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToService/Attribute:service_id' => 'Služba',
 	'Class:lnkContactToService/Attribute:service_id+' => '',
 	'Class:lnkContactToService/Attribute:service_name' => 'Názov služby',
@@ -322,6 +329,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:ServiceSubcategory' => 'Podkategória služieb',
 	'Class:ServiceSubcategory+' => '',
+	'Class:ServiceSubcategory/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:ServiceSubcategory/Attribute:name' => 'Názov',
 	'Class:ServiceSubcategory/Attribute:name+' => '',
 	'Class:ServiceSubcategory/Attribute:description' => 'Popis',
@@ -418,6 +426,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:lnkSLAToSLT' => 'väzba - SLA / SLT',
 	'Class:lnkSLAToSLT+' => '',
+	'Class:lnkSLAToSLT/Name' => '%1$s / %2$s~~',
 	'Class:lnkSLAToSLT/Attribute:sla_id' => 'SLA',
 	'Class:lnkSLAToSLT/Attribute:sla_id+' => '',
 	'Class:lnkSLAToSLT/Attribute:sla_name' => 'SLA Názov',
@@ -445,6 +454,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:lnkCustomerContractToService' => 'väzba - Zákaznícka zmluva / Služba',
 	'Class:lnkCustomerContractToService+' => '',
+	'Class:lnkCustomerContractToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_id' => 'Zákaznícka zmluva',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_id+' => '',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_name' => 'Názov zákazníckeho zmluvy',
@@ -466,6 +476,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:lnkCustomerContractToProviderContract' => 'Link Customer Contract / Provider Contract~~',
 	'Class:lnkCustomerContractToProviderContract+' => '~~',
+	'Class:lnkCustomerContractToProviderContract/Name' => '%1$s / %2$s~~',
 	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_id' => 'Customer contract~~',
 	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_id+' => '~~',
 	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_name' => 'Customer contract Name~~',
@@ -483,6 +494,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:lnkCustomerContractToFunctionalCI' => 'Link Customer Contract / FunctionalCI~~',
 	'Class:lnkCustomerContractToFunctionalCI+' => '~~',
+	'Class:lnkCustomerContractToFunctionalCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_id' => 'Customer contract~~',
 	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_id+' => '~~',
 	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_name' => 'Customer contract Name~~',
@@ -521,6 +533,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:lnkDeliveryModelToContact' => 'väzba - Model dodávky / Kontakt',
 	'Class:lnkDeliveryModelToContact+' => '',
+	'Class:lnkDeliveryModelToContact/Name' => '%1$s / %2$s~~',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id' => 'Model dodávky',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id+' => '',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name' => 'Názov typu dodávky',
diff --git a/datamodels/2.x/itop-service-mgmt-provider/dictionaries/tr.dict.itop-service-mgmt-provider.php b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/tr.dict.itop-service-mgmt-provider.php
index 7c53c19c96..20bd79126f 100644
--- a/datamodels/2.x/itop-service-mgmt-provider/dictionaries/tr.dict.itop-service-mgmt-provider.php
+++ b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/tr.dict.itop-service-mgmt-provider.php
@@ -37,7 +37,6 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Hizmet seviyesine göre sözleşmeler',
 	'UI-ServiceManagementMenu-ContractsByStatus' => 'Durumuna göre sözleşmeler',
 	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => '30 gün çinde biten sözleşmeler',
-
 	'Menu:ProviderContract' => 'Tedarikçi sözleşmeleri',
 	'Menu:ProviderContract+' => 'Tedarikçi sözleşmeleri',
 	'Menu:CustomerContract' => 'Müşteri sözleşmeleri',
@@ -56,9 +55,11 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Menu:DeliveryModel+' => 'Delivery models~~',
 	'Menu:ServiceFamily' => 'Service families~~',
 	'Menu:ServiceFamily+' => 'Service families~~',
+	'Contract:baseinfo' => 'General information~~',
+	'Contract:moreinfo' => 'Contractual information~~',
+	'Contract:cost' => 'Cost information~~',
 ));
 
-
 /*
 	'UI:ServiceManagementMenu' => 'Gestion des Services',
 	'UI:ServiceManagementMenu+' => 'Gestion des Services',
@@ -183,6 +184,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:lnkContactToContract' => 'Link Contact / Contract~~',
 	'Class:lnkContactToContract+' => '~~',
+	'Class:lnkContactToContract/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToContract/Attribute:contract_id' => 'Contract~~',
 	'Class:lnkContactToContract/Attribute:contract_id+' => '~~',
 	'Class:lnkContactToContract/Attribute:contract_name' => 'Contract Name~~',
@@ -200,6 +202,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:lnkContractToDocument' => 'Link Contract / Document~~',
 	'Class:lnkContractToDocument+' => '~~',
+	'Class:lnkContractToDocument/Name' => '%1$s / %2$s~~',
 	'Class:lnkContractToDocument/Attribute:contract_id' => 'Contract~~',
 	'Class:lnkContractToDocument/Attribute:contract_id+' => '~~',
 	'Class:lnkContractToDocument/Attribute:contract_name' => 'Contract Name~~',
@@ -217,6 +220,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:lnkFunctionalCIToProviderContract' => 'Link FunctionalCI / ProviderContract~~',
 	'Class:lnkFunctionalCIToProviderContract+' => '~~',
+	'Class:lnkFunctionalCIToProviderContract/Name' => '%1$s / %2$s~~',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Provider contract~~',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '~~',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Provider contract Name~~',
@@ -249,6 +253,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:Service' => 'Hizmet',
 	'Class:Service+' => '',
+	'Class:Service/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Service/Attribute:name' => 'Adı',
 	'Class:Service/Attribute:name+' => '',
 	'Class:Service/Attribute:org_id' => 'Hizmet Sağlayıcı',
@@ -288,6 +293,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:lnkDocumentToService' => 'Link Document / Service~~',
 	'Class:lnkDocumentToService+' => '~~',
+	'Class:lnkDocumentToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToService/Attribute:service_id' => 'Service~~',
 	'Class:lnkDocumentToService/Attribute:service_id+' => '~~',
 	'Class:lnkDocumentToService/Attribute:service_name' => 'Service Name~~',
@@ -305,6 +311,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:lnkContactToService' => 'Link Contact / Service~~',
 	'Class:lnkContactToService+' => '~~',
+	'Class:lnkContactToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToService/Attribute:service_id' => 'Service~~',
 	'Class:lnkContactToService/Attribute:service_id+' => '~~',
 	'Class:lnkContactToService/Attribute:service_name' => 'Service Name~~',
@@ -322,6 +329,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:ServiceSubcategory' => 'Hizmet alt kategorisi',
 	'Class:ServiceSubcategory+' => '',
+	'Class:ServiceSubcategory/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:ServiceSubcategory/Attribute:name' => 'Adı',
 	'Class:ServiceSubcategory/Attribute:name+' => '',
 	'Class:ServiceSubcategory/Attribute:description' => 'Tanımlama',
@@ -418,6 +426,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:lnkSLAToSLT' => 'Link SLA / SLT~~',
 	'Class:lnkSLAToSLT+' => '~~',
+	'Class:lnkSLAToSLT/Name' => '%1$s / %2$s~~',
 	'Class:lnkSLAToSLT/Attribute:sla_id' => 'SLA~~',
 	'Class:lnkSLAToSLT/Attribute:sla_id+' => '~~',
 	'Class:lnkSLAToSLT/Attribute:sla_name' => 'SLA Name~~',
@@ -445,6 +454,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:lnkCustomerContractToService' => 'Link Customer Contract / Service~~',
 	'Class:lnkCustomerContractToService+' => '~~',
+	'Class:lnkCustomerContractToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_id' => 'Customer contract~~',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_id+' => '~~',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_name' => 'Customer contract Name~~',
@@ -466,6 +476,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:lnkCustomerContractToProviderContract' => 'Müşteri ve Tedarikçi Sözleşmesi ilişkilendirmesi',
 	'Class:lnkCustomerContractToProviderContract+' => '',
+	'Class:lnkCustomerContractToProviderContract/Name' => '%1$s / %2$s~~',
 	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_id' => 'Customer contract~~',
 	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_id+' => '~~',
 	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_name' => 'Customer contract Name~~',
@@ -483,6 +494,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:lnkCustomerContractToFunctionalCI' => 'Link Customer Contract / FunctionalCI~~',
 	'Class:lnkCustomerContractToFunctionalCI+' => '~~',
+	'Class:lnkCustomerContractToFunctionalCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_id' => 'Customer contract~~',
 	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_id+' => '~~',
 	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_name' => 'Customer contract Name~~',
@@ -521,6 +533,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:lnkDeliveryModelToContact' => 'Link DeliveryModel / Contact~~',
 	'Class:lnkDeliveryModelToContact+' => '~~',
+	'Class:lnkDeliveryModelToContact/Name' => '%1$s / %2$s~~',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id' => 'Delivery model~~',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id+' => '~~',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name' => 'Delivery model name~~',
diff --git a/datamodels/2.x/itop-service-mgmt-provider/dictionaries/zh_cn.dict.itop-service-mgmt-provider.php b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/zh_cn.dict.itop-service-mgmt-provider.php
index 9e8091f7e1..e6ae734941 100644
--- a/datamodels/2.x/itop-service-mgmt-provider/dictionaries/zh_cn.dict.itop-service-mgmt-provider.php
+++ b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/zh_cn.dict.itop-service-mgmt-provider.php
@@ -20,7 +20,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/>
  */
-
 // Dictionnay conventions
 // Class:<class_name>
 // Class:<class_name>+
@@ -30,8 +29,6 @@
 // Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
 // Class:<class_name>/Stimulus:<stimulus_code>
 // Class:<class_name>/Stimulus:<stimulus_code>+
-
-
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Menu:ServiceManagement' => '服务管理',
 	'Menu:ServiceManagement+' => '服务管理概况',
@@ -40,7 +37,6 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'UI-ServiceManagementMenu-ContractsBySrvLevel' => '合同 (按服务等级)',
 	'UI-ServiceManagementMenu-ContractsByStatus' => '合同(按状态)',
 	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => '30天内截止的合同',
-
 	'Menu:ProviderContract' => '供应商合同',
 	'Menu:ProviderContract+' => '供应商合同',
 	'Menu:CustomerContract' => '客户合同',
@@ -57,11 +53,13 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Menu:SLT+' => '服务等级目标',
 	'Menu:DeliveryModel' => '交付模式',
 	'Menu:DeliveryModel+' => '交付模式',
-	'Menu:ServiceFamily' => '服务族',
-	'Menu:ServiceFamily+' => '服务族',
+	'Menu:ServiceFamily' => '服务系列',
+	'Menu:ServiceFamily+' => '服务系列',
+	'Contract:baseinfo' => 'General information~~',
+	'Contract:moreinfo' => 'Contractual information~~',
+	'Contract:cost' => 'Cost information~~',
 ));
 
-
 /*
 	'UI:ServiceManagementMenu' => 'Gestion des Services',
 	'UI:ServiceManagementMenu+' => 'Gestion des Services',
@@ -186,6 +184,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:lnkContactToContract' => '关联 联系人/合同',
 	'Class:lnkContactToContract+' => '',
+	'Class:lnkContactToContract/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToContract/Attribute:contract_id' => '合同',
 	'Class:lnkContactToContract/Attribute:contract_id+' => '',
 	'Class:lnkContactToContract/Attribute:contract_name' => '合同名称',
@@ -203,6 +202,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:lnkContractToDocument' => '关联 合同/文档',
 	'Class:lnkContractToDocument+' => '',
+	'Class:lnkContractToDocument/Name' => '%1$s / %2$s~~',
 	'Class:lnkContractToDocument/Attribute:contract_id' => '合同',
 	'Class:lnkContractToDocument/Attribute:contract_id+' => '',
 	'Class:lnkContractToDocument/Attribute:contract_name' => '合同名称',
@@ -220,6 +220,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:lnkFunctionalCIToProviderContract' => '关联 功能配置项/供应商合同',
 	'Class:lnkFunctionalCIToProviderContract+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Name' => '%1$s / %2$s~~',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => '供应商合同',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => '供应商合同名称',
@@ -235,7 +236,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 //
 
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:ServiceFamily' => '服务族',
+	'Class:ServiceFamily' => '服务系列',
 	'Class:ServiceFamily+' => '',
 	'Class:ServiceFamily/Attribute:name' => '名称',
 	'Class:ServiceFamily/Attribute:name+' => '',
@@ -252,6 +253,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:Service' => '服务',
 	'Class:Service+' => '',
+	'Class:Service/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Service/Attribute:name' => '名称',
 	'Class:Service/Attribute:name+' => '',
 	'Class:Service/Attribute:org_id' => '供应商',
@@ -260,9 +262,9 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:Service/Attribute:organization_name+' => '',
 	'Class:Service/Attribute:description' => '描述',
 	'Class:Service/Attribute:description+' => '',
-	'Class:Service/Attribute:servicefamily_id' => '服务族',
+	'Class:Service/Attribute:servicefamily_id' => '服务系列',
 	'Class:Service/Attribute:servicefamily_id+' => '',
-	'Class:Service/Attribute:servicefamily_name' => '服务族名称',
+	'Class:Service/Attribute:servicefamily_name' => '服务系列名称',
 	'Class:Service/Attribute:servicefamily_name+' => '',
 	'Class:Service/Attribute:documents_list' => '文档',
 	'Class:Service/Attribute:documents_list+' => '此服务相关的所有文档',
@@ -291,6 +293,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:lnkDocumentToService' => '关联 文档/服务',
 	'Class:lnkDocumentToService+' => '',
+	'Class:lnkDocumentToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToService/Attribute:service_id' => '服务',
 	'Class:lnkDocumentToService/Attribute:service_id+' => '',
 	'Class:lnkDocumentToService/Attribute:service_name' => '服务名称',
@@ -308,6 +311,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:lnkContactToService' => '关联 联系人/服务',
 	'Class:lnkContactToService+' => '',
+	'Class:lnkContactToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToService/Attribute:service_id' => '服务',
 	'Class:lnkContactToService/Attribute:service_id+' => '',
 	'Class:lnkContactToService/Attribute:service_name' => '服务名称',
@@ -325,6 +329,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:ServiceSubcategory' => '子服务',
 	'Class:ServiceSubcategory+' => '',
+	'Class:ServiceSubcategory/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:ServiceSubcategory/Attribute:name' => '名称',
 	'Class:ServiceSubcategory/Attribute:name+' => '',
 	'Class:ServiceSubcategory/Attribute:description' => '描述',
@@ -421,6 +426,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:lnkSLAToSLT' => '关联 SLA/SLT',
 	'Class:lnkSLAToSLT+' => '',
+	'Class:lnkSLAToSLT/Name' => '%1$s / %2$s~~',
 	'Class:lnkSLAToSLT/Attribute:sla_id' => 'SLA',
 	'Class:lnkSLAToSLT/Attribute:sla_id+' => '',
 	'Class:lnkSLAToSLT/Attribute:sla_name' => 'SLA名称',
@@ -448,6 +454,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:lnkCustomerContractToService' => '关联 客户合同/服务',
 	'Class:lnkCustomerContractToService+' => '',
+	'Class:lnkCustomerContractToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_id' => '客户合同',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_id+' => '',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_name' => '客户合同名称',
@@ -469,6 +476,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:lnkCustomerContractToProviderContract' => '关联 客户合同/供应商合同',
 	'Class:lnkCustomerContractToProviderContract+' => '',
+	'Class:lnkCustomerContractToProviderContract/Name' => '%1$s / %2$s~~',
 	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_id' => '客户合同',
 	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_id+' => '',
 	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_name' => '客户合同名称',
@@ -486,6 +494,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:lnkCustomerContractToFunctionalCI' => '关联 客户合同/功能配置项',
 	'Class:lnkCustomerContractToFunctionalCI+' => '',
+	'Class:lnkCustomerContractToFunctionalCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_id' => '客户合同',
 	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_id+' => '',
 	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_name' => '客户合同名称',
@@ -524,6 +533,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:lnkDeliveryModelToContact' => '关联 交付模式/联系人',
 	'Class:lnkDeliveryModelToContact+' => '',
+	'Class:lnkDeliveryModelToContact/Name' => '%1$s / %2$s~~',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id' => '交付模式',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id+' => '',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name' => '交付模式名称',
diff --git a/datamodels/2.x/itop-service-mgmt/datamodel.itop-service-mgmt.xml b/datamodels/2.x/itop-service-mgmt/datamodel.itop-service-mgmt.xml
index 7b1a4bb2bf..df841c8421 100755
--- a/datamodels/2.x/itop-service-mgmt/datamodel.itop-service-mgmt.xml
+++ b/datamodels/2.x/itop-service-mgmt/datamodel.itop-service-mgmt.xml
@@ -100,7 +100,6 @@
           <count_max>0</count_max>
           <ext_key_to_remote>contact_id</ext_key_to_remote>
           <duplicates/>
-          <read_only>false</read_only>
         </field>
         <field id="documents_list" xsi:type="AttributeLinkedSetIndirect">
           <linked_class>lnkContractToDocument</linked_class>
@@ -109,7 +108,6 @@
           <count_max>0</count_max>
           <ext_key_to_remote>document_id</ext_key_to_remote>
           <duplicates/>
-          <read_only>false</read_only>
         </field>
         <field id="description" xsi:type="AttributeText">
           <sql>description</sql>
@@ -439,7 +437,6 @@ public function PrefillSearchForm(&$aContextParam)
           <count_max>0</count_max>
           <ext_key_to_remote>service_id</ext_key_to_remote>
           <duplicates/>
-          <read_only>false</read_only>
         </field>
       </fields>
       <methods/>
@@ -613,7 +610,6 @@ public function PrefillSearchForm(&$aContextParam)
           <count_max>0</count_max>
           <ext_key_to_remote>functionalci_id</ext_key_to_remote>
           <duplicates/>
-          <read_only>false</read_only>
         </field>
         <field id="sla" xsi:type="AttributeString">
           <sql>sla</sql>
@@ -632,7 +628,6 @@ public function PrefillSearchForm(&$aContextParam)
           <count_max>0</count_max>
           <ext_key_to_remote>service_id</ext_key_to_remote>
           <duplicates/>
-          <read_only>false</read_only>
         </field>
       </fields>
       <methods/>
@@ -1055,8 +1050,6 @@ public function PrefillSearchForm(&$aContextParam)
           <count_min>0</count_min>
           <count_max>0</count_max>
           <duplicates/>
-          <relation_type>link</relation_type>
-          <read_only>false</read_only>
         </field>
       </fields>
       <methods/>
@@ -1168,7 +1161,6 @@ public function PrefillSearchForm(&$aContextParam)
           <count_max>0</count_max>
           <ext_key_to_remote>document_id</ext_key_to_remote>
           <duplicates/>
-          <read_only>false</read_only>
         </field>
         <field id="contacts_list" xsi:type="AttributeLinkedSetIndirect">
           <linked_class>lnkContactToService</linked_class>
@@ -1177,7 +1169,6 @@ public function PrefillSearchForm(&$aContextParam)
           <count_max>0</count_max>
           <ext_key_to_remote>contact_id</ext_key_to_remote>
           <duplicates/>
-          <read_only>false</read_only>
         </field>
         <field id="status" xsi:type="AttributeEnum">
           <sort_type>rank</sort_type>
@@ -1215,7 +1206,6 @@ public function PrefillSearchForm(&$aContextParam)
           <count_max>0</count_max>
           <ext_key_to_remote>customercontract_id</ext_key_to_remote>
           <duplicates/>
-          <read_only>false</read_only>
         </field>
         <field id="providercontracts_list" xsi:type="AttributeLinkedSetIndirect">
           <linked_class>lnkProviderContractToService</linked_class>
@@ -1224,7 +1214,6 @@ public function PrefillSearchForm(&$aContextParam)
           <count_max>0</count_max>
           <ext_key_to_remote>providercontract_id</ext_key_to_remote>
           <duplicates/>
-          <read_only>false</read_only>
         </field>
         <field id="functionalcis_list" xsi:type="AttributeLinkedSetIndirect">
           <linked_class>lnkFunctionalCIToService</linked_class>
@@ -1233,7 +1222,6 @@ public function PrefillSearchForm(&$aContextParam)
           <count_max>0</count_max>
           <ext_key_to_remote>functionalci_id</ext_key_to_remote>
           <duplicates/>
-          <read_only>false</read_only>
         </field>
         <field id="servicesubcategories_list" xsi:type="AttributeLinkedSet">
           <linked_class>ServiceSubcategory</linked_class>
@@ -1242,8 +1230,6 @@ public function PrefillSearchForm(&$aContextParam)
           <count_min>0</count_min>
           <count_max>0</count_max>
           <duplicates/>
-          <relation_type>link</relation_type>
-          <read_only>false</read_only>
         </field>
       </fields>
       <methods/>
@@ -1772,7 +1758,6 @@ public function PrefillSearchForm(&$aContextParam)
           <count_max>0</count_max>
           <ext_key_to_remote>slt_id</ext_key_to_remote>
           <duplicates/>
-          <read_only>false</read_only>
         </field>
         <field id="customercontracts_list" xsi:type="AttributeLinkedSet">
           <linked_class>lnkCustomerContractToService</linked_class>
@@ -1780,8 +1765,6 @@ public function PrefillSearchForm(&$aContextParam)
           <count_min>0</count_min>
           <count_max>0</count_max>
           <edit_mode>none</edit_mode>
-          <relation_type>link</relation_type>
-          <read_only>true</read_only>
         </field>
       </fields>
       <methods/>
@@ -1949,7 +1932,6 @@ public function PrefillSearchForm(&$aContextParam)
           <count_max>0</count_max>
           <ext_key_to_remote>sla_id</ext_key_to_remote>
           <duplicates/>
-          <read_only>false</read_only>
         </field>
       </fields>
       <methods/>
@@ -2442,7 +2424,6 @@ public function PrefillSearchForm(&$aContextParam)
           <count_max>0</count_max>
           <ext_key_to_remote>contact_id</ext_key_to_remote>
           <duplicates/>
-          <read_only>false</read_only>
         </field>
         <field id="customers_list" xsi:type="AttributeLinkedSet">
           <linked_class>Organization</linked_class>
@@ -2450,8 +2431,6 @@ public function PrefillSearchForm(&$aContextParam)
           <edit_mode>add_remove</edit_mode>
           <count_min>0</count_min>
           <count_max>0</count_max>
-          <relation_type>link</relation_type>
-          <read_only>false</read_only>
         </field>
       </fields>
       <methods/>
diff --git a/datamodels/2.x/itop-service-mgmt/dictionaries/cs.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/cs.dict.itop-service-mgmt.php
index 9a94d0858d..f80c5b1ac5 100644
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/cs.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/cs.dict.itop-service-mgmt.php
@@ -60,6 +60,9 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Menu:ServiceFamily+' => 'Balíčky (kategorie) služeb',
 	'Menu:Procedure' => 'Katalog postupů',
 	'Menu:Procedure+' => 'Katalog všech postupů',
+	'Contract:baseinfo' => 'General information~~',
+	'Contract:moreinfo' => 'Contractual information~~',
+	'Contract:cost' => 'Cost information~~',
 ));
 
 //
@@ -173,6 +176,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:lnkContactToContract' => 'Spojení (Kontakt / Smlouva)',
 	'Class:lnkContactToContract+' => '',
+	'Class:lnkContactToContract/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToContract/Attribute:contract_id' => 'Smlouva',
 	'Class:lnkContactToContract/Attribute:contract_id+' => '',
 	'Class:lnkContactToContract/Attribute:contract_name' => 'Název smlouvy',
@@ -190,6 +194,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:lnkContractToDocument' => 'Spojení (Smlouva / Dokument)',
 	'Class:lnkContractToDocument+' => '',
+	'Class:lnkContractToDocument/Name' => '%1$s / %2$s~~',
 	'Class:lnkContractToDocument/Attribute:contract_id' => 'Smlouva',
 	'Class:lnkContractToDocument/Attribute:contract_id+' => '',
 	'Class:lnkContractToDocument/Attribute:contract_name' => 'Název smlouvy',
@@ -222,6 +227,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:Service' => 'Služba',
 	'Class:Service+' => '',
+	'Class:Service/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Service/Attribute:name' => 'Název',
 	'Class:Service/Attribute:name+' => '',
 	'Class:Service/Attribute:org_id' => 'Poskytovatel',
@@ -265,6 +271,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:lnkDocumentToService' => 'Spojení (Dokument / Služba)',
 	'Class:lnkDocumentToService+' => '',
+	'Class:lnkDocumentToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToService/Attribute:service_id' => 'Služba',
 	'Class:lnkDocumentToService/Attribute:service_id+' => '',
 	'Class:lnkDocumentToService/Attribute:service_name' => 'Název služby',
@@ -282,6 +289,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:lnkContactToService' => 'Spojení (Kontakt / Služba)',
 	'Class:lnkContactToService+' => '',
+	'Class:lnkContactToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToService/Attribute:service_id' => 'Služba',
 	'Class:lnkContactToService/Attribute:service_id+' => '',
 	'Class:lnkContactToService/Attribute:service_name' => 'Název služby',
@@ -299,6 +307,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:ServiceSubcategory' => 'Podkategorie služeb',
 	'Class:ServiceSubcategory+' => '',
+	'Class:ServiceSubcategory/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:ServiceSubcategory/Attribute:name' => 'Název',
 	'Class:ServiceSubcategory/Attribute:name+' => '',
 	'Class:ServiceSubcategory/Attribute:description' => 'Popis',
@@ -384,6 +393,8 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:SLT/Attribute:unit/Value:hours+' => '',
 	'Class:SLT/Attribute:unit/Value:minutes' => 'minuty',
 	'Class:SLT/Attribute:unit/Value:minutes+' => '',
+	'Class:SLT/Attribute:slas_list' => 'SLAs~~',
+	'Class:SLT/Attribute:slas_list+' => 'All the service level agreements using this SLT~~',
 ));
 
 //
@@ -393,6 +404,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:lnkSLAToSLT' => 'Spojení (SLA / SLT)',
 	'Class:lnkSLAToSLT+' => '',
+	'Class:lnkSLAToSLT/Name' => '%1$s / %2$s~~',
 	'Class:lnkSLAToSLT/Attribute:sla_id' => 'SLA',
 	'Class:lnkSLAToSLT/Attribute:sla_id+' => '',
 	'Class:lnkSLAToSLT/Attribute:sla_name' => 'Název SLA',
@@ -420,6 +432,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:lnkCustomerContractToService' => 'Spojení (Smlouva se zákazníkem / Služba)',
 	'Class:lnkCustomerContractToService+' => '',
+	'Class:lnkCustomerContractToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_id' => 'Smlouva se zákazníkem',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_id+' => '',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_name' => 'Název smlouvy se zákazníkem',
@@ -441,6 +454,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:lnkProviderContractToService' => 'Spojení (Smlouva s poskytovatelem / Služba)',
 	'Class:lnkProviderContractToService+' => '',
+	'Class:lnkProviderContractToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkProviderContractToService/Attribute:service_id' => 'Služba',
 	'Class:lnkProviderContractToService/Attribute:service_id+' => '',
 	'Class:lnkProviderContractToService/Attribute:service_name' => 'Název služby',
@@ -479,6 +493,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:lnkDeliveryModelToContact' => 'Spojení (Model poskytování služeb / Kontakt)',
 	'Class:lnkDeliveryModelToContact+' => '',
+	'Class:lnkDeliveryModelToContact/Name' => '%1$s / %2$s~~',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id' => 'Model poskytování služeb',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id+' => '',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name' => 'Název modelu poskytování služeb',
diff --git a/datamodels/2.x/itop-service-mgmt/dictionaries/da.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/da.dict.itop-service-mgmt.php
index 6e7a275c88..e204cba3d9 100644
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/da.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/da.dict.itop-service-mgmt.php
@@ -48,6 +48,9 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Menu:ServiceFamily+' => '',
 	'Menu:Procedure' => 'Procedure katalog',
 	'Menu:Procedure+' => '',
+	'Contract:baseinfo' => 'General information~~',
+	'Contract:moreinfo' => 'Contractual information~~',
+	'Contract:cost' => 'Cost information~~',
 ));
 
 //
@@ -161,6 +164,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:lnkContactToContract' => 'Sammenhæng Kontakt/Kontrakt',
 	'Class:lnkContactToContract+' => '',
+	'Class:lnkContactToContract/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToContract/Attribute:contract_id' => 'Kontrakt',
 	'Class:lnkContactToContract/Attribute:contract_id+' => '',
 	'Class:lnkContactToContract/Attribute:contract_name' => 'Kontrakt navn',
@@ -178,6 +182,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:lnkContractToDocument' => 'Sammenhæng Kontrakt/Dokument',
 	'Class:lnkContractToDocument+' => '',
+	'Class:lnkContractToDocument/Name' => '%1$s / %2$s~~',
 	'Class:lnkContractToDocument/Attribute:contract_id' => 'Kontrakt',
 	'Class:lnkContractToDocument/Attribute:contract_id+' => '',
 	'Class:lnkContractToDocument/Attribute:contract_name' => 'Kontrakt navn',
@@ -210,6 +215,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:Service' => 'Ydelse',
 	'Class:Service+' => '',
+	'Class:Service/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Service/Attribute:name' => 'Navn',
 	'Class:Service/Attribute:name+' => '',
 	'Class:Service/Attribute:org_id' => 'Udbyder',
@@ -253,6 +259,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:lnkDocumentToService' => 'Sammenhæng Dokument/Ydelse',
 	'Class:lnkDocumentToService+' => '',
+	'Class:lnkDocumentToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToService/Attribute:service_id' => 'Ydelse',
 	'Class:lnkDocumentToService/Attribute:service_id+' => '',
 	'Class:lnkDocumentToService/Attribute:service_name' => 'Ydelses navn',
@@ -270,6 +277,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:lnkContactToService' => 'Sammenhæng Kontakt/Ydelse',
 	'Class:lnkContactToService+' => '',
+	'Class:lnkContactToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToService/Attribute:service_id' => 'Ydelse',
 	'Class:lnkContactToService/Attribute:service_id+' => '',
 	'Class:lnkContactToService/Attribute:service_name' => 'Ydelses navn',
@@ -287,6 +295,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:ServiceSubcategory' => 'Ydelse underkategorier',
 	'Class:ServiceSubcategory+' => '',
+	'Class:ServiceSubcategory/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:ServiceSubcategory/Attribute:name' => 'Navn',
 	'Class:ServiceSubcategory/Attribute:name+' => '',
 	'Class:ServiceSubcategory/Attribute:description' => 'Beskrivelse',
@@ -372,6 +381,8 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:SLT/Attribute:unit/Value:hours+' => '',
 	'Class:SLT/Attribute:unit/Value:minutes' => 'Minutter',
 	'Class:SLT/Attribute:unit/Value:minutes+' => '',
+	'Class:SLT/Attribute:slas_list' => 'SLAs~~',
+	'Class:SLT/Attribute:slas_list+' => 'All the service level agreements using this SLT~~',
 ));
 
 //
@@ -381,6 +392,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:lnkSLAToSLT' => 'Sammenhæng SLA/SLT',
 	'Class:lnkSLAToSLT+' => '',
+	'Class:lnkSLAToSLT/Name' => '%1$s / %2$s~~',
 	'Class:lnkSLAToSLT/Attribute:sla_id' => 'SLA',
 	'Class:lnkSLAToSLT/Attribute:sla_id+' => '',
 	'Class:lnkSLAToSLT/Attribute:sla_name' => 'SLA navn',
@@ -408,6 +420,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:lnkCustomerContractToService' => 'Sammenhæng Kunde kontrakt/Ydelse',
 	'Class:lnkCustomerContractToService+' => '',
+	'Class:lnkCustomerContractToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_id' => 'Kunde kontrakt',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_id+' => '',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_name' => 'Kunde kontrakt navn',
@@ -429,6 +442,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:lnkProviderContractToService' => 'Sammenhæng Leverandør kontrakt/Ydelse',
 	'Class:lnkProviderContractToService+' => '',
+	'Class:lnkProviderContractToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkProviderContractToService/Attribute:service_id' => 'Ydelse',
 	'Class:lnkProviderContractToService/Attribute:service_id+' => '',
 	'Class:lnkProviderContractToService/Attribute:service_name' => 'Ydelses navn',
@@ -467,6 +481,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:lnkDeliveryModelToContact' => 'Sammenhæng Leverings model/Kontakt',
 	'Class:lnkDeliveryModelToContact+' => '',
+	'Class:lnkDeliveryModelToContact/Name' => '%1$s / %2$s~~',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id' => 'Leverings model',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id+' => '',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name' => 'Leverings model navn',
diff --git a/datamodels/2.x/itop-service-mgmt/dictionaries/de.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/de.dict.itop-service-mgmt.php
index 743fc44851..a2039d8649 100644
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/de.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/de.dict.itop-service-mgmt.php
@@ -24,12 +24,12 @@
 */
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Menu:ServiceManagement' => 'Service Management',
-	'Menu:ServiceManagement+' => 'Service Management-Übersicht',
+	'Menu:ServiceManagement+' => 'Service-Management-Übersicht',
 	'Menu:Service:Overview' => 'Übersicht',
-	'Menu:Service:Overview+' => '',
-	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Verträge nach Service Level',
+	'Menu:Service:Overview+' => 'Überblick über das Service-Management',
+	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Verträge nach Service-Level',
 	'UI-ServiceManagementMenu-ContractsByStatus' => 'Verträge nach Status',
-	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Verträge, die in weniger als 30 Tagen enden',
+	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Verträge, die in weniger als 30 Tagen auslaufen',
 	'Menu:ProviderContract' => 'Provider-Verträge',
 	'Menu:ProviderContract+' => 'Provider-Verträge',
 	'Menu:CustomerContract' => 'Kundenverträge',
@@ -39,17 +39,20 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Menu:Service' => 'Services',
 	'Menu:Service+' => 'Services',
 	'Menu:ServiceElement' => 'Service-Elemente',
-	'Menu:ServiceElement+' => '',
+	'Menu:ServiceElement+' => 'Service-Elemente',
 	'Menu:SLA' => 'SLAs',
-	'Menu:SLA+' => 'Service Level Agreements',
+	'Menu:SLA+' => 'Service Level Agreements (SLAs)',
 	'Menu:SLT' => 'SLTs',
-	'Menu:SLT+' => 'Service Level Targets',
+	'Menu:SLT+' => 'Service Level Targets (SLTs)',
 	'Menu:DeliveryModel' => 'Delivery-Modelle',
-	'Menu:DeliveryModel+' => '',
+	'Menu:DeliveryModel+' => 'Delivery-Modelle',
 	'Menu:ServiceFamily' => 'Service-Familien',
-	'Menu:ServiceFamily+' => '',
+	'Menu:ServiceFamily+' => 'Service-Familien',
 	'Menu:Procedure' => 'Verfahrens-Katalog',
 	'Menu:Procedure+' => '',
+	'Contract:baseinfo' => 'Allgemeine Informationen',
+	'Contract:moreinfo' => 'Vertragliche Informationen',
+	'Contract:cost' => 'Kosteninformation',
 ));
 
 //
@@ -86,9 +89,9 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:Contract/Attribute:organization_name' => 'Kunden-Name',
 	'Class:Contract/Attribute:organization_name+' => '',
 	'Class:Contract/Attribute:contacts_list' => 'Kontakte',
-	'Class:Contract/Attribute:contacts_list+' => 'All the contacts for this customer contract~~',
+	'Class:Contract/Attribute:contacts_list+' => 'Alle Kontakte für diesen Kundenvertrag',
 	'Class:Contract/Attribute:documents_list' => 'Dokumente',
-	'Class:Contract/Attribute:documents_list+' => 'All the documents for this customer contract~~',
+	'Class:Contract/Attribute:documents_list+' => 'Alle Dokumente für diesen Kundenvertrag',
 	'Class:Contract/Attribute:description' => 'Beschreibung',
 	'Class:Contract/Attribute:description+' => '',
 	'Class:Contract/Attribute:start_date' => 'Anfangsdatum',
@@ -124,7 +127,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:Contract/Attribute:status/Value:production' => 'Produktion',
 	'Class:Contract/Attribute:status/Value:production+' => '',
 	'Class:Contract/Attribute:finalclass' => 'Typ',
-	'Class:Contract/Attribute:finalclass+' => '',
+	'Class:Contract/Attribute:finalclass+' => 'Name der instanziierbaren Klasse',
 ));
 //
 // Class: CustomerContract
@@ -134,7 +137,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:CustomerContract' => 'Kundenvertrag',
 	'Class:CustomerContract+' => '',
 	'Class:CustomerContract/Attribute:services_list' => 'Services',
-	'Class:CustomerContract/Attribute:services_list+' => 'All the services purchased for this contract~~',
+	'Class:CustomerContract/Attribute:services_list+' => 'Alle für diesen Vertrag erworbenen Services',
 ));
 
 //
@@ -145,7 +148,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:ProviderContract' => 'Provider-Vertrag',
 	'Class:ProviderContract+' => '',
 	'Class:ProviderContract/Attribute:functionalcis_list' => 'CIs',
-	'Class:ProviderContract/Attribute:functionalcis_list+' => 'All the configuration items covered by this provider contract~~',
+	'Class:ProviderContract/Attribute:functionalcis_list+' => 'Alle CIs, die von diesem Provider-Vertrag abgedeckt werden',
 	'Class:ProviderContract/Attribute:sla' => 'SLA',
 	'Class:ProviderContract/Attribute:sla+' => 'Service Level Agreement',
 	'Class:ProviderContract/Attribute:coverage' => 'Abdeckung',
@@ -163,6 +166,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:lnkContactToContract' => 'Verknüpfung Kontakt/Vertrag',
 	'Class:lnkContactToContract+' => '',
+	'Class:lnkContactToContract/Name' => '%1$s / %2$s',
 	'Class:lnkContactToContract/Attribute:contract_id' => 'Vertrag',
 	'Class:lnkContactToContract/Attribute:contract_id+' => '',
 	'Class:lnkContactToContract/Attribute:contract_name' => 'Vertrags-Name',
@@ -180,6 +184,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:lnkContractToDocument' => 'Verknüpfung Vertrag/Dokument',
 	'Class:lnkContractToDocument+' => '',
+	'Class:lnkContractToDocument/Name' => '%1$s / %2$s',
 	'Class:lnkContractToDocument/Attribute:contract_id' => 'Vertrag',
 	'Class:lnkContractToDocument/Attribute:contract_id+' => '',
 	'Class:lnkContractToDocument/Attribute:contract_name' => 'Vertrags-Name',
@@ -202,7 +207,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:ServiceFamily/Attribute:icon' => 'Icon',
 	'Class:ServiceFamily/Attribute:icon+' => '',
 	'Class:ServiceFamily/Attribute:services_list' => 'Services',
-	'Class:ServiceFamily/Attribute:services_list+' => 'All the services in this category~~',
+	'Class:ServiceFamily/Attribute:services_list+' => 'Alle Services dieser Kategorie',
 ));
 
 //
@@ -212,6 +217,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:Service' => 'Service',
 	'Class:Service+' => '',
+	'Class:Service/ComplementaryName' => '%1$s - %2$s',
 	'Class:Service/Attribute:name' => 'Name',
 	'Class:Service/Attribute:name+' => '',
 	'Class:Service/Attribute:org_id' => 'Anbieter',
@@ -225,9 +231,9 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:Service/Attribute:description' => 'Beschreibung',
 	'Class:Service/Attribute:description+' => '',
 	'Class:Service/Attribute:documents_list' => 'Dokumente',
-	'Class:Service/Attribute:documents_list+' => 'All the documents linked to the service~~',
+	'Class:Service/Attribute:documents_list+' => 'Alle mit dem Service verknüpften Dokumente~',
 	'Class:Service/Attribute:contacts_list' => 'Kontakte',
-	'Class:Service/Attribute:contacts_list+' => 'All the contacts for this service~~',
+	'Class:Service/Attribute:contacts_list+' => 'Alle mit dem Service verknüpften Kontakte',
 	'Class:Service/Attribute:status' => 'Status',
 	'Class:Service/Attribute:status+' => '',
 	'Class:Service/Attribute:status/Value:implementation' => 'Implementation',
@@ -238,14 +244,14 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:Service/Attribute:status/Value:production+' => '',
 	'Class:Service/Attribute:icon' => 'Icon',
 	'Class:Service/Attribute:icon+' => '',
-	'Class:Service/Attribute:customercontracts_list' => 'Kunden-Verträge',
-	'Class:Service/Attribute:customercontracts_list+' => 'All the customer contracts that have purchased this service~~',
+	'Class:Service/Attribute:customercontracts_list' => 'Kundenverträge',
+	'Class:Service/Attribute:customercontracts_list+' => 'Alle Kundenverträge, die diesen Service verwenden',
 	'Class:Service/Attribute:providercontracts_list' => 'Provider-Verträge',
-	'Class:Service/Attribute:providercontracts_list+' => 'All the provider contracts to support this service~~',
+	'Class:Service/Attribute:providercontracts_list+' => 'Alle Anbieterverträge zur Unterstützung dieses Services',
 	'Class:Service/Attribute:functionalcis_list' => 'Benötigte CIs',
-	'Class:Service/Attribute:functionalcis_list+' => 'All the configuration items that are used to provide this service~~',
+	'Class:Service/Attribute:functionalcis_list+' => 'Alle CIs, die zur Bereitstellung dieses Services verwendet werden',
 	'Class:Service/Attribute:servicesubcategories_list' => 'Service-Subkategorien',
-	'Class:Service/Attribute:servicesubcategories_list+' => 'All the sub categories for this service~~',
+	'Class:Service/Attribute:servicesubcategories_list+' => 'Alle Service-Unterkategorien für diesen Service',
 ));
 
 //
@@ -255,6 +261,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:lnkDocumentToService' => 'Verknüpfung Dokument/Service',
 	'Class:lnkDocumentToService+' => '',
+	'Class:lnkDocumentToService/Name' => '%1$s / %2$s',
 	'Class:lnkDocumentToService/Attribute:service_id' => 'Service',
 	'Class:lnkDocumentToService/Attribute:service_id+' => '',
 	'Class:lnkDocumentToService/Attribute:service_name' => 'Service-Name',
@@ -272,6 +279,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:lnkContactToService' => 'Verknüpfung Kontakt/Service',
 	'Class:lnkContactToService+' => '',
+	'Class:lnkContactToService/Name' => '%1$s / %2$s',
 	'Class:lnkContactToService/Attribute:service_id' => 'Service',
 	'Class:lnkContactToService/Attribute:service_id+' => '',
 	'Class:lnkContactToService/Attribute:service_name' => 'Service-Name',
@@ -289,6 +297,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:ServiceSubcategory' => 'Service-Unterkategorien',
 	'Class:ServiceSubcategory+' => '',
+	'Class:ServiceSubcategory/ComplementaryName' => '%1$s - %2$s',
 	'Class:ServiceSubcategory/Attribute:name' => 'Name',
 	'Class:ServiceSubcategory/Attribute:name+' => '',
 	'Class:ServiceSubcategory/Attribute:description' => 'Beschreibung',
@@ -329,10 +338,10 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:SLA/Attribute:organization_name' => 'Provider-Name',
 	'Class:SLA/Attribute:organization_name+' => '',
 	'Class:SLA/Attribute:slts_list' => 'SLTs',
-	'Class:SLA/Attribute:slts_list+' => 'Service Level Targets:',
-	'Class:SLA/Attribute:customercontracts_list' => 'Kunden-Verträge',
-	'Class:SLA/Attribute:customercontracts_list+' => 'All the customer contracts using this SLA~~',
-	'Class:SLA/Error:UniqueLnkCustomerContractToService' => 'Konnte den Link zwischen Kundevertrag %1$s und Service %2$s speichern: SLA existiert bereits',
+	'Class:SLA/Attribute:slts_list+' => 'Service Level Targets',
+	'Class:SLA/Attribute:customercontracts_list' => 'Kundenverträge',
+	'Class:SLA/Attribute:customercontracts_list+' => 'Alle Kundenverträge, die diese SLA verwenden',
+	'Class:SLA/Error:UniqueLnkCustomerContractToService' => 'Die Verknüpfung zwischen Kundenvertrag %1$s und Service %2$s konnte nicht gespeichert werden: SLA existiert bereits',
 ));
 
 //
@@ -341,39 +350,41 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:SLT' => 'SLT',
-	'Class:SLT+' => '',
+	'Class:SLT+' => 'Service-Level-Target (SLT)',
 	'Class:SLT/Attribute:name' => 'Name',
 	'Class:SLT/Attribute:name+' => '',
 	'Class:SLT/Attribute:priority' => 'Priorität',
 	'Class:SLT/Attribute:priority+' => '',
 	'Class:SLT/Attribute:priority/Value:1' => 'Kritisch',
-	'Class:SLT/Attribute:priority/Value:1+' => '',
+	'Class:SLT/Attribute:priority/Value:1+' => 'Kritisch',
 	'Class:SLT/Attribute:priority/Value:2' => 'Hoch',
-	'Class:SLT/Attribute:priority/Value:2+' => '',
+	'Class:SLT/Attribute:priority/Value:2+' => 'Hoch',
 	'Class:SLT/Attribute:priority/Value:3' => 'Mittel',
-	'Class:SLT/Attribute:priority/Value:3+' => '',
+	'Class:SLT/Attribute:priority/Value:3+' => 'Mittel',
 	'Class:SLT/Attribute:priority/Value:4' => 'Niedrig',
-	'Class:SLT/Attribute:priority/Value:4+' => '',
+	'Class:SLT/Attribute:priority/Value:4+' => 'Niedrig',
 	'Class:SLT/Attribute:request_type' => 'Request-Typ',
 	'Class:SLT/Attribute:request_type+' => '',
 	'Class:SLT/Attribute:request_type/Value:incident' => 'Incident',
-	'Class:SLT/Attribute:request_type/Value:incident+' => '',
+	'Class:SLT/Attribute:request_type/Value:incident+' => 'Incident',
 	'Class:SLT/Attribute:request_type/Value:service_request' => 'Service-Request',
-	'Class:SLT/Attribute:request_type/Value:service_request+' => '',
+	'Class:SLT/Attribute:request_type/Value:service_request+' => 'Service-Request',
 	'Class:SLT/Attribute:metric' => 'Metrik',
 	'Class:SLT/Attribute:metric+' => '',
-	'Class:SLT/Attribute:metric/Value:tto' => 'TTO (Time To Own)',
-	'Class:SLT/Attribute:metric/Value:tto+' => '',
-	'Class:SLT/Attribute:metric/Value:ttr' => 'TTR (Time To Resolve)',
-	'Class:SLT/Attribute:metric/Value:ttr+' => '',
+	'Class:SLT/Attribute:metric/Value:tto' => 'TTO',
+	'Class:SLT/Attribute:metric/Value:tto+' => 'TTO (Time To Own)',
+	'Class:SLT/Attribute:metric/Value:ttr' => 'TTR',
+	'Class:SLT/Attribute:metric/Value:ttr+' => 'TTR (Time To Resolve)',
 	'Class:SLT/Attribute:value' => 'Wert',
 	'Class:SLT/Attribute:value+' => '',
 	'Class:SLT/Attribute:unit' => 'Einheit',
 	'Class:SLT/Attribute:unit+' => '',
 	'Class:SLT/Attribute:unit/Value:hours' => 'Stunden',
-	'Class:SLT/Attribute:unit/Value:hours+' => '',
+	'Class:SLT/Attribute:unit/Value:hours+' => 'Stunden',
 	'Class:SLT/Attribute:unit/Value:minutes' => 'Minuten',
-	'Class:SLT/Attribute:unit/Value:minutes+' => '',
+	'Class:SLT/Attribute:unit/Value:minutes+' => 'Minuten',
+	'Class:SLT/Attribute:slas_list' => 'SLAs',
+	'Class:SLT/Attribute:slas_list+' => 'Alle Service Level Agreements, die diese SLT verwenden',
 ));
 
 //
@@ -383,6 +394,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:lnkSLAToSLT' => 'Verknüpfung SLA/SLT',
 	'Class:lnkSLAToSLT+' => '',
+	'Class:lnkSLAToSLT/Name' => '%1$s / %2$s',
 	'Class:lnkSLAToSLT/Attribute:sla_id' => 'SLA',
 	'Class:lnkSLAToSLT/Attribute:sla_id+' => '',
 	'Class:lnkSLAToSLT/Attribute:sla_name' => 'SLA-Name',
@@ -410,6 +422,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:lnkCustomerContractToService' => 'Verknüpfung Kunden-Vertrag/Service',
 	'Class:lnkCustomerContractToService+' => '',
+	'Class:lnkCustomerContractToService/Name' => '%1$s / %2$s',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_id' => 'Kunden-Vertrag',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_id+' => '',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_name' => 'Kundenvertrags-Name',
@@ -431,6 +444,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:lnkProviderContractToService' => 'Verknüpfung Provider-Vertrag/Service',
 	'Class:lnkProviderContractToService+' => '',
+	'Class:lnkProviderContractToService/Name' => '%1$s / %2$s',
 	'Class:lnkProviderContractToService/Attribute:service_id' => 'Service',
 	'Class:lnkProviderContractToService/Attribute:service_id+' => '',
 	'Class:lnkProviderContractToService/Attribute:service_name' => 'Service-Name',
@@ -457,9 +471,9 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:DeliveryModel/Attribute:description' => 'Beschreibung',
 	'Class:DeliveryModel/Attribute:description+' => '',
 	'Class:DeliveryModel/Attribute:contacts_list' => 'Kontakte',
-	'Class:DeliveryModel/Attribute:contacts_list+' => 'All the contacts (Teams and Person) for this delivery model~~',
+	'Class:DeliveryModel/Attribute:contacts_list+' => 'Alle Kontakte (Teams and Person) für dieses Delivery-Modell',
 	'Class:DeliveryModel/Attribute:customers_list' => 'Kunden',
-	'Class:DeliveryModel/Attribute:customers_list+' => 'All the customers having this delivering model~~',
+	'Class:DeliveryModel/Attribute:customers_list+' => 'Alle Kunden mit diesem Delivery-Modell',
 ));
 
 //
@@ -469,6 +483,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:lnkDeliveryModelToContact' => 'Verknüpfung Delivery-Modell/Kontakt',
 	'Class:lnkDeliveryModelToContact+' => '',
+	'Class:lnkDeliveryModelToContact/Name' => '%1$s / %2$s',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id' => 'Delivery-Modell',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id+' => '',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name' => 'Delivery-Modell-Name',
diff --git a/datamodels/2.x/itop-service-mgmt/dictionaries/es_cr.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/es_cr.dict.itop-service-mgmt.php
index 60ee3061d7..abfadbc19b 100644
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/es_cr.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/es_cr.dict.itop-service-mgmt.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
@@ -59,6 +59,9 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Menu:ServiceFamily+' => 'Familias de servicio',
 	'Menu:Procedure' => 'Catálogo de procedimientos',
 	'Menu:Procedure+' => 'Catálogo de procedimientos',
+	'Contract:baseinfo' => 'General information~~',
+	'Contract:moreinfo' => 'Contractual information~~',
+	'Contract:cost' => 'Cost information~~',
 ));
 
 //
@@ -172,6 +175,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkContactToContract' => 'Relación Contacto y Contrato',
 	'Class:lnkContactToContract+' => 'Relación Contacto y Contrato',
+	'Class:lnkContactToContract/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToContract/Attribute:contract_id' => 'Contrato',
 	'Class:lnkContactToContract/Attribute:contract_id+' => 'Contrato',
 	'Class:lnkContactToContract/Attribute:contract_name' => 'Contrato',
@@ -189,6 +193,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkContractToDocument' => 'Relación Contrato y Documento',
 	'Class:lnkContractToDocument+' => 'Relación Contrato y Documento',
+	'Class:lnkContractToDocument/Name' => '%1$s / %2$s~~',
 	'Class:lnkContractToDocument/Attribute:contract_id' => 'Contrato',
 	'Class:lnkContractToDocument/Attribute:contract_id+' => 'Contrato',
 	'Class:lnkContractToDocument/Attribute:contract_name' => 'Contrato',
@@ -221,6 +226,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Service' => 'Servicio',
 	'Class:Service+' => 'Servicio',
+	'Class:Service/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Service/Attribute:name' => 'Nombre',
 	'Class:Service/Attribute:name+' => 'Nombre del Servicio',
 	'Class:Service/Attribute:org_id' => 'Proveedor',
@@ -264,6 +270,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkDocumentToService' => 'Relación Documento y Servicio',
 	'Class:lnkDocumentToService+' => 'Relación Documento y Servicio',
+	'Class:lnkDocumentToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToService/Attribute:service_id' => 'Servicio',
 	'Class:lnkDocumentToService/Attribute:service_id+' => 'Servicio',
 	'Class:lnkDocumentToService/Attribute:service_name' => 'Servicio',
@@ -281,6 +288,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkContactToService' => 'Relación Contacto y Servicio',
 	'Class:lnkContactToService+' => 'Relación Contacto y Servicio',
+	'Class:lnkContactToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToService/Attribute:service_id' => 'Servicio',
 	'Class:lnkContactToService/Attribute:service_id+' => 'Servicio',
 	'Class:lnkContactToService/Attribute:service_name' => 'Servicio',
@@ -298,6 +306,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:ServiceSubcategory' => 'Subcategoría',
 	'Class:ServiceSubcategory+' => 'Subcategoría',
+	'Class:ServiceSubcategory/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:ServiceSubcategory/Attribute:name' => 'Nombre',
 	'Class:ServiceSubcategory/Attribute:name+' => 'Nombre de la Subcategoria',
 	'Class:ServiceSubcategory/Attribute:description' => 'Descripción',
@@ -383,6 +392,8 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:SLT/Attribute:unit/Value:hours+' => 'Horas',
 	'Class:SLT/Attribute:unit/Value:minutes' => 'Minutos',
 	'Class:SLT/Attribute:unit/Value:minutes+' => 'Minutos',
+	'Class:SLT/Attribute:slas_list' => 'SLAs~~',
+	'Class:SLT/Attribute:slas_list+' => 'All the service level agreements using this SLT~~',
 ));
 
 //
@@ -392,6 +403,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkSLAToSLT' => 'Relación SLA y SLT',
 	'Class:lnkSLAToSLT+' => 'Relación SLA y SLT',
+	'Class:lnkSLAToSLT/Name' => '%1$s / %2$s~~',
 	'Class:lnkSLAToSLT/Attribute:sla_id' => 'SLA',
 	'Class:lnkSLAToSLT/Attribute:sla_id+' => 'SLA',
 	'Class:lnkSLAToSLT/Attribute:sla_name' => 'SLA',
@@ -419,6 +431,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkCustomerContractToService' => 'Relación Acuerdo con Cliente y Servicio',
 	'Class:lnkCustomerContractToService+' => 'Relación Acuerdo con Cliente y Servicio',
+	'Class:lnkCustomerContractToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_id' => 'Acuerdo con Cliente',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_id+' => 'Acuerdo con Cliente',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_name' => 'Acuerdo con Cliente',
@@ -440,6 +453,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkProviderContractToService' => 'Relación Contrato con Proveedor y Servicio',
 	'Class:lnkProviderContractToService+' => 'Relación Contrato con Proveedor y Servicio',
+	'Class:lnkProviderContractToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkProviderContractToService/Attribute:service_id' => 'Servicio',
 	'Class:lnkProviderContractToService/Attribute:service_id+' => 'Servicio',
 	'Class:lnkProviderContractToService/Attribute:service_name' => 'Servicio',
@@ -478,6 +492,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkDeliveryModelToContact' => 'Relación Modelo de Entrega y Contacto',
 	'Class:lnkDeliveryModelToContact+' => 'Relación Modelo de Entrega y Contacto',
+	'Class:lnkDeliveryModelToContact/Name' => '%1$s / %2$s~~',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id' => 'Modelo de Entrega',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id+' => 'Modelo de Entrega',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name' => 'Modelo de Entrega',
diff --git a/datamodels/2.x/itop-service-mgmt/dictionaries/fr.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/fr.dict.itop-service-mgmt.php
index 2e3379cf66..37ad423d65 100644
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/fr.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/fr.dict.itop-service-mgmt.php
@@ -19,7 +19,6 @@
  * @copyright   Copyright (C) 2010-2023 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
-
 //
 // Menu, fieldsets, UI, messages translations
 //
@@ -51,10 +50,9 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Menu:ServiceFamily+' => 'Familles de service',
 	'Menu:Procedure' => 'Catalogue des procédures',
 	'Menu:Procedure+' => 'Catalogue des procédures',
-
 	'Contract:baseinfo' => 'Information générale',
 	'Contract:moreinfo' => 'Aspects contractuels',
-	'Contract:cost'     => 'Coûts',
+	'Contract:cost' => 'Coûts',
 ));
 
 //
@@ -168,6 +166,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:lnkContactToContract' => 'Lien Contact / Contrat',
 	'Class:lnkContactToContract+' => '',
+	'Class:lnkContactToContract/Name' => '%1$s / %2$s',
 	'Class:lnkContactToContract/Attribute:contract_id' => 'Contrat',
 	'Class:lnkContactToContract/Attribute:contract_id+' => '',
 	'Class:lnkContactToContract/Attribute:contract_name' => 'Nom contrat',
@@ -185,6 +184,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:lnkContractToDocument' => 'Lien Contrat / Document',
 	'Class:lnkContractToDocument+' => '',
+	'Class:lnkContractToDocument/Name' => '%1$s / %2$s',
 	'Class:lnkContractToDocument/Attribute:contract_id' => 'Contrat',
 	'Class:lnkContractToDocument/Attribute:contract_id+' => '',
 	'Class:lnkContractToDocument/Attribute:contract_name' => 'Nom contrat',
@@ -217,6 +217,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:Service' => 'Service',
 	'Class:Service+' => '',
+	'Class:Service/ComplementaryName' => '%1$s - %2$s',
 	'Class:Service/Attribute:name' => 'Nom',
 	'Class:Service/Attribute:name+' => '',
 	'Class:Service/Attribute:org_id' => 'Fournisseur',
@@ -260,6 +261,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:lnkDocumentToService' => 'Lien Document / Service',
 	'Class:lnkDocumentToService+' => '',
+	'Class:lnkDocumentToService/Name' => '%1$s / %2$s',
 	'Class:lnkDocumentToService/Attribute:service_id' => 'Service',
 	'Class:lnkDocumentToService/Attribute:service_id+' => '',
 	'Class:lnkDocumentToService/Attribute:service_name' => 'Nom service',
@@ -277,6 +279,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:lnkContactToService' => 'Lien Contact / Service',
 	'Class:lnkContactToService+' => '',
+	'Class:lnkContactToService/Name' => '%1$s / %2$s',
 	'Class:lnkContactToService/Attribute:service_id' => 'Service',
 	'Class:lnkContactToService/Attribute:service_id+' => '',
 	'Class:lnkContactToService/Attribute:service_name' => 'Nom service',
@@ -294,6 +297,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:ServiceSubcategory' => 'Sous catégorie de service',
 	'Class:ServiceSubcategory+' => '',
+	'Class:ServiceSubcategory/ComplementaryName' => '%1$s - %2$s',
 	'Class:ServiceSubcategory/Attribute:name' => 'Nom',
 	'Class:ServiceSubcategory/Attribute:name+' => '',
 	'Class:ServiceSubcategory/Attribute:description' => 'Description',
@@ -390,6 +394,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:lnkSLAToSLT' => 'Lien SLA / SLT',
 	'Class:lnkSLAToSLT+' => '',
+	'Class:lnkSLAToSLT/Name' => '%1$s / %2$s',
 	'Class:lnkSLAToSLT/Attribute:sla_id' => 'SLA',
 	'Class:lnkSLAToSLT/Attribute:sla_id+' => '',
 	'Class:lnkSLAToSLT/Attribute:sla_name' => 'Nom SLA',
@@ -417,6 +422,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:lnkCustomerContractToService' => 'Lien Contrat client / Service',
 	'Class:lnkCustomerContractToService+' => '',
+	'Class:lnkCustomerContractToService/Name' => '%1$s / %2$s',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_id' => 'Contrat client',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_id+' => '',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_name' => 'Nom contrat client',
@@ -438,6 +444,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:lnkProviderContractToService' => 'Lien Contrat fournisseur / Service',
 	'Class:lnkProviderContractToService+' => '',
+	'Class:lnkProviderContractToService/Name' => '%1$s / %2$s',
 	'Class:lnkProviderContractToService/Attribute:service_id' => 'Service',
 	'Class:lnkProviderContractToService/Attribute:service_id+' => '',
 	'Class:lnkProviderContractToService/Attribute:service_name' => 'Nom service',
@@ -476,6 +483,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:lnkDeliveryModelToContact' => 'Lien Modèle de support / Contact',
 	'Class:lnkDeliveryModelToContact+' => '',
+	'Class:lnkDeliveryModelToContact/Name' => '%1$s / %2$s',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id' => 'Modèle de support',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id+' => '',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name' => 'Nom Modèle de support',
@@ -489,7 +497,6 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:lnkDeliveryModelToContact/Attribute:role_name' => 'Nom Rôle',
 	'Class:lnkDeliveryModelToContact/Attribute:role_name+' => '',
 ));
-
 // 1:n relations custom labels for tooltip and pop-up title
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:DeliveryModel/Attribute:customers_list/UI:Links:Create:Button+' => 'Créer un %4$s',
@@ -515,5 +522,5 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:SLA/Attribute:customercontracts_list/UI:Links:Remove:Button+' => 'Retirer ce %4$s',
 	'Class:SLA/Attribute:customercontracts_list/UI:Links:Remove:Modal:Title' => 'Retirer ce %4$s de son %1$s',
 	'Class:SLA/Attribute:customercontracts_list/UI:Links:Delete:Button+' => 'Supprimer ce %4$s',
-	'Class:SLA/Attribute:customercontracts_list/UI:Links:Delete:Modal:Title' => 'Supprimer un %4$s',
+	'Class:SLA/Attribute:customercontracts_list/UI:Links:Delete:Modal:Title' => 'Supprimer un %4$s'
 ));
diff --git a/datamodels/2.x/itop-service-mgmt/dictionaries/hu.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/hu.dict.itop-service-mgmt.php
index a15e359ae2..b08f1731fc 100644
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/hu.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/hu.dict.itop-service-mgmt.php
@@ -20,33 +20,36 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Menu:ServiceManagement' => 'Szolgáltatáskezelés',
-    'Menu:ServiceManagement+' => '',
-    'Menu:Service:Overview' => 'Áttekintő',
-    'Menu:Service:Overview+' => '',
-    'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Szerződések szolgáltatás szintenként',
-    'UI-ServiceManagementMenu-ContractsByStatus' => 'Szerződések állapotuk szerint',
-    'UI-ServiceManagementMenu-ContractsEndingIn30Days' => '30 napon belül lejáró szerződések',
-    'Menu:ProviderContract' => 'Szállítói szerződés',
-    'Menu:ProviderContract+' => '',
-    'Menu:CustomerContract' => 'Ügyfélszerződés',
-    'Menu:CustomerContract+' => '',
-    'Menu:ServiceSubcategory' => 'Szolgáltatás alkategóriák',
-    'Menu:ServiceSubcategory+' => '',
-    'Menu:Service' => 'Szolgáltatások',
-    'Menu:Service+' => '',
-    'Menu:ServiceElement' => 'Szolgáltatás elemek',
-    'Menu:ServiceElement+' => 'Sevice elements~~',
-    'Menu:SLA' => 'SLA-k',
-    'Menu:SLA+' => '',
-    'Menu:SLT' => 'SLT-k',
-    'Menu:SLT+' => '',
-    'Menu:DeliveryModel' => 'Teljesítési modellek',
-    'Menu:DeliveryModel+' => 'Delivery models~~',
-    'Menu:ServiceFamily' => 'Szolgáltatáscsaládok',
-    'Menu:ServiceFamily+' => 'Service families~~',
-    'Menu:Procedure' => 'Eljáráskatalógus',
-    'Menu:Procedure+' => 'All procedures catalog~~',
+	'Menu:ServiceManagement' => 'Szolgáltatáskezelés',
+	'Menu:ServiceManagement+' => '',
+	'Menu:Service:Overview' => 'Áttekintő',
+	'Menu:Service:Overview+' => '',
+	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Szerződések szolgáltatás szintenként',
+	'UI-ServiceManagementMenu-ContractsByStatus' => 'Szerződések állapotuk szerint',
+	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => '30 napon belül lejáró szerződések',
+	'Menu:ProviderContract' => 'Szállítói szerződés',
+	'Menu:ProviderContract+' => '',
+	'Menu:CustomerContract' => 'Ügyfélszerződés',
+	'Menu:CustomerContract+' => '',
+	'Menu:ServiceSubcategory' => 'Szolgáltatás alkategóriák',
+	'Menu:ServiceSubcategory+' => '',
+	'Menu:Service' => 'Szolgáltatások',
+	'Menu:Service+' => '',
+	'Menu:ServiceElement' => 'Szolgáltatás elemek',
+	'Menu:ServiceElement+' => 'Sevice elements~~',
+	'Menu:SLA' => 'SLA-k',
+	'Menu:SLA+' => '',
+	'Menu:SLT' => 'SLT-k',
+	'Menu:SLT+' => '',
+	'Menu:DeliveryModel' => 'Teljesítési modellek',
+	'Menu:DeliveryModel+' => 'Delivery models~~',
+	'Menu:ServiceFamily' => 'Szolgáltatáscsaládok',
+	'Menu:ServiceFamily+' => 'Service families~~',
+	'Menu:Procedure' => 'Eljáráskatalógus',
+	'Menu:Procedure+' => 'All procedures catalog~~',
+	'Contract:baseinfo' => 'General information~~',
+	'Contract:moreinfo' => 'Contractual information~~',
+	'Contract:cost' => 'Cost information~~',
 ));
 
 //
@@ -54,9 +57,9 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:Organization/Attribute:deliverymodel_id' => 'Teljesítési modell',
-    'Class:Organization/Attribute:deliverymodel_id+' => '~~',
-    'Class:Organization/Attribute:deliverymodel_name' => 'Teljesítési modell név',
+	'Class:Organization/Attribute:deliverymodel_id' => 'Teljesítési modell',
+	'Class:Organization/Attribute:deliverymodel_id+' => '~~',
+	'Class:Organization/Attribute:deliverymodel_name' => 'Teljesítési modell név',
 ));
 
 
@@ -65,8 +68,8 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:ContractType' => 'Szerződés típus',
-    'Class:ContractType+' => '~~',
+	'Class:ContractType' => 'Szerződés típus',
+	'Class:ContractType+' => '~~',
 ));
 
 //
@@ -74,64 +77,64 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:Contract' => 'Szerződés',
-    'Class:Contract+' => '',
-    'Class:Contract/Attribute:name' => 'Név',
-    'Class:Contract/Attribute:name+' => '',
-    'Class:Contract/Attribute:org_id' => 'Ügyfél',
-    'Class:Contract/Attribute:org_id+' => '~~',
-    'Class:Contract/Attribute:organization_name' => 'Ügyfél név',
-    'Class:Contract/Attribute:organization_name+' => 'Általános név',
-    'Class:Contract/Attribute:contacts_list' => 'Kapcsolattartók',
-    'Class:Contract/Attribute:contacts_list+' => 'Az ügyfélszerződés kapcsolattartói',
-    'Class:Contract/Attribute:documents_list' => 'Dokumentumok',
-    'Class:Contract/Attribute:documents_list+' => 'Az ügyfélszerződés dokumentumai',
-    'Class:Contract/Attribute:description' => 'Leírás',
-    'Class:Contract/Attribute:description+' => '',
-    'Class:Contract/Attribute:start_date' => 'Érvényesség kezdete',
-    'Class:Contract/Attribute:start_date+' => '',
-    'Class:Contract/Attribute:end_date' => 'Érvényesség vége',
-    'Class:Contract/Attribute:end_date+' => '',
-    'Class:Contract/Attribute:cost' => 'Költség',
-    'Class:Contract/Attribute:cost+' => '',
-    'Class:Contract/Attribute:cost_currency' => 'Költség pénznem',
-    'Class:Contract/Attribute:cost_currency+' => '',
-    'Class:Contract/Attribute:cost_currency/Value:dollars' => 'Forint',
-    'Class:Contract/Attribute:cost_currency/Value:dollars+' => '',
-    'Class:Contract/Attribute:cost_currency/Value:euros' => 'Euró',
-    'Class:Contract/Attribute:cost_currency/Value:euros+' => '',
-    'Class:Contract/Attribute:contracttype_id' => 'Szerződés típus',
-    'Class:Contract/Attribute:contracttype_id+' => '~~',
-    'Class:Contract/Attribute:contracttype_name' => 'Szerződés típus név',
-    'Class:Contract/Attribute:contracttype_name+' => '~~',
-    'Class:Contract/Attribute:billing_frequency' => 'Számlázási gyakoriság',
-    'Class:Contract/Attribute:billing_frequency+' => '',
-    'Class:Contract/Attribute:cost_unit' => 'Költség egység',
-    'Class:Contract/Attribute:cost_unit+' => '',
-    'Class:Contract/Attribute:provider_id' => 'Szolgáltató',
-    'Class:Contract/Attribute:provider_id+' => '~~',
-    'Class:Contract/Attribute:provider_name' => 'Szolgáltató név',
-    'Class:Contract/Attribute:provider_name+' => 'Általános név',
-    'Class:Contract/Attribute:status' => 'Állapot',
-    'Class:Contract/Attribute:status+' => '~~',
-    'Class:Contract/Attribute:status/Value:implementation' => 'Megvalósítás alatt',
-    'Class:Contract/Attribute:status/Value:implementation+' => 'implementation~~',
-    'Class:Contract/Attribute:status/Value:obsolete' => 'Elavult',
-    'Class:Contract/Attribute:status/Value:obsolete+' => 'obsolete~~',
-    'Class:Contract/Attribute:status/Value:production' => 'Használatban',
-    'Class:Contract/Attribute:status/Value:production+' => 'használatban',
-    'Class:Contract/Attribute:finalclass' => 'Típus',
-    'Class:Contract/Attribute:finalclass+' => '',
+	'Class:Contract' => 'Szerződés',
+	'Class:Contract+' => '',
+	'Class:Contract/Attribute:name' => 'Név',
+	'Class:Contract/Attribute:name+' => '',
+	'Class:Contract/Attribute:org_id' => 'Ügyfél',
+	'Class:Contract/Attribute:org_id+' => '~~',
+	'Class:Contract/Attribute:organization_name' => 'Ügyfél név',
+	'Class:Contract/Attribute:organization_name+' => 'Általános név',
+	'Class:Contract/Attribute:contacts_list' => 'Kapcsolattartók',
+	'Class:Contract/Attribute:contacts_list+' => 'Az ügyfélszerződés kapcsolattartói',
+	'Class:Contract/Attribute:documents_list' => 'Dokumentumok',
+	'Class:Contract/Attribute:documents_list+' => 'Az ügyfélszerződés dokumentumai',
+	'Class:Contract/Attribute:description' => 'Leírás',
+	'Class:Contract/Attribute:description+' => '',
+	'Class:Contract/Attribute:start_date' => 'Érvényesség kezdete',
+	'Class:Contract/Attribute:start_date+' => '',
+	'Class:Contract/Attribute:end_date' => 'Érvényesség vége',
+	'Class:Contract/Attribute:end_date+' => '',
+	'Class:Contract/Attribute:cost' => 'Költség',
+	'Class:Contract/Attribute:cost+' => '',
+	'Class:Contract/Attribute:cost_currency' => 'Költség pénznem',
+	'Class:Contract/Attribute:cost_currency+' => '',
+	'Class:Contract/Attribute:cost_currency/Value:dollars' => 'Forint',
+	'Class:Contract/Attribute:cost_currency/Value:dollars+' => '',
+	'Class:Contract/Attribute:cost_currency/Value:euros' => 'Euró',
+	'Class:Contract/Attribute:cost_currency/Value:euros+' => '',
+	'Class:Contract/Attribute:contracttype_id' => 'Szerződés típus',
+	'Class:Contract/Attribute:contracttype_id+' => '~~',
+	'Class:Contract/Attribute:contracttype_name' => 'Szerződés típus név',
+	'Class:Contract/Attribute:contracttype_name+' => '~~',
+	'Class:Contract/Attribute:billing_frequency' => 'Számlázási gyakoriság',
+	'Class:Contract/Attribute:billing_frequency+' => '',
+	'Class:Contract/Attribute:cost_unit' => 'Költség egység',
+	'Class:Contract/Attribute:cost_unit+' => '',
+	'Class:Contract/Attribute:provider_id' => 'Szolgáltató',
+	'Class:Contract/Attribute:provider_id+' => '~~',
+	'Class:Contract/Attribute:provider_name' => 'Szolgáltató név',
+	'Class:Contract/Attribute:provider_name+' => 'Általános név',
+	'Class:Contract/Attribute:status' => 'Állapot',
+	'Class:Contract/Attribute:status+' => '~~',
+	'Class:Contract/Attribute:status/Value:implementation' => 'Megvalósítás alatt',
+	'Class:Contract/Attribute:status/Value:implementation+' => 'implementation~~',
+	'Class:Contract/Attribute:status/Value:obsolete' => 'Elavult',
+	'Class:Contract/Attribute:status/Value:obsolete+' => 'obsolete~~',
+	'Class:Contract/Attribute:status/Value:production' => 'Használatban',
+	'Class:Contract/Attribute:status/Value:production+' => 'használatban',
+	'Class:Contract/Attribute:finalclass' => 'Típus',
+	'Class:Contract/Attribute:finalclass+' => '',
 ));
 //
 // Class: CustomerContract
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:CustomerContract' => 'Ügyfél kapcsolattartó',
-    'Class:CustomerContract+' => '',
-    'Class:CustomerContract/Attribute:services_list' => 'Szolgáltatások',
-    'Class:CustomerContract/Attribute:services_list+' => 'Szolgáltatások melyek be lettek szerezve ennek a kapcsolattartónak',
+	'Class:CustomerContract' => 'Ügyfél kapcsolattartó',
+	'Class:CustomerContract+' => '',
+	'Class:CustomerContract/Attribute:services_list' => 'Szolgáltatások',
+	'Class:CustomerContract/Attribute:services_list+' => 'Szolgáltatások melyek be lettek szerezve ennek a kapcsolattartónak',
 ));
 
 //
@@ -139,18 +142,18 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:ProviderContract' => 'Szolgáltatói szerződés',
-    'Class:ProviderContract+' => '',
-    'Class:ProviderContract/Attribute:functionalcis_list' => 'CI-k',
-    'Class:ProviderContract/Attribute:functionalcis_list+' => 'Konfigurációs elemek, melyeket lefed ez a szolgáltatói szerződés',
-    'Class:ProviderContract/Attribute:sla' => 'SLA',
-    'Class:ProviderContract/Attribute:sla+' => '',
-    'Class:ProviderContract/Attribute:coverage' => 'Szolgáltatási időtartam',
-    'Class:ProviderContract/Attribute:coverage+' => '',
-    'Class:ProviderContract/Attribute:contracttype_id' => 'Szerződés típus',
-    'Class:ProviderContract/Attribute:contracttype_id+' => '~~',
-    'Class:ProviderContract/Attribute:contracttype_name' => 'Szerződés típus név',
-    'Class:ProviderContract/Attribute:contracttype_name+' => '~~',
+	'Class:ProviderContract' => 'Szolgáltatói szerződés',
+	'Class:ProviderContract+' => '',
+	'Class:ProviderContract/Attribute:functionalcis_list' => 'CI-k',
+	'Class:ProviderContract/Attribute:functionalcis_list+' => 'Konfigurációs elemek, melyeket lefed ez a szolgáltatói szerződés',
+	'Class:ProviderContract/Attribute:sla' => 'SLA',
+	'Class:ProviderContract/Attribute:sla+' => '',
+	'Class:ProviderContract/Attribute:coverage' => 'Szolgáltatási időtartam',
+	'Class:ProviderContract/Attribute:coverage+' => '',
+	'Class:ProviderContract/Attribute:contracttype_id' => 'Szerződés típus',
+	'Class:ProviderContract/Attribute:contracttype_id+' => '~~',
+	'Class:ProviderContract/Attribute:contracttype_name' => 'Szerződés típus név',
+	'Class:ProviderContract/Attribute:contracttype_name+' => '~~',
 ));
 
 //
@@ -158,16 +161,17 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:lnkContactToContract' => 'Kapcsolattartó / Szerződés',
-    'Class:lnkContactToContract+' => '~~',
-    'Class:lnkContactToContract/Attribute:contract_id' => 'Szerződés',
-    'Class:lnkContactToContract/Attribute:contract_id+' => '~~',
-    'Class:lnkContactToContract/Attribute:contract_name' => 'Szerződés név',
-    'Class:lnkContactToContract/Attribute:contract_name+' => '~~',
-    'Class:lnkContactToContract/Attribute:contact_id' => 'Kapcsolattartó',
-    'Class:lnkContactToContract/Attribute:contact_id+' => '~~',
-    'Class:lnkContactToContract/Attribute:contact_name' => 'Kapcsolattartó név',
-    'Class:lnkContactToContract/Attribute:contact_name+' => '~~',
+	'Class:lnkContactToContract' => 'Kapcsolattartó / Szerződés',
+	'Class:lnkContactToContract+' => '~~',
+	'Class:lnkContactToContract/Name' => '%1$s / %2$s~~',
+	'Class:lnkContactToContract/Attribute:contract_id' => 'Szerződés',
+	'Class:lnkContactToContract/Attribute:contract_id+' => '~~',
+	'Class:lnkContactToContract/Attribute:contract_name' => 'Szerződés név',
+	'Class:lnkContactToContract/Attribute:contract_name+' => '~~',
+	'Class:lnkContactToContract/Attribute:contact_id' => 'Kapcsolattartó',
+	'Class:lnkContactToContract/Attribute:contact_id+' => '~~',
+	'Class:lnkContactToContract/Attribute:contact_name' => 'Kapcsolattartó név',
+	'Class:lnkContactToContract/Attribute:contact_name+' => '~~',
 ));
 
 //
@@ -175,16 +179,17 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:lnkContractToDocument' => 'Szerződés / Dokumentum',
-    'Class:lnkContractToDocument+' => '~~',
-    'Class:lnkContractToDocument/Attribute:contract_id' => 'Szerződés',
-    'Class:lnkContractToDocument/Attribute:contract_id+' => '~~',
-    'Class:lnkContractToDocument/Attribute:contract_name' => 'Szerződés név',
-    'Class:lnkContractToDocument/Attribute:contract_name+' => '~~',
-    'Class:lnkContractToDocument/Attribute:document_id' => 'Dokumentum',
-    'Class:lnkContractToDocument/Attribute:document_id+' => '~~',
-    'Class:lnkContractToDocument/Attribute:document_name' => 'Dokumentum név',
-    'Class:lnkContractToDocument/Attribute:document_name+' => '~~',
+	'Class:lnkContractToDocument' => 'Szerződés / Dokumentum',
+	'Class:lnkContractToDocument+' => '~~',
+	'Class:lnkContractToDocument/Name' => '%1$s / %2$s~~',
+	'Class:lnkContractToDocument/Attribute:contract_id' => 'Szerződés',
+	'Class:lnkContractToDocument/Attribute:contract_id+' => '~~',
+	'Class:lnkContractToDocument/Attribute:contract_name' => 'Szerződés név',
+	'Class:lnkContractToDocument/Attribute:contract_name+' => '~~',
+	'Class:lnkContractToDocument/Attribute:document_id' => 'Dokumentum',
+	'Class:lnkContractToDocument/Attribute:document_id+' => '~~',
+	'Class:lnkContractToDocument/Attribute:document_name' => 'Dokumentum név',
+	'Class:lnkContractToDocument/Attribute:document_name+' => '~~',
 ));
 
 //
@@ -192,14 +197,14 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:ServiceFamily' => 'Szolgáltatáscsalád',
-    'Class:ServiceFamily+' => '~~',
-    'Class:ServiceFamily/Attribute:name' => 'Név',
-    'Class:ServiceFamily/Attribute:name+' => '~~',
-    'Class:ServiceFamily/Attribute:icon' => 'Ikon',
-    'Class:ServiceFamily/Attribute:icon+' => '~~',
-    'Class:ServiceFamily/Attribute:services_list' => 'Szolgáltatások',
-    'Class:ServiceFamily/Attribute:services_list+' => 'Szolgáltatások ebben a kategóriában',
+	'Class:ServiceFamily' => 'Szolgáltatáscsalád',
+	'Class:ServiceFamily+' => '~~',
+	'Class:ServiceFamily/Attribute:name' => 'Név',
+	'Class:ServiceFamily/Attribute:name+' => '~~',
+	'Class:ServiceFamily/Attribute:icon' => 'Ikon',
+	'Class:ServiceFamily/Attribute:icon+' => '~~',
+	'Class:ServiceFamily/Attribute:services_list' => 'Szolgáltatások',
+	'Class:ServiceFamily/Attribute:services_list+' => 'Szolgáltatások ebben a kategóriában',
 ));
 
 //
@@ -207,42 +212,43 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:Service' => 'Szolgáltatás',
-    'Class:Service+' => '',
-    'Class:Service/Attribute:name' => 'Név',
-    'Class:Service/Attribute:name+' => '',
-    'Class:Service/Attribute:org_id' => 'Szolgáltató szervezeti egység',
-    'Class:Service/Attribute:org_id+' => '',
-    'Class:Service/Attribute:organization_name' => 'Szolgáltató név',
-    'Class:Service/Attribute:organization_name+' => '~~',
-    'Class:Service/Attribute:servicefamily_id' => 'Szolgáltatáscsalád',
-    'Class:Service/Attribute:servicefamily_id+' => '~~',
-    'Class:Service/Attribute:servicefamily_name' => 'Szolgáltatáscsalád név',
-    'Class:Service/Attribute:servicefamily_name+' => '~~',
-    'Class:Service/Attribute:description' => 'Leírás',
-    'Class:Service/Attribute:description+' => '',
-    'Class:Service/Attribute:documents_list' => 'Dokumentumok',
-    'Class:Service/Attribute:documents_list+' => 'A szolgáltatás dokumentumai',
-    'Class:Service/Attribute:contacts_list' => 'Kapcsolattartók',
-    'Class:Service/Attribute:contacts_list+' => 'A szolgáltatás kapcsolattartói',
-    'Class:Service/Attribute:status' => 'Állapot',
-    'Class:Service/Attribute:status+' => '',
-    'Class:Service/Attribute:status/Value:implementation' => 'Megvalósítás alatt',
-    'Class:Service/Attribute:status/Value:implementation+' => 'implementation~~',
-    'Class:Service/Attribute:status/Value:obsolete' => 'Elavult',
-    'Class:Service/Attribute:status/Value:obsolete+' => '',
-    'Class:Service/Attribute:status/Value:production' => 'Használatban',
-    'Class:Service/Attribute:status/Value:production+' => '',
-    'Class:Service/Attribute:icon' => 'Ikon',
-    'Class:Service/Attribute:icon+' => '~~',
-    'Class:Service/Attribute:customercontracts_list' => 'Ügyfélszerződések',
-    'Class:Service/Attribute:customercontracts_list+' => 'Ügyfélszerződések, melyek beszerezték ezt a szolgáltatást',
-    'Class:Service/Attribute:providercontracts_list' => 'Szolgáltatói szerződések',
-    'Class:Service/Attribute:providercontracts_list+' => 'Szolgáltatói szerződések, melyek támogatják ezt a szerződést',
-    'Class:Service/Attribute:functionalcis_list' => 'CI függőség',
-    'Class:Service/Attribute:functionalcis_list+' => 'Konfigurációs elemek, melyek ehhez a szolgáltatáshoz kellenek',
-    'Class:Service/Attribute:servicesubcategories_list' => 'Szolgáltatás alkategóriák',
-    'Class:Service/Attribute:servicesubcategories_list+' => 'A szolgáltatás alkategóriái',
+	'Class:Service' => 'Szolgáltatás',
+	'Class:Service+' => '',
+	'Class:Service/ComplementaryName' => '%1$s - %2$s~~',
+	'Class:Service/Attribute:name' => 'Név',
+	'Class:Service/Attribute:name+' => '',
+	'Class:Service/Attribute:org_id' => 'Szolgáltató szervezeti egység',
+	'Class:Service/Attribute:org_id+' => '',
+	'Class:Service/Attribute:organization_name' => 'Szolgáltató név',
+	'Class:Service/Attribute:organization_name+' => '~~',
+	'Class:Service/Attribute:servicefamily_id' => 'Szolgáltatáscsalád',
+	'Class:Service/Attribute:servicefamily_id+' => '~~',
+	'Class:Service/Attribute:servicefamily_name' => 'Szolgáltatáscsalád név',
+	'Class:Service/Attribute:servicefamily_name+' => '~~',
+	'Class:Service/Attribute:description' => 'Leírás',
+	'Class:Service/Attribute:description+' => '',
+	'Class:Service/Attribute:documents_list' => 'Dokumentumok',
+	'Class:Service/Attribute:documents_list+' => 'A szolgáltatás dokumentumai',
+	'Class:Service/Attribute:contacts_list' => 'Kapcsolattartók',
+	'Class:Service/Attribute:contacts_list+' => 'A szolgáltatás kapcsolattartói',
+	'Class:Service/Attribute:status' => 'Állapot',
+	'Class:Service/Attribute:status+' => '',
+	'Class:Service/Attribute:status/Value:implementation' => 'Megvalósítás alatt',
+	'Class:Service/Attribute:status/Value:implementation+' => 'implementation~~',
+	'Class:Service/Attribute:status/Value:obsolete' => 'Elavult',
+	'Class:Service/Attribute:status/Value:obsolete+' => '',
+	'Class:Service/Attribute:status/Value:production' => 'Használatban',
+	'Class:Service/Attribute:status/Value:production+' => '',
+	'Class:Service/Attribute:icon' => 'Ikon',
+	'Class:Service/Attribute:icon+' => '~~',
+	'Class:Service/Attribute:customercontracts_list' => 'Ügyfélszerződések',
+	'Class:Service/Attribute:customercontracts_list+' => 'Ügyfélszerződések, melyek beszerezték ezt a szolgáltatást',
+	'Class:Service/Attribute:providercontracts_list' => 'Szolgáltatói szerződések',
+	'Class:Service/Attribute:providercontracts_list+' => 'Szolgáltatói szerződések, melyek támogatják ezt a szerződést',
+	'Class:Service/Attribute:functionalcis_list' => 'CI függőség',
+	'Class:Service/Attribute:functionalcis_list+' => 'Konfigurációs elemek, melyek ehhez a szolgáltatáshoz kellenek',
+	'Class:Service/Attribute:servicesubcategories_list' => 'Szolgáltatás alkategóriák',
+	'Class:Service/Attribute:servicesubcategories_list+' => 'A szolgáltatás alkategóriái',
 ));
 
 //
@@ -250,16 +256,17 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:lnkDocumentToService' => 'Dokumentum / Szolgáltatás',
-    'Class:lnkDocumentToService+' => '~~',
-    'Class:lnkDocumentToService/Attribute:service_id' => 'Szolgáltatás',
-    'Class:lnkDocumentToService/Attribute:service_id+' => '~~',
-    'Class:lnkDocumentToService/Attribute:service_name' => 'Szolgáltatás név',
-    'Class:lnkDocumentToService/Attribute:service_name+' => '~~',
-    'Class:lnkDocumentToService/Attribute:document_id' => 'Dokumentum',
-    'Class:lnkDocumentToService/Attribute:document_id+' => '~~',
-    'Class:lnkDocumentToService/Attribute:document_name' => 'Dokumentum név',
-    'Class:lnkDocumentToService/Attribute:document_name+' => '~~',
+	'Class:lnkDocumentToService' => 'Dokumentum / Szolgáltatás',
+	'Class:lnkDocumentToService+' => '~~',
+	'Class:lnkDocumentToService/Name' => '%1$s / %2$s~~',
+	'Class:lnkDocumentToService/Attribute:service_id' => 'Szolgáltatás',
+	'Class:lnkDocumentToService/Attribute:service_id+' => '~~',
+	'Class:lnkDocumentToService/Attribute:service_name' => 'Szolgáltatás név',
+	'Class:lnkDocumentToService/Attribute:service_name+' => '~~',
+	'Class:lnkDocumentToService/Attribute:document_id' => 'Dokumentum',
+	'Class:lnkDocumentToService/Attribute:document_id+' => '~~',
+	'Class:lnkDocumentToService/Attribute:document_name' => 'Dokumentum név',
+	'Class:lnkDocumentToService/Attribute:document_name+' => '~~',
 ));
 
 //
@@ -267,16 +274,17 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:lnkContactToService' => 'Kapcsolattartó / Szolgáltatás',
-    'Class:lnkContactToService+' => '~~',
-    'Class:lnkContactToService/Attribute:service_id' => 'Szolgáltatás',
-    'Class:lnkContactToService/Attribute:service_id+' => '~~',
-    'Class:lnkContactToService/Attribute:service_name' => 'Szolgáltatás név',
-    'Class:lnkContactToService/Attribute:service_name+' => '~~',
-    'Class:lnkContactToService/Attribute:contact_id' => 'Kapcsolattartó',
-    'Class:lnkContactToService/Attribute:contact_id+' => '~~',
-    'Class:lnkContactToService/Attribute:contact_name' => 'Kapcsolattartó név',
-    'Class:lnkContactToService/Attribute:contact_name+' => '~~',
+	'Class:lnkContactToService' => 'Kapcsolattartó / Szolgáltatás',
+	'Class:lnkContactToService+' => '~~',
+	'Class:lnkContactToService/Name' => '%1$s / %2$s~~',
+	'Class:lnkContactToService/Attribute:service_id' => 'Szolgáltatás',
+	'Class:lnkContactToService/Attribute:service_id+' => '~~',
+	'Class:lnkContactToService/Attribute:service_name' => 'Szolgáltatás név',
+	'Class:lnkContactToService/Attribute:service_name+' => '~~',
+	'Class:lnkContactToService/Attribute:contact_id' => 'Kapcsolattartó',
+	'Class:lnkContactToService/Attribute:contact_id+' => '~~',
+	'Class:lnkContactToService/Attribute:contact_name' => 'Kapcsolattartó név',
+	'Class:lnkContactToService/Attribute:contact_name+' => '~~',
 ));
 
 //
@@ -284,30 +292,31 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:ServiceSubcategory' => 'Szolgáltatás alkategória',
-    'Class:ServiceSubcategory+' => '',
-    'Class:ServiceSubcategory/Attribute:name' => 'Név',
-    'Class:ServiceSubcategory/Attribute:name+' => '',
-    'Class:ServiceSubcategory/Attribute:description' => 'Leírás',
-    'Class:ServiceSubcategory/Attribute:description+' => '',
-    'Class:ServiceSubcategory/Attribute:service_id' => 'Szolgáltatás',
-    'Class:ServiceSubcategory/Attribute:service_id+' => '',
-    'Class:ServiceSubcategory/Attribute:service_name' => 'Szolgáltatás',
-    'Class:ServiceSubcategory/Attribute:service_name+' => '',
-    'Class:ServiceSubcategory/Attribute:request_type' => 'Kérelem típus',
-    'Class:ServiceSubcategory/Attribute:request_type+' => '~~',
-    'Class:ServiceSubcategory/Attribute:request_type/Value:incident' => 'Incidens',
-    'Class:ServiceSubcategory/Attribute:request_type/Value:incident+' => 'incident~~',
-    'Class:ServiceSubcategory/Attribute:request_type/Value:service_request' => 'Szolgáltatás kérelem',
-    'Class:ServiceSubcategory/Attribute:request_type/Value:service_request+' => 'service request~~',
-    'Class:ServiceSubcategory/Attribute:status' => 'Állapot',
-    'Class:ServiceSubcategory/Attribute:status+' => '~~',
-    'Class:ServiceSubcategory/Attribute:status/Value:implementation' => 'Megvalósítás alatt',
-    'Class:ServiceSubcategory/Attribute:status/Value:implementation+' => 'implementation~~',
-    'Class:ServiceSubcategory/Attribute:status/Value:obsolete' => 'Elavult',
-    'Class:ServiceSubcategory/Attribute:status/Value:obsolete+' => 'obsolete~~',
-    'Class:ServiceSubcategory/Attribute:status/Value:production' => 'Használatban',
-    'Class:ServiceSubcategory/Attribute:status/Value:production+' => 'production~~',
+	'Class:ServiceSubcategory' => 'Szolgáltatás alkategória',
+	'Class:ServiceSubcategory+' => '',
+	'Class:ServiceSubcategory/ComplementaryName' => '%1$s - %2$s~~',
+	'Class:ServiceSubcategory/Attribute:name' => 'Név',
+	'Class:ServiceSubcategory/Attribute:name+' => '',
+	'Class:ServiceSubcategory/Attribute:description' => 'Leírás',
+	'Class:ServiceSubcategory/Attribute:description+' => '',
+	'Class:ServiceSubcategory/Attribute:service_id' => 'Szolgáltatás',
+	'Class:ServiceSubcategory/Attribute:service_id+' => '',
+	'Class:ServiceSubcategory/Attribute:service_name' => 'Szolgáltatás',
+	'Class:ServiceSubcategory/Attribute:service_name+' => '',
+	'Class:ServiceSubcategory/Attribute:request_type' => 'Kérelem típus',
+	'Class:ServiceSubcategory/Attribute:request_type+' => '~~',
+	'Class:ServiceSubcategory/Attribute:request_type/Value:incident' => 'Incidens',
+	'Class:ServiceSubcategory/Attribute:request_type/Value:incident+' => 'incident~~',
+	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request' => 'Szolgáltatás kérelem',
+	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request+' => 'service request~~',
+	'Class:ServiceSubcategory/Attribute:status' => 'Állapot',
+	'Class:ServiceSubcategory/Attribute:status+' => '~~',
+	'Class:ServiceSubcategory/Attribute:status/Value:implementation' => 'Megvalósítás alatt',
+	'Class:ServiceSubcategory/Attribute:status/Value:implementation+' => 'implementation~~',
+	'Class:ServiceSubcategory/Attribute:status/Value:obsolete' => 'Elavult',
+	'Class:ServiceSubcategory/Attribute:status/Value:obsolete+' => 'obsolete~~',
+	'Class:ServiceSubcategory/Attribute:status/Value:production' => 'Használatban',
+	'Class:ServiceSubcategory/Attribute:status/Value:production+' => 'production~~',
 ));
 
 //
@@ -315,21 +324,21 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:SLA' => 'SLA',
-    'Class:SLA+' => '',
-    'Class:SLA/Attribute:name' => 'Név',
-    'Class:SLA/Attribute:name+' => '',
-    'Class:SLA/Attribute:description' => 'Leírás',
-    'Class:SLA/Attribute:description+' => '~~',
-    'Class:SLA/Attribute:org_id' => 'Szolgáltató szervezeti egység',
-    'Class:SLA/Attribute:org_id+' => '~~',
-    'Class:SLA/Attribute:organization_name' => 'Szolgáltató név',
-    'Class:SLA/Attribute:organization_name+' => 'Általános név',
-    'Class:SLA/Attribute:slts_list' => 'SLT-k',
-    'Class:SLA/Attribute:slts_list+' => 'All the service level targets for this SLA~~',
-    'Class:SLA/Attribute:customercontracts_list' => 'Ügyfélszerződések',
-    'Class:SLA/Attribute:customercontracts_list+' => 'Ügyfélszerződések, melyek használják ezt az SLA-t',
-    'Class:SLA/Error:UniqueLnkCustomerContractToService' => 'Nem sikerült elmenteni a linket az Ügyfél szerződés %1$s és szolgáltatás %2$s : SLA már létezik',
+	'Class:SLA' => 'SLA',
+	'Class:SLA+' => '',
+	'Class:SLA/Attribute:name' => 'Név',
+	'Class:SLA/Attribute:name+' => '',
+	'Class:SLA/Attribute:description' => 'Leírás',
+	'Class:SLA/Attribute:description+' => '~~',
+	'Class:SLA/Attribute:org_id' => 'Szolgáltató szervezeti egység',
+	'Class:SLA/Attribute:org_id+' => '~~',
+	'Class:SLA/Attribute:organization_name' => 'Szolgáltató név',
+	'Class:SLA/Attribute:organization_name+' => 'Általános név',
+	'Class:SLA/Attribute:slts_list' => 'SLT-k',
+	'Class:SLA/Attribute:slts_list+' => 'All the service level targets for this SLA~~',
+	'Class:SLA/Attribute:customercontracts_list' => 'Ügyfélszerződések',
+	'Class:SLA/Attribute:customercontracts_list+' => 'Ügyfélszerződések, melyek használják ezt az SLA-t',
+	'Class:SLA/Error:UniqueLnkCustomerContractToService' => 'Nem sikerült elmenteni a linket az Ügyfél szerződés %1$s és szolgáltatás %2$s : SLA már létezik',
 ));
 
 //
@@ -337,40 +346,42 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:SLT' => 'SLT',
-    'Class:SLT+' => '',
-    'Class:SLT/Attribute:name' => 'Név',
-    'Class:SLT/Attribute:name+' => '',
-    'Class:SLT/Attribute:priority' => 'Prioritás',
-    'Class:SLT/Attribute:priority+' => '~~',
-    'Class:SLT/Attribute:priority/Value:1' => 'Kritikus',
-    'Class:SLT/Attribute:priority/Value:1+' => 'critical~~',
-    'Class:SLT/Attribute:priority/Value:2' => 'Magas',
-    'Class:SLT/Attribute:priority/Value:2+' => 'high~~',
-    'Class:SLT/Attribute:priority/Value:3' => 'Közepes',
-    'Class:SLT/Attribute:priority/Value:3+' => 'medium~~',
-    'Class:SLT/Attribute:priority/Value:4' => 'Alacsony',
-    'Class:SLT/Attribute:priority/Value:4+' => 'low~~',
-    'Class:SLT/Attribute:request_type' => 'Kérelem típus',
-    'Class:SLT/Attribute:request_type+' => '~~',
-    'Class:SLT/Attribute:request_type/Value:incident' => 'Incidens',
-    'Class:SLT/Attribute:request_type/Value:incident+' => 'incident~~',
-    'Class:SLT/Attribute:request_type/Value:service_request' => 'Szolgáltatás kérelem',
-    'Class:SLT/Attribute:request_type/Value:service_request+' => 'service request~~',
-    'Class:SLT/Attribute:metric' => 'Metrika',
-    'Class:SLT/Attribute:metric+' => '',
-    'Class:SLT/Attribute:metric/Value:tto' => 'TTO',
-    'Class:SLT/Attribute:metric/Value:tto+' => 'TTO~~',
-    'Class:SLT/Attribute:metric/Value:ttr' => 'TTR',
-    'Class:SLT/Attribute:metric/Value:ttr+' => 'TTR~~',
-    'Class:SLT/Attribute:value' => 'Érték',
-    'Class:SLT/Attribute:value+' => '',
-    'Class:SLT/Attribute:unit' => 'Egység',
-    'Class:SLT/Attribute:unit+' => '~~',
-    'Class:SLT/Attribute:unit/Value:hours' => 'óra',
-    'Class:SLT/Attribute:unit/Value:hours+' => 'hours~~',
-    'Class:SLT/Attribute:unit/Value:minutes' => 'perc',
-    'Class:SLT/Attribute:unit/Value:minutes+' => 'minutes~~',
+	'Class:SLT' => 'SLT',
+	'Class:SLT+' => '',
+	'Class:SLT/Attribute:name' => 'Név',
+	'Class:SLT/Attribute:name+' => '',
+	'Class:SLT/Attribute:priority' => 'Prioritás',
+	'Class:SLT/Attribute:priority+' => '~~',
+	'Class:SLT/Attribute:priority/Value:1' => 'Kritikus',
+	'Class:SLT/Attribute:priority/Value:1+' => 'critical~~',
+	'Class:SLT/Attribute:priority/Value:2' => 'Magas',
+	'Class:SLT/Attribute:priority/Value:2+' => 'high~~',
+	'Class:SLT/Attribute:priority/Value:3' => 'Közepes',
+	'Class:SLT/Attribute:priority/Value:3+' => 'medium~~',
+	'Class:SLT/Attribute:priority/Value:4' => 'Alacsony',
+	'Class:SLT/Attribute:priority/Value:4+' => 'low~~',
+	'Class:SLT/Attribute:request_type' => 'Kérelem típus',
+	'Class:SLT/Attribute:request_type+' => '~~',
+	'Class:SLT/Attribute:request_type/Value:incident' => 'Incidens',
+	'Class:SLT/Attribute:request_type/Value:incident+' => 'incident~~',
+	'Class:SLT/Attribute:request_type/Value:service_request' => 'Szolgáltatás kérelem',
+	'Class:SLT/Attribute:request_type/Value:service_request+' => 'service request~~',
+	'Class:SLT/Attribute:metric' => 'Metrika',
+	'Class:SLT/Attribute:metric+' => '',
+	'Class:SLT/Attribute:metric/Value:tto' => 'TTO',
+	'Class:SLT/Attribute:metric/Value:tto+' => 'TTO~~',
+	'Class:SLT/Attribute:metric/Value:ttr' => 'TTR',
+	'Class:SLT/Attribute:metric/Value:ttr+' => 'TTR~~',
+	'Class:SLT/Attribute:value' => 'Érték',
+	'Class:SLT/Attribute:value+' => '',
+	'Class:SLT/Attribute:unit' => 'Egység',
+	'Class:SLT/Attribute:unit+' => '~~',
+	'Class:SLT/Attribute:unit/Value:hours' => 'óra',
+	'Class:SLT/Attribute:unit/Value:hours+' => 'hours~~',
+	'Class:SLT/Attribute:unit/Value:minutes' => 'perc',
+	'Class:SLT/Attribute:unit/Value:minutes+' => 'minutes~~',
+	'Class:SLT/Attribute:slas_list' => 'SLAs~~',
+	'Class:SLT/Attribute:slas_list+' => 'All the service level agreements using this SLT~~',
 ));
 
 //
@@ -378,26 +389,27 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:lnkSLAToSLT' => 'SLA / SLT',
-    'Class:lnkSLAToSLT+' => '~~',
-    'Class:lnkSLAToSLT/Attribute:sla_id' => 'SLA',
-    'Class:lnkSLAToSLT/Attribute:sla_id+' => '~~',
-    'Class:lnkSLAToSLT/Attribute:sla_name' => 'SLA név',
-    'Class:lnkSLAToSLT/Attribute:sla_name+' => '~~',
-    'Class:lnkSLAToSLT/Attribute:slt_id' => 'SLT',
-    'Class:lnkSLAToSLT/Attribute:slt_id+' => '~~',
-    'Class:lnkSLAToSLT/Attribute:slt_name' => 'SLT név',
-    'Class:lnkSLAToSLT/Attribute:slt_name+' => '~~',
-    'Class:lnkSLAToSLT/Attribute:slt_metric' => 'SLT metrika',
-    'Class:lnkSLAToSLT/Attribute:slt_metric+' => '~~',
-    'Class:lnkSLAToSLT/Attribute:slt_request_type' => 'SLT kérelem típus',
-    'Class:lnkSLAToSLT/Attribute:slt_request_type+' => '~~',
-    'Class:lnkSLAToSLT/Attribute:slt_ticket_priority' => 'SLT hibajegy prioritás',
-    'Class:lnkSLAToSLT/Attribute:slt_ticket_priority+' => '~~',
-    'Class:lnkSLAToSLT/Attribute:slt_value' => 'SLT érték',
-    'Class:lnkSLAToSLT/Attribute:slt_value+' => '~~',
-    'Class:lnkSLAToSLT/Attribute:slt_value_unit' => 'SLT érték egység',
-    'Class:lnkSLAToSLT/Attribute:slt_value_unit+' => '~~',
+	'Class:lnkSLAToSLT' => 'SLA / SLT',
+	'Class:lnkSLAToSLT+' => '~~',
+	'Class:lnkSLAToSLT/Name' => '%1$s / %2$s~~',
+	'Class:lnkSLAToSLT/Attribute:sla_id' => 'SLA',
+	'Class:lnkSLAToSLT/Attribute:sla_id+' => '~~',
+	'Class:lnkSLAToSLT/Attribute:sla_name' => 'SLA név',
+	'Class:lnkSLAToSLT/Attribute:sla_name+' => '~~',
+	'Class:lnkSLAToSLT/Attribute:slt_id' => 'SLT',
+	'Class:lnkSLAToSLT/Attribute:slt_id+' => '~~',
+	'Class:lnkSLAToSLT/Attribute:slt_name' => 'SLT név',
+	'Class:lnkSLAToSLT/Attribute:slt_name+' => '~~',
+	'Class:lnkSLAToSLT/Attribute:slt_metric' => 'SLT metrika',
+	'Class:lnkSLAToSLT/Attribute:slt_metric+' => '~~',
+	'Class:lnkSLAToSLT/Attribute:slt_request_type' => 'SLT kérelem típus',
+	'Class:lnkSLAToSLT/Attribute:slt_request_type+' => '~~',
+	'Class:lnkSLAToSLT/Attribute:slt_ticket_priority' => 'SLT hibajegy prioritás',
+	'Class:lnkSLAToSLT/Attribute:slt_ticket_priority+' => '~~',
+	'Class:lnkSLAToSLT/Attribute:slt_value' => 'SLT érték',
+	'Class:lnkSLAToSLT/Attribute:slt_value+' => '~~',
+	'Class:lnkSLAToSLT/Attribute:slt_value_unit' => 'SLT érték egység',
+	'Class:lnkSLAToSLT/Attribute:slt_value_unit+' => '~~',
 ));
 
 //
@@ -405,20 +417,21 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:lnkCustomerContractToService' => 'Ügyfélszerződés / Szolgáltatás',
-    'Class:lnkCustomerContractToService+' => '~~',
-    'Class:lnkCustomerContractToService/Attribute:customercontract_id' => 'Ügyfélszerződés',
-    'Class:lnkCustomerContractToService/Attribute:customercontract_id+' => '~~',
-    'Class:lnkCustomerContractToService/Attribute:customercontract_name' => 'Ügyfélszerződés név',
-    'Class:lnkCustomerContractToService/Attribute:customercontract_name+' => '~~',
-    'Class:lnkCustomerContractToService/Attribute:service_id' => 'Szolgáltatás',
-    'Class:lnkCustomerContractToService/Attribute:service_id+' => '~~',
-    'Class:lnkCustomerContractToService/Attribute:service_name' => 'Szolgáltatás név',
-    'Class:lnkCustomerContractToService/Attribute:service_name+' => '~~',
-    'Class:lnkCustomerContractToService/Attribute:sla_id' => 'SLA',
-    'Class:lnkCustomerContractToService/Attribute:sla_id+' => '~~',
-    'Class:lnkCustomerContractToService/Attribute:sla_name' => 'SLA név',
-    'Class:lnkCustomerContractToService/Attribute:sla_name+' => '~~',
+	'Class:lnkCustomerContractToService' => 'Ügyfélszerződés / Szolgáltatás',
+	'Class:lnkCustomerContractToService+' => '~~',
+	'Class:lnkCustomerContractToService/Name' => '%1$s / %2$s~~',
+	'Class:lnkCustomerContractToService/Attribute:customercontract_id' => 'Ügyfélszerződés',
+	'Class:lnkCustomerContractToService/Attribute:customercontract_id+' => '~~',
+	'Class:lnkCustomerContractToService/Attribute:customercontract_name' => 'Ügyfélszerződés név',
+	'Class:lnkCustomerContractToService/Attribute:customercontract_name+' => '~~',
+	'Class:lnkCustomerContractToService/Attribute:service_id' => 'Szolgáltatás',
+	'Class:lnkCustomerContractToService/Attribute:service_id+' => '~~',
+	'Class:lnkCustomerContractToService/Attribute:service_name' => 'Szolgáltatás név',
+	'Class:lnkCustomerContractToService/Attribute:service_name+' => '~~',
+	'Class:lnkCustomerContractToService/Attribute:sla_id' => 'SLA',
+	'Class:lnkCustomerContractToService/Attribute:sla_id+' => '~~',
+	'Class:lnkCustomerContractToService/Attribute:sla_name' => 'SLA név',
+	'Class:lnkCustomerContractToService/Attribute:sla_name+' => '~~',
 ));
 
 //
@@ -426,16 +439,17 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:lnkProviderContractToService' => 'Szolgáltatói szerződés / Szolgáltatás',
-    'Class:lnkProviderContractToService+' => '~~',
-    'Class:lnkProviderContractToService/Attribute:service_id' => 'Szolgáltatás',
-    'Class:lnkProviderContractToService/Attribute:service_id+' => '~~',
-    'Class:lnkProviderContractToService/Attribute:service_name' => 'Szolgáltatás név',
-    'Class:lnkProviderContractToService/Attribute:service_name+' => '~~',
-    'Class:lnkProviderContractToService/Attribute:providercontract_id' => 'Szolgáltatói szerződés',
-    'Class:lnkProviderContractToService/Attribute:providercontract_id+' => '~~',
-    'Class:lnkProviderContractToService/Attribute:providercontract_name' => 'Szolgáltatói szerződés név',
-    'Class:lnkProviderContractToService/Attribute:providercontract_name+' => '~~',
+	'Class:lnkProviderContractToService' => 'Szolgáltatói szerződés / Szolgáltatás',
+	'Class:lnkProviderContractToService+' => '~~',
+	'Class:lnkProviderContractToService/Name' => '%1$s / %2$s~~',
+	'Class:lnkProviderContractToService/Attribute:service_id' => 'Szolgáltatás',
+	'Class:lnkProviderContractToService/Attribute:service_id+' => '~~',
+	'Class:lnkProviderContractToService/Attribute:service_name' => 'Szolgáltatás név',
+	'Class:lnkProviderContractToService/Attribute:service_name+' => '~~',
+	'Class:lnkProviderContractToService/Attribute:providercontract_id' => 'Szolgáltatói szerződés',
+	'Class:lnkProviderContractToService/Attribute:providercontract_id+' => '~~',
+	'Class:lnkProviderContractToService/Attribute:providercontract_name' => 'Szolgáltatói szerződés név',
+	'Class:lnkProviderContractToService/Attribute:providercontract_name+' => '~~',
 ));
 
 //
@@ -443,20 +457,20 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:DeliveryModel' => 'Teljesítési modell',
-    'Class:DeliveryModel+' => '~~',
-    'Class:DeliveryModel/Attribute:name' => 'Név',
-    'Class:DeliveryModel/Attribute:name+' => '~~',
-    'Class:DeliveryModel/Attribute:org_id' => 'Szervezeti egység',
-    'Class:DeliveryModel/Attribute:org_id+' => '~~',
-    'Class:DeliveryModel/Attribute:organization_name' => 'Szervezeti egység név',
-    'Class:DeliveryModel/Attribute:organization_name+' => 'Általános név',
-    'Class:DeliveryModel/Attribute:description' => 'Leírás',
-    'Class:DeliveryModel/Attribute:description+' => '~~',
-    'Class:DeliveryModel/Attribute:contacts_list' => 'Kapcsolattartók',
-    'Class:DeliveryModel/Attribute:contacts_list+' => 'Kapcsolattartók (csapat és személy) ehhez a teljesítési modellhez',
-    'Class:DeliveryModel/Attribute:customers_list' => 'Ügyfelek',
-    'Class:DeliveryModel/Attribute:customers_list+' => 'Ügyfelek, melyek rendelkeznek ezzel a teljesítési modellel',
+	'Class:DeliveryModel' => 'Teljesítési modell',
+	'Class:DeliveryModel+' => '~~',
+	'Class:DeliveryModel/Attribute:name' => 'Név',
+	'Class:DeliveryModel/Attribute:name+' => '~~',
+	'Class:DeliveryModel/Attribute:org_id' => 'Szervezeti egység',
+	'Class:DeliveryModel/Attribute:org_id+' => '~~',
+	'Class:DeliveryModel/Attribute:organization_name' => 'Szervezeti egység név',
+	'Class:DeliveryModel/Attribute:organization_name+' => 'Általános név',
+	'Class:DeliveryModel/Attribute:description' => 'Leírás',
+	'Class:DeliveryModel/Attribute:description+' => '~~',
+	'Class:DeliveryModel/Attribute:contacts_list' => 'Kapcsolattartók',
+	'Class:DeliveryModel/Attribute:contacts_list+' => 'Kapcsolattartók (csapat és személy) ehhez a teljesítési modellhez',
+	'Class:DeliveryModel/Attribute:customers_list' => 'Ügyfelek',
+	'Class:DeliveryModel/Attribute:customers_list+' => 'Ügyfelek, melyek rendelkeznek ezzel a teljesítési modellel',
 ));
 
 //
@@ -464,18 +478,19 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:lnkDeliveryModelToContact' => 'Teljesítési modell / Kapcsolattartó',
-    'Class:lnkDeliveryModelToContact+' => '~~',
-    'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id' => 'Teljesítési modell',
-    'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id+' => '~~',
-    'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name' => 'Teljesítési modell név',
-    'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name+' => '~~',
-    'Class:lnkDeliveryModelToContact/Attribute:contact_id' => 'Kapcsolattartó',
-    'Class:lnkDeliveryModelToContact/Attribute:contact_id+' => '~~',
-    'Class:lnkDeliveryModelToContact/Attribute:contact_name' => 'Kapcsolattartó név',
-    'Class:lnkDeliveryModelToContact/Attribute:contact_name+' => '~~',
-    'Class:lnkDeliveryModelToContact/Attribute:role_id' => 'Beosztás',
-    'Class:lnkDeliveryModelToContact/Attribute:role_id+' => '~~',
-    'Class:lnkDeliveryModelToContact/Attribute:role_name' => 'Beosztás név',
-    'Class:lnkDeliveryModelToContact/Attribute:role_name+' => '~~',
-));
\ No newline at end of file
+	'Class:lnkDeliveryModelToContact' => 'Teljesítési modell / Kapcsolattartó',
+	'Class:lnkDeliveryModelToContact+' => '~~',
+	'Class:lnkDeliveryModelToContact/Name' => '%1$s / %2$s~~',
+	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id' => 'Teljesítési modell',
+	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id+' => '~~',
+	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name' => 'Teljesítési modell név',
+	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name+' => '~~',
+	'Class:lnkDeliveryModelToContact/Attribute:contact_id' => 'Kapcsolattartó',
+	'Class:lnkDeliveryModelToContact/Attribute:contact_id+' => '~~',
+	'Class:lnkDeliveryModelToContact/Attribute:contact_name' => 'Kapcsolattartó név',
+	'Class:lnkDeliveryModelToContact/Attribute:contact_name+' => '~~',
+	'Class:lnkDeliveryModelToContact/Attribute:role_id' => 'Beosztás',
+	'Class:lnkDeliveryModelToContact/Attribute:role_id+' => '~~',
+	'Class:lnkDeliveryModelToContact/Attribute:role_name' => 'Beosztás név',
+	'Class:lnkDeliveryModelToContact/Attribute:role_name+' => '~~',
+));
diff --git a/datamodels/2.x/itop-service-mgmt/dictionaries/it.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/it.dict.itop-service-mgmt.php
index f23c801498..460f140d47 100644
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/it.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/it.dict.itop-service-mgmt.php
@@ -58,6 +58,9 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Menu:ServiceFamily+' => 'Service families~~',
 	'Menu:Procedure' => 'Procedures catalog~~',
 	'Menu:Procedure+' => 'All procedures catalog~~',
+	'Contract:baseinfo' => 'General information~~',
+	'Contract:moreinfo' => 'Contractual information~~',
+	'Contract:cost' => 'Cost information~~',
 ));
 
 //
@@ -171,6 +174,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:lnkContactToContract' => 'Link Contact / Contract~~',
 	'Class:lnkContactToContract+' => '~~',
+	'Class:lnkContactToContract/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToContract/Attribute:contract_id' => 'Contract~~',
 	'Class:lnkContactToContract/Attribute:contract_id+' => '~~',
 	'Class:lnkContactToContract/Attribute:contract_name' => 'Contract Name~~',
@@ -188,6 +192,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:lnkContractToDocument' => 'Link Contract / Document~~',
 	'Class:lnkContractToDocument+' => '~~',
+	'Class:lnkContractToDocument/Name' => '%1$s / %2$s~~',
 	'Class:lnkContractToDocument/Attribute:contract_id' => 'Contract~~',
 	'Class:lnkContractToDocument/Attribute:contract_id+' => '~~',
 	'Class:lnkContractToDocument/Attribute:contract_name' => 'Contract Name~~',
@@ -220,6 +225,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:Service' => 'Servizio',
 	'Class:Service+' => '',
+	'Class:Service/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Service/Attribute:name' => 'Nome',
 	'Class:Service/Attribute:name+' => '',
 	'Class:Service/Attribute:org_id' => 'Provider',
@@ -263,6 +269,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:lnkDocumentToService' => 'Link Document / Service~~',
 	'Class:lnkDocumentToService+' => '~~',
+	'Class:lnkDocumentToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToService/Attribute:service_id' => 'Service~~',
 	'Class:lnkDocumentToService/Attribute:service_id+' => '~~',
 	'Class:lnkDocumentToService/Attribute:service_name' => 'Service Name~~',
@@ -280,6 +287,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:lnkContactToService' => 'Link Contact / Service~~',
 	'Class:lnkContactToService+' => '~~',
+	'Class:lnkContactToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToService/Attribute:service_id' => 'Service~~',
 	'Class:lnkContactToService/Attribute:service_id+' => '~~',
 	'Class:lnkContactToService/Attribute:service_name' => 'Service Name~~',
@@ -297,6 +305,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:ServiceSubcategory' => 'Sottocategorie del servizio',
 	'Class:ServiceSubcategory+' => '',
+	'Class:ServiceSubcategory/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:ServiceSubcategory/Attribute:name' => 'Nome',
 	'Class:ServiceSubcategory/Attribute:name+' => '',
 	'Class:ServiceSubcategory/Attribute:description' => 'Descrizione',
@@ -382,6 +391,8 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:SLT/Attribute:unit/Value:hours+' => 'hours~~',
 	'Class:SLT/Attribute:unit/Value:minutes' => 'minutes~~',
 	'Class:SLT/Attribute:unit/Value:minutes+' => 'minutes~~',
+	'Class:SLT/Attribute:slas_list' => 'SLAs~~',
+	'Class:SLT/Attribute:slas_list+' => 'All the service level agreements using this SLT~~',
 ));
 
 //
@@ -391,6 +402,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:lnkSLAToSLT' => 'Link SLA / SLT~~',
 	'Class:lnkSLAToSLT+' => '~~',
+	'Class:lnkSLAToSLT/Name' => '%1$s / %2$s~~',
 	'Class:lnkSLAToSLT/Attribute:sla_id' => 'SLA~~',
 	'Class:lnkSLAToSLT/Attribute:sla_id+' => '~~',
 	'Class:lnkSLAToSLT/Attribute:sla_name' => 'SLA Name~~',
@@ -418,6 +430,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:lnkCustomerContractToService' => 'Link Customer Contract / Service~~',
 	'Class:lnkCustomerContractToService+' => '~~',
+	'Class:lnkCustomerContractToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_id' => 'Customer contract~~',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_id+' => '~~',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_name' => 'Customer contract Name~~',
@@ -439,6 +452,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:lnkProviderContractToService' => 'Link Provider Contract / Service~~',
 	'Class:lnkProviderContractToService+' => '~~',
+	'Class:lnkProviderContractToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkProviderContractToService/Attribute:service_id' => 'Service~~',
 	'Class:lnkProviderContractToService/Attribute:service_id+' => '~~',
 	'Class:lnkProviderContractToService/Attribute:service_name' => 'Service Name~~',
@@ -477,6 +491,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:lnkDeliveryModelToContact' => 'Link Delivery Model / Contact~~',
 	'Class:lnkDeliveryModelToContact+' => '~~',
+	'Class:lnkDeliveryModelToContact/Name' => '%1$s / %2$s~~',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id' => 'Delivery model~~',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id+' => '~~',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name' => 'Delivery model name~~',
diff --git a/datamodels/2.x/itop-service-mgmt/dictionaries/ja.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/ja.dict.itop-service-mgmt.php
index fa0244279b..a3462abb8b 100644
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/ja.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/ja.dict.itop-service-mgmt.php
@@ -47,6 +47,9 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Menu:ServiceFamily+' => 'サービスファミリ',
 	'Menu:Procedure' => '手順カタログ',
 	'Menu:Procedure+' => '全ての手順カタログ',
+	'Contract:baseinfo' => 'General information~~',
+	'Contract:moreinfo' => 'Contractual information~~',
+	'Contract:cost' => 'Cost information~~',
 ));
 
 //
@@ -160,6 +163,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:lnkContactToContract' => 'リンク 連絡先/契約',
 	'Class:lnkContactToContract+' => '',
+	'Class:lnkContactToContract/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToContract/Attribute:contract_id' => '契約',
 	'Class:lnkContactToContract/Attribute:contract_id+' => '',
 	'Class:lnkContactToContract/Attribute:contract_name' => '契約名',
@@ -177,6 +181,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:lnkContractToDocument' => 'リンク 契約/文書',
 	'Class:lnkContractToDocument+' => '',
+	'Class:lnkContractToDocument/Name' => '%1$s / %2$s~~',
 	'Class:lnkContractToDocument/Attribute:contract_id' => '契約',
 	'Class:lnkContractToDocument/Attribute:contract_id+' => '',
 	'Class:lnkContractToDocument/Attribute:contract_name' => '契約名',
@@ -209,6 +214,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:Service' => 'サービス',
 	'Class:Service+' => '',
+	'Class:Service/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Service/Attribute:name' => '名前',
 	'Class:Service/Attribute:name+' => '',
 	'Class:Service/Attribute:org_id' => 'プロバイダー',
@@ -252,6 +258,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:lnkDocumentToService' => 'リンク 文書/サービス',
 	'Class:lnkDocumentToService+' => '',
+	'Class:lnkDocumentToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToService/Attribute:service_id' => 'サービス',
 	'Class:lnkDocumentToService/Attribute:service_id+' => '',
 	'Class:lnkDocumentToService/Attribute:service_name' => 'サービス名',
@@ -269,6 +276,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:lnkContactToService' => 'リンク 連絡先/サービス',
 	'Class:lnkContactToService+' => '',
+	'Class:lnkContactToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToService/Attribute:service_id' => 'サービス',
 	'Class:lnkContactToService/Attribute:service_id+' => '',
 	'Class:lnkContactToService/Attribute:service_name' => 'サービス名',
@@ -286,6 +294,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:ServiceSubcategory' => 'サービスサブカテゴリ',
 	'Class:ServiceSubcategory+' => '',
+	'Class:ServiceSubcategory/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:ServiceSubcategory/Attribute:name' => '名前',
 	'Class:ServiceSubcategory/Attribute:name+' => '',
 	'Class:ServiceSubcategory/Attribute:description' => '説明',
@@ -371,6 +380,8 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:SLT/Attribute:unit/Value:hours+' => '時間',
 	'Class:SLT/Attribute:unit/Value:minutes' => '分',
 	'Class:SLT/Attribute:unit/Value:minutes+' => '分',
+	'Class:SLT/Attribute:slas_list' => 'SLAs~~',
+	'Class:SLT/Attribute:slas_list+' => 'All the service level agreements using this SLT~~',
 ));
 
 //
@@ -380,6 +391,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:lnkSLAToSLT' => 'リンク SLA / SLT',
 	'Class:lnkSLAToSLT+' => '',
+	'Class:lnkSLAToSLT/Name' => '%1$s / %2$s~~',
 	'Class:lnkSLAToSLT/Attribute:sla_id' => 'SLA',
 	'Class:lnkSLAToSLT/Attribute:sla_id+' => '',
 	'Class:lnkSLAToSLT/Attribute:sla_name' => 'SLA名',
@@ -407,6 +419,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:lnkCustomerContractToService' => 'リンク 顧客契約/サービス',
 	'Class:lnkCustomerContractToService+' => '',
+	'Class:lnkCustomerContractToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_id' => '顧客契約',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_id+' => '',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_name' => '顧客契約名',
@@ -428,6 +441,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:lnkProviderContractToService' => 'リンク プロバイダ契約/サービス',
 	'Class:lnkProviderContractToService+' => '',
+	'Class:lnkProviderContractToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkProviderContractToService/Attribute:service_id' => 'サービス',
 	'Class:lnkProviderContractToService/Attribute:service_id+' => '',
 	'Class:lnkProviderContractToService/Attribute:service_name' => 'サービス名',
@@ -466,6 +480,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:lnkDeliveryModelToContact' => 'Link 提供モデル/連絡先',
 	'Class:lnkDeliveryModelToContact+' => '',
+	'Class:lnkDeliveryModelToContact/Name' => '%1$s / %2$s~~',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id' => '提供モデル',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id+' => '',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name' => '提供モデル名',
diff --git a/datamodels/2.x/itop-service-mgmt/dictionaries/nl.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/nl.dict.itop-service-mgmt.php
index 17030ca047..7eb3669bcd 100644
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/nl.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/nl.dict.itop-service-mgmt.php
@@ -62,6 +62,9 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Menu:ServiceFamily+' => 'Servicecategorieën',
 	'Menu:Procedure' => 'Procedurecatalogus',
 	'Menu:Procedure+' => 'Alle procedures in een catalogus',
+	'Contract:baseinfo' => 'General information~~',
+	'Contract:moreinfo' => 'Contractual information~~',
+	'Contract:cost' => 'Cost information~~',
 ));
 
 //
@@ -175,6 +178,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:lnkContactToContract' => 'Link Contact / Contract',
 	'Class:lnkContactToContract+' => '',
+	'Class:lnkContactToContract/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToContract/Attribute:contract_id' => 'Contract',
 	'Class:lnkContactToContract/Attribute:contract_id+' => '',
 	'Class:lnkContactToContract/Attribute:contract_name' => 'Naam contract',
@@ -192,6 +196,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:lnkContractToDocument' => 'Link Contract / Document',
 	'Class:lnkContractToDocument+' => '',
+	'Class:lnkContractToDocument/Name' => '%1$s / %2$s~~',
 	'Class:lnkContractToDocument/Attribute:contract_id' => 'Contract',
 	'Class:lnkContractToDocument/Attribute:contract_id+' => '',
 	'Class:lnkContractToDocument/Attribute:contract_name' => 'Naam contract',
@@ -224,6 +229,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:Service' => 'Service',
 	'Class:Service+' => '',
+	'Class:Service/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Service/Attribute:name' => 'Naam',
 	'Class:Service/Attribute:name+' => '',
 	'Class:Service/Attribute:org_id' => 'Leverancier',
@@ -267,6 +273,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:lnkDocumentToService' => 'Link Document / Service',
 	'Class:lnkDocumentToService+' => '',
+	'Class:lnkDocumentToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToService/Attribute:service_id' => 'Service',
 	'Class:lnkDocumentToService/Attribute:service_id+' => '',
 	'Class:lnkDocumentToService/Attribute:service_name' => 'Naam service',
@@ -284,6 +291,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:lnkContactToService' => 'Link Contact / Service',
 	'Class:lnkContactToService+' => '',
+	'Class:lnkContactToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToService/Attribute:service_id' => 'Service',
 	'Class:lnkContactToService/Attribute:service_id+' => '',
 	'Class:lnkContactToService/Attribute:service_name' => 'Naam service',
@@ -301,6 +309,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:ServiceSubcategory' => 'Subcategorie service',
 	'Class:ServiceSubcategory+' => '',
+	'Class:ServiceSubcategory/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:ServiceSubcategory/Attribute:name' => 'Naam',
 	'Class:ServiceSubcategory/Attribute:name+' => '',
 	'Class:ServiceSubcategory/Attribute:description' => 'Omschrijving',
@@ -386,6 +395,8 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:SLT/Attribute:unit/Value:hours+' => 'uren',
 	'Class:SLT/Attribute:unit/Value:minutes' => 'minuten',
 	'Class:SLT/Attribute:unit/Value:minutes+' => 'minuten',
+	'Class:SLT/Attribute:slas_list' => 'SLAs~~',
+	'Class:SLT/Attribute:slas_list+' => 'All the service level agreements using this SLT~~',
 ));
 
 //
@@ -395,6 +406,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:lnkSLAToSLT' => 'Link SLA / SLT',
 	'Class:lnkSLAToSLT+' => '',
+	'Class:lnkSLAToSLT/Name' => '%1$s / %2$s~~',
 	'Class:lnkSLAToSLT/Attribute:sla_id' => 'SLA',
 	'Class:lnkSLAToSLT/Attribute:sla_id+' => '',
 	'Class:lnkSLAToSLT/Attribute:sla_name' => 'Naam SLA',
@@ -422,6 +434,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:lnkCustomerContractToService' => 'Link Klantencontract / Service',
 	'Class:lnkCustomerContractToService+' => '',
+	'Class:lnkCustomerContractToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_id' => 'Klantencontract',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_id+' => '',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_name' => 'Naam klantencontract',
@@ -443,6 +456,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:lnkProviderContractToService' => 'Link Leverancierscontract / Service',
 	'Class:lnkProviderContractToService+' => '',
+	'Class:lnkProviderContractToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkProviderContractToService/Attribute:service_id' => 'Service',
 	'Class:lnkProviderContractToService/Attribute:service_id+' => '',
 	'Class:lnkProviderContractToService/Attribute:service_name' => 'Naam service',
@@ -481,6 +495,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:lnkDeliveryModelToContact' => 'Link Leveringsmodel / Contact',
 	'Class:lnkDeliveryModelToContact+' => '',
+	'Class:lnkDeliveryModelToContact/Name' => '%1$s / %2$s~~',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id' => 'Leveringsmodel',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id+' => '',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name' => 'Naam leveringsmodel',
diff --git a/datamodels/2.x/itop-service-mgmt/dictionaries/pl.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/pl.dict.itop-service-mgmt.php
index 009a8f48ae..10e0773032 100644
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/pl.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/pl.dict.itop-service-mgmt.php
@@ -20,7 +20,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/>
  */
-
 // Dictionnay conventions
 // Class:<class_name>
 // Class:<class_name>+
@@ -30,8 +29,6 @@
 // Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
 // Class:<class_name>/Stimulus:<stimulus_code>
 // Class:<class_name>/Stimulus:<stimulus_code>+
-
-
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Menu:ServiceManagement' => 'Zarządzanie usługami',
 	'Menu:ServiceManagement+' => 'Omówienie zarządzania usługami',
@@ -60,6 +57,9 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Menu:ServiceFamily+' => 'Rodziny usług',
 	'Menu:Procedure' => 'Katalog procedur',
 	'Menu:Procedure+' => 'Katalog wszystkich procedur',
+	'Contract:baseinfo' => 'General information~~',
+	'Contract:moreinfo' => 'Contractual information~~',
+	'Contract:cost' => 'Cost information~~',
 ));
 
 //
@@ -173,6 +173,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:lnkContactToContract' => 'Połączenie Kontakt / Umowa',
 	'Class:lnkContactToContract+' => '',
+	'Class:lnkContactToContract/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToContract/Attribute:contract_id' => 'Umowa',
 	'Class:lnkContactToContract/Attribute:contract_id+' => '',
 	'Class:lnkContactToContract/Attribute:contract_name' => 'Nazwa umowy',
@@ -190,6 +191,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:lnkContractToDocument' => 'Połączenie Umowa / Dokument',
 	'Class:lnkContractToDocument+' => '',
+	'Class:lnkContractToDocument/Name' => '%1$s / %2$s~~',
 	'Class:lnkContractToDocument/Attribute:contract_id' => 'Umowa',
 	'Class:lnkContractToDocument/Attribute:contract_id+' => '',
 	'Class:lnkContractToDocument/Attribute:contract_name' => 'Nazwa umowy',
@@ -222,6 +224,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:Service' => 'Usługa',
 	'Class:Service+' => '',
+	'Class:Service/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Service/Attribute:name' => 'Nazwa',
 	'Class:Service/Attribute:name+' => '',
 	'Class:Service/Attribute:org_id' => 'Dostawca',
@@ -265,6 +268,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:lnkDocumentToService' => 'Połączenie Dokument / Usługa',
 	'Class:lnkDocumentToService+' => '',
+	'Class:lnkDocumentToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToService/Attribute:service_id' => 'Usługa',
 	'Class:lnkDocumentToService/Attribute:service_id+' => '',
 	'Class:lnkDocumentToService/Attribute:service_name' => 'Nazwa usługi',
@@ -282,6 +286,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:lnkContactToService' => 'Połączenie Kontakt / Usługa',
 	'Class:lnkContactToService+' => '',
+	'Class:lnkContactToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToService/Attribute:service_id' => 'Usługa',
 	'Class:lnkContactToService/Attribute:service_id+' => '',
 	'Class:lnkContactToService/Attribute:service_name' => 'Nazwa usługi',
@@ -299,6 +304,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:ServiceSubcategory' => 'Podkategoria usługi',
 	'Class:ServiceSubcategory+' => '',
+	'Class:ServiceSubcategory/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:ServiceSubcategory/Attribute:name' => 'Nazwa',
 	'Class:ServiceSubcategory/Attribute:name+' => '',
 	'Class:ServiceSubcategory/Attribute:description' => 'Opis',
@@ -384,6 +390,8 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:SLT/Attribute:unit/Value:hours+' => 'godzin',
 	'Class:SLT/Attribute:unit/Value:minutes' => 'minut',
 	'Class:SLT/Attribute:unit/Value:minutes+' => 'minut',
+	'Class:SLT/Attribute:slas_list' => 'SLAs~~',
+	'Class:SLT/Attribute:slas_list+' => 'All the service level agreements using this SLT~~',
 ));
 
 //
@@ -393,6 +401,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:lnkSLAToSLT' => 'Połączenie SLA / SLT',
 	'Class:lnkSLAToSLT+' => '',
+	'Class:lnkSLAToSLT/Name' => '%1$s / %2$s~~',
 	'Class:lnkSLAToSLT/Attribute:sla_id' => 'Umowa SLA',
 	'Class:lnkSLAToSLT/Attribute:sla_id+' => '',
 	'Class:lnkSLAToSLT/Attribute:sla_name' => 'Nazwa umowy SLA',
@@ -420,6 +429,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:lnkCustomerContractToService' => 'Połączenie Umowa z klientem / Usługa',
 	'Class:lnkCustomerContractToService+' => '',
+	'Class:lnkCustomerContractToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_id' => 'Umowa z klientem',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_id+' => '',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_name' => 'Nazwa umowy z klientem',
@@ -441,6 +451,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:lnkProviderContractToService' => 'Połączenie Umowa z dostawcą / Usługa',
 	'Class:lnkProviderContractToService+' => '',
+	'Class:lnkProviderContractToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkProviderContractToService/Attribute:service_id' => 'Usługa',
 	'Class:lnkProviderContractToService/Attribute:service_id+' => '',
 	'Class:lnkProviderContractToService/Attribute:service_name' => 'Nazwa usługi',
@@ -479,6 +490,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:lnkDeliveryModelToContact' => 'Połączenie Model obsługi / Kontakt',
 	'Class:lnkDeliveryModelToContact+' => '',
+	'Class:lnkDeliveryModelToContact/Name' => '%1$s / %2$s~~',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id' => 'Model obsługi',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id+' => '',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name' => 'Nazwa modelu obsługi',
diff --git a/datamodels/2.x/itop-service-mgmt/dictionaries/pt_br.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/pt_br.dict.itop-service-mgmt.php
index a6022231bd..95d38d0602 100644
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/pt_br.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/pt_br.dict.itop-service-mgmt.php
@@ -58,6 +58,9 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Menu:ServiceFamily+' => 'Lista de família de serviços',
 	'Menu:Procedure' => 'Catálogo de procedimentos',
 	'Menu:Procedure+' => '',
+	'Contract:baseinfo' => 'General information~~',
+	'Contract:moreinfo' => 'Contractual information~~',
+	'Contract:cost' => 'Cost information~~',
 ));
 
 //
@@ -171,6 +174,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:lnkContactToContract' => 'Link Contato / Contrato',
 	'Class:lnkContactToContract+' => '',
+	'Class:lnkContactToContract/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToContract/Attribute:contract_id' => 'Contrato',
 	'Class:lnkContactToContract/Attribute:contract_id+' => '',
 	'Class:lnkContactToContract/Attribute:contract_name' => 'Nome do contrato',
@@ -188,6 +192,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:lnkContractToDocument' => 'Link Contrato / Documento',
 	'Class:lnkContractToDocument+' => '',
+	'Class:lnkContractToDocument/Name' => '%1$s / %2$s~~',
 	'Class:lnkContractToDocument/Attribute:contract_id' => 'Contrato',
 	'Class:lnkContractToDocument/Attribute:contract_id+' => '',
 	'Class:lnkContractToDocument/Attribute:contract_name' => 'Nome do contrato',
@@ -220,6 +225,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:Service' => 'Serviço',
 	'Class:Service+' => '',
+	'Class:Service/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Service/Attribute:name' => 'Nome',
 	'Class:Service/Attribute:name+' => '',
 	'Class:Service/Attribute:org_id' => 'Provedor',
@@ -263,6 +269,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:lnkDocumentToService' => 'Link Documento / Serviço',
 	'Class:lnkDocumentToService+' => '',
+	'Class:lnkDocumentToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToService/Attribute:service_id' => 'Serviço',
 	'Class:lnkDocumentToService/Attribute:service_id+' => '',
 	'Class:lnkDocumentToService/Attribute:service_name' => 'Nome serviço',
@@ -280,6 +287,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:lnkContactToService' => 'Link Contato / Serviço',
 	'Class:lnkContactToService+' => '',
+	'Class:lnkContactToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToService/Attribute:service_id' => 'Serviço',
 	'Class:lnkContactToService/Attribute:service_id+' => '',
 	'Class:lnkContactToService/Attribute:service_name' => 'Nome do serviço',
@@ -297,6 +305,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:ServiceSubcategory' => 'Subcategorias de serviço',
 	'Class:ServiceSubcategory+' => '',
+	'Class:ServiceSubcategory/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:ServiceSubcategory/Attribute:name' => 'Nome',
 	'Class:ServiceSubcategory/Attribute:name+' => '',
 	'Class:ServiceSubcategory/Attribute:description' => 'Descrição',
@@ -382,6 +391,8 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:SLT/Attribute:unit/Value:hours+' => '',
 	'Class:SLT/Attribute:unit/Value:minutes' => 'Minutos',
 	'Class:SLT/Attribute:unit/Value:minutes+' => '',
+	'Class:SLT/Attribute:slas_list' => 'SLAs~~',
+	'Class:SLT/Attribute:slas_list+' => 'All the service level agreements using this SLT~~',
 ));
 
 //
@@ -391,6 +402,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:lnkSLAToSLT' => 'Link SLA / SLT',
 	'Class:lnkSLAToSLT+' => '',
+	'Class:lnkSLAToSLT/Name' => '%1$s / %2$s~~',
 	'Class:lnkSLAToSLT/Attribute:sla_id' => 'SLA',
 	'Class:lnkSLAToSLT/Attribute:sla_id+' => '',
 	'Class:lnkSLAToSLT/Attribute:sla_name' => 'Nome do SLA',
@@ -418,6 +430,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:lnkCustomerContractToService' => 'Link Contrato de cliente / Serviço',
 	'Class:lnkCustomerContractToService+' => '',
+	'Class:lnkCustomerContractToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_id' => 'Contrato de cliente',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_id+' => '',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_name' => 'Nome do contrato de cliente',
@@ -439,6 +452,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:lnkProviderContractToService' => 'Link Contrato de provedor / Serviço',
 	'Class:lnkProviderContractToService+' => '',
+	'Class:lnkProviderContractToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkProviderContractToService/Attribute:service_id' => 'Serviço',
 	'Class:lnkProviderContractToService/Attribute:service_id+' => '',
 	'Class:lnkProviderContractToService/Attribute:service_name' => 'Nome do serviço',
@@ -477,6 +491,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:lnkDeliveryModelToContact' => 'Link Modelo de entrega / Contato',
 	'Class:lnkDeliveryModelToContact+' => '',
+	'Class:lnkDeliveryModelToContact/Name' => '%1$s / %2$s~~',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id' => 'Modelo de entrega',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id+' => '',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name' => 'Nome do modelo de entrega',
diff --git a/datamodels/2.x/itop-service-mgmt/dictionaries/ru.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/ru.dict.itop-service-mgmt.php
index 062938292e..5037ed0d38 100644
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/ru.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/ru.dict.itop-service-mgmt.php
@@ -36,6 +36,9 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Menu:ServiceFamily+' => 'Пакеты услуг',
 	'Menu:Procedure' => 'Каталог процедур',
 	'Menu:Procedure+' => 'Каталог процедур',
+	'Contract:baseinfo' => 'General information~~',
+	'Contract:moreinfo' => 'Contractual information~~',
+	'Contract:cost' => 'Cost information~~',
 ));
 
 //
@@ -149,6 +152,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:lnkContactToContract' => 'Связь Контакт/Договор',
 	'Class:lnkContactToContract+' => '',
+	'Class:lnkContactToContract/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToContract/Attribute:contract_id' => 'Договор',
 	'Class:lnkContactToContract/Attribute:contract_id+' => '',
 	'Class:lnkContactToContract/Attribute:contract_name' => 'Договор',
@@ -166,6 +170,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:lnkContractToDocument' => 'Связь Договор/Документ',
 	'Class:lnkContractToDocument+' => '',
+	'Class:lnkContractToDocument/Name' => '%1$s / %2$s~~',
 	'Class:lnkContractToDocument/Attribute:contract_id' => 'Договор',
 	'Class:lnkContractToDocument/Attribute:contract_id+' => '',
 	'Class:lnkContractToDocument/Attribute:contract_name' => 'Договор',
@@ -198,6 +203,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:Service' => 'Услуга',
 	'Class:Service+' => '',
+	'Class:Service/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Service/Attribute:name' => 'Название',
 	'Class:Service/Attribute:name+' => '',
 	'Class:Service/Attribute:org_id' => 'Поставщик',
@@ -241,6 +247,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:lnkDocumentToService' => 'Связь Документ/Услуга',
 	'Class:lnkDocumentToService+' => '',
+	'Class:lnkDocumentToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToService/Attribute:service_id' => 'Услуга',
 	'Class:lnkDocumentToService/Attribute:service_id+' => '',
 	'Class:lnkDocumentToService/Attribute:service_name' => 'Услуга',
@@ -258,6 +265,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:lnkContactToService' => 'Связь Контакт/Услуга',
 	'Class:lnkContactToService+' => '',
+	'Class:lnkContactToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToService/Attribute:service_id' => 'Услуга',
 	'Class:lnkContactToService/Attribute:service_id+' => '',
 	'Class:lnkContactToService/Attribute:service_name' => 'Услуга',
@@ -275,6 +283,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:ServiceSubcategory' => 'Подкатегория услуги',
 	'Class:ServiceSubcategory+' => '',
+	'Class:ServiceSubcategory/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:ServiceSubcategory/Attribute:name' => 'Название',
 	'Class:ServiceSubcategory/Attribute:name+' => '',
 	'Class:ServiceSubcategory/Attribute:description' => 'Описание',
@@ -360,6 +369,8 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:SLT/Attribute:unit/Value:hours+' => 'Часы',
 	'Class:SLT/Attribute:unit/Value:minutes' => 'Минуты',
 	'Class:SLT/Attribute:unit/Value:minutes+' => 'Минуты',
+	'Class:SLT/Attribute:slas_list' => 'SLAs~~',
+	'Class:SLT/Attribute:slas_list+' => 'All the service level agreements using this SLT~~',
 ));
 
 //
@@ -369,6 +380,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:lnkSLAToSLT' => 'Связь SLA/SLT',
 	'Class:lnkSLAToSLT+' => '',
+	'Class:lnkSLAToSLT/Name' => '%1$s / %2$s~~',
 	'Class:lnkSLAToSLT/Attribute:sla_id' => 'SLA',
 	'Class:lnkSLAToSLT/Attribute:sla_id+' => '',
 	'Class:lnkSLAToSLT/Attribute:sla_name' => 'SLA',
@@ -396,6 +408,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:lnkCustomerContractToService' => 'Связь Договор с заказчиком/Услуга',
 	'Class:lnkCustomerContractToService+' => '',
+	'Class:lnkCustomerContractToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_id' => 'Договор с заказчиком',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_id+' => '',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_name' => 'Договор с заказчиком',
@@ -417,6 +430,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:lnkProviderContractToService' => 'Связь Договор с поставщиком/Услуга',
 	'Class:lnkProviderContractToService+' => '',
+	'Class:lnkProviderContractToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkProviderContractToService/Attribute:service_id' => 'Услуга',
 	'Class:lnkProviderContractToService/Attribute:service_id+' => '',
 	'Class:lnkProviderContractToService/Attribute:service_name' => 'Услуга',
@@ -455,6 +469,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:lnkDeliveryModelToContact' => 'Связь Модель предоставления услуг/Контакт',
 	'Class:lnkDeliveryModelToContact+' => '',
+	'Class:lnkDeliveryModelToContact/Name' => '%1$s / %2$s~~',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id' => 'Модель предоставления услуг',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id+' => '',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name' => 'Модель предоставления услуг',
diff --git a/datamodels/2.x/itop-service-mgmt/dictionaries/sk.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/sk.dict.itop-service-mgmt.php
index 9fb8316c0a..4f466cd60a 100644
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/sk.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/sk.dict.itop-service-mgmt.php
@@ -57,6 +57,9 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Menu:ServiceFamily+' => '',
 	'Menu:Procedure' => 'Katalóg procedúr',
 	'Menu:Procedure+' => '',
+	'Contract:baseinfo' => 'General information~~',
+	'Contract:moreinfo' => 'Contractual information~~',
+	'Contract:cost' => 'Cost information~~',
 ));
 
 //
@@ -170,6 +173,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:lnkContactToContract' => 'väzba - Kontakt / zmluva',
 	'Class:lnkContactToContract+' => '',
+	'Class:lnkContactToContract/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToContract/Attribute:contract_id' => 'zmluva',
 	'Class:lnkContactToContract/Attribute:contract_id+' => '',
 	'Class:lnkContactToContract/Attribute:contract_name' => 'Názov zmluvy',
@@ -187,6 +191,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:lnkContractToDocument' => 'väzba - zmluva / Dokument',
 	'Class:lnkContractToDocument+' => '',
+	'Class:lnkContractToDocument/Name' => '%1$s / %2$s~~',
 	'Class:lnkContractToDocument/Attribute:contract_id' => 'zmluva',
 	'Class:lnkContractToDocument/Attribute:contract_id+' => '',
 	'Class:lnkContractToDocument/Attribute:contract_name' => 'Názov zmluvy',
@@ -219,6 +224,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:Service' => 'Služby',
 	'Class:Service+' => '',
+	'Class:Service/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Service/Attribute:name' => 'Názov',
 	'Class:Service/Attribute:name+' => '',
 	'Class:Service/Attribute:org_id' => 'Poskytovateľ',
@@ -262,6 +268,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:lnkDocumentToService' => 'väzba - Dokument / Služba',
 	'Class:lnkDocumentToService+' => '',
+	'Class:lnkDocumentToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToService/Attribute:service_id' => 'Služba',
 	'Class:lnkDocumentToService/Attribute:service_id+' => '',
 	'Class:lnkDocumentToService/Attribute:service_name' => 'Názov služby',
@@ -279,6 +286,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:lnkContactToService' => 'väzba - Kontakt / Služba',
 	'Class:lnkContactToService+' => '',
+	'Class:lnkContactToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToService/Attribute:service_id' => 'Služba',
 	'Class:lnkContactToService/Attribute:service_id+' => '',
 	'Class:lnkContactToService/Attribute:service_name' => 'Názov služby',
@@ -296,6 +304,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:ServiceSubcategory' => 'Podkategória služieb',
 	'Class:ServiceSubcategory+' => '',
+	'Class:ServiceSubcategory/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:ServiceSubcategory/Attribute:name' => 'Názov',
 	'Class:ServiceSubcategory/Attribute:name+' => '',
 	'Class:ServiceSubcategory/Attribute:description' => 'Popis',
@@ -381,6 +390,8 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:SLT/Attribute:unit/Value:hours+' => '',
 	'Class:SLT/Attribute:unit/Value:minutes' => 'Minúty',
 	'Class:SLT/Attribute:unit/Value:minutes+' => '',
+	'Class:SLT/Attribute:slas_list' => 'SLAs~~',
+	'Class:SLT/Attribute:slas_list+' => 'All the service level agreements using this SLT~~',
 ));
 
 //
@@ -390,6 +401,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:lnkSLAToSLT' => 'väzba - SLA / SLT',
 	'Class:lnkSLAToSLT+' => '',
+	'Class:lnkSLAToSLT/Name' => '%1$s / %2$s~~',
 	'Class:lnkSLAToSLT/Attribute:sla_id' => 'SLA',
 	'Class:lnkSLAToSLT/Attribute:sla_id+' => '',
 	'Class:lnkSLAToSLT/Attribute:sla_name' => 'SLA Názov',
@@ -417,6 +429,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:lnkCustomerContractToService' => 'väzba - Zákaznícka zmluva / Služba',
 	'Class:lnkCustomerContractToService+' => '',
+	'Class:lnkCustomerContractToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_id' => 'Zákaznícka zmluva',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_id+' => '',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_name' => 'Názov zákazníckeho zmluvy',
@@ -438,6 +451,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:lnkProviderContractToService' => 'väzba - Poskytovateľská zmluva / Služba',
 	'Class:lnkProviderContractToService+' => '',
+	'Class:lnkProviderContractToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkProviderContractToService/Attribute:service_id' => 'Služba',
 	'Class:lnkProviderContractToService/Attribute:service_id+' => '',
 	'Class:lnkProviderContractToService/Attribute:service_name' => 'Názov služby',
@@ -476,6 +490,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:lnkDeliveryModelToContact' => 'väzba - Model dodávky / Kontakt',
 	'Class:lnkDeliveryModelToContact+' => '',
+	'Class:lnkDeliveryModelToContact/Name' => '%1$s / %2$s~~',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id' => 'Model dodávky',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id+' => '',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name' => 'Názov typu dodávky',
diff --git a/datamodels/2.x/itop-service-mgmt/dictionaries/tr.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/tr.dict.itop-service-mgmt.php
index 7f64c2227e..eac85f0165 100644
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/tr.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/tr.dict.itop-service-mgmt.php
@@ -59,6 +59,9 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Menu:ServiceFamily+' => 'Servis aileleri',
 	'Menu:Procedure' => 'Prosedür kataloğu',
 	'Menu:Procedure+' => 'Tüm prosedürler kataloğu',
+	'Contract:baseinfo' => 'General information~~',
+	'Contract:moreinfo' => 'Contractual information~~',
+	'Contract:cost' => 'Cost information~~',
 ));
 
 //
@@ -172,6 +175,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:lnkContactToContract' => 'İletişim / Sözleşme bağla',
 	'Class:lnkContactToContract+' => '~~',
+	'Class:lnkContactToContract/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToContract/Attribute:contract_id' => 'Sözleşme',
 	'Class:lnkContactToContract/Attribute:contract_id+' => '~~',
 	'Class:lnkContactToContract/Attribute:contract_name' => 'Sözleşme adı',
@@ -189,6 +193,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:lnkContractToDocument' => 'Sözleşmesi / Belge bağla',
 	'Class:lnkContractToDocument+' => '~~',
+	'Class:lnkContractToDocument/Name' => '%1$s / %2$s~~',
 	'Class:lnkContractToDocument/Attribute:contract_id' => 'Sözleşme',
 	'Class:lnkContractToDocument/Attribute:contract_id+' => '~~',
 	'Class:lnkContractToDocument/Attribute:contract_name' => 'Sözleşme Adı',
@@ -221,6 +226,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:Service' => 'Hizmet',
 	'Class:Service+' => '',
+	'Class:Service/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Service/Attribute:name' => 'Adı',
 	'Class:Service/Attribute:name+' => '',
 	'Class:Service/Attribute:org_id' => 'Hizmet Sağlayıcı',
@@ -264,6 +270,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:lnkDocumentToService' => 'Belge / servis bağla',
 	'Class:lnkDocumentToService+' => '~~',
+	'Class:lnkDocumentToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToService/Attribute:service_id' => 'Servis',
 	'Class:lnkDocumentToService/Attribute:service_id+' => '~~',
 	'Class:lnkDocumentToService/Attribute:service_name' => 'Servis Adı',
@@ -281,6 +288,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:lnkContactToService' => 'Kişi / Servis bağla',
 	'Class:lnkContactToService+' => '~~',
+	'Class:lnkContactToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToService/Attribute:service_id' => 'Servis',
 	'Class:lnkContactToService/Attribute:service_id+' => '~~',
 	'Class:lnkContactToService/Attribute:service_name' => 'Servis Adı',
@@ -298,6 +306,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:ServiceSubcategory' => 'Hizmet alt kategorisi',
 	'Class:ServiceSubcategory+' => '',
+	'Class:ServiceSubcategory/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:ServiceSubcategory/Attribute:name' => 'Adı',
 	'Class:ServiceSubcategory/Attribute:name+' => '',
 	'Class:ServiceSubcategory/Attribute:description' => 'Tanımlama',
@@ -383,6 +392,8 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:SLT/Attribute:unit/Value:hours+' => 'saatler',
 	'Class:SLT/Attribute:unit/Value:minutes' => 'dakikalar',
 	'Class:SLT/Attribute:unit/Value:minutes+' => 'dakikalar',
+	'Class:SLT/Attribute:slas_list' => 'SLAs~~',
+	'Class:SLT/Attribute:slas_list+' => 'All the service level agreements using this SLT~~',
 ));
 
 //
@@ -392,6 +403,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:lnkSLAToSLT' => 'SLA / SLT bağla',
 	'Class:lnkSLAToSLT+' => '~~',
+	'Class:lnkSLAToSLT/Name' => '%1$s / %2$s~~',
 	'Class:lnkSLAToSLT/Attribute:sla_id' => 'SLA',
 	'Class:lnkSLAToSLT/Attribute:sla_id+' => '~~',
 	'Class:lnkSLAToSLT/Attribute:sla_name' => 'SLA Adı',
@@ -419,6 +431,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:lnkCustomerContractToService' => 'Müşteri Sözleşmesi / Servis bağla',
 	'Class:lnkCustomerContractToService+' => '~~',
+	'Class:lnkCustomerContractToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_id' => 'Müşteri Sözleşmesi',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_id+' => '~~',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_name' => 'Müşteri Sözleşmesi Adı',
@@ -440,6 +453,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:lnkProviderContractToService' => 'Sağlayıcı Sözleşmesi / Servis bağla',
 	'Class:lnkProviderContractToService+' => '~~',
+	'Class:lnkProviderContractToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkProviderContractToService/Attribute:service_id' => 'Servis',
 	'Class:lnkProviderContractToService/Attribute:service_id+' => '~~',
 	'Class:lnkProviderContractToService/Attribute:service_name' => 'Servis Adı',
@@ -478,6 +492,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:lnkDeliveryModelToContact' => 'Teslimatı Modeli / Kişi bağla',
 	'Class:lnkDeliveryModelToContact+' => '~~',
+	'Class:lnkDeliveryModelToContact/Name' => '%1$s / %2$s~~',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id' => 'Teslimat Modeli',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id+' => '~~',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name' => 'Teslimat Modeli Adı',
diff --git a/datamodels/2.x/itop-service-mgmt/dictionaries/zh_cn.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/zh_cn.dict.itop-service-mgmt.php
index 9be746c0f8..f116f1a6ec 100644
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/zh_cn.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/zh_cn.dict.itop-service-mgmt.php
@@ -20,7 +20,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/>
  */
-
 // Dictionnay conventions
 // Class:<class_name>
 // Class:<class_name>+
@@ -30,8 +29,6 @@
 // Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
 // Class:<class_name>/Stimulus:<stimulus_code>
 // Class:<class_name>/Stimulus:<stimulus_code>+
-
-
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Menu:ServiceManagement' => '服务管理',
 	'Menu:ServiceManagement+' => '服务管理概况',
@@ -56,10 +53,13 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Menu:SLT+' => '服务等级目标',
 	'Menu:DeliveryModel' => '交付模式',
 	'Menu:DeliveryModel+' => '交付模式',
-	'Menu:ServiceFamily' => '服务族',
-	'Menu:ServiceFamily+' => '服务族',
+	'Menu:ServiceFamily' => '服务系列',
+	'Menu:ServiceFamily+' => '服务系列',
 	'Menu:Procedure' => '流程清单',
 	'Menu:Procedure+' => '所有流程清单',
+	'Contract:baseinfo' => 'General information~~',
+	'Contract:moreinfo' => 'Contractual information~~',
+	'Contract:cost' => 'Cost information~~',
 ));
 
 //
@@ -173,6 +173,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:lnkContactToContract' => '关联 联系人/合同',
 	'Class:lnkContactToContract+' => '',
+	'Class:lnkContactToContract/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToContract/Attribute:contract_id' => '合同',
 	'Class:lnkContactToContract/Attribute:contract_id+' => '',
 	'Class:lnkContactToContract/Attribute:contract_name' => '合同名称',
@@ -190,6 +191,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:lnkContractToDocument' => '关联 合同/文档',
 	'Class:lnkContractToDocument+' => '',
+	'Class:lnkContractToDocument/Name' => '%1$s / %2$s~~',
 	'Class:lnkContractToDocument/Attribute:contract_id' => '合同',
 	'Class:lnkContractToDocument/Attribute:contract_id+' => '',
 	'Class:lnkContractToDocument/Attribute:contract_name' => '合同名称',
@@ -205,7 +207,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 //
 
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:ServiceFamily' => '服务族',
+	'Class:ServiceFamily' => '服务系列',
 	'Class:ServiceFamily+' => '',
 	'Class:ServiceFamily/Attribute:name' => '名称',
 	'Class:ServiceFamily/Attribute:name+' => '',
@@ -222,15 +224,16 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:Service' => '服务',
 	'Class:Service+' => '',
+	'Class:Service/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Service/Attribute:name' => '名称',
 	'Class:Service/Attribute:name+' => '',
 	'Class:Service/Attribute:org_id' => '供应商',
 	'Class:Service/Attribute:org_id+' => '',
 	'Class:Service/Attribute:organization_name' => '供应商名称',
 	'Class:Service/Attribute:organization_name+' => '',
-	'Class:Service/Attribute:servicefamily_id' => '服务族',
+	'Class:Service/Attribute:servicefamily_id' => '服务系列',
 	'Class:Service/Attribute:servicefamily_id+' => '',
-	'Class:Service/Attribute:servicefamily_name' => '服务族名称',
+	'Class:Service/Attribute:servicefamily_name' => '服务系列名称',
 	'Class:Service/Attribute:servicefamily_name+' => '',
 	'Class:Service/Attribute:description' => '描述',
 	'Class:Service/Attribute:description+' => '',
@@ -265,6 +268,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:lnkDocumentToService' => '关联 文档/服务',
 	'Class:lnkDocumentToService+' => '',
+	'Class:lnkDocumentToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToService/Attribute:service_id' => '服务',
 	'Class:lnkDocumentToService/Attribute:service_id+' => '',
 	'Class:lnkDocumentToService/Attribute:service_name' => '服务名称',
@@ -282,6 +286,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:lnkContactToService' => '关联 联系人/服务',
 	'Class:lnkContactToService+' => '',
+	'Class:lnkContactToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToService/Attribute:service_id' => '服务',
 	'Class:lnkContactToService/Attribute:service_id+' => '',
 	'Class:lnkContactToService/Attribute:service_name' => '服务名称',
@@ -299,6 +304,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:ServiceSubcategory' => '子服务',
 	'Class:ServiceSubcategory+' => '',
+	'Class:ServiceSubcategory/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:ServiceSubcategory/Attribute:name' => '名称',
 	'Class:ServiceSubcategory/Attribute:name+' => '',
 	'Class:ServiceSubcategory/Attribute:description' => '描述',
@@ -384,6 +390,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:SLT/Attribute:unit/Value:hours+' => '小时',
 	'Class:SLT/Attribute:unit/Value:minutes' => '分钟',
 	'Class:SLT/Attribute:unit/Value:minutes+' => '分钟',
+	'Class:SLT/Attribute:slas_list' => 'SLAs~~',
+	'Class:SLT/Attribute:slas_list+' => 'All the service level agreements using this SLT~~',
 ));
 
 //
@@ -393,6 +401,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:lnkSLAToSLT' => '关联 SLA/SLT',
 	'Class:lnkSLAToSLT+' => '',
+	'Class:lnkSLAToSLT/Name' => '%1$s / %2$s~~',
 	'Class:lnkSLAToSLT/Attribute:sla_id' => 'SLA',
 	'Class:lnkSLAToSLT/Attribute:sla_id+' => '',
 	'Class:lnkSLAToSLT/Attribute:sla_name' => 'SLA 名称',
@@ -420,6 +429,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:lnkCustomerContractToService' => '关联 客户合同/服务',
 	'Class:lnkCustomerContractToService+' => '',
+	'Class:lnkCustomerContractToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_id' => '客户合同',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_id+' => '',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_name' => '客户合同名称',
@@ -441,6 +451,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:lnkProviderContractToService' => '关联 供应商合同/服务',
 	'Class:lnkProviderContractToService+' => '',
+	'Class:lnkProviderContractToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkProviderContractToService/Attribute:service_id' => '服务',
 	'Class:lnkProviderContractToService/Attribute:service_id+' => '',
 	'Class:lnkProviderContractToService/Attribute:service_name' => '服务名称',
@@ -479,6 +490,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:lnkDeliveryModelToContact' => '关联 交付模式/联系人',
 	'Class:lnkDeliveryModelToContact+' => '',
+	'Class:lnkDeliveryModelToContact/Name' => '%1$s / %2$s~~',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id' => '交付模式',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id+' => '',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name' => '交付模式名称',
diff --git a/datamodels/2.x/itop-sla-computation/dictionaries/pl.dict.itop-sla-computation.php b/datamodels/2.x/itop-sla-computation/dictionaries/pl.dict.itop-sla-computation.php
index 8c8116fcf2..01c3735422 100644
--- a/datamodels/2.x/itop-sla-computation/dictionaries/pl.dict.itop-sla-computation.php
+++ b/datamodels/2.x/itop-sla-computation/dictionaries/pl.dict.itop-sla-computation.php
@@ -20,7 +20,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/>
  */
-
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	// Dictionary entries go here
 ));
diff --git a/datamodels/2.x/itop-sla-computation/dictionaries/zh_cn.dict.itop-sla-computation.php b/datamodels/2.x/itop-sla-computation/dictionaries/zh_cn.dict.itop-sla-computation.php
index 941687929e..b37f7d482a 100644
--- a/datamodels/2.x/itop-sla-computation/dictionaries/zh_cn.dict.itop-sla-computation.php
+++ b/datamodels/2.x/itop-sla-computation/dictionaries/zh_cn.dict.itop-sla-computation.php
@@ -20,7 +20,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/>
  */
-
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	// Dictionary entries go here
 ));
diff --git a/datamodels/2.x/itop-storage-mgmt/datamodel.itop-storage-mgmt.xml b/datamodels/2.x/itop-storage-mgmt/datamodel.itop-storage-mgmt.xml
index 1dafa62a13..e1cb421d6b 100644
--- a/datamodels/2.x/itop-storage-mgmt/datamodel.itop-storage-mgmt.xml
+++ b/datamodels/2.x/itop-storage-mgmt/datamodel.itop-storage-mgmt.xml
@@ -38,8 +38,6 @@
           <tracking_level>all</tracking_level>
           <count_min>0</count_min>
           <count_max>0</count_max>
-          <relation_type>property</relation_type>
-          <read_only>false</read_only>
         </field>
       </fields>
       <presentation>
@@ -302,7 +300,6 @@
           <count_max>0</count_max>
           <ext_key_to_remote>datacenterdevice_id</ext_key_to_remote>
           <duplicates/>
-          <read_only>false</read_only>
         </field>
       </fields>
       <presentation>
@@ -562,8 +559,6 @@
           <tracking_level>all</tracking_level>
           <count_min>0</count_min>
           <count_max>0</count_max>
-          <relation_type>property</relation_type>
-          <read_only>false</read_only>
         </field>
       </fields>
       <presentation>
@@ -823,8 +818,6 @@
           <tracking_level>all</tracking_level>
           <count_min>0</count_min>
           <count_max>0</count_max>
-          <relation_type>property</relation_type>
-          <read_only>false</read_only>
         </field>
       </fields>
       <presentation>
@@ -1515,7 +1508,6 @@
           <count_max>0</count_max>
           <ext_key_to_remote>server_id</ext_key_to_remote>
           <duplicates/>
-          <read_only>false</read_only>
         </field>
         <field id="virtualdevices_list" xsi:type="AttributeLinkedSetIndirect">
           <linked_class>lnkVirtualDeviceToVolume</linked_class>
@@ -1524,7 +1516,6 @@
           <count_max>0</count_max>
           <ext_key_to_remote>virtualdevice_id</ext_key_to_remote>
           <duplicates/>
-          <read_only>false</read_only>
         </field>
       </fields>
       <presentation>
diff --git a/datamodels/2.x/itop-storage-mgmt/dictionaries/pl.dict.itop-storage-mgmt.php b/datamodels/2.x/itop-storage-mgmt/dictionaries/pl.dict.itop-storage-mgmt.php
index 8c8116fcf2..01c3735422 100644
--- a/datamodels/2.x/itop-storage-mgmt/dictionaries/pl.dict.itop-storage-mgmt.php
+++ b/datamodels/2.x/itop-storage-mgmt/dictionaries/pl.dict.itop-storage-mgmt.php
@@ -20,7 +20,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/>
  */
-
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	// Dictionary entries go here
 ));
diff --git a/datamodels/2.x/itop-storage-mgmt/dictionaries/zh_cn.dict.itop-storage-mgmt.php b/datamodels/2.x/itop-storage-mgmt/dictionaries/zh_cn.dict.itop-storage-mgmt.php
index 941687929e..b37f7d482a 100644
--- a/datamodels/2.x/itop-storage-mgmt/dictionaries/zh_cn.dict.itop-storage-mgmt.php
+++ b/datamodels/2.x/itop-storage-mgmt/dictionaries/zh_cn.dict.itop-storage-mgmt.php
@@ -20,7 +20,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/>
  */
-
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	// Dictionary entries go here
 ));
diff --git a/datamodels/2.x/itop-structure/datamodel.itop-structure.xml b/datamodels/2.x/itop-structure/datamodel.itop-structure.xml
index 1aee1ed75b..6eafece7ad 100644
--- a/datamodels/2.x/itop-structure/datamodel.itop-structure.xml
+++ b/datamodels/2.x/itop-structure/datamodel.itop-structure.xml
@@ -285,8 +285,6 @@
           <edit_mode>add_only</edit_mode>
           <count_min>0</count_min>
           <count_max>0</count_max>
-          <relation_type>link</relation_type>
-          <read_only>false</read_only>
         </field>
       </fields>
       <methods/>
@@ -710,7 +708,6 @@
           <count_max>0</count_max>
           <ext_key_to_remote>team_id</ext_key_to_remote>
           <duplicates/>
-          <read_only>false</read_only>
         </field>
         <field id="user_list" xsi:type="AttributeLinkedSet">
           <linked_class>User</linked_class>
@@ -718,8 +715,6 @@
           <edit_mode>add_only</edit_mode>
           <count_min>0</count_min>
           <count_max>0</count_max>
-          <relation_type>link</relation_type>
-          <read_only>false</read_only>
         </field>
       </fields>
       <methods>
@@ -1028,7 +1023,6 @@
           <count_max>0</count_max>
           <ext_key_to_remote>person_id</ext_key_to_remote>
           <duplicates/>
-          <read_only>false</read_only>
         </field>
       </fields>
       <methods/>
diff --git a/datamodels/2.x/itop-structure/dictionaries/cs.dict.itop-structure.php b/datamodels/2.x/itop-structure/dictionaries/cs.dict.itop-structure.php
index eb3fcb684d..6a860838b0 100644
--- a/datamodels/2.x/itop-structure/dictionaries/cs.dict.itop-structure.php
+++ b/datamodels/2.x/itop-structure/dictionaries/cs.dict.itop-structure.php
@@ -107,6 +107,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:Contact' => 'Kontakt',
 	'Class:Contact+' => '',
+	'Class:Contact/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Contact/Attribute:name' => 'Název',
 	'Class:Contact/Attribute:name+' => '',
 	'Class:Contact/Attribute:status' => 'Stav',
@@ -144,6 +145,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:Person' => 'Osoba',
 	'Class:Person+' => '',
+	'Class:Person/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Person/Attribute:name' => 'Příjmení',
 	'Class:Person/Attribute:name+' => '',
 	'Class:Person/Attribute:first_name' => 'Jméno',
@@ -164,6 +166,8 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:Person/Attribute:team_list+' => 'Všechny týmy, kterých je tato osoba členem',
 	'Class:Person/Attribute:tickets_list' => 'Tikety',
 	'Class:Person/Attribute:tickets_list+' => 'Všechny tikety, které tato osoba zadala',
+	'Class:Person/Attribute:user_list' => 'Users~~',
+	'Class:Person/Attribute:user_list+' => 'All the Users associated to this person~~',
 	'Class:Person/Attribute:manager_id_friendlyname' => 'Popisný název vedoucího',
 	'Class:Person/Attribute:manager_id_friendlyname+' => '',
 	'Class:Person/Attribute:picture' => 'Picture~~',
@@ -172,6 +176,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:Person/UniquenessRule:employee_number' => 'there is already a person in \'$this->org_name$\' organization with the same employee number~~',
 	'Class:Person/UniquenessRule:name+' => 'The employee name should be unique inside its organization~~',
 	'Class:Person/UniquenessRule:name' => 'There is already a person in \'$this->org_name$\' organization with the same name~~',
+	'Class:Person/Error:ChangingOrgDenied' => 'Impossible to move this person under organization \'%1$s\' as it would break his access to the User Portal, his associated user not being allowed on this organization~~',
 ));
 
 //
@@ -181,6 +186,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:Team' => 'Tým',
 	'Class:Team+' => '',
+	'Class:Team/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Team/Attribute:persons_list' => 'Členové',
 	'Class:Team/Attribute:persons_list+' => 'Všichni členové týmu',
 	'Class:Team/Attribute:tickets_list' => 'Tikety',
@@ -194,6 +200,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:Document' => 'Dokument',
 	'Class:Document+' => '',
+	'Class:Document/ComplementaryName' => '%1$s - %2$s - %3$s~~',
 	'Class:Document/Attribute:name' => 'Název',
 	'Class:Document/Attribute:name+' => '',
 	'Class:Document/Attribute:org_id' => 'Organizace',
@@ -293,6 +300,8 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:lnkPersonToTeam' => 'Spojení (Osoba / Tým)',
 	'Class:lnkPersonToTeam+' => '',
+	'Class:lnkPersonToTeam/Name' => '%1$s / %2$s~~',
+	'Class:lnkPersonToTeam/Name+' => '~~',
 	'Class:lnkPersonToTeam/Attribute:team_id' => 'Tým',
 	'Class:lnkPersonToTeam/Attribute:team_id+' => '',
 	'Class:lnkPersonToTeam/Attribute:team_name' => 'Název týmu',
@@ -356,6 +365,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Person:info' => 'Obecné informace',
 	'User:info' => 'Obecné informace',
+	'User:profiles' => 'Profiles (minimum one)~~',
 	'Person:personal_info' => 'Osobní informace',
 	'Person:notifiy' => 'Upozornění',
 ));
diff --git a/datamodels/2.x/itop-structure/dictionaries/da.dict.itop-structure.php b/datamodels/2.x/itop-structure/dictionaries/da.dict.itop-structure.php
index c1968bcc9a..bb2927036c 100644
--- a/datamodels/2.x/itop-structure/dictionaries/da.dict.itop-structure.php
+++ b/datamodels/2.x/itop-structure/dictionaries/da.dict.itop-structure.php
@@ -97,6 +97,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:Contact' => 'Kontakt',
 	'Class:Contact+' => '',
+	'Class:Contact/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Contact/Attribute:name' => 'Navn',
 	'Class:Contact/Attribute:name+' => '',
 	'Class:Contact/Attribute:status' => 'Status',
@@ -134,6 +135,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:Person' => 'Person',
 	'Class:Person+' => '',
+	'Class:Person/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Person/Attribute:name' => 'Efternavn',
 	'Class:Person/Attribute:name+' => '~~',
 	'Class:Person/Attribute:first_name' => 'Fornavn',
@@ -154,6 +156,8 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:Person/Attribute:team_list+' => 'All the teams this person belongs to~~',
 	'Class:Person/Attribute:tickets_list' => 'List Tickets',
 	'Class:Person/Attribute:tickets_list+' => 'All the tickets this person is the caller~~',
+	'Class:Person/Attribute:user_list' => 'Users~~',
+	'Class:Person/Attribute:user_list+' => 'All the Users associated to this person~~',
 	'Class:Person/Attribute:manager_id_friendlyname' => 'Manager Friendly Name',
 	'Class:Person/Attribute:manager_id_friendlyname+' => '',
 	'Class:Person/Attribute:picture' => 'Picture~~',
@@ -162,6 +166,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:Person/UniquenessRule:employee_number' => 'there is already a person in \'$this->org_name$\' organization with the same employee number~~',
 	'Class:Person/UniquenessRule:name+' => 'The employee name should be unique inside its organization~~',
 	'Class:Person/UniquenessRule:name' => 'There is already a person in \'$this->org_name$\' organization with the same name~~',
+	'Class:Person/Error:ChangingOrgDenied' => 'Impossible to move this person under organization \'%1$s\' as it would break his access to the User Portal, his associated user not being allowed on this organization~~',
 ));
 
 //
@@ -171,6 +176,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:Team' => 'Team',
 	'Class:Team+' => '',
+	'Class:Team/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Team/Attribute:persons_list' => 'List Medlemmer',
 	'Class:Team/Attribute:persons_list+' => 'All the people belonging to this team~~',
 	'Class:Team/Attribute:tickets_list' => 'List Tickets',
@@ -184,6 +190,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:Document' => 'Dokument',
 	'Class:Document+' => '',
+	'Class:Document/ComplementaryName' => '%1$s - %2$s - %3$s~~',
 	'Class:Document/Attribute:name' => 'Navn',
 	'Class:Document/Attribute:name+' => '',
 	'Class:Document/Attribute:org_id' => 'Organisation',
@@ -283,6 +290,8 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:lnkPersonToTeam' => 'Sammenhæng Person/Team',
 	'Class:lnkPersonToTeam+' => '',
+	'Class:lnkPersonToTeam/Name' => '%1$s / %2$s~~',
+	'Class:lnkPersonToTeam/Name+' => '~~',
 	'Class:lnkPersonToTeam/Attribute:team_id' => 'Team',
 	'Class:lnkPersonToTeam/Attribute:team_id+' => '',
 	'Class:lnkPersonToTeam/Attribute:team_name' => 'Team navn',
@@ -346,6 +355,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Person:info' => 'Almindelig Information',
 	'User:info' => 'Almindelig Information',
+	'User:profiles' => 'Profiles (minimum one)~~',
 	'Person:personal_info' => 'Personal information~~',
 	'Person:notifiy' => 'Underretning',
 ));
diff --git a/datamodels/2.x/itop-structure/dictionaries/de.dict.itop-structure.php b/datamodels/2.x/itop-structure/dictionaries/de.dict.itop-structure.php
index 29221653ab..ec2703f2ec 100644
--- a/datamodels/2.x/itop-structure/dictionaries/de.dict.itop-structure.php
+++ b/datamodels/2.x/itop-structure/dictionaries/de.dict.itop-structure.php
@@ -94,9 +94,9 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:Location/Attribute:country' => 'Land',
 	'Class:Location/Attribute:country+' => '',
 	'Class:Location/Attribute:physicaldevice_list' => 'Geräte',
-	'Class:Location/Attribute:physicaldevice_list+' => 'All the devices in this location~~',
+	'Class:Location/Attribute:physicaldevice_list+' => 'Alle Geräte an diesem Standort',
 	'Class:Location/Attribute:person_list' => 'Kontakte',
-	'Class:Location/Attribute:person_list+' => 'All the contacts located on this location~~',
+	'Class:Location/Attribute:person_list+' => 'Alle Kontakte, die sich an diesem Standort befinden',
 ));
 
 //
@@ -106,6 +106,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:Contact' => 'Kontakt',
 	'Class:Contact+' => '',
+	'Class:Contact/ComplementaryName' => '%1$s - %2$s',
 	'Class:Contact/Attribute:name' => 'Name',
 	'Class:Contact/Attribute:name+' => '',
 	'Class:Contact/Attribute:status' => 'Status',
@@ -123,17 +124,17 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:Contact/Attribute:phone' => 'Telefonnummer',
 	'Class:Contact/Attribute:phone+' => '',
 	'Class:Contact/Attribute:notify' => 'Benachrichtigung',
-	'Class:Contact/Attribute:notify+' => '',
+	'Class:Contact/Attribute:notify+' => 'Attribut, das bei der Suche nach Empfängern von Benachrichtigungen verwendet werden kann',
 	'Class:Contact/Attribute:notify/Value:no' => 'Nein',
-	'Class:Contact/Attribute:notify/Value:no+' => '',
+	'Class:Contact/Attribute:notify/Value:no+' => 'Nein',
 	'Class:Contact/Attribute:notify/Value:yes' => 'Ja',
-	'Class:Contact/Attribute:notify/Value:yes+' => '',
+	'Class:Contact/Attribute:notify/Value:yes+' => 'Ja',
 	'Class:Contact/Attribute:function' => 'Funktion',
 	'Class:Contact/Attribute:function+' => '',
 	'Class:Contact/Attribute:cis_list' => 'CIs',
-	'Class:Contact/Attribute:cis_list+' => 'All the configuration items linked to this contact~~',
+	'Class:Contact/Attribute:cis_list+' => 'Alle mit diesem Kontakt verknüpften CIs',
 	'Class:Contact/Attribute:finalclass' => 'Typ',
-	'Class:Contact/Attribute:finalclass+' => '',
+	'Class:Contact/Attribute:finalclass+' => 'Name der instanziierbaren Klasse',
 ));
 
 //
@@ -143,6 +144,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:Person' => 'Person',
 	'Class:Person+' => '',
+	'Class:Person/ComplementaryName' => '%1$s - %2$s',
 	'Class:Person/Attribute:name' => 'Name',
 	'Class:Person/Attribute:name+' => '',
 	'Class:Person/Attribute:first_name' => 'Vorname',
@@ -160,9 +162,11 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:Person/Attribute:manager_name' => 'Manager-Name',
 	'Class:Person/Attribute:manager_name+' => '',
 	'Class:Person/Attribute:team_list' => 'Teams',
-	'Class:Person/Attribute:team_list+' => 'All the teams this person belongs to~~',
+	'Class:Person/Attribute:team_list+' => 'Alle Teams, denen diese Person angehört',
 	'Class:Person/Attribute:tickets_list' => 'Tickets',
-	'Class:Person/Attribute:tickets_list+' => 'All the tickets this person is the caller~~',
+	'Class:Person/Attribute:tickets_list+' => 'Alle Tickets, bei denen diese Person der Melder ist',
+	'Class:Person/Attribute:user_list' => 'Benutzer',
+	'Class:Person/Attribute:user_list+' => 'Alle Benutzer, die mit dieser Person verbunden sind',
 	'Class:Person/Attribute:manager_id_friendlyname' => 'Manager-Name (lesbar)',
 	'Class:Person/Attribute:manager_id_friendlyname+' => '',
 	'Class:Person/Attribute:picture' => 'Bild',
@@ -171,6 +175,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:Person/UniquenessRule:employee_number' => 'In der Organisation \'$this->org_name$\' existiert bereits eine Person mit der gleichen Personalnummer',
 	'Class:Person/UniquenessRule:name+' => 'Innerhalb einer Organisation muss der Name einer Person eindeutig sein',
 	'Class:Person/UniquenessRule:name' => 'In der Organisation \'$this->org_name$\' existiert bereits eine Person mit dem gleichen Namen',
+	'Class:Person/Error:ChangingOrgDenied' => 'Es ist nicht möglich, dieser Person der Organisation \'%1$s\' zuzuordnen, da dies seinen Zugang zum Benutzerportal unterbinden würde, da sein zugehöriger Benutzer nicht für diese Organisation zugelassen ist.',
 ));
 
 //
@@ -180,10 +185,11 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:Team' => 'Team',
 	'Class:Team+' => '',
+	'Class:Team/ComplementaryName' => '%1$s - %2$s',
 	'Class:Team/Attribute:persons_list' => 'Mitglieder',
-	'Class:Team/Attribute:persons_list+' => 'All the people belonging to this team~~',
+	'Class:Team/Attribute:persons_list+' => 'Alle Personen, die zu diesem Team gehören',
 	'Class:Team/Attribute:tickets_list' => 'Tickets',
-	'Class:Team/Attribute:tickets_list+' => 'All the tickets assigned to this team~~',
+	'Class:Team/Attribute:tickets_list+' => 'Alle diesem Team zugewiesenen Tickets',
 ));
 
 //
@@ -193,6 +199,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:Document' => 'Dokument',
 	'Class:Document+' => '',
+	'Class:Document/ComplementaryName' => '%1$s - %2$s - %3$s',
 	'Class:Document/Attribute:name' => 'Name',
 	'Class:Document/Attribute:name+' => '',
 	'Class:Document/Attribute:org_id' => 'Organisation',
@@ -216,9 +223,9 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:Document/Attribute:status/Value:published' => 'Veröffentlicht',
 	'Class:Document/Attribute:status/Value:published+' => '',
 	'Class:Document/Attribute:cis_list' => 'CIs',
-	'Class:Document/Attribute:cis_list+' => 'All the configuration items linked to this document~~',
-	'Class:Document/Attribute:finalclass' => 'Dokumenttyp',
-	'Class:Document/Attribute:finalclass+' => '',
+	'Class:Document/Attribute:cis_list+' => 'Alle mit diesem Dokument verknüpften CIs',
+	'Class:Document/Attribute:finalclass' => 'Unterklasse von Dokument',
+	'Class:Document/Attribute:finalclass+' => 'Name der instanziierbaren Klasse',
 ));
 
 //
@@ -264,7 +271,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:Typology/Attribute:name' => 'Name',
 	'Class:Typology/Attribute:name+' => '',
 	'Class:Typology/Attribute:finalclass' => 'Typ',
-	'Class:Typology/Attribute:finalclass+' => '',
+	'Class:Typology/Attribute:finalclass+' => 'Name der instanziierbaren Klasse',
 ));
 
 //
@@ -292,6 +299,8 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:lnkPersonToTeam' => 'Verknüpfung Person/Team',
 	'Class:lnkPersonToTeam+' => '',
+	'Class:lnkPersonToTeam/Name' => '%1$s / %2$s',
+	'Class:lnkPersonToTeam/Name+' => '',
 	'Class:lnkPersonToTeam/Attribute:team_id' => 'Team',
 	'Class:lnkPersonToTeam/Attribute:team_id+' => '',
 	'Class:lnkPersonToTeam/Attribute:team_name' => 'Teamname',
@@ -301,7 +310,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:lnkPersonToTeam/Attribute:person_name' => 'Personenname',
 	'Class:lnkPersonToTeam/Attribute:person_name+' => '',
 	'Class:lnkPersonToTeam/Attribute:role_id' => 'Rolle',
-	'Class:lnkPersonToTeam/Attribute:role_id+' => '',
+	'Class:lnkPersonToTeam/Attribute:role_id+' => 'Eine Rolle aus einer Typologie möglicher Rollen',
 	'Class:lnkPersonToTeam/Attribute:role_name' => 'Rollenname',
 	'Class:lnkPersonToTeam/Attribute:role_name+' => '',
 ));
@@ -345,7 +354,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Menu:ConfigManagement:Shortcuts' => 'Shortcuts',
 	'Menu:ConfigManagement:AllContacts' => 'Alle Kontakte: %1$d',
 	'Menu:Typology' => 'Typologie-Konfiguration',
-	'Menu:Typology+' => '',
+	'Menu:Typology+' => 'Typologie-Konfiguration',
 	'UI_WelcomeMenu_AllConfigItems' => 'Zusammenfassung',
 	'Menu:ConfigManagement:Typology' => 'Typologie-Konfiguration',
 ));
@@ -355,6 +364,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Person:info' => 'Allgemeine Informationen',
 	'User:info' => 'Allgemeine Informationen',
+	'User:profiles' => 'Profile (mindestens eines)',
 	'Person:personal_info' => 'Persönliche Informationen',
 	'Person:notifiy' => 'Benachrichtigungen',
 ));
diff --git a/datamodels/2.x/itop-structure/dictionaries/es_cr.dict.itop-structure.php b/datamodels/2.x/itop-structure/dictionaries/es_cr.dict.itop-structure.php
index 5d7460f9e5..e9dee3788c 100644
--- a/datamodels/2.x/itop-structure/dictionaries/es_cr.dict.itop-structure.php
+++ b/datamodels/2.x/itop-structure/dictionaries/es_cr.dict.itop-structure.php
@@ -64,6 +64,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 //
 // Class: Location
 //
+
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Location' => 'Localidad',
 	'Class:Location+' => 'Cualquier Tipo de Localidad: Región, País, Ciudad, Sitio, Edificio, Piso, Cuarto, Rack,...',
@@ -96,9 +97,11 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 //
 // Class: Contact
 //
+
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Contact' => 'Contacto',
 	'Class:Contact+' => 'Contacto',
+	'Class:Contact/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Contact/Attribute:name' => 'Nombre',
 	'Class:Contact/Attribute:name+' => 'Nombre del Contacto',
 	'Class:Contact/Attribute:status' => 'Estatus',
@@ -132,9 +135,11 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 //
 // Class: Person
 //
+
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Person' => 'Persona',
 	'Class:Person+' => 'Persona',
+	'Class:Person/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Person/Attribute:name' => 'Apellidos',
 	'Class:Person/Attribute:name+' => 'Apellidos',
 	'Class:Person/Attribute:first_name' => 'Nombre',
@@ -155,6 +160,8 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Person/Attribute:team_list+' => 'Grupos',
 	'Class:Person/Attribute:tickets_list' => 'Tickets',
 	'Class:Person/Attribute:tickets_list+' => 'Tickets',
+	'Class:Person/Attribute:user_list' => 'Users~~',
+	'Class:Person/Attribute:user_list+' => 'All the Users associated to this person~~',
 	'Class:Person/Attribute:manager_id_friendlyname' => 'Nombre del Jefe',
 	'Class:Person/Attribute:manager_id_friendlyname+' => 'Nombre del Jefe',
 	'Class:Person/Attribute:picture' => 'Fotografía',
@@ -163,14 +170,17 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Person/UniquenessRule:employee_number' => 'Ya existe una persona en la organiación \'$this->org_name$\', con el mismo número de empleado',
 	'Class:Person/UniquenessRule:name+' => 'El nombre del empleado debe ser único dentro de su Organización',
 	'Class:Person/UniquenessRule:name' => 'Ya existe una persona en la organiación \'$this->org_name$\', con el mismo nombre',
+	'Class:Person/Error:ChangingOrgDenied' => 'Impossible to move this person under organization \'%1$s\' as it would break his access to the User Portal, his associated user not being allowed on this organization~~',
 ));
 
 //
 // Class: Team
 //
+
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Team' => 'Grupo de Trabajo',
 	'Class:Team+' => 'Grupo de Trabajo',
+	'Class:Team/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Team/Attribute:persons_list' => 'Miembros',
 	'Class:Team/Attribute:persons_list+' => 'Miembros',
 	'Class:Team/Attribute:tickets_list' => 'Tickets',
@@ -180,9 +190,11 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 //
 // Class: Document
 //
+
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Document' => 'Documento',
 	'Class:Document+' => 'Documento',
+	'Class:Document/ComplementaryName' => '%1$s - %2$s - %3$s~~',
 	'Class:Document/Attribute:name' => 'Nombre',
 	'Class:Document/Attribute:name+' => 'Nombre del Documento',
 	'Class:Document/Attribute:org_id' => 'Organización',
@@ -214,6 +226,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 //
 // Class: DocumentFile
 //
+
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:DocumentFile' => 'Documento de Archivo',
 	'Class:DocumentFile+' => '',
@@ -224,6 +237,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 //
 // Class: DocumentNote
 //
+
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:DocumentNote' => 'Nota',
 	'Class:DocumentNote+' => 'Nota',
@@ -234,6 +248,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 //
 // Class: DocumentWeb
 //
+
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:DocumentWeb' => 'Documento Web',
 	'Class:DocumentWeb+' => 'Documento disponible en otro servidor Web',
@@ -279,6 +294,8 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkPersonToTeam' => 'Relación Persona y Grupo',
 	'Class:lnkPersonToTeam+' => 'Relación Persona y Grupo',
+	'Class:lnkPersonToTeam/Name' => '%1$s / %2$s~~',
+	'Class:lnkPersonToTeam/Name+' => '~~',
 	'Class:lnkPersonToTeam/Attribute:team_id' => 'Grupo',
 	'Class:lnkPersonToTeam/Attribute:team_id+' => 'Grupo',
 	'Class:lnkPersonToTeam/Attribute:team_name' => 'Grupo',
@@ -342,6 +359,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Person:info' => 'Información General',
 	'User:info' => 'Información General',
+	'User:profiles' => 'Profiles (minimum one)~~',
 	'Person:personal_info' => 'Información Personal',
 	'Person:notifiy' => 'Notificación',
 ));
diff --git a/datamodels/2.x/itop-structure/dictionaries/fr.dict.itop-structure.php b/datamodels/2.x/itop-structure/dictionaries/fr.dict.itop-structure.php
index b6e951af04..66c3667234 100644
--- a/datamodels/2.x/itop-structure/dictionaries/fr.dict.itop-structure.php
+++ b/datamodels/2.x/itop-structure/dictionaries/fr.dict.itop-structure.php
@@ -77,9 +77,9 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:Organization/Attribute:parent_name' => 'Nom du parent',
 	'Class:Organization/Attribute:parent_name+' => 'Nom de l\'organisation parente',
 	'Class:Organization/Attribute:deliverymodel_id' => 'Modèle de support',
-	'Class:Organization/Attribute:deliverymodel_id+' => '~~',
+	'Class:Organization/Attribute:deliverymodel_id+' => '',
 	'Class:Organization/Attribute:deliverymodel_name' => 'Nom modèle de support',
-	'Class:Organization/Attribute:deliverymodel_name+' => '~~',
+	'Class:Organization/Attribute:deliverymodel_name+' => '',
 	'Class:Organization/Attribute:parent_id_friendlyname' => 'Nom commun',
 	'Class:Organization/Attribute:parent_id_friendlyname+' => '',
 	'Class:Organization/Attribute:overview' => 'Tableau de bord',
@@ -128,6 +128,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:Contact' => 'Contact',
 	'Class:Contact+' => '',
+	'Class:Contact/ComplementaryName' => '%1$s - %2$s',
 	'Class:Contact/Attribute:name' => 'Nom',
 	'Class:Contact/Attribute:name+' => '',
 	'Class:Contact/Attribute:status' => 'Etat',
@@ -165,8 +166,9 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:Person' => 'Personne',
 	'Class:Person+' => '',
+	'Class:Person/ComplementaryName' => '%1$s - %2$s',
 	'Class:Person/Attribute:name' => 'Nom',
-	'Class:Person/Attribute:name+' => '~~',
+	'Class:Person/Attribute:name+' => '',
 	'Class:Person/Attribute:first_name' => 'Prénom',
 	'Class:Person/Attribute:first_name+' => '',
 	'Class:Person/Attribute:employee_number' => 'Numéro d\'employé',
@@ -206,6 +208,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:Team' => 'Equipe',
 	'Class:Team+' => '',
+	'Class:Team/ComplementaryName' => '%1$s - %2$s',
 	'Class:Team/Attribute:persons_list' => 'Membres',
 	'Class:Team/Attribute:persons_list+' => 'Toutes les personnes appartenant à cette équipe',
 	'Class:Team/Attribute:tickets_list' => 'Tickets',
@@ -219,6 +222,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:Document' => 'Document',
 	'Class:Document+' => '',
+	'Class:Document/ComplementaryName' => '%1$s - %2$s - %3$s',
 	'Class:Document/Attribute:name' => 'Nom',
 	'Class:Document/Attribute:name+' => '',
 	'Class:Document/Attribute:org_id' => 'Organisation',
@@ -318,6 +322,8 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:lnkPersonToTeam' => 'Lien Personne / Equipe',
 	'Class:lnkPersonToTeam+' => '',
+	'Class:lnkPersonToTeam/Name' => '%1$s / %2$s',
+	'Class:lnkPersonToTeam/Name+' => '',
 	'Class:lnkPersonToTeam/Attribute:team_id' => 'Equipe',
 	'Class:lnkPersonToTeam/Attribute:team_id+' => 'Une équipe à laquelle appartient la personne',
 	'Class:lnkPersonToTeam/Attribute:team_name' => 'Nom Equipe',
@@ -391,22 +397,19 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'theme:fullmoon' => 'Full moon',
 	'theme:test-red' => 'Instance de test (Rouge)',
 ));
-
 //
 // n:n relations custom labels : nom de classe féminin
 //
 Dict::Add('FR FR', 'French', 'Français', array(
-	'Class:Person/Attribute:team_list/UI:Links:Add:Button+'       => 'Ajouter une %4$s',
-	'Class:Person/Attribute:team_list/UI:Links:Add:Modal:Title'   => 'Ajouter une %4$s à %2$s',
-	'Class:Person/Attribute:team_list/UI:Links:Remove:Button+'    => 'Retirer cette %4$s',
-	'Class:Person/Attribute:team_list/UI:Links:Remove:Modal:Title'  => 'Retirer une %4$s',
-	'Class:Team/Attribute:persons_list/UI:Links:Add:Button+'      => 'Ajouter une %4$s',
-	'Class:Team/Attribute:persons_list/UI:Links:Add:Modal:Title'  => 'Ajouter une %4$s à %2$s',
-	'Class:Team/Attribute:persons_list/UI:Links:Remove:Button+'   => 'Retirer cette %4$s',
-	'Class:Team/Attribute:persons_list/UI:Links:Remove:Modal:Title' => 'Retirer une %4$s',
+	'Class:Person/Attribute:team_list/UI:Links:Add:Button+' => 'Ajouter une %4$s',
+	'Class:Person/Attribute:team_list/UI:Links:Add:Modal:Title' => 'Ajouter une %4$s à %2$s',
+	'Class:Person/Attribute:team_list/UI:Links:Remove:Button+' => 'Retirer cette %4$s',
+	'Class:Person/Attribute:team_list/UI:Links:Remove:Modal:Title' => 'Retirer une %4$s',
+	'Class:Team/Attribute:persons_list/UI:Links:Add:Button+' => 'Ajouter une %4$s',
+	'Class:Team/Attribute:persons_list/UI:Links:Add:Modal:Title' => 'Ajouter une %4$s à %2$s',
+	'Class:Team/Attribute:persons_list/UI:Links:Remove:Button+' => 'Retirer cette %4$s',
+	'Class:Team/Attribute:persons_list/UI:Links:Remove:Modal:Title' => 'Retirer une %4$s'
 ));
-
-
 // 1:n relations custom labels for tooltip and pop-up title
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:Location/Attribute:person_list/UI:Links:Create:Button+' => 'Créer une %4$s',
@@ -420,7 +423,5 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:Person/Attribute:user_list/UI:Links:Remove:Button+' => 'Retirer ce %4$s',
 	'Class:Person/Attribute:user_list/UI:Links:Remove:Modal:Title' => 'Retirer ce %4$s de sa %1$s',
 	'Class:Person/Attribute:user_list/UI:Links:Delete:Button+' => 'Supprimer ce %4$s',
-	'Class:Person/Attribute:user_list/UI:Links:Delete:Modal:Title' => 'Supprimer un %4$s',
-
+	'Class:Person/Attribute:user_list/UI:Links:Delete:Modal:Title' => 'Supprimer un %4$s'
 ));
-
diff --git a/datamodels/2.x/itop-structure/dictionaries/hu.dict.itop-structure.php b/datamodels/2.x/itop-structure/dictionaries/hu.dict.itop-structure.php
index 7b1566c186..6dcc675dba 100644
--- a/datamodels/2.x/itop-structure/dictionaries/hu.dict.itop-structure.php
+++ b/datamodels/2.x/itop-structure/dictionaries/hu.dict.itop-structure.php
@@ -31,32 +31,32 @@
 // Class: Organization
 //
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:Organization' => 'Szevezeti egység',
-    'Class:Organization+' => '',
-    'Class:Organization/Attribute:name' => 'Név',
-    'Class:Organization/Attribute:name+' => '',
-    'Class:Organization/Attribute:code' => 'Azonosító',
-    'Class:Organization/Attribute:code+' => '',
-    'Class:Organization/Attribute:status' => 'Állapot',
-    'Class:Organization/Attribute:status+' => '',
-    'Class:Organization/Attribute:status/Value:active' => 'Aktív',
-    'Class:Organization/Attribute:status/Value:active+' => '',
-    'Class:Organization/Attribute:status/Value:inactive' => 'Inaktív',
-    'Class:Organization/Attribute:status/Value:inactive+' => '',
-    'Class:Organization/Attribute:parent_id' => 'Fölérendelt szervezeti egység',
-    'Class:Organization/Attribute:parent_id+' => '',
-    'Class:Organization/Attribute:parent_name' => 'Fölérendelt szervezeti egység név',
-    'Class:Organization/Attribute:parent_name+' => '',
-    'Class:Organization/Attribute:deliverymodel_id' => 'Teljesítési modell',
-    'Class:Organization/Attribute:deliverymodel_id+' => '~~',
-    'Class:Organization/Attribute:deliverymodel_name' => 'Teljesítési modell név',
-    'Class:Organization/Attribute:deliverymodel_name+' => '~~',
-    'Class:Organization/Attribute:parent_id_friendlyname' => 'Szülő',
-    'Class:Organization/Attribute:parent_id_friendlyname+' => 'Szülő szervezeti egység',
-    'Class:Organization/Attribute:overview' => 'Áttekintő',
-    'Organization:Overview:FunctionalCIs' => 'A szervezet konfigurációs elemei',
-    'Organization:Overview:FunctionalCIs:subtitle' => 'típus szerint',
-    'Organization:Overview:Users' => ITOP_APPLICATION_SHORT.' szervezeten belüli felhasználók',
+	'Class:Organization' => 'Szevezeti egység',
+	'Class:Organization+' => '',
+	'Class:Organization/Attribute:name' => 'Név',
+	'Class:Organization/Attribute:name+' => '',
+	'Class:Organization/Attribute:code' => 'Azonosító',
+	'Class:Organization/Attribute:code+' => '',
+	'Class:Organization/Attribute:status' => 'Állapot',
+	'Class:Organization/Attribute:status+' => '',
+	'Class:Organization/Attribute:status/Value:active' => 'Aktív',
+	'Class:Organization/Attribute:status/Value:active+' => '',
+	'Class:Organization/Attribute:status/Value:inactive' => 'Inaktív',
+	'Class:Organization/Attribute:status/Value:inactive+' => '',
+	'Class:Organization/Attribute:parent_id' => 'Fölérendelt szervezeti egység',
+	'Class:Organization/Attribute:parent_id+' => '',
+	'Class:Organization/Attribute:parent_name' => 'Fölérendelt szervezeti egység név',
+	'Class:Organization/Attribute:parent_name+' => '',
+	'Class:Organization/Attribute:deliverymodel_id' => 'Teljesítési modell',
+	'Class:Organization/Attribute:deliverymodel_id+' => '~~',
+	'Class:Organization/Attribute:deliverymodel_name' => 'Teljesítési modell név',
+	'Class:Organization/Attribute:deliverymodel_name+' => '~~',
+	'Class:Organization/Attribute:parent_id_friendlyname' => 'Szülő',
+	'Class:Organization/Attribute:parent_id_friendlyname+' => 'Szülő szervezeti egység',
+	'Class:Organization/Attribute:overview' => 'Áttekintő',
+	'Organization:Overview:FunctionalCIs' => 'A szervezet konfigurációs elemei',
+	'Organization:Overview:FunctionalCIs:subtitle' => 'típus szerint',
+	'Organization:Overview:Users' => ITOP_APPLICATION_SHORT.' szervezeten belüli felhasználók',
 ));
 
 //
@@ -64,32 +64,32 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:Location' => 'Helyszín',
-    'Class:Location+' => '',
-    'Class:Location/Attribute:name' => 'Név',
-    'Class:Location/Attribute:name+' => '',
-    'Class:Location/Attribute:status' => 'Állapot',
-    'Class:Location/Attribute:status+' => '',
-    'Class:Location/Attribute:status/Value:active' => 'Aktív',
-    'Class:Location/Attribute:status/Value:active+' => '',
-    'Class:Location/Attribute:status/Value:inactive' => 'Inaktív',
-    'Class:Location/Attribute:status/Value:inactive+' => '',
-    'Class:Location/Attribute:org_id' => 'Szervezeti egység',
-    'Class:Location/Attribute:org_id+' => '',
-    'Class:Location/Attribute:org_name' => 'Szervezeti egység név',
-    'Class:Location/Attribute:org_name+' => '',
-    'Class:Location/Attribute:address' => 'Cím',
-    'Class:Location/Attribute:address+' => '',
-    'Class:Location/Attribute:postal_code' => 'Irányítószám',
-    'Class:Location/Attribute:postal_code+' => '',
-    'Class:Location/Attribute:city' => 'Város',
-    'Class:Location/Attribute:city+' => '',
-    'Class:Location/Attribute:country' => 'Ország',
-    'Class:Location/Attribute:country+' => '',
-    'Class:Location/Attribute:physicaldevice_list' => 'Eszközök',
-    'Class:Location/Attribute:physicaldevice_list+' => 'A helyszín összes eszköze',
-    'Class:Location/Attribute:person_list' => 'Kapcsolattartók',
-    'Class:Location/Attribute:person_list+' => 'A helyszín összes kapcsolattartója',
+	'Class:Location' => 'Helyszín',
+	'Class:Location+' => '',
+	'Class:Location/Attribute:name' => 'Név',
+	'Class:Location/Attribute:name+' => '',
+	'Class:Location/Attribute:status' => 'Állapot',
+	'Class:Location/Attribute:status+' => '',
+	'Class:Location/Attribute:status/Value:active' => 'Aktív',
+	'Class:Location/Attribute:status/Value:active+' => '',
+	'Class:Location/Attribute:status/Value:inactive' => 'Inaktív',
+	'Class:Location/Attribute:status/Value:inactive+' => '',
+	'Class:Location/Attribute:org_id' => 'Szervezeti egység',
+	'Class:Location/Attribute:org_id+' => '',
+	'Class:Location/Attribute:org_name' => 'Szervezeti egység név',
+	'Class:Location/Attribute:org_name+' => '',
+	'Class:Location/Attribute:address' => 'Cím',
+	'Class:Location/Attribute:address+' => '',
+	'Class:Location/Attribute:postal_code' => 'Irányítószám',
+	'Class:Location/Attribute:postal_code+' => '',
+	'Class:Location/Attribute:city' => 'Város',
+	'Class:Location/Attribute:city+' => '',
+	'Class:Location/Attribute:country' => 'Ország',
+	'Class:Location/Attribute:country+' => '',
+	'Class:Location/Attribute:physicaldevice_list' => 'Eszközök',
+	'Class:Location/Attribute:physicaldevice_list+' => 'A helyszín összes eszköze',
+	'Class:Location/Attribute:person_list' => 'Kapcsolattartók',
+	'Class:Location/Attribute:person_list+' => 'A helyszín összes kapcsolattartója',
 ));
 
 //
@@ -97,36 +97,37 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:Contact' => 'Kapcsolattartó',
-    'Class:Contact+' => '',
-    'Class:Contact/Attribute:name' => 'Név',
-    'Class:Contact/Attribute:name+' => '',
-    'Class:Contact/Attribute:status' => 'Állapot',
-    'Class:Contact/Attribute:status+' => '',
-    'Class:Contact/Attribute:status/Value:active' => 'Aktív',
-    'Class:Contact/Attribute:status/Value:active+' => '',
-    'Class:Contact/Attribute:status/Value:inactive' => 'Inaktív',
-    'Class:Contact/Attribute:status/Value:inactive+' => '',
-    'Class:Contact/Attribute:org_id' => 'Szervezeti egység',
-    'Class:Contact/Attribute:org_id+' => '',
-    'Class:Contact/Attribute:org_name' => 'Szervezeti egység név',
-    'Class:Contact/Attribute:org_name+' => '',
-    'Class:Contact/Attribute:email' => 'Email',
-    'Class:Contact/Attribute:email+' => '',
-    'Class:Contact/Attribute:phone' => 'Telefonszám',
-    'Class:Contact/Attribute:phone+' => '',
-    'Class:Contact/Attribute:notify' => 'Értesítés',
-    'Class:Contact/Attribute:notify+' => '~~',
-    'Class:Contact/Attribute:notify/Value:no' => 'Nem',
-    'Class:Contact/Attribute:notify/Value:no+' => 'nem',
-    'Class:Contact/Attribute:notify/Value:yes' => 'Igen',
-    'Class:Contact/Attribute:notify/Value:yes+' => 'igen',
-    'Class:Contact/Attribute:function' => 'Funkció',
-    'Class:Contact/Attribute:function+' => '~~',
-    'Class:Contact/Attribute:cis_list' => 'CI-k',
-    'Class:Contact/Attribute:cis_list+' => 'A kapcsolattartóhoz tartozó összes konfigurációs elem',
-    'Class:Contact/Attribute:finalclass' => 'Típus',
-    'Class:Contact/Attribute:finalclass+' => '',
+	'Class:Contact' => 'Kapcsolattartó',
+	'Class:Contact+' => '',
+	'Class:Contact/ComplementaryName' => '%1$s - %2$s~~',
+	'Class:Contact/Attribute:name' => 'Név',
+	'Class:Contact/Attribute:name+' => '',
+	'Class:Contact/Attribute:status' => 'Állapot',
+	'Class:Contact/Attribute:status+' => '',
+	'Class:Contact/Attribute:status/Value:active' => 'Aktív',
+	'Class:Contact/Attribute:status/Value:active+' => '',
+	'Class:Contact/Attribute:status/Value:inactive' => 'Inaktív',
+	'Class:Contact/Attribute:status/Value:inactive+' => '',
+	'Class:Contact/Attribute:org_id' => 'Szervezeti egység',
+	'Class:Contact/Attribute:org_id+' => '',
+	'Class:Contact/Attribute:org_name' => 'Szervezeti egység név',
+	'Class:Contact/Attribute:org_name+' => '',
+	'Class:Contact/Attribute:email' => 'Email',
+	'Class:Contact/Attribute:email+' => '',
+	'Class:Contact/Attribute:phone' => 'Telefonszám',
+	'Class:Contact/Attribute:phone+' => '',
+	'Class:Contact/Attribute:notify' => 'Értesítés',
+	'Class:Contact/Attribute:notify+' => '~~',
+	'Class:Contact/Attribute:notify/Value:no' => 'Nem',
+	'Class:Contact/Attribute:notify/Value:no+' => 'nem',
+	'Class:Contact/Attribute:notify/Value:yes' => 'Igen',
+	'Class:Contact/Attribute:notify/Value:yes+' => 'igen',
+	'Class:Contact/Attribute:function' => 'Funkció',
+	'Class:Contact/Attribute:function+' => '~~',
+	'Class:Contact/Attribute:cis_list' => 'CI-k',
+	'Class:Contact/Attribute:cis_list+' => 'A kapcsolattartóhoz tartozó összes konfigurációs elem',
+	'Class:Contact/Attribute:finalclass' => 'Típus',
+	'Class:Contact/Attribute:finalclass+' => '',
 ));
 
 //
@@ -134,36 +135,40 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:Person' => 'Kapcsolattartó',
-    'Class:Person+' => '',
-    'Class:Person/Attribute:name' => 'Vezetéknév',
-    'Class:Person/Attribute:name+' => '~~',
-    'Class:Person/Attribute:first_name' => 'Keresztnév',
-    'Class:Person/Attribute:first_name+' => '',
-    'Class:Person/Attribute:employee_number' => 'Alkalmazotti szám',
-    'Class:Person/Attribute:employee_number+' => '~~',
-    'Class:Person/Attribute:mobile_phone' => 'Mobiltelefon',
-    'Class:Person/Attribute:mobile_phone+' => '~~',
-    'Class:Person/Attribute:location_id' => 'Helyszín',
-    'Class:Person/Attribute:location_id+' => '~~',
-    'Class:Person/Attribute:location_name' => 'Helyszín név',
-    'Class:Person/Attribute:location_name+' => '~~',
-    'Class:Person/Attribute:manager_id' => 'Felettes',
-    'Class:Person/Attribute:manager_id+' => '~~',
-    'Class:Person/Attribute:manager_name' => 'Felettes neve',
-    'Class:Person/Attribute:manager_name+' => '~~',
-    'Class:Person/Attribute:team_list' => 'Csapatok',
-    'Class:Person/Attribute:team_list+' => '',
-    'Class:Person/Attribute:tickets_list' => 'Hibajegyek',
-    'Class:Person/Attribute:tickets_list+' => '',
-    'Class:Person/Attribute:manager_id_friendlyname' => 'Felettes rövid neve',
-    'Class:Person/Attribute:manager_id_friendlyname+' => '~~',
-    'Class:Person/Attribute:picture' => 'Kép',
-    'Class:Person/Attribute:picture+' => '~~',
-    'Class:Person/UniquenessRule:employee_number+' => 'A szervezeten belül az alkalmazotti számnak egyedinek kell lennie',
-    'Class:Person/UniquenessRule:employee_number' => 'már van egy személy a \'$this->this->org_name$\' szervezetben ugyanezzel az alkalmazotti számmal',
-    'Class:Person/UniquenessRule:name+' => 'Az alkalmazott nevének egyedinek kell lennie a szervezeten belül',
-    'Class:Person/UniquenessRule:name' => 'A \'$this->org_name$\' szervezetben már van egy ugyanilyen nevű személy.',
+	'Class:Person' => 'Kapcsolattartó',
+	'Class:Person+' => '',
+	'Class:Person/ComplementaryName' => '%1$s - %2$s~~',
+	'Class:Person/Attribute:name' => 'Vezetéknév',
+	'Class:Person/Attribute:name+' => '~~',
+	'Class:Person/Attribute:first_name' => 'Keresztnév',
+	'Class:Person/Attribute:first_name+' => '',
+	'Class:Person/Attribute:employee_number' => 'Alkalmazotti szám',
+	'Class:Person/Attribute:employee_number+' => '~~',
+	'Class:Person/Attribute:mobile_phone' => 'Mobiltelefon',
+	'Class:Person/Attribute:mobile_phone+' => '~~',
+	'Class:Person/Attribute:location_id' => 'Helyszín',
+	'Class:Person/Attribute:location_id+' => '~~',
+	'Class:Person/Attribute:location_name' => 'Helyszín név',
+	'Class:Person/Attribute:location_name+' => '~~',
+	'Class:Person/Attribute:manager_id' => 'Felettes',
+	'Class:Person/Attribute:manager_id+' => '~~',
+	'Class:Person/Attribute:manager_name' => 'Felettes neve',
+	'Class:Person/Attribute:manager_name+' => '~~',
+	'Class:Person/Attribute:team_list' => 'Csapatok',
+	'Class:Person/Attribute:team_list+' => '',
+	'Class:Person/Attribute:tickets_list' => 'Hibajegyek',
+	'Class:Person/Attribute:tickets_list+' => '',
+	'Class:Person/Attribute:user_list' => 'Users~~',
+	'Class:Person/Attribute:user_list+' => 'All the Users associated to this person~~',
+	'Class:Person/Attribute:manager_id_friendlyname' => 'Felettes rövid neve',
+	'Class:Person/Attribute:manager_id_friendlyname+' => '~~',
+	'Class:Person/Attribute:picture' => 'Kép',
+	'Class:Person/Attribute:picture+' => '~~',
+	'Class:Person/UniquenessRule:employee_number+' => 'A szervezeten belül az alkalmazotti számnak egyedinek kell lennie',
+	'Class:Person/UniquenessRule:employee_number' => 'már van egy személy a \'$this->this->org_name$\' szervezetben ugyanezzel az alkalmazotti számmal',
+	'Class:Person/UniquenessRule:name+' => 'Az alkalmazott nevének egyedinek kell lennie a szervezeten belül',
+	'Class:Person/UniquenessRule:name' => 'A \'$this->org_name$\' szervezetben már van egy ugyanilyen nevű személy.',
+	'Class:Person/Error:ChangingOrgDenied' => 'Impossible to move this person under organization \'%1$s\' as it would break his access to the User Portal, his associated user not being allowed on this organization~~',
 ));
 
 //
@@ -171,12 +176,13 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:Team' => 'Csapat',
-    'Class:Team+' => '',
-    'Class:Team/Attribute:persons_list' => 'Tagok',
-    'Class:Team/Attribute:persons_list+' => '',
-    'Class:Team/Attribute:tickets_list' => 'Hibajegyek',
-    'Class:Team/Attribute:tickets_list+' => '',
+	'Class:Team' => 'Csapat',
+	'Class:Team+' => '',
+	'Class:Team/ComplementaryName' => '%1$s - %2$s~~',
+	'Class:Team/Attribute:persons_list' => 'Tagok',
+	'Class:Team/Attribute:persons_list+' => '',
+	'Class:Team/Attribute:tickets_list' => 'Hibajegyek',
+	'Class:Team/Attribute:tickets_list+' => '',
 ));
 
 //
@@ -184,34 +190,35 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:Document' => 'Dokumentum',
-    'Class:Document+' => '',
-    'Class:Document/Attribute:name' => 'Név',
-    'Class:Document/Attribute:name+' => '',
-    'Class:Document/Attribute:org_id' => 'Szervezeti egység',
-    'Class:Document/Attribute:org_id+' => '~~',
-    'Class:Document/Attribute:org_name' => 'Szervezeti egység név',
-    'Class:Document/Attribute:org_name+' => '',
-    'Class:Document/Attribute:documenttype_id' => 'Dokumentum típus',
-    'Class:Document/Attribute:documenttype_id+' => '~~',
-    'Class:Document/Attribute:documenttype_name' => 'Dokumentum típus név',
-    'Class:Document/Attribute:documenttype_name+' => '~~',
-    'Class:Document/Attribute:version' => 'Verzió',
-    'Class:Document/Attribute:version+' => '~~',
-    'Class:Document/Attribute:description' => 'Leírás',
-    'Class:Document/Attribute:description+' => '',
-    'Class:Document/Attribute:status' => 'Állapot',
-    'Class:Document/Attribute:status+' => '',
-    'Class:Document/Attribute:status/Value:draft' => 'Munkapéldány',
-    'Class:Document/Attribute:status/Value:draft+' => '',
-    'Class:Document/Attribute:status/Value:obsolete' => 'Elavult',
-    'Class:Document/Attribute:status/Value:obsolete+' => '',
-    'Class:Document/Attribute:status/Value:published' => 'Érvényes',
-    'Class:Document/Attribute:status/Value:published+' => '',
-    'Class:Document/Attribute:cis_list' => 'CI-k',
-    'Class:Document/Attribute:cis_list+' => '',
-    'Class:Document/Attribute:finalclass' => 'Dokumentum típus',
-    'Class:Document/Attribute:finalclass+' => 'A végső osztály neve',
+	'Class:Document' => 'Dokumentum',
+	'Class:Document+' => '',
+	'Class:Document/ComplementaryName' => '%1$s - %2$s - %3$s~~',
+	'Class:Document/Attribute:name' => 'Név',
+	'Class:Document/Attribute:name+' => '',
+	'Class:Document/Attribute:org_id' => 'Szervezeti egység',
+	'Class:Document/Attribute:org_id+' => '~~',
+	'Class:Document/Attribute:org_name' => 'Szervezeti egység név',
+	'Class:Document/Attribute:org_name+' => '',
+	'Class:Document/Attribute:documenttype_id' => 'Dokumentum típus',
+	'Class:Document/Attribute:documenttype_id+' => '~~',
+	'Class:Document/Attribute:documenttype_name' => 'Dokumentum típus név',
+	'Class:Document/Attribute:documenttype_name+' => '~~',
+	'Class:Document/Attribute:version' => 'Verzió',
+	'Class:Document/Attribute:version+' => '~~',
+	'Class:Document/Attribute:description' => 'Leírás',
+	'Class:Document/Attribute:description+' => '',
+	'Class:Document/Attribute:status' => 'Állapot',
+	'Class:Document/Attribute:status+' => '',
+	'Class:Document/Attribute:status/Value:draft' => 'Munkapéldány',
+	'Class:Document/Attribute:status/Value:draft+' => '',
+	'Class:Document/Attribute:status/Value:obsolete' => 'Elavult',
+	'Class:Document/Attribute:status/Value:obsolete+' => '',
+	'Class:Document/Attribute:status/Value:published' => 'Érvényes',
+	'Class:Document/Attribute:status/Value:published+' => '',
+	'Class:Document/Attribute:cis_list' => 'CI-k',
+	'Class:Document/Attribute:cis_list+' => '',
+	'Class:Document/Attribute:finalclass' => 'Dokumentum típus',
+	'Class:Document/Attribute:finalclass+' => 'A végső osztály neve',
 ));
 
 //
@@ -219,10 +226,10 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:DocumentFile' => 'Dokumentum fájl',
-    'Class:DocumentFile+' => '~~',
-    'Class:DocumentFile/Attribute:file' => 'Fájl',
-    'Class:DocumentFile/Attribute:file+' => '~~',
+	'Class:DocumentFile' => 'Dokumentum fájl',
+	'Class:DocumentFile+' => '~~',
+	'Class:DocumentFile/Attribute:file' => 'Fájl',
+	'Class:DocumentFile/Attribute:file+' => '~~',
 ));
 
 //
@@ -230,10 +237,10 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:DocumentNote' => 'Dokumentum jegyzet',
-    'Class:DocumentNote+' => '~~',
-    'Class:DocumentNote/Attribute:text' => 'Szöveg',
-    'Class:DocumentNote/Attribute:text+' => '~~',
+	'Class:DocumentNote' => 'Dokumentum jegyzet',
+	'Class:DocumentNote+' => '~~',
+	'Class:DocumentNote/Attribute:text' => 'Szöveg',
+	'Class:DocumentNote/Attribute:text+' => '~~',
 ));
 
 //
@@ -241,10 +248,10 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:DocumentWeb' => 'Webdokumentum',
-    'Class:DocumentWeb+' => '~~',
-    'Class:DocumentWeb/Attribute:url' => 'URL',
-    'Class:DocumentWeb/Attribute:url+' => '',
+	'Class:DocumentWeb' => 'Webdokumentum',
+	'Class:DocumentWeb+' => '~~',
+	'Class:DocumentWeb/Attribute:url' => 'URL',
+	'Class:DocumentWeb/Attribute:url+' => '',
 ));
 
 //
@@ -252,12 +259,12 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:Typology' => 'Tipológia',
-    'Class:Typology+' => '~~',
-    'Class:Typology/Attribute:name' => 'Név',
-    'Class:Typology/Attribute:name+' => '~~',
-    'Class:Typology/Attribute:finalclass' => 'Típus',
-    'Class:Typology/Attribute:finalclass+' => '',
+	'Class:Typology' => 'Tipológia',
+	'Class:Typology+' => '~~',
+	'Class:Typology/Attribute:name' => 'Név',
+	'Class:Typology/Attribute:name+' => '~~',
+	'Class:Typology/Attribute:finalclass' => 'Típus',
+	'Class:Typology/Attribute:finalclass+' => '',
 ));
 
 //
@@ -265,8 +272,8 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:DocumentType' => 'Dokumentum típus',
-    'Class:DocumentType+' => '~~',
+	'Class:DocumentType' => 'Dokumentum típus',
+	'Class:DocumentType+' => '~~',
 ));
 
 //
@@ -274,8 +281,8 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:ContactType' => 'Kapcsolattartó típus',
-    'Class:ContactType+' => '~~',
+	'Class:ContactType' => 'Kapcsolattartó típus',
+	'Class:ContactType+' => '~~',
 ));
 
 //
@@ -283,20 +290,22 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:lnkPersonToTeam' => 'Kapcsolattartó / Csapat',
-    'Class:lnkPersonToTeam+' => '~~',
-    'Class:lnkPersonToTeam/Attribute:team_id' => 'Csapat',
-    'Class:lnkPersonToTeam/Attribute:team_id+' => '~~',
-    'Class:lnkPersonToTeam/Attribute:team_name' => 'Csapat név',
-    'Class:lnkPersonToTeam/Attribute:team_name+' => '~~',
-    'Class:lnkPersonToTeam/Attribute:person_id' => 'Kapcsolattartó',
-    'Class:lnkPersonToTeam/Attribute:person_id+' => '~~',
-    'Class:lnkPersonToTeam/Attribute:person_name' => 'Kapcsolattartó név',
-    'Class:lnkPersonToTeam/Attribute:person_name+' => '~~',
-    'Class:lnkPersonToTeam/Attribute:role_id' => 'Beosztás',
-    'Class:lnkPersonToTeam/Attribute:role_id+' => '~~',
-    'Class:lnkPersonToTeam/Attribute:role_name' => 'Beosztás név',
-    'Class:lnkPersonToTeam/Attribute:role_name+' => '~~',
+	'Class:lnkPersonToTeam' => 'Kapcsolattartó / Csapat',
+	'Class:lnkPersonToTeam+' => '~~',
+	'Class:lnkPersonToTeam/Name' => '%1$s / %2$s~~',
+	'Class:lnkPersonToTeam/Name+' => '~~',
+	'Class:lnkPersonToTeam/Attribute:team_id' => 'Csapat',
+	'Class:lnkPersonToTeam/Attribute:team_id+' => '~~',
+	'Class:lnkPersonToTeam/Attribute:team_name' => 'Csapat név',
+	'Class:lnkPersonToTeam/Attribute:team_name+' => '~~',
+	'Class:lnkPersonToTeam/Attribute:person_id' => 'Kapcsolattartó',
+	'Class:lnkPersonToTeam/Attribute:person_id+' => '~~',
+	'Class:lnkPersonToTeam/Attribute:person_name' => 'Kapcsolattartó név',
+	'Class:lnkPersonToTeam/Attribute:person_name+' => '~~',
+	'Class:lnkPersonToTeam/Attribute:role_id' => 'Beosztás',
+	'Class:lnkPersonToTeam/Attribute:role_id+' => '~~',
+	'Class:lnkPersonToTeam/Attribute:role_name' => 'Beosztás név',
+	'Class:lnkPersonToTeam/Attribute:role_name+' => '~~',
 ));
 
 //
@@ -304,57 +313,57 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Menu:DataAdministration' => 'Adat adminisztráció',
-    'Menu:DataAdministration+' => '',
-    'Menu:Catalogs' => 'Katalógusok',
-    'Menu:Catalogs+' => '',
-    'Menu:Audit' => 'Audit',
-    'Menu:Audit+' => '',
-    'Menu:CSVImport' => 'CSV import',
-    'Menu:CSVImport+' => '',
-    'Menu:Organization' => 'Szervezeti egység',
-    'Menu:Organization+' => '',
-    'Menu:ConfigManagement' => 'Konfigurációkezelés',
-    'Menu:ConfigManagement+' => '',
-    'Menu:ConfigManagementCI' => 'Konfigurációs elemek (CI)',
-    'Menu:ConfigManagementCI+' => '',
-    'Menu:ConfigManagementOverview' => 'Áttekintő',
-    'Menu:ConfigManagementOverview+' => '',
-    'Menu:Contact' => 'Kapcsolattartók',
-    'Menu:Contact+' => '',
-    'Menu:Contact:Count' => '%1$d',
-    'Menu:Person' => 'Kapcsolattartók',
-    'Menu:Person+' => '',
-    'Menu:Team' => 'Csapatok',
-    'Menu:Team+' => '',
-    'Menu:Document' => 'Dokumentumok',
-    'Menu:Document+' => '',
-    'Menu:Location' => 'Helyszínek',
-    'Menu:Location+' => '',
-    'Menu:NewContact' => 'Új kapcsolattartó',
-    'Menu:NewContact+' => '',
-    'Menu:SearchContacts' => 'Kapcsolattartó keresés',
-    'Menu:SearchContacts+' => '',
-    'Menu:ConfigManagement:Shortcuts' => 'Gyorsgombok',
-    'Menu:ConfigManagement:AllContacts' => 'Összes kapcsolattartó: %1$d',
-    'Menu:Typology' => 'Tipológia konfiguráció',
-    'Menu:Typology+' => '',
-    'UI_WelcomeMenu_AllConfigItems' => 'Összegzés',
-    'Menu:ConfigManagement:Typology' => 'Tipológia konfiguráció',
+	'Menu:DataAdministration' => 'Adat adminisztráció',
+	'Menu:DataAdministration+' => '',
+	'Menu:Catalogs' => 'Katalógusok',
+	'Menu:Catalogs+' => '',
+	'Menu:Audit' => 'Audit',
+	'Menu:Audit+' => '',
+	'Menu:CSVImport' => 'CSV import',
+	'Menu:CSVImport+' => '',
+	'Menu:Organization' => 'Szervezeti egység',
+	'Menu:Organization+' => '',
+	'Menu:ConfigManagement' => 'Konfigurációkezelés',
+	'Menu:ConfigManagement+' => '',
+	'Menu:ConfigManagementCI' => 'Konfigurációs elemek (CI)',
+	'Menu:ConfigManagementCI+' => '',
+	'Menu:ConfigManagementOverview' => 'Áttekintő',
+	'Menu:ConfigManagementOverview+' => '',
+	'Menu:Contact' => 'Kapcsolattartók',
+	'Menu:Contact+' => '',
+	'Menu:Contact:Count' => '%1$d',
+	'Menu:Person' => 'Kapcsolattartók',
+	'Menu:Person+' => '',
+	'Menu:Team' => 'Csapatok',
+	'Menu:Team+' => '',
+	'Menu:Document' => 'Dokumentumok',
+	'Menu:Document+' => '',
+	'Menu:Location' => 'Helyszínek',
+	'Menu:Location+' => '',
+	'Menu:NewContact' => 'Új kapcsolattartó',
+	'Menu:NewContact+' => '',
+	'Menu:SearchContacts' => 'Kapcsolattartó keresés',
+	'Menu:SearchContacts+' => '',
+	'Menu:ConfigManagement:Shortcuts' => 'Gyorsgombok',
+	'Menu:ConfigManagement:AllContacts' => 'Összes kapcsolattartó: %1$d',
+	'Menu:Typology' => 'Tipológia konfiguráció',
+	'Menu:Typology+' => '',
+	'UI_WelcomeMenu_AllConfigItems' => 'Összegzés',
+	'Menu:ConfigManagement:Typology' => 'Tipológia konfiguráció',
 ));
 
 // Add translation for Fieldsets
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Person:info' => 'Általános információk',
-    'User:info' => 'Általános információk',
-    'Person:personal_info' => 'Személyes információk',
-    'Person:notifiy' => 'Értesítés',
+	'Person:info' => 'Általános információk',
+	'User:info' => 'Általános információk',
+	'User:profiles' => 'Profiles (minimum one)~~',
+	'Person:personal_info' => 'Személyes információk',
+	'Person:notifiy' => 'Értesítés',
 ));
 
 // Themes
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'theme:fullmoon' => 'Full moon',
-    'theme:test-red' => 'Tesztpéldány (Red)',
+	'theme:fullmoon' => 'Full moon',
+	'theme:test-red' => 'Tesztpéldány (Red)',
 ));
-
diff --git a/datamodels/2.x/itop-structure/dictionaries/it.dict.itop-structure.php b/datamodels/2.x/itop-structure/dictionaries/it.dict.itop-structure.php
index 9cf7c3b327..74325451f8 100644
--- a/datamodels/2.x/itop-structure/dictionaries/it.dict.itop-structure.php
+++ b/datamodels/2.x/itop-structure/dictionaries/it.dict.itop-structure.php
@@ -99,6 +99,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:Contact' => 'Contatto',
 	'Class:Contact+' => '',
+	'Class:Contact/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Contact/Attribute:name' => 'Nome',
 	'Class:Contact/Attribute:name+' => '',
 	'Class:Contact/Attribute:status' => 'Stato',
@@ -136,6 +137,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:Person' => 'Persona',
 	'Class:Person+' => '',
+	'Class:Person/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Person/Attribute:name' => 'Last Name~~',
 	'Class:Person/Attribute:name+' => '~~',
 	'Class:Person/Attribute:first_name' => 'Nome',
@@ -156,6 +158,8 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:Person/Attribute:team_list+' => 'All the teams this person belongs to~~',
 	'Class:Person/Attribute:tickets_list' => 'Tickets~~',
 	'Class:Person/Attribute:tickets_list+' => 'All the tickets this person is the caller~~',
+	'Class:Person/Attribute:user_list' => 'Users~~',
+	'Class:Person/Attribute:user_list+' => 'All the Users associated to this person~~',
 	'Class:Person/Attribute:manager_id_friendlyname' => 'Manager friendly name~~',
 	'Class:Person/Attribute:manager_id_friendlyname+' => '~~',
 	'Class:Person/Attribute:picture' => 'Picture~~',
@@ -164,6 +168,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:Person/UniquenessRule:employee_number' => 'there is already a person in \'$this->org_name$\' organization with the same employee number~~',
 	'Class:Person/UniquenessRule:name+' => 'The employee name should be unique inside its organization~~',
 	'Class:Person/UniquenessRule:name' => 'There is already a person in \'$this->org_name$\' organization with the same name~~',
+	'Class:Person/Error:ChangingOrgDenied' => 'Impossible to move this person under organization \'%1$s\' as it would break his access to the User Portal, his associated user not being allowed on this organization~~',
 ));
 
 //
@@ -173,6 +178,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:Team' => 'Squadra',
 	'Class:Team+' => '',
+	'Class:Team/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Team/Attribute:persons_list' => 'Members~~',
 	'Class:Team/Attribute:persons_list+' => 'All the people belonging to this team~~',
 	'Class:Team/Attribute:tickets_list' => 'Tickets~~',
@@ -186,6 +192,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:Document' => 'Documento',
 	'Class:Document+' => '',
+	'Class:Document/ComplementaryName' => '%1$s - %2$s - %3$s~~',
 	'Class:Document/Attribute:name' => 'Nome',
 	'Class:Document/Attribute:name+' => '',
 	'Class:Document/Attribute:org_id' => 'Organizzazione',
@@ -285,6 +292,8 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:lnkPersonToTeam' => 'Link Person / Team~~',
 	'Class:lnkPersonToTeam+' => '~~',
+	'Class:lnkPersonToTeam/Name' => '%1$s / %2$s~~',
+	'Class:lnkPersonToTeam/Name+' => '~~',
 	'Class:lnkPersonToTeam/Attribute:team_id' => 'Team~~',
 	'Class:lnkPersonToTeam/Attribute:team_id+' => '~~',
 	'Class:lnkPersonToTeam/Attribute:team_name' => 'Team name~~',
@@ -348,6 +357,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Person:info' => 'General information~~',
 	'User:info' => 'General information~~',
+	'User:profiles' => 'Profiles (minimum one)~~',
 	'Person:personal_info' => 'Personal information~~',
 	'Person:notifiy' => 'Notification~~',
 ));
diff --git a/datamodels/2.x/itop-structure/dictionaries/ja.dict.itop-structure.php b/datamodels/2.x/itop-structure/dictionaries/ja.dict.itop-structure.php
index 3d135c7d52..9586af1226 100644
--- a/datamodels/2.x/itop-structure/dictionaries/ja.dict.itop-structure.php
+++ b/datamodels/2.x/itop-structure/dictionaries/ja.dict.itop-structure.php
@@ -99,6 +99,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:Contact' => '連絡先',
 	'Class:Contact+' => '',
+	'Class:Contact/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Contact/Attribute:name' => '名前',
 	'Class:Contact/Attribute:name+' => '',
 	'Class:Contact/Attribute:status' => '状態',
@@ -136,6 +137,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:Person' => '人物',
 	'Class:Person+' => '',
+	'Class:Person/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Person/Attribute:name' => '姓',
 	'Class:Person/Attribute:name+' => '~~',
 	'Class:Person/Attribute:first_name' => 'ファーストネーム',
@@ -156,6 +158,8 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:Person/Attribute:team_list+' => 'All the teams this person belongs to~~',
 	'Class:Person/Attribute:tickets_list' => 'チケット',
 	'Class:Person/Attribute:tickets_list+' => 'All the tickets this person is the caller~~',
+	'Class:Person/Attribute:user_list' => 'Users~~',
+	'Class:Person/Attribute:user_list+' => 'All the Users associated to this person~~',
 	'Class:Person/Attribute:manager_id_friendlyname' => 'マネージャーフレンドリ名',
 	'Class:Person/Attribute:manager_id_friendlyname+' => '',
 	'Class:Person/Attribute:picture' => 'Picture~~',
@@ -164,6 +168,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:Person/UniquenessRule:employee_number' => 'there is already a person in \'$this->org_name$\' organization with the same employee number~~',
 	'Class:Person/UniquenessRule:name+' => 'The employee name should be unique inside its organization~~',
 	'Class:Person/UniquenessRule:name' => 'There is already a person in \'$this->org_name$\' organization with the same name~~',
+	'Class:Person/Error:ChangingOrgDenied' => 'Impossible to move this person under organization \'%1$s\' as it would break his access to the User Portal, his associated user not being allowed on this organization~~',
 ));
 
 //
@@ -173,6 +178,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:Team' => 'チーム',
 	'Class:Team+' => '',
+	'Class:Team/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Team/Attribute:persons_list' => 'メンバー',
 	'Class:Team/Attribute:persons_list+' => 'All the people belonging to this team~~',
 	'Class:Team/Attribute:tickets_list' => 'チケット',
@@ -186,6 +192,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:Document' => '文書',
 	'Class:Document+' => '',
+	'Class:Document/ComplementaryName' => '%1$s - %2$s - %3$s~~',
 	'Class:Document/Attribute:name' => '名前',
 	'Class:Document/Attribute:name+' => '',
 	'Class:Document/Attribute:org_id' => '組織',
@@ -285,6 +292,8 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:lnkPersonToTeam' => 'リンク 人物/チーム',
 	'Class:lnkPersonToTeam+' => '',
+	'Class:lnkPersonToTeam/Name' => '%1$s / %2$s~~',
+	'Class:lnkPersonToTeam/Name+' => '~~',
 	'Class:lnkPersonToTeam/Attribute:team_id' => 'チーム',
 	'Class:lnkPersonToTeam/Attribute:team_id+' => '',
 	'Class:lnkPersonToTeam/Attribute:team_name' => 'チーム名',
@@ -348,6 +357,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Person:info' => '情報',
 	'User:info' => '情報',
+	'User:profiles' => 'Profiles (minimum one)~~',
 	'Person:personal_info' => 'Personal information~~',
 	'Person:notifiy' => '通知',
 ));
diff --git a/datamodels/2.x/itop-structure/dictionaries/nl.dict.itop-structure.php b/datamodels/2.x/itop-structure/dictionaries/nl.dict.itop-structure.php
index 5352f38905..17db3ae869 100644
--- a/datamodels/2.x/itop-structure/dictionaries/nl.dict.itop-structure.php
+++ b/datamodels/2.x/itop-structure/dictionaries/nl.dict.itop-structure.php
@@ -106,6 +106,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:Contact' => 'Contact',
 	'Class:Contact+' => '',
+	'Class:Contact/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Contact/Attribute:name' => 'Naam',
 	'Class:Contact/Attribute:name+' => '',
 	'Class:Contact/Attribute:status' => 'Status',
@@ -143,6 +144,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:Person' => 'Persoon',
 	'Class:Person+' => '',
+	'Class:Person/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Person/Attribute:name' => 'Achternaam',
 	'Class:Person/Attribute:name+' => '',
 	'Class:Person/Attribute:first_name' => 'Voornaam',
@@ -163,6 +165,8 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:Person/Attribute:team_list+' => 'Alle teams waarvan deze persoon lid is',
 	'Class:Person/Attribute:tickets_list' => 'Tickets',
 	'Class:Person/Attribute:tickets_list+' => 'Alle tickets waarvan deze persoon de aanvrager is',
+	'Class:Person/Attribute:user_list' => 'Users~~',
+	'Class:Person/Attribute:user_list+' => 'All the Users associated to this person~~',
 	'Class:Person/Attribute:manager_id_friendlyname' => 'Herkenbare naam manager',
 	'Class:Person/Attribute:manager_id_friendlyname+' => '',
 	'Class:Person/Attribute:picture' => 'Foto',
@@ -171,6 +175,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:Person/UniquenessRule:employee_number' => 'Er is al een persoon in de organisatie \'$this->org_name$\' met hetzelfde identificatienummer',
 	'Class:Person/UniquenessRule:name+' => 'De naam moet uniek zijn binnen een organisatie',
 	'Class:Person/UniquenessRule:name' => 'Er is al een persoon in de organisatie \'$this->org_name$\' met dezelfde naam',
+	'Class:Person/Error:ChangingOrgDenied' => 'Impossible to move this person under organization \'%1$s\' as it would break his access to the User Portal, his associated user not being allowed on this organization~~',
 ));
 
 //
@@ -180,6 +185,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:Team' => 'Team',
 	'Class:Team+' => '',
+	'Class:Team/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Team/Attribute:persons_list' => 'Leden',
 	'Class:Team/Attribute:persons_list+' => 'Alle personen die lid zijn van dit team',
 	'Class:Team/Attribute:tickets_list' => 'Tickets',
@@ -193,6 +199,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:Document' => 'Document',
 	'Class:Document+' => '',
+	'Class:Document/ComplementaryName' => '%1$s - %2$s - %3$s~~',
 	'Class:Document/Attribute:name' => 'Naam',
 	'Class:Document/Attribute:name+' => '',
 	'Class:Document/Attribute:org_id' => 'Organisatie',
@@ -292,6 +299,8 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:lnkPersonToTeam' => 'Link Persoon / Team',
 	'Class:lnkPersonToTeam+' => '',
+	'Class:lnkPersonToTeam/Name' => '%1$s / %2$s~~',
+	'Class:lnkPersonToTeam/Name+' => '~~',
 	'Class:lnkPersonToTeam/Attribute:team_id' => 'Team',
 	'Class:lnkPersonToTeam/Attribute:team_id+' => '',
 	'Class:lnkPersonToTeam/Attribute:team_name' => 'Naam team',
@@ -355,6 +364,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Person:info' => 'Globale informatie',
 	'User:info' => 'Globale informatie',
+	'User:profiles' => 'Profiles (minimum one)~~',
 	'Person:personal_info' => 'Persoonlijke informatie',
 	'Person:notifiy' => 'Notificeer',
 ));
diff --git a/datamodels/2.x/itop-structure/dictionaries/pl.dict.itop-structure.php b/datamodels/2.x/itop-structure/dictionaries/pl.dict.itop-structure.php
index f12ff8725a..86d213b870 100644
--- a/datamodels/2.x/itop-structure/dictionaries/pl.dict.itop-structure.php
+++ b/datamodels/2.x/itop-structure/dictionaries/pl.dict.itop-structure.php
@@ -110,6 +110,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:Contact' => 'Kontakt',
 	'Class:Contact+' => '',
+	'Class:Contact/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Contact/Attribute:name' => 'Nazwa',
 	'Class:Contact/Attribute:name+' => '',
 	'Class:Contact/Attribute:status' => 'Status',
@@ -147,6 +148,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:Person' => 'Osoba',
 	'Class:Person+' => '',
+	'Class:Person/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Person/Attribute:name' => 'Nazwisko',
 	'Class:Person/Attribute:name+' => '',
 	'Class:Person/Attribute:first_name' => 'Imię',
@@ -167,6 +169,8 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:Person/Attribute:team_list+' => 'Wszystkie zespoły, do których należy ta osoba',
 	'Class:Person/Attribute:tickets_list' => 'Zgłoszenia',
 	'Class:Person/Attribute:tickets_list+' => 'Wszystkie zgłoszenia, które ta osoba założyła',
+	'Class:Person/Attribute:user_list' => 'Users~~',
+	'Class:Person/Attribute:user_list+' => 'All the Users associated to this person~~',
 	'Class:Person/Attribute:manager_id_friendlyname' => 'Przyjazna nazwa menedżera',
 	'Class:Person/Attribute:manager_id_friendlyname+' => '',
 	'Class:Person/Attribute:picture' => 'Zdjęcie',
@@ -175,6 +179,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:Person/UniquenessRule:employee_number' => 'W organizacji \'$this->org_name$\' istnieje już osoba o tym samym numerze pracownika',
 	'Class:Person/UniquenessRule:name+' => 'Imię i nazwisko pracownika powinno być unikalne w jego organizacji',
 	'Class:Person/UniquenessRule:name' => 'W organizacji \'$this->org_name$\' istnieje już osoba o takiej samej nazwie',
+	'Class:Person/Error:ChangingOrgDenied' => 'Impossible to move this person under organization \'%1$s\' as it would break his access to the User Portal, his associated user not being allowed on this organization~~',
 ));
 
 //
@@ -184,6 +189,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:Team' => 'Zespół',
 	'Class:Team+' => '',
+	'Class:Team/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Team/Attribute:persons_list' => 'Członkowie',
 	'Class:Team/Attribute:persons_list+' => 'Wszystkie osoby należące do tego zespołu',
 	'Class:Team/Attribute:tickets_list' => 'Zgłoszenia',
@@ -197,6 +203,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:Document' => 'Dokument',
 	'Class:Document+' => '',
+	'Class:Document/ComplementaryName' => '%1$s - %2$s - %3$s~~',
 	'Class:Document/Attribute:name' => 'Nazwa',
 	'Class:Document/Attribute:name+' => '',
 	'Class:Document/Attribute:org_id' => 'Organizacja',
@@ -296,6 +303,8 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:lnkPersonToTeam' => 'Połączenie osoba / zespół',
 	'Class:lnkPersonToTeam+' => '',
+	'Class:lnkPersonToTeam/Name' => '%1$s / %2$s~~',
+	'Class:lnkPersonToTeam/Name+' => '~~',
 	'Class:lnkPersonToTeam/Attribute:team_id' => 'Zespół',
 	'Class:lnkPersonToTeam/Attribute:team_id+' => '',
 	'Class:lnkPersonToTeam/Attribute:team_name' => 'Nazwa zespołu',
@@ -359,6 +368,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Person:info' => 'Informacje ogólne',
 	'User:info' => 'Informacje ogólne',
+	'User:profiles' => 'Profiles (minimum one)~~',
 	'Person:personal_info' => 'Informacje osobiste',
 	'Person:notifiy' => 'Powiadomienie',
 ));
diff --git a/datamodels/2.x/itop-structure/dictionaries/pt_br.dict.itop-structure.php b/datamodels/2.x/itop-structure/dictionaries/pt_br.dict.itop-structure.php
index 3f238096db..f46b3092b6 100644
--- a/datamodels/2.x/itop-structure/dictionaries/pt_br.dict.itop-structure.php
+++ b/datamodels/2.x/itop-structure/dictionaries/pt_br.dict.itop-structure.php
@@ -100,6 +100,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:Contact' => 'Contato',
 	'Class:Contact+' => '',
+	'Class:Contact/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Contact/Attribute:name' => 'Nome',
 	'Class:Contact/Attribute:name+' => '',
 	'Class:Contact/Attribute:status' => 'Status',
@@ -137,6 +138,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:Person' => 'Pessoa',
 	'Class:Person+' => '',
+	'Class:Person/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Person/Attribute:name' => 'Último nome',
 	'Class:Person/Attribute:name+' => '',
 	'Class:Person/Attribute:first_name' => 'Primeiro nome',
@@ -157,6 +159,8 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:Person/Attribute:team_list+' => 'Todas as equipes que essa pessoa pertence',
 	'Class:Person/Attribute:tickets_list' => 'Solicitações',
 	'Class:Person/Attribute:tickets_list+' => 'Todos as solicitações que essa pessoa solicitou',
+	'Class:Person/Attribute:user_list' => 'Users~~',
+	'Class:Person/Attribute:user_list+' => 'All the Users associated to this person~~',
 	'Class:Person/Attribute:manager_id_friendlyname' => 'Nome amigável do gerente',
 	'Class:Person/Attribute:manager_id_friendlyname+' => 'Nome amigável do gerente do usuário correspondente',
 	'Class:Person/Attribute:picture' => 'Imagem',
@@ -165,6 +169,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:Person/UniquenessRule:employee_number' => 'Já existe uma pessoa na organização \'$this->org_name$\' com o mesmo número de colaborador',
 	'Class:Person/UniquenessRule:name+' => 'O nome do colaborador deve ser único dentro de sua organização',
 	'Class:Person/UniquenessRule:name' => 'Já existe uma pessoa na organização \'$this->org_name$\' com o mesmo nome',
+	'Class:Person/Error:ChangingOrgDenied' => 'Impossible to move this person under organization \'%1$s\' as it would break his access to the User Portal, his associated user not being allowed on this organization~~',
 ));
 
 //
@@ -174,6 +179,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:Team' => 'Equipe',
 	'Class:Team+' => '',
+	'Class:Team/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Team/Attribute:persons_list' => 'Membros',
 	'Class:Team/Attribute:persons_list+' => 'Todas as pessoas que pertencem a essa equipe',
 	'Class:Team/Attribute:tickets_list' => 'Solicitações',
@@ -187,6 +193,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:Document' => 'Documento',
 	'Class:Document+' => '',
+	'Class:Document/ComplementaryName' => '%1$s - %2$s - %3$s~~',
 	'Class:Document/Attribute:name' => 'Nome',
 	'Class:Document/Attribute:name+' => '',
 	'Class:Document/Attribute:org_id' => 'Organização',
@@ -286,6 +293,8 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:lnkPersonToTeam' => 'Link Pessoa / Equipe',
 	'Class:lnkPersonToTeam+' => '',
+	'Class:lnkPersonToTeam/Name' => '%1$s / %2$s~~',
+	'Class:lnkPersonToTeam/Name+' => '~~',
 	'Class:lnkPersonToTeam/Attribute:team_id' => 'Equipe',
 	'Class:lnkPersonToTeam/Attribute:team_id+' => '',
 	'Class:lnkPersonToTeam/Attribute:team_name' => 'Nome da equipe',
@@ -349,6 +358,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Person:info' => 'Informações gerais',
 	'User:info' => 'Informações gerais',
+	'User:profiles' => 'Profiles (minimum one)~~',
 	'Person:personal_info' => 'Informações pessoais',
 	'Person:notifiy' => 'Notificações',
 ));
diff --git a/datamodels/2.x/itop-structure/dictionaries/ru.dict.itop-structure.php b/datamodels/2.x/itop-structure/dictionaries/ru.dict.itop-structure.php
index ea38e2ccde..3ea77c093f 100644
--- a/datamodels/2.x/itop-structure/dictionaries/ru.dict.itop-structure.php
+++ b/datamodels/2.x/itop-structure/dictionaries/ru.dict.itop-structure.php
@@ -87,6 +87,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:Contact' => 'Контакт',
 	'Class:Contact+' => 'Контакт',
+	'Class:Contact/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Contact/Attribute:name' => 'Название',
 	'Class:Contact/Attribute:name+' => '',
 	'Class:Contact/Attribute:status' => 'Статус',
@@ -124,6 +125,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:Person' => 'Персона',
 	'Class:Person+' => 'Персона',
+	'Class:Person/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Person/Attribute:name' => 'Фамилия',
 	'Class:Person/Attribute:name+' => '',
 	'Class:Person/Attribute:first_name' => 'Имя',
@@ -144,6 +146,8 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:Person/Attribute:team_list+' => 'Команды с участием персоны',
 	'Class:Person/Attribute:tickets_list' => 'Тикеты',
 	'Class:Person/Attribute:tickets_list+' => 'Связанные тикеты',
+	'Class:Person/Attribute:user_list' => 'Users~~',
+	'Class:Person/Attribute:user_list+' => 'All the Users associated to this person~~',
 	'Class:Person/Attribute:manager_id_friendlyname' => 'Руководитель',
 	'Class:Person/Attribute:manager_id_friendlyname+' => '',
 	'Class:Person/Attribute:picture' => 'Фотография',
@@ -152,6 +156,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:Person/UniquenessRule:employee_number' => 'В организации \'$this->org_name$\' уже есть персона с таким номером сотрудника',
 	'Class:Person/UniquenessRule:name+' => 'Имя сотрудника должно быть уникальным внутри организации',
 	'Class:Person/UniquenessRule:name' => 'В организации \'$this->org_name$\' уже есть персона с таким именем',
+	'Class:Person/Error:ChangingOrgDenied' => 'Impossible to move this person under organization \'%1$s\' as it would break his access to the User Portal, his associated user not being allowed on this organization~~',
 ));
 
 //
@@ -161,6 +166,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:Team' => 'Команда',
 	'Class:Team+' => 'Команда',
+	'Class:Team/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Team/Attribute:persons_list' => 'Участники',
 	'Class:Team/Attribute:persons_list+' => 'Участники команды',
 	'Class:Team/Attribute:tickets_list' => 'Тикеты',
@@ -174,6 +180,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:Document' => 'Документ',
 	'Class:Document+' => 'Документ',
+	'Class:Document/ComplementaryName' => '%1$s - %2$s - %3$s~~',
 	'Class:Document/Attribute:name' => 'Название',
 	'Class:Document/Attribute:name+' => '',
 	'Class:Document/Attribute:org_id' => 'Организация',
@@ -273,6 +280,8 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:lnkPersonToTeam' => 'Связь Персона/Команда',
 	'Class:lnkPersonToTeam+' => '',
+	'Class:lnkPersonToTeam/Name' => '%1$s / %2$s~~',
+	'Class:lnkPersonToTeam/Name+' => '~~',
 	'Class:lnkPersonToTeam/Attribute:team_id' => 'Команда',
 	'Class:lnkPersonToTeam/Attribute:team_id+' => '',
 	'Class:lnkPersonToTeam/Attribute:team_name' => 'Команда',
@@ -336,6 +345,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Person:info' => 'Основная информация',
 	'User:info' => 'Основная информация',
+	'User:profiles' => 'Profiles (minimum one)~~',
 	'Person:personal_info' => 'Личная информация',
 	'Person:notifiy' => 'Уведомления',
 ));
diff --git a/datamodels/2.x/itop-structure/dictionaries/sk.dict.itop-structure.php b/datamodels/2.x/itop-structure/dictionaries/sk.dict.itop-structure.php
index 59a7882026..0ee730755c 100644
--- a/datamodels/2.x/itop-structure/dictionaries/sk.dict.itop-structure.php
+++ b/datamodels/2.x/itop-structure/dictionaries/sk.dict.itop-structure.php
@@ -99,6 +99,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:Contact' => 'Kontakt',
 	'Class:Contact+' => '',
+	'Class:Contact/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Contact/Attribute:name' => 'Meno',
 	'Class:Contact/Attribute:name+' => '',
 	'Class:Contact/Attribute:status' => 'Stav',
@@ -136,6 +137,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:Person' => 'Osoba',
 	'Class:Person+' => '',
+	'Class:Person/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Person/Attribute:name' => 'Priezvisko',
 	'Class:Person/Attribute:name+' => '',
 	'Class:Person/Attribute:first_name' => 'Krstné meno',
@@ -156,6 +158,8 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:Person/Attribute:team_list+' => 'All the teams this person belongs to~~',
 	'Class:Person/Attribute:tickets_list' => 'Tickety',
 	'Class:Person/Attribute:tickets_list+' => 'All the tickets this person is the caller~~',
+	'Class:Person/Attribute:user_list' => 'Users~~',
+	'Class:Person/Attribute:user_list+' => 'All the Users associated to this person~~',
 	'Class:Person/Attribute:manager_id_friendlyname' => 'Ľahko čitateľné meno manažéra',
 	'Class:Person/Attribute:manager_id_friendlyname+' => '',
 	'Class:Person/Attribute:picture' => 'Picture~~',
@@ -164,6 +168,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:Person/UniquenessRule:employee_number' => 'there is already a person in \'$this->org_name$\' organization with the same employee number~~',
 	'Class:Person/UniquenessRule:name+' => 'The employee name should be unique inside its organization~~',
 	'Class:Person/UniquenessRule:name' => 'There is already a person in \'$this->org_name$\' organization with the same name~~',
+	'Class:Person/Error:ChangingOrgDenied' => 'Impossible to move this person under organization \'%1$s\' as it would break his access to the User Portal, his associated user not being allowed on this organization~~',
 ));
 
 //
@@ -173,6 +178,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:Team' => 'Tím',
 	'Class:Team+' => '',
+	'Class:Team/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Team/Attribute:persons_list' => 'Osoby',
 	'Class:Team/Attribute:persons_list+' => 'All the people belonging to this team~~',
 	'Class:Team/Attribute:tickets_list' => 'Tickety',
@@ -186,6 +192,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:Document' => 'Dokument',
 	'Class:Document+' => '',
+	'Class:Document/ComplementaryName' => '%1$s - %2$s - %3$s~~',
 	'Class:Document/Attribute:name' => 'Názov',
 	'Class:Document/Attribute:name+' => '',
 	'Class:Document/Attribute:org_id' => 'Organizácia',
@@ -285,6 +292,8 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:lnkPersonToTeam' => 'väzba - Osoba / Tím',
 	'Class:lnkPersonToTeam+' => '',
+	'Class:lnkPersonToTeam/Name' => '%1$s / %2$s~~',
+	'Class:lnkPersonToTeam/Name+' => '~~',
 	'Class:lnkPersonToTeam/Attribute:team_id' => 'Tím',
 	'Class:lnkPersonToTeam/Attribute:team_id+' => '',
 	'Class:lnkPersonToTeam/Attribute:team_name' => 'Názov tímu',
@@ -348,6 +357,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Person:info' => 'Všeobecné informácie',
 	'User:info' => 'Všeobecné informácie',
+	'User:profiles' => 'Profiles (minimum one)~~',
 	'Person:personal_info' => 'Personal information~~',
 	'Person:notifiy' => 'Upozornenie',
 ));
diff --git a/datamodels/2.x/itop-structure/dictionaries/tr.dict.itop-structure.php b/datamodels/2.x/itop-structure/dictionaries/tr.dict.itop-structure.php
index 71ac37ada9..2c36c438cf 100644
--- a/datamodels/2.x/itop-structure/dictionaries/tr.dict.itop-structure.php
+++ b/datamodels/2.x/itop-structure/dictionaries/tr.dict.itop-structure.php
@@ -101,6 +101,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:Contact' => 'İrtibat',
 	'Class:Contact+' => '',
+	'Class:Contact/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Contact/Attribute:name' => 'Adı',
 	'Class:Contact/Attribute:name+' => '',
 	'Class:Contact/Attribute:status' => 'Durumu',
@@ -138,6 +139,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:Person' => 'Kişi',
 	'Class:Person+' => '',
+	'Class:Person/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Person/Attribute:name' => 'Soyad',
 	'Class:Person/Attribute:name+' => '~~',
 	'Class:Person/Attribute:first_name' => 'Adı',
@@ -158,6 +160,8 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:Person/Attribute:team_list+' => 'Bu kişinin ait olduğu tüm ekipler',
 	'Class:Person/Attribute:tickets_list' => 'Çağrı kayıtları',
 	'Class:Person/Attribute:tickets_list+' => 'Bu kişinin oluşturduğu tüm çağrı kayıtları',
+	'Class:Person/Attribute:user_list' => 'Users~~',
+	'Class:Person/Attribute:user_list+' => 'All the Users associated to this person~~',
 	'Class:Person/Attribute:manager_id_friendlyname' => 'Yöneticinin kullandığı adı',
 	'Class:Person/Attribute:manager_id_friendlyname+' => '~~',
 	'Class:Person/Attribute:picture' => 'Picture~~',
@@ -166,6 +170,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:Person/UniquenessRule:employee_number' => 'there is already a person in \'$this->org_name$\' organization with the same employee number~~',
 	'Class:Person/UniquenessRule:name+' => 'The employee name should be unique inside its organization~~',
 	'Class:Person/UniquenessRule:name' => 'There is already a person in \'$this->org_name$\' organization with the same name~~',
+	'Class:Person/Error:ChangingOrgDenied' => 'Impossible to move this person under organization \'%1$s\' as it would break his access to the User Portal, his associated user not being allowed on this organization~~',
 ));
 
 //
@@ -175,6 +180,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:Team' => 'Ekip',
 	'Class:Team+' => '',
+	'Class:Team/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Team/Attribute:persons_list' => 'Üyeler',
 	'Class:Team/Attribute:persons_list+' => 'Bu ekibe ait tüm kişiler',
 	'Class:Team/Attribute:tickets_list' => 'Çağrı Kayıtları',
@@ -188,6 +194,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:Document' => 'Doküman',
 	'Class:Document+' => '',
+	'Class:Document/ComplementaryName' => '%1$s - %2$s - %3$s~~',
 	'Class:Document/Attribute:name' => 'Adı',
 	'Class:Document/Attribute:name+' => '',
 	'Class:Document/Attribute:org_id' => 'Kurum',
@@ -287,6 +294,8 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:lnkPersonToTeam' => 'Bağlantılı Kişi / Ekip',
 	'Class:lnkPersonToTeam+' => '~~',
+	'Class:lnkPersonToTeam/Name' => '%1$s / %2$s~~',
+	'Class:lnkPersonToTeam/Name+' => '~~',
 	'Class:lnkPersonToTeam/Attribute:team_id' => 'Ekip',
 	'Class:lnkPersonToTeam/Attribute:team_id+' => '~~',
 	'Class:lnkPersonToTeam/Attribute:team_name' => 'Ekip adı',
@@ -350,6 +359,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Person:info' => 'Genel Bilgi',
 	'User:info' => 'Genel Bilgi',
+	'User:profiles' => 'Profiles (minimum one)~~',
 	'Person:personal_info' => 'Personal information~~',
 	'Person:notifiy' => 'Bildirim',
 ));
diff --git a/datamodels/2.x/itop-structure/dictionaries/zh_cn.dict.itop-structure.php b/datamodels/2.x/itop-structure/dictionaries/zh_cn.dict.itop-structure.php
index d300ac7d90..e8d18c56f7 100644
--- a/datamodels/2.x/itop-structure/dictionaries/zh_cn.dict.itop-structure.php
+++ b/datamodels/2.x/itop-structure/dictionaries/zh_cn.dict.itop-structure.php
@@ -20,10 +20,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/>
  */
-
-
-
-
 // Dictionnary conventions
 // Class:<class_name>
 // Class:<class_name>+
@@ -35,8 +31,6 @@
 // Class:<class_name>/Stimulus:<stimulus_code>+
 // Class:<class_name>/UniquenessRule:<rule_code>
 // Class:<class_name>/UniquenessRule:<rule_code>+
-
-
 //////////////////////////////////////////////////////////////////////
 // Note: The classes have been grouped by categories: bizmodel
 //////////////////////////////////////////////////////////////////////
@@ -44,12 +38,9 @@
 // Classes in 'bizmodel'
 //////////////////////////////////////////////////////////////////////
 //
-
-
 //
 // Class: Organization
 //
-
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:Organization' => '组织',
 	'Class:Organization+' => '',
@@ -84,8 +75,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 //
 
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:Location' => '地理位置',
-	'Class:Location+' => '任何类型的地理位置: 区域, 国家, 城市, 位置, 建筑, 楼层, 房间, 机架,...',
+	'Class:Location' => '地点',
+	'Class:Location+' => '任何类型的地点: 区域, 国家, 城市, 位置, 建筑, 楼层, 房间, 机架,...',
 	'Class:Location/Attribute:name' => '名称',
 	'Class:Location/Attribute:name+' => '',
 	'Class:Location/Attribute:status' => '状态',
@@ -119,6 +110,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:Contact' => '联系人',
 	'Class:Contact+' => '',
+	'Class:Contact/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Contact/Attribute:name' => '名称',
 	'Class:Contact/Attribute:name+' => '',
 	'Class:Contact/Attribute:status' => '状态',
@@ -145,8 +137,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:Contact/Attribute:function+' => '',
 	'Class:Contact/Attribute:cis_list' => '配置项',
 	'Class:Contact/Attribute:cis_list+' => '此联系人关联的所有配置项',
-	'Class:Contact/Attribute:finalclass' => '联系人子类别',
-	'Class:Contact/Attribute:finalclass+' => 'Name of the final class',
+	'Class:Contact/Attribute:finalclass' => '联系人类型',
+	'Class:Contact/Attribute:finalclass+' => '根本属性的名称',
 ));
 
 //
@@ -157,15 +149,16 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:Person' => '个人',
 	'Class:Person+' => '',
 	'Class:Person/Name' => '%2$s %1$s',
+	'Class:Person/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Person/Attribute:name' => '姓',
 	'Class:Person/Attribute:name+' => '',
 	'Class:Person/Attribute:first_name' => '名',
 	'Class:Person/Attribute:first_name+' => '',
 	'Class:Person/Attribute:employee_number' => '员工编号',
 	'Class:Person/Attribute:employee_number+' => '',
-	'Class:Person/Attribute:mobile_phone' => '移动电话',
+	'Class:Person/Attribute:mobile_phone' => '手机',
 	'Class:Person/Attribute:mobile_phone+' => '',
-	'Class:Person/Attribute:location_id' => '地理位置',
+	'Class:Person/Attribute:location_id' => '地点',
 	'Class:Person/Attribute:location_id+' => '',
 	'Class:Person/Attribute:location_name' => '名称',
 	'Class:Person/Attribute:location_name+' => '',
@@ -177,6 +170,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:Person/Attribute:team_list+' => '这个人归属的所有团队',
 	'Class:Person/Attribute:tickets_list' => '工单',
 	'Class:Person/Attribute:tickets_list+' => '此人发起的所有工单',
+	'Class:Person/Attribute:user_list' => 'Users~~',
+	'Class:Person/Attribute:user_list+' => 'All the Users associated to this person~~',
 	'Class:Person/Attribute:manager_id_friendlyname' => '直属上级姓名',
 	'Class:Person/Attribute:manager_id_friendlyname+' => '',
 	'Class:Person/Attribute:picture' => '头像',
@@ -185,6 +180,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:Person/UniquenessRule:employee_number' => '\'$this->org_name$\' 内已经有人占用了这个员工号',
 	'Class:Person/UniquenessRule:name+' => '同一组织内的员工姓名必须唯一',
 	'Class:Person/UniquenessRule:name' => '\'$this->org_name$\' 内已经有人叫这个名字',
+	'Class:Person/Error:ChangingOrgDenied' => 'Impossible to move this person under organization \'%1$s\' as it would break his access to the User Portal, his associated user not being allowed on this organization~~'
 ));
 
 //
@@ -194,6 +190,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:Team' => '团队',
 	'Class:Team+' => '',
+	'Class:Team/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Team/Attribute:persons_list' => '成员',
 	'Class:Team/Attribute:persons_list+' => '此团队包含的所有成员',
 	'Class:Team/Attribute:tickets_list' => '工单',
@@ -207,6 +204,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:Document' => '文档',
 	'Class:Document+' => '',
+	'Class:Document/ComplementaryName' => '%1$s - %2$s - %3$s~~',
 	'Class:Document/Attribute:name' => '名称',
 	'Class:Document/Attribute:name+' => '',
 	'Class:Document/Attribute:org_id' => '组织',
@@ -227,12 +225,12 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:Document/Attribute:status/Value:draft+' => '',
 	'Class:Document/Attribute:status/Value:obsolete' => '废弃',
 	'Class:Document/Attribute:status/Value:obsolete+' => '',
-	'Class:Document/Attribute:status/Value:published' => '已发布',
+	'Class:Document/Attribute:status/Value:published' => '正式',
 	'Class:Document/Attribute:status/Value:published+' => '',
 	'Class:Document/Attribute:cis_list' => '配置项',
 	'Class:Document/Attribute:cis_list+' => '此文档关联的所有配置项',
-	'Class:Document/Attribute:finalclass' => '文档子类别',
-	'Class:Document/Attribute:finalclass+' => 'Name of the final class',
+	'Class:Document/Attribute:finalclass' => '文档类型',
+	'Class:Document/Attribute:finalclass+' => '根本属性的名称',
 ));
 
 //
@@ -273,12 +271,12 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 //
 
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:Typology' => '类型',
+	'Class:Typology' => '拓扑',
 	'Class:Typology+' => '',
 	'Class:Typology/Attribute:name' => '名称',
 	'Class:Typology/Attribute:name+' => '',
-	'Class:Typology/Attribute:finalclass' => '类型',
-	'Class:Typology/Attribute:finalclass+' => 'Name of the final class',
+	'Class:Typology/Attribute:finalclass' => '拓扑类型',
+	'Class:Typology/Attribute:finalclass+' => '根本属性的名称',
 ));
 
 //
@@ -306,6 +304,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:lnkPersonToTeam' => '关联 个体/团队',
 	'Class:lnkPersonToTeam+' => '',
+	'Class:lnkPersonToTeam/Name' => '%1$s / %2$s~~',
+	'Class:lnkPersonToTeam/Name+' => '~~',
 	'Class:lnkPersonToTeam/Attribute:team_id' => '团队',
 	'Class:lnkPersonToTeam/Attribute:team_id+' => '',
 	'Class:lnkPersonToTeam/Attribute:team_name' => '团队名称',
@@ -350,7 +350,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Menu:Team+' => '所有团队',
 	'Menu:Document' => '文档',
 	'Menu:Document+' => '所有文档',
-	'Menu:Location' => '地理位置',
+	'Menu:Location' => '地点',
 	'Menu:Location+' => '所有位置',
 	'Menu:NewContact' => '新建联系人',
 	'Menu:NewContact+' => '新建联系人',
@@ -369,6 +369,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Person:info' => '基本信息',
 	'User:info' => '基本信息',
+	'User:profiles' => 'Profiles (minimum one)~~',
 	'Person:personal_info' => '个人信息',
 	'Person:notifiy' => '通知',
 ));
diff --git a/datamodels/2.x/itop-themes-compat/cs.dict.itop-themes-compat.php b/datamodels/2.x/itop-themes-compat/cs.dict.itop-themes-compat.php
index acd662ebe3..c49f5b0da3 100644
--- a/datamodels/2.x/itop-themes-compat/cs.dict.itop-themes-compat.php
+++ b/datamodels/2.x/itop-themes-compat/cs.dict.itop-themes-compat.php
@@ -5,7 +5,6 @@
  * @copyright   Copyright (C) 2013 XXXXX
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
-
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'theme:light-grey' => 'Light Grey (deprecated)~~',
 ));
diff --git a/datamodels/2.x/itop-themes-compat/da.dict.itop-themes-compat.php b/datamodels/2.x/itop-themes-compat/da.dict.itop-themes-compat.php
index 6a30e8cb6b..89708875cb 100644
--- a/datamodels/2.x/itop-themes-compat/da.dict.itop-themes-compat.php
+++ b/datamodels/2.x/itop-themes-compat/da.dict.itop-themes-compat.php
@@ -5,7 +5,6 @@
  * @copyright   Copyright (C) 2013 XXXXX
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
-
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'theme:light-grey' => 'Light Grey (deprecated)~~',
 ));
diff --git a/datamodels/2.x/itop-themes-compat/de.dict.itop-themes-compat.php b/datamodels/2.x/itop-themes-compat/de.dict.itop-themes-compat.php
index 181bd28cb1..e09c7f5597 100644
--- a/datamodels/2.x/itop-themes-compat/de.dict.itop-themes-compat.php
+++ b/datamodels/2.x/itop-themes-compat/de.dict.itop-themes-compat.php
@@ -5,7 +5,6 @@
  * @copyright   Copyright (C) 2013 XXXXX
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
-
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'theme:light-grey' => 'Light Grey (veraltet)',
 ));
diff --git a/datamodels/2.x/itop-themes-compat/es_cr.dict.itop-themes-compat.php b/datamodels/2.x/itop-themes-compat/es_cr.dict.itop-themes-compat.php
index 7b89eabc96..29ead56429 100644
--- a/datamodels/2.x/itop-themes-compat/es_cr.dict.itop-themes-compat.php
+++ b/datamodels/2.x/itop-themes-compat/es_cr.dict.itop-themes-compat.php
@@ -5,7 +5,6 @@
  * @copyright   Copyright (C) 2013 XXXXX
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
-
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'theme:light-grey' => 'Light Grey (deprecated)~~',
 ));
diff --git a/datamodels/2.x/itop-themes-compat/fr.dict.itop-themes-compat.php b/datamodels/2.x/itop-themes-compat/fr.dict.itop-themes-compat.php
index 1ca71525ce..54ed5b5729 100644
--- a/datamodels/2.x/itop-themes-compat/fr.dict.itop-themes-compat.php
+++ b/datamodels/2.x/itop-themes-compat/fr.dict.itop-themes-compat.php
@@ -5,7 +5,6 @@
  * @copyright   Copyright (C) 2013 XXXXX
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
-
 Dict::Add('FR FR', 'French', 'Français', array(
 	'theme:light-grey' => 'Light Grey (obsolète)',
 ));
diff --git a/datamodels/2.x/itop-themes-compat/hu.dict.itop-themes-compat.php b/datamodels/2.x/itop-themes-compat/hu.dict.itop-themes-compat.php
index db6189d588..c4eb1c8f25 100644
--- a/datamodels/2.x/itop-themes-compat/hu.dict.itop-themes-compat.php
+++ b/datamodels/2.x/itop-themes-compat/hu.dict.itop-themes-compat.php
@@ -5,7 +5,6 @@
  * @copyright   Copyright (C) 2013 XXXXX
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
-
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'theme:light-grey' => 'Világosszürke (elavult)',
 ));
diff --git a/datamodels/2.x/itop-themes-compat/it.dict.itop-themes-compat.php b/datamodels/2.x/itop-themes-compat/it.dict.itop-themes-compat.php
index 890c745725..8fa4ebeea2 100644
--- a/datamodels/2.x/itop-themes-compat/it.dict.itop-themes-compat.php
+++ b/datamodels/2.x/itop-themes-compat/it.dict.itop-themes-compat.php
@@ -5,7 +5,6 @@
  * @copyright   Copyright (C) 2013 XXXXX
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
-
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'theme:light-grey' => 'Light Grey (deprecated)~~',
 ));
diff --git a/datamodels/2.x/itop-themes-compat/ja.dict.itop-themes-compat.php b/datamodels/2.x/itop-themes-compat/ja.dict.itop-themes-compat.php
index eb29e6616c..df333ef255 100644
--- a/datamodels/2.x/itop-themes-compat/ja.dict.itop-themes-compat.php
+++ b/datamodels/2.x/itop-themes-compat/ja.dict.itop-themes-compat.php
@@ -5,7 +5,6 @@
  * @copyright   Copyright (C) 2013 XXXXX
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
-
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'theme:light-grey' => 'Light Grey (deprecated)~~',
 ));
diff --git a/datamodels/2.x/itop-themes-compat/nl.dict.itop-themes-compat.php b/datamodels/2.x/itop-themes-compat/nl.dict.itop-themes-compat.php
index 9c90276913..822449dd77 100644
--- a/datamodels/2.x/itop-themes-compat/nl.dict.itop-themes-compat.php
+++ b/datamodels/2.x/itop-themes-compat/nl.dict.itop-themes-compat.php
@@ -5,7 +5,6 @@
  * @copyright   Copyright (C) 2013 XXXXX
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
-
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'theme:light-grey' => 'Light Grey (deprecated)~~',
 ));
diff --git a/datamodels/2.x/itop-themes-compat/pt_br.dict.itop-themes-compat.php b/datamodels/2.x/itop-themes-compat/pt_br.dict.itop-themes-compat.php
index 37ba9bb8ea..05f3b5890b 100644
--- a/datamodels/2.x/itop-themes-compat/pt_br.dict.itop-themes-compat.php
+++ b/datamodels/2.x/itop-themes-compat/pt_br.dict.itop-themes-compat.php
@@ -5,7 +5,6 @@
  * @copyright   Copyright (C) 2013 XXXXX
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
-
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'theme:light-grey' => 'Light Grey (deprecated)~~',
 ));
diff --git a/datamodels/2.x/itop-themes-compat/ru.dict.itop-themes-compat.php b/datamodels/2.x/itop-themes-compat/ru.dict.itop-themes-compat.php
index 623b5b8e1e..270944c530 100644
--- a/datamodels/2.x/itop-themes-compat/ru.dict.itop-themes-compat.php
+++ b/datamodels/2.x/itop-themes-compat/ru.dict.itop-themes-compat.php
@@ -5,7 +5,6 @@
  * @copyright   Copyright (C) 2013 XXXXX
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
-
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'theme:light-grey' => 'Light Grey (deprecated)~~',
 ));
diff --git a/datamodels/2.x/itop-themes-compat/sk.dict.itop-themes-compat.php b/datamodels/2.x/itop-themes-compat/sk.dict.itop-themes-compat.php
index c6a188ce66..ba66c61404 100644
--- a/datamodels/2.x/itop-themes-compat/sk.dict.itop-themes-compat.php
+++ b/datamodels/2.x/itop-themes-compat/sk.dict.itop-themes-compat.php
@@ -5,7 +5,6 @@
  * @copyright   Copyright (C) 2013 XXXXX
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
-
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'theme:light-grey' => 'Light Grey (deprecated)~~',
 ));
diff --git a/datamodels/2.x/itop-themes-compat/tr.dict.itop-themes-compat.php b/datamodels/2.x/itop-themes-compat/tr.dict.itop-themes-compat.php
index a0f70571bd..d9bc5cf224 100644
--- a/datamodels/2.x/itop-themes-compat/tr.dict.itop-themes-compat.php
+++ b/datamodels/2.x/itop-themes-compat/tr.dict.itop-themes-compat.php
@@ -5,7 +5,6 @@
  * @copyright   Copyright (C) 2013 XXXXX
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
-
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'theme:light-grey' => 'Light Grey (deprecated)~~',
 ));
diff --git a/datamodels/2.x/itop-themes-compat/zh_cn.dict.itop-themes-compat.php b/datamodels/2.x/itop-themes-compat/zh_cn.dict.itop-themes-compat.php
index 3bdecb0747..510486430d 100644
--- a/datamodels/2.x/itop-themes-compat/zh_cn.dict.itop-themes-compat.php
+++ b/datamodels/2.x/itop-themes-compat/zh_cn.dict.itop-themes-compat.php
@@ -5,7 +5,6 @@
  * @copyright   Copyright (C) 2013 XXXXX
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
-
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'theme:light-grey' => 'Light Grey (deprecated)~~',
 ));
diff --git a/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml b/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml
index 08e6946936..1ee54b548e 100755
--- a/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml
+++ b/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml
@@ -203,7 +203,6 @@
           <count_max>0</count_max>
           <ext_key_to_remote>contact_id</ext_key_to_remote>
           <duplicates/>
-          <read_only>false</read_only>
         </field>
         <field id="functionalcis_list" xsi:type="AttributeLinkedSetIndirect">
           <linked_class>lnkFunctionalCIToTicket</linked_class>
@@ -212,15 +211,12 @@
           <count_max>0</count_max>
           <ext_key_to_remote>functionalci_id</ext_key_to_remote>
           <duplicates/>
-          <read_only>false</read_only>
         </field>
         <field id="workorders_list" xsi:type="AttributeLinkedSet">
           <linked_class>WorkOrder</linked_class>
           <ext_key_to_me>ticket_id</ext_key_to_me>
           <count_min>0</count_min>
           <count_max>0</count_max>
-          <relation_type>link</relation_type>
-          <read_only>false</read_only>
         </field>
       </fields>
       <event_listeners>
@@ -839,8 +835,6 @@
           <edit_mode>add_only</edit_mode>
           <count_min>0</count_min>
           <count_max>0</count_max>
-          <relation_type>link</relation_type>
-          <read_only>false</read_only>
         </field>
       </fields>
       <presentation>
@@ -861,8 +855,6 @@
           <edit_mode>none</edit_mode>
           <count_min>0</count_min>
           <count_max>0</count_max>
-          <relation_type>link</relation_type>
-          <read_only>true</read_only>
         </field>
       </fields>
       <presentation>
@@ -1393,6 +1385,15 @@
             </scope>
           </scopes>
         </class>
+        <class id="lnkContactToTicket" _delta="define">
+          <lists>
+            <!-- Note: since 3.1.0, many to many attributes are displayed automatically, an empty list avoid this -->
+            <list id="list">
+              <items>
+              </items>
+            </list>
+          </lists>
+        </class>
       </classes>
       <action_rules>
         <action_rule id="contact-to-userrequest" _delta="define">
diff --git a/datamodels/2.x/itop-tickets/dictionaries/cs.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/dictionaries/cs.dict.itop-tickets.php
index 661eb56af4..fc6a841a81 100644
--- a/datamodels/2.x/itop-tickets/dictionaries/cs.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/dictionaries/cs.dict.itop-tickets.php
@@ -97,12 +97,15 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:lnkContactToTicket' => 'Spojení (Kontakt / Tiket)',
 	'Class:lnkContactToTicket+' => '',
+	'Class:lnkContactToTicket/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToTicket/Attribute:ticket_id' => 'Tiket',
 	'Class:lnkContactToTicket/Attribute:ticket_id+' => '',
 	'Class:lnkContactToTicket/Attribute:ticket_ref' => 'ID',
 	'Class:lnkContactToTicket/Attribute:ticket_ref+' => '',
 	'Class:lnkContactToTicket/Attribute:contact_id' => 'Kontakt',
 	'Class:lnkContactToTicket/Attribute:contact_id+' => '',
+	'Class:lnkContactToTicket/Attribute:contact_name' => 'Contact name~~',
+	'Class:lnkContactToTicket/Attribute:contact_name+' => '~~',
 	'Class:lnkContactToTicket/Attribute:contact_email' => 'Email kontaktu',
 	'Class:lnkContactToTicket/Attribute:contact_email+' => '',
 	'Class:lnkContactToTicket/Attribute:role' => 'Role (text)',
@@ -155,94 +158,94 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 
 // Fieldset translation
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
-	'Ticket:baseinfo'                                                => 'Obecné informace',
-	'Ticket:date'                                                    => 'Data',
-	'Ticket:contact'                                                 => 'Kontakty',
-	'Ticket:moreinfo'                                               => 'Více informací',
-	'Ticket:relation'                                               => 'Vztahy',
-	'Ticket:log'                                                    => 'Komunikace',
-	'Ticket:Type'                                                   => 'Kvalifikace',
-	'Ticket:support'                                                => 'Podpora',
-	'Ticket:resolution'                                             => 'Řešení',
-	'Ticket:SLA'                                                    => 'SLA zpráva',
-	'WorkOrder:Details'                                             => 'Detaily',
-	'WorkOrder:Moreinfo'                                            => 'Více informací',
-	'Tickets:ResolvedFrom'                                          => 'Vyřešeno automaticky na základě %1$s',
-	'Class:cmdbAbstractObject/Method:Set'                           => 'Set',
-	'Class:cmdbAbstractObject/Method:Set+'                          => 'Set a field with a static value',
-	'Class:cmdbAbstractObject/Method:Set/Param:1'                   => 'Target Field',
-	'Class:cmdbAbstractObject/Method:Set/Param:1+'                  => 'The field to set, in the current object',
-	'Class:cmdbAbstractObject/Method:Set/Param:2'                   => 'Value',
-	'Class:cmdbAbstractObject/Method:Set/Param:2+'                  => 'The value to set',
-	'Class:cmdbAbstractObject/Method:SetCurrentDate'                => 'SetCurrentDate',
-	'Class:cmdbAbstractObject/Method:SetCurrentDate+'               => 'Set a field with the current date and time',
-	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1'        => 'Target Field',
-	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1+'       => 'The field to set, in the current object',
-	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull'          => 'SetCurrentDateIfNull~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull+'         => 'Set an empty field with the current date and time~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull/Param:1'  => 'Target Field~~',
+	'Ticket:baseinfo' => 'Obecné informace',
+	'Ticket:date' => 'Data',
+	'Ticket:contact' => 'Kontakty',
+	'Ticket:moreinfo' => 'Více informací',
+	'Ticket:relation' => 'Vztahy',
+	'Ticket:log' => 'Komunikace',
+	'Ticket:Type' => 'Kvalifikace',
+	'Ticket:support' => 'Podpora',
+	'Ticket:resolution' => 'Řešení',
+	'Ticket:SLA' => 'SLA zpráva',
+	'WorkOrder:Details' => 'Detaily',
+	'WorkOrder:Moreinfo' => 'Více informací',
+	'Tickets:ResolvedFrom' => 'Vyřešeno automaticky na základě %1$s',
+	'Class:cmdbAbstractObject/Method:Set' => 'Set',
+	'Class:cmdbAbstractObject/Method:Set+' => 'Set a field with a static value',
+	'Class:cmdbAbstractObject/Method:Set/Param:1' => 'Target Field',
+	'Class:cmdbAbstractObject/Method:Set/Param:1+' => 'The field to set, in the current object',
+	'Class:cmdbAbstractObject/Method:Set/Param:2' => 'Value',
+	'Class:cmdbAbstractObject/Method:Set/Param:2+' => 'The value to set',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate' => 'SetCurrentDate',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate+' => 'Set a field with the current date and time',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1' => 'Target Field',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1+' => 'The field to set, in the current object',
+	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull' => 'SetCurrentDateIfNull~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull+' => 'Set an empty field with the current date and time~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull/Param:1' => 'Target Field~~',
 	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull/Param:1+' => 'The field to set, in the current object~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentUser'                => 'SetCurrentUser',
-	'Class:cmdbAbstractObject/Method:SetCurrentUser+'               => 'Set a field with the currently logged in user',
-	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1'        => 'Target Field',
-	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1+'       => 'The field to set, in the current object. If the field is a string then the friendly name will be used, otherwise the identifier will be used. That friendly name is the name of the person if any is attached to the user, otherwise it is the login.',
-	'Class:cmdbAbstractObject/Method:SetCurrentPerson'              => 'SetCurrentPerson',
-	'Class:cmdbAbstractObject/Method:SetCurrentPerson+'             => 'Set a field with the currently logged in person (the "person" attached to the logged in "user").',
-	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1'      => 'Target Field',
-	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1+'     => 'The field to set, in the current object. If the field is a string then the friendly name will be used, otherwise the identifier will be used.',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime'                => 'SetElapsedTime',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime+'               => 'Set a field with the time (seconds) elapsed since a date given by another field',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1'        => 'Target Field',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1+'       => 'The field to set, in the current object',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2'        => 'Reference Field',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2+'       => 'The field from which to get the reference date',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3'        => 'Working Hours',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3+'       => 'Leave empty to rely on the standard working hours scheme, or set to "DefaultWorkingTimeComputer" to force a 24x7 scheme',
-	'Class:cmdbAbstractObject/Method:SetIfNull'                     => 'SetIfNull~~',
-	'Class:cmdbAbstractObject/Method:SetIfNull+'                    => 'Set a field only if it is empty, with a static value~~',
-	'Class:cmdbAbstractObject/Method:SetIfNull/Param:1'             => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:SetIfNull/Param:1+'            => 'The field to set, in the current object~~',
-	'Class:cmdbAbstractObject/Method:SetIfNull/Param:2'              => 'Value~~',
-	'Class:cmdbAbstractObject/Method:SetIfNull/Param:2+'             => 'The value to set~~',
-	'Class:cmdbAbstractObject/Method:AddValue'                       => 'AddValue~~',
-	'Class:cmdbAbstractObject/Method:AddValue+'                      => 'Add a fixed value to a field~~',
-	'Class:cmdbAbstractObject/Method:AddValue/Param:1'               => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:AddValue/Param:1+'              => 'The field to modify, in the current object~~',
-	'Class:cmdbAbstractObject/Method:AddValue/Param:2'               => 'Value~~',
-	'Class:cmdbAbstractObject/Method:AddValue/Param:2+'              => 'Decimal value which will be added, can be negative~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDate'                => 'SetComputedDate~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDate+'               => 'Set a field with a date computed from another field with extra logic~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:1'        => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:1+'       => 'The field to set, in the current object~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:2'        => 'Modifier~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:2+'       => 'Textual information to modify the source date, eg. "+3 days"~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:3'        => 'Source field~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:3+'       => 'The field used as source to apply the Modifier logic~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull'          => 'SetComputedDateIfNull~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull+'         => 'Set non empty field with a date computed from another field with extra logic~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:1'  => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser' => 'SetCurrentUser',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser+' => 'Set a field with the currently logged in user',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1' => 'Target Field',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1+' => 'The field to set, in the current object. If the field is a string then the friendly name will be used, otherwise the identifier will be used. That friendly name is the name of the person if any is attached to the user, otherwise it is the login.',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson' => 'SetCurrentPerson',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson+' => 'Set a field with the currently logged in person (the "person" attached to the logged in "user").',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1' => 'Target Field',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1+' => 'The field to set, in the current object. If the field is a string then the friendly name will be used, otherwise the identifier will be used.',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime' => 'SetElapsedTime',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime+' => 'Set a field with the time (seconds) elapsed since a date given by another field',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1' => 'Target Field',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1+' => 'The field to set, in the current object',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2' => 'Reference Field',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2+' => 'The field from which to get the reference date',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3' => 'Working Hours',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3+' => 'Leave empty to rely on the standard working hours scheme, or set to "DefaultWorkingTimeComputer" to force a 24x7 scheme',
+	'Class:cmdbAbstractObject/Method:SetIfNull' => 'SetIfNull~~',
+	'Class:cmdbAbstractObject/Method:SetIfNull+' => 'Set a field only if it is empty, with a static value~~',
+	'Class:cmdbAbstractObject/Method:SetIfNull/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:SetIfNull/Param:1+' => 'The field to set, in the current object~~',
+	'Class:cmdbAbstractObject/Method:SetIfNull/Param:2' => 'Value~~',
+	'Class:cmdbAbstractObject/Method:SetIfNull/Param:2+' => 'The value to set~~',
+	'Class:cmdbAbstractObject/Method:AddValue' => 'AddValue~~',
+	'Class:cmdbAbstractObject/Method:AddValue+' => 'Add a fixed value to a field~~',
+	'Class:cmdbAbstractObject/Method:AddValue/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:AddValue/Param:1+' => 'The field to modify, in the current object~~',
+	'Class:cmdbAbstractObject/Method:AddValue/Param:2' => 'Value~~',
+	'Class:cmdbAbstractObject/Method:AddValue/Param:2+' => 'Decimal value which will be added, can be negative~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDate' => 'SetComputedDate~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDate+' => 'Set a field with a date computed from another field with extra logic~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:1+' => 'The field to set, in the current object~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:2' => 'Modifier~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:2+' => 'Textual information to modify the source date, eg. "+3 days"~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:3' => 'Source field~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:3+' => 'The field used as source to apply the Modifier logic~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull' => 'SetComputedDateIfNull~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull+' => 'Set non empty field with a date computed from another field with extra logic~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:1' => 'Target Field~~',
 	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:1+' => 'The field to set, in the current object~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:2'  => 'Modifier~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:2' => 'Modifier~~',
 	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:2+' => 'Textual information to modify the source date, eg. "+3 days"~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:3'  => 'Source field~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:3' => 'Source field~~',
 	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:3+' => 'The field used as source to apply the Modifier logic~~',
-	'Class:cmdbAbstractObject/Method:Reset'                          => 'Reset',
-	'Class:cmdbAbstractObject/Method:Reset+'                         => 'Reset a field to its default value',
-	'Class:cmdbAbstractObject/Method:Reset/Param:1'                  => 'Target Field',
-	'Class:cmdbAbstractObject/Method:Reset/Param:1+'                 => 'The field to reset, in the current object',
-	'Class:cmdbAbstractObject/Method:Copy'                           => 'Copy',
-	'Class:cmdbAbstractObject/Method:Copy+'                          => 'Copy the value of a field to another field',
-	'Class:cmdbAbstractObject/Method:Copy/Param:1'                   => 'Target Field',
-	'Class:cmdbAbstractObject/Method:Copy/Param:1+'                  => 'The field to set, in the current object',
-	'Class:cmdbAbstractObject/Method:Copy/Param:2'                   => 'Source Field',
-	'Class:cmdbAbstractObject/Method:Copy/Param:2+'                  => 'The field to get the value from, in the current object',
-	'Class:cmdbAbstractObject/Method:ApplyStimulus'                  => 'ApplyStimulus~~',
-	'Class:cmdbAbstractObject/Method:ApplyStimulus+'                 => 'Apply the specified stimulus to the current object~~',
-	'Class:cmdbAbstractObject/Method:ApplyStimulus/Param:1'          => 'Stimulus code~~',
-	'Class:cmdbAbstractObject/Method:ApplyStimulus/Param:1+'         => 'A valid stimulus code for the current class~~',
-	'Class:ResponseTicketTTO/Interface:iMetricComputer'              => 'Time To Own',
-	'Class:ResponseTicketTTO/Interface:iMetricComputer+'             => 'Goal based on a SLT of type TTO',
-	'Class:ResponseTicketTTR/Interface:iMetricComputer'              => 'Time To Resolve',
-	'Class:ResponseTicketTTR/Interface:iMetricComputer+'             => 'Goal based on a SLT of type TTR',
+	'Class:cmdbAbstractObject/Method:Reset' => 'Reset',
+	'Class:cmdbAbstractObject/Method:Reset+' => 'Reset a field to its default value',
+	'Class:cmdbAbstractObject/Method:Reset/Param:1' => 'Target Field',
+	'Class:cmdbAbstractObject/Method:Reset/Param:1+' => 'The field to reset, in the current object',
+	'Class:cmdbAbstractObject/Method:Copy' => 'Copy',
+	'Class:cmdbAbstractObject/Method:Copy+' => 'Copy the value of a field to another field',
+	'Class:cmdbAbstractObject/Method:Copy/Param:1' => 'Target Field',
+	'Class:cmdbAbstractObject/Method:Copy/Param:1+' => 'The field to set, in the current object',
+	'Class:cmdbAbstractObject/Method:Copy/Param:2' => 'Source Field',
+	'Class:cmdbAbstractObject/Method:Copy/Param:2+' => 'The field to get the value from, in the current object',
+	'Class:cmdbAbstractObject/Method:ApplyStimulus' => 'ApplyStimulus~~',
+	'Class:cmdbAbstractObject/Method:ApplyStimulus+' => 'Apply the specified stimulus to the current object~~',
+	'Class:cmdbAbstractObject/Method:ApplyStimulus/Param:1' => 'Stimulus code~~',
+	'Class:cmdbAbstractObject/Method:ApplyStimulus/Param:1+' => 'A valid stimulus code for the current class~~',
+	'Class:ResponseTicketTTO/Interface:iMetricComputer' => 'Time To Own',
+	'Class:ResponseTicketTTO/Interface:iMetricComputer+' => 'Goal based on a SLT of type TTO',
+	'Class:ResponseTicketTTR/Interface:iMetricComputer' => 'Time To Resolve',
+	'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'Goal based on a SLT of type TTR',
 ));
 
diff --git a/datamodels/2.x/itop-tickets/dictionaries/da.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/dictionaries/da.dict.itop-tickets.php
index 8c3d76f5b6..25e23257aa 100644
--- a/datamodels/2.x/itop-tickets/dictionaries/da.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/dictionaries/da.dict.itop-tickets.php
@@ -82,12 +82,15 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:lnkContactToTicket' => 'Sammenhæng Kontakt/Ticket',
 	'Class:lnkContactToTicket+' => '',
+	'Class:lnkContactToTicket/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToTicket/Attribute:ticket_id' => 'Ticket',
 	'Class:lnkContactToTicket/Attribute:ticket_id+' => '',
 	'Class:lnkContactToTicket/Attribute:ticket_ref' => 'Reference',
 	'Class:lnkContactToTicket/Attribute:ticket_ref+' => '',
 	'Class:lnkContactToTicket/Attribute:contact_id' => 'Kontakt',
 	'Class:lnkContactToTicket/Attribute:contact_id+' => '',
+	'Class:lnkContactToTicket/Attribute:contact_name' => 'Contact name~~',
+	'Class:lnkContactToTicket/Attribute:contact_name+' => '~~',
 	'Class:lnkContactToTicket/Attribute:contact_email' => 'Kontakt Email',
 	'Class:lnkContactToTicket/Attribute:contact_email+' => '',
 	'Class:lnkContactToTicket/Attribute:role' => 'Rolle',
@@ -140,94 +143,94 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 
 // Fieldset translation
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
-	'Ticket:baseinfo'                                                => 'Almindelig information',
-	'Ticket:date'                                                    => 'Dato',
-	'Ticket:contact'                                                 => 'Kontakt',
-	'Ticket:moreinfo'                                               => 'Yderligere information',
-	'Ticket:relation'                                               => 'Betegnelse',
-	'Ticket:log'                                                    => 'Kommunikation',
-	'Ticket:Type'                                                   => 'Qualifikation',
-	'Ticket:support'                                                => 'Support',
-	'Ticket:resolution'                                             => 'Løsning',
-	'Ticket:SLA'                                                    => 'SLA Report',
-	'WorkOrder:Details'                                             => 'Detaljer',
-	'WorkOrder:Moreinfo'                                            => 'Yderligere information',
-	'Tickets:ResolvedFrom'                                          => 'Automatically resolved from %1$s~~',
-	'Class:cmdbAbstractObject/Method:Set'                           => 'Set~~',
-	'Class:cmdbAbstractObject/Method:Set+'                          => 'Set a field with a static value~~',
-	'Class:cmdbAbstractObject/Method:Set/Param:1'                   => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:Set/Param:1+'                  => 'The field to set, in the current object~~',
-	'Class:cmdbAbstractObject/Method:Set/Param:2'                   => 'Value~~',
-	'Class:cmdbAbstractObject/Method:Set/Param:2+'                  => 'The value to set~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentDate'                => 'SetCurrentDate~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentDate+'               => 'Set a field with the current date and time~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1'        => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1+'       => 'The field to set, in the current object~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull'          => 'SetCurrentDateIfNull~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull+'         => 'Set an empty field with the current date and time~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull/Param:1'  => 'Target Field~~',
+	'Ticket:baseinfo' => 'Almindelig information',
+	'Ticket:date' => 'Dato',
+	'Ticket:contact' => 'Kontakt',
+	'Ticket:moreinfo' => 'Yderligere information',
+	'Ticket:relation' => 'Betegnelse',
+	'Ticket:log' => 'Kommunikation',
+	'Ticket:Type' => 'Qualifikation',
+	'Ticket:support' => 'Support',
+	'Ticket:resolution' => 'Løsning',
+	'Ticket:SLA' => 'SLA Report',
+	'WorkOrder:Details' => 'Detaljer',
+	'WorkOrder:Moreinfo' => 'Yderligere information',
+	'Tickets:ResolvedFrom' => 'Automatically resolved from %1$s~~',
+	'Class:cmdbAbstractObject/Method:Set' => 'Set~~',
+	'Class:cmdbAbstractObject/Method:Set+' => 'Set a field with a static value~~',
+	'Class:cmdbAbstractObject/Method:Set/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:Set/Param:1+' => 'The field to set, in the current object~~',
+	'Class:cmdbAbstractObject/Method:Set/Param:2' => 'Value~~',
+	'Class:cmdbAbstractObject/Method:Set/Param:2+' => 'The value to set~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate' => 'SetCurrentDate~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate+' => 'Set a field with the current date and time~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1+' => 'The field to set, in the current object~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull' => 'SetCurrentDateIfNull~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull+' => 'Set an empty field with the current date and time~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull/Param:1' => 'Target Field~~',
 	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull/Param:1+' => 'The field to set, in the current object~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentUser'                => 'SetCurrentUser~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentUser+'               => 'Set a field with the currently logged in user~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1'        => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1+'       => 'The field to set, in the current object. If the field is a string then the friendly name will be used, otherwise the identifier will be used. That friendly name is the name of the person if any is attached to the user, otherwise it is the login.~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentPerson'              => 'SetCurrentPerson~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentPerson+'             => 'Set a field with the currently logged in person (the \\"person\\" attached to the logged in \\"user\\").~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1'      => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1+'     => 'The field to set, in the current object. If the field is a string then the friendly name will be used, otherwise the identifier will be used.~~',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime'                => 'SetElapsedTime~~',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime+'               => 'Set a field with the time (seconds) elapsed since a date given by another field~~',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1'        => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1+'       => 'The field to set, in the current object~~',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2'        => 'Reference Field~~',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2+'       => 'The field from which to get the reference date~~',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3'        => 'Working Hours~~',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3+'       => 'Leave empty to rely on the standard working hours scheme, or set to \\"DefaultWorkingTimeComputer\\" to force a 24x7 scheme~~',
-	'Class:cmdbAbstractObject/Method:SetIfNull'                     => 'SetIfNull~~',
-	'Class:cmdbAbstractObject/Method:SetIfNull+'                    => 'Set a field only if it is empty, with a static value~~',
-	'Class:cmdbAbstractObject/Method:SetIfNull/Param:1'             => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:SetIfNull/Param:1+'            => 'The field to set, in the current object~~',
-	'Class:cmdbAbstractObject/Method:SetIfNull/Param:2'              => 'Value~~',
-	'Class:cmdbAbstractObject/Method:SetIfNull/Param:2+'             => 'The value to set~~',
-	'Class:cmdbAbstractObject/Method:AddValue'                       => 'AddValue~~',
-	'Class:cmdbAbstractObject/Method:AddValue+'                      => 'Add a fixed value to a field~~',
-	'Class:cmdbAbstractObject/Method:AddValue/Param:1'               => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:AddValue/Param:1+'              => 'The field to modify, in the current object~~',
-	'Class:cmdbAbstractObject/Method:AddValue/Param:2'               => 'Value~~',
-	'Class:cmdbAbstractObject/Method:AddValue/Param:2+'              => 'Decimal value which will be added, can be negative~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDate'                => 'SetComputedDate~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDate+'               => 'Set a field with a date computed from another field with extra logic~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:1'        => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:1+'       => 'The field to set, in the current object~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:2'        => 'Modifier~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:2+'       => 'Textual information to modify the source date, eg. "+3 days"~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:3'        => 'Source field~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:3+'       => 'The field used as source to apply the Modifier logic~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull'          => 'SetComputedDateIfNull~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull+'         => 'Set non empty field with a date computed from another field with extra logic~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:1'  => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser' => 'SetCurrentUser~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser+' => 'Set a field with the currently logged in user~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1+' => 'The field to set, in the current object. If the field is a string then the friendly name will be used, otherwise the identifier will be used. That friendly name is the name of the person if any is attached to the user, otherwise it is the login.~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson' => 'SetCurrentPerson~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson+' => 'Set a field with the currently logged in person (the \\"person\\" attached to the logged in \\"user\\").~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1+' => 'The field to set, in the current object. If the field is a string then the friendly name will be used, otherwise the identifier will be used.~~',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime' => 'SetElapsedTime~~',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime+' => 'Set a field with the time (seconds) elapsed since a date given by another field~~',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1+' => 'The field to set, in the current object~~',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2' => 'Reference Field~~',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2+' => 'The field from which to get the reference date~~',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3' => 'Working Hours~~',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3+' => 'Leave empty to rely on the standard working hours scheme, or set to \\"DefaultWorkingTimeComputer\\" to force a 24x7 scheme~~',
+	'Class:cmdbAbstractObject/Method:SetIfNull' => 'SetIfNull~~',
+	'Class:cmdbAbstractObject/Method:SetIfNull+' => 'Set a field only if it is empty, with a static value~~',
+	'Class:cmdbAbstractObject/Method:SetIfNull/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:SetIfNull/Param:1+' => 'The field to set, in the current object~~',
+	'Class:cmdbAbstractObject/Method:SetIfNull/Param:2' => 'Value~~',
+	'Class:cmdbAbstractObject/Method:SetIfNull/Param:2+' => 'The value to set~~',
+	'Class:cmdbAbstractObject/Method:AddValue' => 'AddValue~~',
+	'Class:cmdbAbstractObject/Method:AddValue+' => 'Add a fixed value to a field~~',
+	'Class:cmdbAbstractObject/Method:AddValue/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:AddValue/Param:1+' => 'The field to modify, in the current object~~',
+	'Class:cmdbAbstractObject/Method:AddValue/Param:2' => 'Value~~',
+	'Class:cmdbAbstractObject/Method:AddValue/Param:2+' => 'Decimal value which will be added, can be negative~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDate' => 'SetComputedDate~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDate+' => 'Set a field with a date computed from another field with extra logic~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:1+' => 'The field to set, in the current object~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:2' => 'Modifier~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:2+' => 'Textual information to modify the source date, eg. "+3 days"~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:3' => 'Source field~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:3+' => 'The field used as source to apply the Modifier logic~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull' => 'SetComputedDateIfNull~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull+' => 'Set non empty field with a date computed from another field with extra logic~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:1' => 'Target Field~~',
 	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:1+' => 'The field to set, in the current object~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:2'  => 'Modifier~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:2' => 'Modifier~~',
 	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:2+' => 'Textual information to modify the source date, eg. "+3 days"~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:3'  => 'Source field~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:3' => 'Source field~~',
 	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:3+' => 'The field used as source to apply the Modifier logic~~',
-	'Class:cmdbAbstractObject/Method:Reset'                          => 'Reset~~',
-	'Class:cmdbAbstractObject/Method:Reset+'                         => 'Reset a field to its default value~~',
-	'Class:cmdbAbstractObject/Method:Reset/Param:1'                  => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:Reset/Param:1+'                 => 'The field to reset, in the current object~~',
-	'Class:cmdbAbstractObject/Method:Copy'                           => 'Copy~~',
-	'Class:cmdbAbstractObject/Method:Copy+'                          => 'Copy the value of a field to another field~~',
-	'Class:cmdbAbstractObject/Method:Copy/Param:1'                   => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:Copy/Param:1+'                  => 'The field to set, in the current object~~',
-	'Class:cmdbAbstractObject/Method:Copy/Param:2'                   => 'Source Field~~',
-	'Class:cmdbAbstractObject/Method:Copy/Param:2+'                  => 'The field to get the value from, in the current object~~',
-	'Class:cmdbAbstractObject/Method:ApplyStimulus'                  => 'ApplyStimulus~~',
-	'Class:cmdbAbstractObject/Method:ApplyStimulus+'                 => 'Apply the specified stimulus to the current object~~',
-	'Class:cmdbAbstractObject/Method:ApplyStimulus/Param:1'          => 'Stimulus code~~',
-	'Class:cmdbAbstractObject/Method:ApplyStimulus/Param:1+'         => 'A valid stimulus code for the current class~~',
-	'Class:ResponseTicketTTO/Interface:iMetricComputer'              => 'Time To Own~~',
-	'Class:ResponseTicketTTO/Interface:iMetricComputer+'             => 'Goal based on a SLT of type TTO~~',
-	'Class:ResponseTicketTTR/Interface:iMetricComputer'              => 'Time To Resolve~~',
-	'Class:ResponseTicketTTR/Interface:iMetricComputer+'             => 'Goal based on a SLT of type TTR~~',
+	'Class:cmdbAbstractObject/Method:Reset' => 'Reset~~',
+	'Class:cmdbAbstractObject/Method:Reset+' => 'Reset a field to its default value~~',
+	'Class:cmdbAbstractObject/Method:Reset/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:Reset/Param:1+' => 'The field to reset, in the current object~~',
+	'Class:cmdbAbstractObject/Method:Copy' => 'Copy~~',
+	'Class:cmdbAbstractObject/Method:Copy+' => 'Copy the value of a field to another field~~',
+	'Class:cmdbAbstractObject/Method:Copy/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:Copy/Param:1+' => 'The field to set, in the current object~~',
+	'Class:cmdbAbstractObject/Method:Copy/Param:2' => 'Source Field~~',
+	'Class:cmdbAbstractObject/Method:Copy/Param:2+' => 'The field to get the value from, in the current object~~',
+	'Class:cmdbAbstractObject/Method:ApplyStimulus' => 'ApplyStimulus~~',
+	'Class:cmdbAbstractObject/Method:ApplyStimulus+' => 'Apply the specified stimulus to the current object~~',
+	'Class:cmdbAbstractObject/Method:ApplyStimulus/Param:1' => 'Stimulus code~~',
+	'Class:cmdbAbstractObject/Method:ApplyStimulus/Param:1+' => 'A valid stimulus code for the current class~~',
+	'Class:ResponseTicketTTO/Interface:iMetricComputer' => 'Time To Own~~',
+	'Class:ResponseTicketTTO/Interface:iMetricComputer+' => 'Goal based on a SLT of type TTO~~',
+	'Class:ResponseTicketTTR/Interface:iMetricComputer' => 'Time To Resolve~~',
+	'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'Goal based on a SLT of type TTR~~',
 ));
 
diff --git a/datamodels/2.x/itop-tickets/dictionaries/de.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/dictionaries/de.dict.itop-tickets.php
index 114ca1c130..506131be31 100644
--- a/datamodels/2.x/itop-tickets/dictionaries/de.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/dictionaries/de.dict.itop-tickets.php
@@ -58,21 +58,21 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:Ticket/Attribute:private_log' => 'Privates Log',
 	'Class:Ticket/Attribute:private_log+' => '',
 	'Class:Ticket/Attribute:contacts_list' => 'Kontakte',
-	'Class:Ticket/Attribute:contacts_list+' => 'All the contacts linked to this ticket~~',
+	'Class:Ticket/Attribute:contacts_list+' => 'Alle Kontakte, die mit diesem Ticket verknüpft sind',
 	'Class:Ticket/Attribute:functionalcis_list' => 'CIs',
-	'Class:Ticket/Attribute:functionalcis_list+' => 'All the configuration items impacted by this ticket. Items marked as "Computed" have been automatically marked as impacted. Items marked as "Not impacted" are excluded from the impact.~~',
+	'Class:Ticket/Attribute:functionalcis_list+' => 'Alle CIs, die von diesem Ticket betroffen sind. Elemente, die als "Berechnet" markiert sind, wurden automatisch als betroffen markiert. Elemente, die als "Nicht betroffen" markiert sind, sind von den Auswirkungen ausgeschlossen.',
 	'Class:Ticket/Attribute:workorders_list' => 'Arbeitsaufträge',
-	'Class:Ticket/Attribute:workorders_list+' => 'All the work orders for this ticket~~',
+	'Class:Ticket/Attribute:workorders_list+' => 'Alle Arbeitsaufträge für dieses Ticket',
 	'Class:Ticket/Attribute:finalclass' => 'Typ',
 	'Class:Ticket/Attribute:finalclass+' => '',
 	'Class:Ticket/Attribute:operational_status' => 'Betriebsstatus',
-	'Class:Ticket/Attribute:operational_status+' => 'Berechnet nach detailliertem Status',
+	'Class:Ticket/Attribute:operational_status+' => 'Berechnet aus dem Status jeder Ticketart',
 	'Class:Ticket/Attribute:operational_status/Value:ongoing' => 'In Bearbeitung',
 	'Class:Ticket/Attribute:operational_status/Value:ongoing+' => 'In Bearbeitung',
 	'Class:Ticket/Attribute:operational_status/Value:resolved' => 'Gelöst',
-	'Class:Ticket/Attribute:operational_status/Value:resolved+' => '',
+	'Class:Ticket/Attribute:operational_status/Value:resolved+' => 'Gelöst',
 	'Class:Ticket/Attribute:operational_status/Value:closed' => 'Geschlossen',
-	'Class:Ticket/Attribute:operational_status/Value:closed+' => '',
+	'Class:Ticket/Attribute:operational_status/Value:closed+' => 'Geschlossen',
 	'Ticket:ImpactAnalysis' => 'Auswirkungsanalyse',
 ));
 
@@ -84,12 +84,15 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:lnkContactToTicket' => 'Verknüpfung Kontakt/Ticket',
 	'Class:lnkContactToTicket+' => '',
+	'Class:lnkContactToTicket/Name' => '%1$s / %2$s',
 	'Class:lnkContactToTicket/Attribute:ticket_id' => 'Ticket',
 	'Class:lnkContactToTicket/Attribute:ticket_id+' => '',
 	'Class:lnkContactToTicket/Attribute:ticket_ref' => 'Referenz',
 	'Class:lnkContactToTicket/Attribute:ticket_ref+' => '',
 	'Class:lnkContactToTicket/Attribute:contact_id' => 'Kontakt',
 	'Class:lnkContactToTicket/Attribute:contact_id+' => '',
+	'Class:lnkContactToTicket/Attribute:contact_name' => 'Kontaktname',
+	'Class:lnkContactToTicket/Attribute:contact_name+' => '',
 	'Class:lnkContactToTicket/Attribute:contact_email' => 'Kontakt-E-Mail',
 	'Class:lnkContactToTicket/Attribute:contact_email+' => '',
 	'Class:lnkContactToTicket/Attribute:role' => 'Rolle (Text)',
@@ -142,94 +145,94 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 
 // Fieldset translation
 Dict::Add('DE DE', 'German', 'Deutsch', array(
-	'Ticket:baseinfo'                                                => 'Allgemeine Informationen',
-	'Ticket:date'                                                    => 'Daten',
-	'Ticket:contact'                                                 => 'Kontakte',
-	'Ticket:moreinfo'                                               => 'Weitergehende Informationen',
-	'Ticket:relation'                                               => 'Beziehungen',
-	'Ticket:log'                                                    => 'Kommunikation',
-	'Ticket:Type'                                                   => 'Qualifikation',
-	'Ticket:support'                                                => 'Support',
-	'Ticket:resolution'                                             => 'Lösung',
-	'Ticket:SLA'                                                    => 'SLA-Report',
-	'WorkOrder:Details'                                             => 'Details',
-	'WorkOrder:Moreinfo'                                            => 'Weitere Informationen',
-	'Tickets:ResolvedFrom'                                          => 'Automatisch durch %1$s gelöst',
-	'Class:cmdbAbstractObject/Method:Set'                           => 'Set',
-	'Class:cmdbAbstractObject/Method:Set+'                          => 'Ein Attribut (Feld) mit einem statischen Wert beschreiben',
-	'Class:cmdbAbstractObject/Method:Set/Param:1'                   => 'Zielfeld',
-	'Class:cmdbAbstractObject/Method:Set/Param:1+'                  => 'Das Feld, das im aktuellen Objekt gesetzt werden soll',
-	'Class:cmdbAbstractObject/Method:Set/Param:2'                   => 'Wert',
-	'Class:cmdbAbstractObject/Method:Set/Param:2+'                  => 'Der Wert, der geschrieben werden soll',
-	'Class:cmdbAbstractObject/Method:SetCurrentDate'                => 'SetCurrentDate',
-	'Class:cmdbAbstractObject/Method:SetCurrentDate+'               => 'Ein Attribut (Feld) mit der aktuellen Zeit und Datum schreiben',
-	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1'        => 'Zielfeld',
-	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1+'       => 'Das Feld, das im aktuellen Objekt geschrieben werden soll',
-	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull'          => 'SetCurrentDateIfNull',
-	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull+'         => 'Ein Attribut (Feld), wenn leer, mit der aktuellen Zeit und Datum schreiben',
-	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull/Param:1'  => 'Zielfeld',
+	'Ticket:baseinfo' => 'Allgemeine Informationen',
+	'Ticket:date' => 'Daten',
+	'Ticket:contact' => 'Kontakte',
+	'Ticket:moreinfo' => 'Weitergehende Informationen',
+	'Ticket:relation' => 'Beziehungen',
+	'Ticket:log' => 'Kommunikation',
+	'Ticket:Type' => 'Qualifikation',
+	'Ticket:support' => 'Support',
+	'Ticket:resolution' => 'Lösung',
+	'Ticket:SLA' => 'SLA-Report',
+	'WorkOrder:Details' => 'Details',
+	'WorkOrder:Moreinfo' => 'Weitere Informationen',
+	'Tickets:ResolvedFrom' => 'Automatisch durch %1$s gelöst',
+	'Class:cmdbAbstractObject/Method:Set' => 'Set',
+	'Class:cmdbAbstractObject/Method:Set+' => 'Ein Attribut (Feld) mit einem statischen Wert beschreiben',
+	'Class:cmdbAbstractObject/Method:Set/Param:1' => 'Zielfeld',
+	'Class:cmdbAbstractObject/Method:Set/Param:1+' => 'Das Feld, das im aktuellen Objekt gesetzt werden soll',
+	'Class:cmdbAbstractObject/Method:Set/Param:2' => 'Wert',
+	'Class:cmdbAbstractObject/Method:Set/Param:2+' => 'Der Wert, der geschrieben werden soll',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate' => 'SetCurrentDate',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate+' => 'Ein Attribut (Feld) mit der aktuellen Zeit und Datum schreiben',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1' => 'Zielfeld',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1+' => 'Das Feld, das im aktuellen Objekt geschrieben werden soll',
+	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull' => 'SetCurrentDateIfNull',
+	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull+' => 'Ein Attribut (Feld), wenn leer, mit der aktuellen Zeit und Datum schreiben',
+	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull/Param:1' => 'Zielfeld',
 	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull/Param:1+' => 'Das Feld, das im aktuellen Objekt geschrieben werden soll',
-	'Class:cmdbAbstractObject/Method:SetCurrentUser'                => 'SetCurrentUser',
-	'Class:cmdbAbstractObject/Method:SetCurrentUser+'               => 'Ein Attribut (Feld) mit dem derzeit eingeloggten User schreiben',
-	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1'        => 'Zielfeld',
-	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1+'       => 'Das Feld, das im aktuellen Objekt geschrieben werden soll. Falls das Feld vom Typ String ist, wird der FriendlyName des Users verwendet, ansonsten der Identifikator. Der FriendlyName ist der Name, der mit dem User-Account verknüpften Person (falls vorhanden), ansonsten der Accountname (Login).',
-	'Class:cmdbAbstractObject/Method:SetCurrentPerson'              => 'SetCurrentPerson',
-	'Class:cmdbAbstractObject/Method:SetCurrentPerson+'             => 'Schreibe ein Attribut (Feld) mit der gerade eingeloggten Person (die \\"Person\\", die mit dem gerade eingeloggten User verknüpft ist)',
-	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1'      => 'Zielfeld',
-	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1+'     => 'Das Feld, das im aktuellen Objekt geschrieben werden soll. Falls das Feld vom Typ String ist, wird der FriendlyName des Users verwendet, ansonsten der Identifikator.',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime'                => 'SetElapsedTime',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime+'               => 'Ein Attribut (Feld) mit der Zeit (in Sekunden) schreiben, die seit einem Datumswert aus einem anderen Feld vergangen ist. ',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1'        => 'Zielfeld',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1+'       => 'Das Feld, das im aktuellen Objekt geschrieben werden soll',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2'        => 'Referenzfeld',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2+'       => 'Das Feld, aus dem die Refernzzeit/datum gelesen werden soll',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3'        => 'Arbeitszeiten',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3+'       => 'Leer lassen um das Standard-Arbeitzeiten-Schema zu verwenden, oder auf  \\"DefaultWorkingTimeComputer\\" setzen um ein 24x7-Schema zu erzwingen',
-	'Class:cmdbAbstractObject/Method:SetIfNull'                     => 'SetIfNull',
-	'Class:cmdbAbstractObject/Method:SetIfNull+'                    => 'Ein Attribut (Feld), wenn leer, mit einem festen Wert schreiben',
-	'Class:cmdbAbstractObject/Method:SetIfNull/Param:1'             => 'Zielfeld',
-	'Class:cmdbAbstractObject/Method:SetIfNull/Param:1+'            => 'Das Feld, das im aktuellen Objekt geschrieben werden soll',
-	'Class:cmdbAbstractObject/Method:SetIfNull/Param:2'              => 'Wert',
-	'Class:cmdbAbstractObject/Method:SetIfNull/Param:2+'             => 'Der Wert der geschrieben werden soll',
-	'Class:cmdbAbstractObject/Method:AddValue'                       => 'AddValue',
-	'Class:cmdbAbstractObject/Method:AddValue+'                      => 'Addiert einen festen Wert zu einem Attribut (Feld)',
-	'Class:cmdbAbstractObject/Method:AddValue/Param:1'               => 'Zielfeld',
-	'Class:cmdbAbstractObject/Method:AddValue/Param:1+'              => 'Das Feld, das im aktuellen Objekt geschrieben werden soll',
-	'Class:cmdbAbstractObject/Method:AddValue/Param:2'               => 'Wert',
-	'Class:cmdbAbstractObject/Method:AddValue/Param:2+'              => 'Dezimalwert welcher addiert werden soll, kann auch negativ sein',
-	'Class:cmdbAbstractObject/Method:SetComputedDate'                => 'SetComputedDate',
-	'Class:cmdbAbstractObject/Method:SetComputedDate+'               => 'Ein Attribut (Feld) mit einem Datum schreiben, welches aus einem anderen Feld berechnet wird',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:1'        => 'Zielfeld',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:1+'       => 'Das Feld, das im aktuellen Objekt geschrieben werden soll',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:2'        => 'Modifikator',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:2+'       => 'Modifikator für das Quellfeld in Textform z.B. "+3 days"',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:3'        => 'Quellfeld',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:3+'       => 'Das Feld, welches als Quellfeld für den Modifikator verwendet werden soll',
-	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull'          => 'SetComputedDateIfNull',
-	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull+'         => 'Ein Attribut (Feld), wenn leer, mit einem Datum schreiben, welches aus einem anderen Feld berechnet wird',
-	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:1'  => 'Zielfeld',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser' => 'SetCurrentUser',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser+' => 'Ein Attribut (Feld) mit dem derzeit eingeloggten User schreiben',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1' => 'Zielfeld',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1+' => 'Das Feld, das im aktuellen Objekt geschrieben werden soll. Falls das Feld vom Typ String ist, wird der FriendlyName des Users verwendet, ansonsten der Identifikator. Der FriendlyName ist der Name, der mit dem User-Account verknüpften Person (falls vorhanden), ansonsten der Accountname (Login).',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson' => 'SetCurrentPerson',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson+' => 'Schreibe ein Attribut (Feld) mit der gerade eingeloggten Person (die \\"Person\\", die mit dem gerade eingeloggten User verknüpft ist)',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1' => 'Zielfeld',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1+' => 'Das Feld, das im aktuellen Objekt geschrieben werden soll. Falls das Feld vom Typ String ist, wird der FriendlyName des Users verwendet, ansonsten der Identifikator.',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime' => 'SetElapsedTime',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime+' => 'Ein Attribut (Feld) mit der Zeit (in Sekunden) schreiben, die seit einem Datumswert aus einem anderen Feld vergangen ist. ',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1' => 'Zielfeld',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1+' => 'Das Feld, das im aktuellen Objekt geschrieben werden soll',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2' => 'Referenzfeld',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2+' => 'Das Feld, aus dem die Refernzzeit/datum gelesen werden soll',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3' => 'Arbeitszeiten',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3+' => 'Leer lassen um das Standard-Arbeitzeiten-Schema zu verwenden, oder auf  \\"DefaultWorkingTimeComputer\\" setzen um ein 24x7-Schema zu erzwingen',
+	'Class:cmdbAbstractObject/Method:SetIfNull' => 'SetIfNull',
+	'Class:cmdbAbstractObject/Method:SetIfNull+' => 'Ein Attribut (Feld), wenn leer, mit einem festen Wert schreiben',
+	'Class:cmdbAbstractObject/Method:SetIfNull/Param:1' => 'Zielfeld',
+	'Class:cmdbAbstractObject/Method:SetIfNull/Param:1+' => 'Das Feld, das im aktuellen Objekt geschrieben werden soll',
+	'Class:cmdbAbstractObject/Method:SetIfNull/Param:2' => 'Wert',
+	'Class:cmdbAbstractObject/Method:SetIfNull/Param:2+' => 'Der Wert der geschrieben werden soll',
+	'Class:cmdbAbstractObject/Method:AddValue' => 'AddValue',
+	'Class:cmdbAbstractObject/Method:AddValue+' => 'Addiert einen festen Wert zu einem Attribut (Feld)',
+	'Class:cmdbAbstractObject/Method:AddValue/Param:1' => 'Zielfeld',
+	'Class:cmdbAbstractObject/Method:AddValue/Param:1+' => 'Das Feld, das im aktuellen Objekt geschrieben werden soll',
+	'Class:cmdbAbstractObject/Method:AddValue/Param:2' => 'Wert',
+	'Class:cmdbAbstractObject/Method:AddValue/Param:2+' => 'Dezimalwert welcher addiert werden soll, kann auch negativ sein',
+	'Class:cmdbAbstractObject/Method:SetComputedDate' => 'SetComputedDate',
+	'Class:cmdbAbstractObject/Method:SetComputedDate+' => 'Ein Attribut (Feld) mit einem Datum schreiben, welches aus einem anderen Feld berechnet wird',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:1' => 'Zielfeld',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:1+' => 'Das Feld, das im aktuellen Objekt geschrieben werden soll',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:2' => 'Modifikator',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:2+' => 'Modifikator für das Quellfeld in Textform z.B. "+3 days"',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:3' => 'Quellfeld',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:3+' => 'Das Feld, welches als Quellfeld für den Modifikator verwendet werden soll',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull' => 'SetComputedDateIfNull',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull+' => 'Ein Attribut (Feld), wenn leer, mit einem Datum schreiben, welches aus einem anderen Feld berechnet wird',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:1' => 'Zielfeld',
 	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:1+' => 'Das Feld, das im aktuellen Objekt geschrieben werden soll',
-	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:2'  => 'Modifikator',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:2' => 'Modifikator',
 	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:2+' => 'Modifikator für das Quellfeld in Textform z.B. "+3 days"',
-	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:3'  => 'Quellfeld',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:3' => 'Quellfeld',
 	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:3+' => 'Das Feld, welches als Quellfeld für den Modifikator verwendet werden soll',
-	'Class:cmdbAbstractObject/Method:Reset'                          => 'Reset',
-	'Class:cmdbAbstractObject/Method:Reset+'                         => 'Ein Attribut (Feld) auf seinen Default-Wert zurücksetzen',
-	'Class:cmdbAbstractObject/Method:Reset/Param:1'                  => 'Zielfeld',
-	'Class:cmdbAbstractObject/Method:Reset/Param:1+'                 => 'Das Feld, das im aktuellen Objekt zurückgesetzt werden soll',
-	'Class:cmdbAbstractObject/Method:Copy'                           => 'Copy',
-	'Class:cmdbAbstractObject/Method:Copy+'                          => 'Kopiere den Wert eines Attributs (Felds) in ein anderes Feld',
-	'Class:cmdbAbstractObject/Method:Copy/Param:1'                   => 'Zielfeld',
-	'Class:cmdbAbstractObject/Method:Copy/Param:1+'                  => 'Das Feld, das im aktuellen Objekt geschrieben werden soll',
-	'Class:cmdbAbstractObject/Method:Copy/Param:2'                   => 'Quellfeld',
-	'Class:cmdbAbstractObject/Method:Copy/Param:2+'                  => 'Das Feld des aktuellen Objekts, aus dem der Wert entnommen werden soll',
-	'Class:cmdbAbstractObject/Method:ApplyStimulus'                  => 'Stimulus anwenden',
-	'Class:cmdbAbstractObject/Method:ApplyStimulus+'                 => 'Dem ausgewählten Objekt den ausgewählten Stimulus zuweisen',
-	'Class:cmdbAbstractObject/Method:ApplyStimulus/Param:1'          => 'Stimulus-Code',
-	'Class:cmdbAbstractObject/Method:ApplyStimulus/Param:1+'         => 'Ein valider Stimulus-Code für die aktuelle Klasse',
-	'Class:ResponseTicketTTO/Interface:iMetricComputer'              => 'Time To Own (Erstzuweisungszeit)',
-	'Class:ResponseTicketTTO/Interface:iMetricComputer+'             => 'Zielvorgabe (SLT) vom Typ TTO',
-	'Class:ResponseTicketTTR/Interface:iMetricComputer'              => 'Time To Resolve (Erstlösungszeit)',
-	'Class:ResponseTicketTTR/Interface:iMetricComputer+'             => 'Zielvorgabe (SLT) vom Typ TTR',
+	'Class:cmdbAbstractObject/Method:Reset' => 'Reset',
+	'Class:cmdbAbstractObject/Method:Reset+' => 'Ein Attribut (Feld) auf seinen Default-Wert zurücksetzen',
+	'Class:cmdbAbstractObject/Method:Reset/Param:1' => 'Zielfeld',
+	'Class:cmdbAbstractObject/Method:Reset/Param:1+' => 'Das Feld, das im aktuellen Objekt zurückgesetzt werden soll',
+	'Class:cmdbAbstractObject/Method:Copy' => 'Copy',
+	'Class:cmdbAbstractObject/Method:Copy+' => 'Kopiere den Wert eines Attributs (Felds) in ein anderes Feld',
+	'Class:cmdbAbstractObject/Method:Copy/Param:1' => 'Zielfeld',
+	'Class:cmdbAbstractObject/Method:Copy/Param:1+' => 'Das Feld, das im aktuellen Objekt geschrieben werden soll',
+	'Class:cmdbAbstractObject/Method:Copy/Param:2' => 'Quellfeld',
+	'Class:cmdbAbstractObject/Method:Copy/Param:2+' => 'Das Feld des aktuellen Objekts, aus dem der Wert entnommen werden soll',
+	'Class:cmdbAbstractObject/Method:ApplyStimulus' => 'Stimulus anwenden',
+	'Class:cmdbAbstractObject/Method:ApplyStimulus+' => 'Dem ausgewählten Objekt den ausgewählten Stimulus zuweisen',
+	'Class:cmdbAbstractObject/Method:ApplyStimulus/Param:1' => 'Stimulus-Code',
+	'Class:cmdbAbstractObject/Method:ApplyStimulus/Param:1+' => 'Ein valider Stimulus-Code für die aktuelle Klasse',
+	'Class:ResponseTicketTTO/Interface:iMetricComputer' => 'Time To Own (Erstzuweisungszeit)',
+	'Class:ResponseTicketTTO/Interface:iMetricComputer+' => 'Zielvorgabe (SLT) vom Typ TTO',
+	'Class:ResponseTicketTTR/Interface:iMetricComputer' => 'Time To Resolve (Erstlösungszeit)',
+	'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'Zielvorgabe (SLT) vom Typ TTR',
 ));
 
diff --git a/datamodels/2.x/itop-tickets/dictionaries/es_cr.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/dictionaries/es_cr.dict.itop-tickets.php
index cc8fdfcef6..872ae9843a 100644
--- a/datamodels/2.x/itop-tickets/dictionaries/es_cr.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/dictionaries/es_cr.dict.itop-tickets.php
@@ -96,12 +96,15 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkContactToTicket' => 'Relación Contacto y Ticket',
 	'Class:lnkContactToTicket+' => 'Relación Contacto y Ticket',
+	'Class:lnkContactToTicket/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToTicket/Attribute:ticket_id' => 'Ticket',
 	'Class:lnkContactToTicket/Attribute:ticket_id+' => 'Ticket',
 	'Class:lnkContactToTicket/Attribute:ticket_ref' => 'Ref',
 	'Class:lnkContactToTicket/Attribute:ticket_ref+' => 'Ref',
 	'Class:lnkContactToTicket/Attribute:contact_id' => 'Contacto',
 	'Class:lnkContactToTicket/Attribute:contact_id+' => 'Contacto',
+	'Class:lnkContactToTicket/Attribute:contact_name' => 'Contact name~~',
+	'Class:lnkContactToTicket/Attribute:contact_name+' => '~~',
 	'Class:lnkContactToTicket/Attribute:contact_email' => 'Correo Electrónico',
 	'Class:lnkContactToTicket/Attribute:contact_email+' => 'Correo Electrónico',
 	'Class:lnkContactToTicket/Attribute:role' => 'Rol',
@@ -154,94 +157,94 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 
 // Fieldset translation
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
-	'Ticket:baseinfo'                                                => 'Información General',
-	'Ticket:date'                                                    => 'Fechas',
-	'Ticket:contact'                                                 => 'Contactos',
-	'Ticket:moreinfo'                                               => 'Más Información',
-	'Ticket:relation'                                               => 'Relaciones',
-	'Ticket:log'                                                    => 'Comunicaciones',
-	'Ticket:Type'                                                   => 'Clasificación',
-	'Ticket:support'                                                => 'Soporte',
-	'Ticket:resolution'                                             => 'Solución',
-	'Ticket:SLA'                                                    => 'Reporte de SLA',
-	'WorkOrder:Details'                                             => 'Detalles',
-	'WorkOrder:Moreinfo'                                            => 'Más Información',
-	'Tickets:ResolvedFrom'                                          => 'Automáticamente resuelto de %1$s',
-	'Class:cmdbAbstractObject/Method:Set'                           => 'Asignar',
-	'Class:cmdbAbstractObject/Method:Set+'                          => 'Asignar campo con valor estático',
-	'Class:cmdbAbstractObject/Method:Set/Param:1'                   => 'Campo Destino',
-	'Class:cmdbAbstractObject/Method:Set/Param:1+'                  => 'El campo a asignar, en el objeto actual',
-	'Class:cmdbAbstractObject/Method:Set/Param:2'                   => 'Valor',
-	'Class:cmdbAbstractObject/Method:Set/Param:2+'                  => 'Valor a asignar',
-	'Class:cmdbAbstractObject/Method:SetCurrentDate'                => 'Asignar fecha actual',
-	'Class:cmdbAbstractObject/Method:SetCurrentDate+'               => 'Asignar fecha y hora actuales',
-	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1'        => 'Campo Destino',
-	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1+'       => 'El campo a asignar, en el objeto actual',
-	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull'          => 'SetCurrentDateIfNull~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull+'         => 'Set an empty field with the current date and time~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull/Param:1'  => 'Target Field~~',
+	'Ticket:baseinfo' => 'Información General',
+	'Ticket:date' => 'Fechas',
+	'Ticket:contact' => 'Contactos',
+	'Ticket:moreinfo' => 'Más Información',
+	'Ticket:relation' => 'Relaciones',
+	'Ticket:log' => 'Comunicaciones',
+	'Ticket:Type' => 'Clasificación',
+	'Ticket:support' => 'Soporte',
+	'Ticket:resolution' => 'Solución',
+	'Ticket:SLA' => 'Reporte de SLA',
+	'WorkOrder:Details' => 'Detalles',
+	'WorkOrder:Moreinfo' => 'Más Información',
+	'Tickets:ResolvedFrom' => 'Automáticamente resuelto de %1$s',
+	'Class:cmdbAbstractObject/Method:Set' => 'Asignar',
+	'Class:cmdbAbstractObject/Method:Set+' => 'Asignar campo con valor estático',
+	'Class:cmdbAbstractObject/Method:Set/Param:1' => 'Campo Destino',
+	'Class:cmdbAbstractObject/Method:Set/Param:1+' => 'El campo a asignar, en el objeto actual',
+	'Class:cmdbAbstractObject/Method:Set/Param:2' => 'Valor',
+	'Class:cmdbAbstractObject/Method:Set/Param:2+' => 'Valor a asignar',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate' => 'Asignar fecha actual',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate+' => 'Asignar fecha y hora actuales',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1' => 'Campo Destino',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1+' => 'El campo a asignar, en el objeto actual',
+	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull' => 'SetCurrentDateIfNull~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull+' => 'Set an empty field with the current date and time~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull/Param:1' => 'Target Field~~',
 	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull/Param:1+' => 'The field to set, in the current object~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentUser'                => 'Asignar Usuario actual',
-	'Class:cmdbAbstractObject/Method:SetCurrentUser+'               => 'Asignar Usuario actual',
-	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1'        => 'Campo Destino',
-	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1+'       => 'Si el campo es una cadena de caracteres, entonces el nombre completo será usado, de otra manera el identificador será usado. El nombre completo es el nombre de una persona que está ligado a un usurio, si no será su clave de acceso.',
-	'Class:cmdbAbstractObject/Method:SetCurrentPerson'              => 'Asignar Persona actual',
-	'Class:cmdbAbstractObject/Method:SetCurrentPerson+'             => 'Asignar Persona actual',
-	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1'      => 'Campo Destino',
-	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1+'     => 'Si el campo es una cadena de caracteres, entonces el nombre completo será usado, de otra manera el identificador será usado.',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime'                => 'Asignar tiempo transcurrido',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime+'               => 'Asignar tiempo transcurrido (segundos)',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1'        => 'Campo Destino',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1+'       => 'El campo a configurar, en el objeto actual',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2'        => 'Campo de Referencia',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2+'       => 'El campo desde el que se obtienen los datos referenciados',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3'        => 'Horas Trabajadas',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3+'       => 'Dejar vacio para utilizar el horario de trabajo estandar, o dejar por omisión para usar esquema 7x24',
-	'Class:cmdbAbstractObject/Method:SetIfNull'                     => 'SetIfNull~~',
-	'Class:cmdbAbstractObject/Method:SetIfNull+'                    => 'Set a field only if it is empty, with a static value~~',
-	'Class:cmdbAbstractObject/Method:SetIfNull/Param:1'             => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:SetIfNull/Param:1+'            => 'The field to set, in the current object~~',
-	'Class:cmdbAbstractObject/Method:SetIfNull/Param:2'              => 'Value~~',
-	'Class:cmdbAbstractObject/Method:SetIfNull/Param:2+'             => 'The value to set~~',
-	'Class:cmdbAbstractObject/Method:AddValue'                       => 'AddValue~~',
-	'Class:cmdbAbstractObject/Method:AddValue+'                      => 'Add a fixed value to a field~~',
-	'Class:cmdbAbstractObject/Method:AddValue/Param:1'               => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:AddValue/Param:1+'              => 'The field to modify, in the current object~~',
-	'Class:cmdbAbstractObject/Method:AddValue/Param:2'               => 'Value~~',
-	'Class:cmdbAbstractObject/Method:AddValue/Param:2+'              => 'Decimal value which will be added, can be negative~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDate'                => 'SetComputedDate~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDate+'               => 'Set a field with a date computed from another field with extra logic~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:1'        => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:1+'       => 'The field to set, in the current object~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:2'        => 'Modifier~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:2+'       => 'Textual information to modify the source date, eg. "+3 days"~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:3'        => 'Source field~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:3+'       => 'The field used as source to apply the Modifier logic~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull'          => 'SetComputedDateIfNull~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull+'         => 'Set non empty field with a date computed from another field with extra logic~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:1'  => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser' => 'Asignar Usuario actual',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser+' => 'Asignar Usuario actual',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1' => 'Campo Destino',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1+' => 'Si el campo es una cadena de caracteres, entonces el nombre completo será usado, de otra manera el identificador será usado. El nombre completo es el nombre de una persona que está ligado a un usurio, si no será su clave de acceso.',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson' => 'Asignar Persona actual',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson+' => 'Asignar Persona actual',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1' => 'Campo Destino',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1+' => 'Si el campo es una cadena de caracteres, entonces el nombre completo será usado, de otra manera el identificador será usado.',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime' => 'Asignar tiempo transcurrido',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime+' => 'Asignar tiempo transcurrido (segundos)',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1' => 'Campo Destino',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1+' => 'El campo a configurar, en el objeto actual',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2' => 'Campo de Referencia',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2+' => 'El campo desde el que se obtienen los datos referenciados',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3' => 'Horas Trabajadas',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3+' => 'Dejar vacio para utilizar el horario de trabajo estandar, o dejar por omisión para usar esquema 7x24',
+	'Class:cmdbAbstractObject/Method:SetIfNull' => 'SetIfNull~~',
+	'Class:cmdbAbstractObject/Method:SetIfNull+' => 'Set a field only if it is empty, with a static value~~',
+	'Class:cmdbAbstractObject/Method:SetIfNull/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:SetIfNull/Param:1+' => 'The field to set, in the current object~~',
+	'Class:cmdbAbstractObject/Method:SetIfNull/Param:2' => 'Value~~',
+	'Class:cmdbAbstractObject/Method:SetIfNull/Param:2+' => 'The value to set~~',
+	'Class:cmdbAbstractObject/Method:AddValue' => 'AddValue~~',
+	'Class:cmdbAbstractObject/Method:AddValue+' => 'Add a fixed value to a field~~',
+	'Class:cmdbAbstractObject/Method:AddValue/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:AddValue/Param:1+' => 'The field to modify, in the current object~~',
+	'Class:cmdbAbstractObject/Method:AddValue/Param:2' => 'Value~~',
+	'Class:cmdbAbstractObject/Method:AddValue/Param:2+' => 'Decimal value which will be added, can be negative~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDate' => 'SetComputedDate~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDate+' => 'Set a field with a date computed from another field with extra logic~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:1+' => 'The field to set, in the current object~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:2' => 'Modifier~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:2+' => 'Textual information to modify the source date, eg. "+3 days"~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:3' => 'Source field~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:3+' => 'The field used as source to apply the Modifier logic~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull' => 'SetComputedDateIfNull~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull+' => 'Set non empty field with a date computed from another field with extra logic~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:1' => 'Target Field~~',
 	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:1+' => 'The field to set, in the current object~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:2'  => 'Modifier~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:2' => 'Modifier~~',
 	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:2+' => 'Textual information to modify the source date, eg. "+3 days"~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:3'  => 'Source field~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:3' => 'Source field~~',
 	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:3+' => 'The field used as source to apply the Modifier logic~~',
-	'Class:cmdbAbstractObject/Method:Reset'                          => 'Restablecer',
-	'Class:cmdbAbstractObject/Method:Reset+'                         => 'Restablecer a valor por omisión',
-	'Class:cmdbAbstractObject/Method:Reset/Param:1'                  => 'Campo Destino',
-	'Class:cmdbAbstractObject/Method:Reset/Param:1+'                 => 'Campo a restablecer',
-	'Class:cmdbAbstractObject/Method:Copy'                           => 'Copiar',
-	'Class:cmdbAbstractObject/Method:Copy+'                          => 'Copier el valor de un campo a otro',
-	'Class:cmdbAbstractObject/Method:Copy/Param:1'                   => 'Campo Destino',
-	'Class:cmdbAbstractObject/Method:Copy/Param:1+'                  => 'Campo a asignar',
-	'Class:cmdbAbstractObject/Method:Copy/Param:2'                   => 'Campo Origen',
-	'Class:cmdbAbstractObject/Method:Copy/Param:2+'                  => 'Campo de donde se obtendrá valor',
-	'Class:cmdbAbstractObject/Method:ApplyStimulus'                  => 'Aplicar Stimulus',
-	'Class:cmdbAbstractObject/Method:ApplyStimulus+'                 => 'Aplicar stimulus específico a objeto actual',
-	'Class:cmdbAbstractObject/Method:ApplyStimulus/Param:1'          => 'Código Stimulus',
-	'Class:cmdbAbstractObject/Method:ApplyStimulus/Param:1+'         => 'Un código de stimulus válido para la clase actual',
-	'Class:ResponseTicketTTO/Interface:iMetricComputer'              => 'Tiempo a Pertenencia',
-	'Class:ResponseTicketTTO/Interface:iMetricComputer+'             => 'Objetivo basado en SLT de tipo TTO',
-	'Class:ResponseTicketTTR/Interface:iMetricComputer'              => 'Tiempo a Resolución',
-	'Class:ResponseTicketTTR/Interface:iMetricComputer+'             => 'Objetivo basado en SLT de tipo TTR',
+	'Class:cmdbAbstractObject/Method:Reset' => 'Restablecer',
+	'Class:cmdbAbstractObject/Method:Reset+' => 'Restablecer a valor por omisión',
+	'Class:cmdbAbstractObject/Method:Reset/Param:1' => 'Campo Destino',
+	'Class:cmdbAbstractObject/Method:Reset/Param:1+' => 'Campo a restablecer',
+	'Class:cmdbAbstractObject/Method:Copy' => 'Copiar',
+	'Class:cmdbAbstractObject/Method:Copy+' => 'Copier el valor de un campo a otro',
+	'Class:cmdbAbstractObject/Method:Copy/Param:1' => 'Campo Destino',
+	'Class:cmdbAbstractObject/Method:Copy/Param:1+' => 'Campo a asignar',
+	'Class:cmdbAbstractObject/Method:Copy/Param:2' => 'Campo Origen',
+	'Class:cmdbAbstractObject/Method:Copy/Param:2+' => 'Campo de donde se obtendrá valor',
+	'Class:cmdbAbstractObject/Method:ApplyStimulus' => 'Aplicar Stimulus',
+	'Class:cmdbAbstractObject/Method:ApplyStimulus+' => 'Aplicar stimulus específico a objeto actual',
+	'Class:cmdbAbstractObject/Method:ApplyStimulus/Param:1' => 'Código Stimulus',
+	'Class:cmdbAbstractObject/Method:ApplyStimulus/Param:1+' => 'Un código de stimulus válido para la clase actual',
+	'Class:ResponseTicketTTO/Interface:iMetricComputer' => 'Tiempo a Pertenencia',
+	'Class:ResponseTicketTTO/Interface:iMetricComputer+' => 'Objetivo basado en SLT de tipo TTO',
+	'Class:ResponseTicketTTR/Interface:iMetricComputer' => 'Tiempo a Resolución',
+	'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'Objetivo basado en SLT de tipo TTR',
 ));
 
diff --git a/datamodels/2.x/itop-tickets/dictionaries/fr.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/dictionaries/fr.dict.itop-tickets.php
index d8a0e5465f..6f765ba7b1 100644
--- a/datamodels/2.x/itop-tickets/dictionaries/fr.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/dictionaries/fr.dict.itop-tickets.php
@@ -84,6 +84,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:lnkContactToTicket' => 'Lien Contact / Ticket',
 	'Class:lnkContactToTicket+' => '',
+	'Class:lnkContactToTicket/Name' => '%1$s / %2$s',
 	'Class:lnkContactToTicket/Attribute:ticket_id' => 'Ticket',
 	'Class:lnkContactToTicket/Attribute:ticket_id+' => '',
 	'Class:lnkContactToTicket/Attribute:ticket_ref' => 'Référence',
@@ -144,98 +145,96 @@ Dict::Add('FR FR', 'French', 'Français', array(
 
 // Fieldset translation
 Dict::Add('FR FR', 'French', 'Français', array(
-	'Ticket:baseinfo'                                                => 'Informations générales',
-	'Ticket:date'                                                    => 'Dates',
-	'Ticket:contact'                                                 => 'Contacts',
-	'Ticket:moreinfo'                                               => 'Informations complémentaires',
-	'Ticket:relation'                                               => 'Relations',
-	'Ticket:log'                                                    => 'Communications',
-	'Ticket:Type'                                                   => 'Qualification',
-	'Ticket:support'                                                => 'Support',
-	'Ticket:resolution'                                             => 'Résolution',
-	'Ticket:SLA'                                                    => 'Rapport SLA',
-	'WorkOrder:Details'                                             => 'Détails',
-	'WorkOrder:Moreinfo'                                            => 'Informations complémentaires',
-	'Tickets:ResolvedFrom'                                          => 'Résolu via %1$s',
-	'Class:cmdbAbstractObject/Method:Set'                           => 'Set (remplir)',
-	'Class:cmdbAbstractObject/Method:Set+'                          => 'Remplir un champ avec une valeur statique',
-	'Class:cmdbAbstractObject/Method:Set/Param:1'                   => 'Champ Cible',
-	'Class:cmdbAbstractObject/Method:Set/Param:1+'                  => 'Le champ à initialiser, dans l\'objet courant',
-	'Class:cmdbAbstractObject/Method:Set/Param:2'                   => 'Valeur',
-	'Class:cmdbAbstractObject/Method:Set/Param:2+'                  => 'La valeur statique',
-	'Class:cmdbAbstractObject/Method:SetCurrentDate'                => 'SetCurrentDate (reinitialiser à la date courante)',
-	'Class:cmdbAbstractObject/Method:SetCurrentDate+'               => 'Initialiser un champ avec la date et l\'heure courantes',
-	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1'        => 'Champ Cible',
-	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1+'       => 'Le champ à initialiser, dans l\'objet courant',
-	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull'          => 'SetCurrentDateIfNull (initialiser à la date courante)',
-	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull+'         => 'Initialiser un champ seulement s\'il est vide, avec la date et l\'heure courantes',
-	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull/Param:1'  => 'Champ Cible',
+	'Ticket:baseinfo' => 'Informations générales',
+	'Ticket:date' => 'Dates',
+	'Ticket:contact' => 'Contacts',
+	'Ticket:moreinfo' => 'Informations complémentaires',
+	'Ticket:relation' => 'Relations',
+	'Ticket:log' => 'Communications',
+	'Ticket:Type' => 'Qualification',
+	'Ticket:support' => 'Support',
+	'Ticket:resolution' => 'Résolution',
+	'Ticket:SLA' => 'Rapport SLA',
+	'WorkOrder:Details' => 'Détails',
+	'WorkOrder:Moreinfo' => 'Informations complémentaires',
+	'Tickets:ResolvedFrom' => 'Résolu via %1$s',
+	'Class:cmdbAbstractObject/Method:Set' => 'Set (remplir)',
+	'Class:cmdbAbstractObject/Method:Set+' => 'Remplir un champ avec une valeur statique',
+	'Class:cmdbAbstractObject/Method:Set/Param:1' => 'Champ Cible',
+	'Class:cmdbAbstractObject/Method:Set/Param:1+' => 'Le champ à initialiser, dans l\'objet courant',
+	'Class:cmdbAbstractObject/Method:Set/Param:2' => 'Valeur',
+	'Class:cmdbAbstractObject/Method:Set/Param:2+' => 'La valeur statique',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate' => 'SetCurrentDate (reinitialiser à la date courante)',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate+' => 'Initialiser un champ avec la date et l\'heure courantes',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1' => 'Champ Cible',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1+' => 'Le champ à initialiser, dans l\'objet courant',
+	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull' => 'SetCurrentDateIfNull (initialiser à la date courante)',
+	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull+' => 'Initialiser un champ seulement s\'il est vide, avec la date et l\'heure courantes',
+	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull/Param:1' => 'Champ Cible',
 	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull/Param:1+' => 'Le champ à initialiser, dans l\'objet courant',
-	'Class:cmdbAbstractObject/Method:SetCurrentUser'                => 'SetCurrentUser (reinitialiser à l\'utilisateur courant)',
-	'Class:cmdbAbstractObject/Method:SetCurrentUser+'               => 'Initialiser un champ avec l\'utilisateur qui est en train d\'effectuer une action sur l\'objet',
-	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1'        => 'Champ Cible',
-	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1+'       => 'Le champ à initialiser, dans l\'objet courant. Si ce champ est une chaîne de caractère, alors le nom usuel sera utilisé. Dans les autres cas, ce sera l\'identifiant de l\'objet. Le nom usuel est le nom usuel de la personne attachée au compte utilisateur. Si aucune personne n\'est rattachée au compte utilisateur, alors le nom usuel est l\'identifiant de connexion.',
-	'Class:cmdbAbstractObject/Method:SetCurrentPerson'              => 'SetCurrentPerson (initialiser à l\'utilisateur courant)',
-	'Class:cmdbAbstractObject/Method:SetCurrentPerson+'             => 'Initialiser un champ avec la personne associée au compte de l\'utilisateur qui est en train d\'effectuer une action sur l\'objet',
-	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1'      => 'Champ Cible',
-	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1+'     => 'Le champ à initialiser, dans l\'objet courant. Si ce champ est une chaîne de caractère, alors le nom usuel sera utilisé. Dans les autres cas, ce sera l\'identifiant de l\'objet',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime'                => 'SetElapsedTime (initialiser avec le temps passé)',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime+'               => 'Initialiser un champ avec la durée écoulée depuis une date donnée par un autre champ (champ de référence)',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1'        => 'Champ Cible',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1+'       => 'Le champ à initialiser, dans l\'objet courant',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2'        => 'Champ de Référence',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2+'       => 'Le champ contenant la date de début',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3'        => 'Jours et Heures Ouvrés',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3+'       => 'Laisser ce champ vide pour bénéficier de la gestion des fenêtres de couverture, ou saisir "DefaultWorkingTimeComputer" pour passer en mode 24h/24 7j/7',
-	'Class:cmdbAbstractObject/Method:SetIfNull'                     => 'SetIfNull (initialiser)',
-	'Class:cmdbAbstractObject/Method:SetIfNull+'                    => 'Remplir seulement s\'il est vide, un champ avec une valeur statique',
-	'Class:cmdbAbstractObject/Method:SetIfNull/Param:1'             => 'Champ Cible',
-	'Class:cmdbAbstractObject/Method:SetIfNull/Param:1+'            => 'Le champ à initialiser, dans l\'objet courant',
-	'Class:cmdbAbstractObject/Method:SetIfNull/Param:2'              => 'Valeur',
-	'Class:cmdbAbstractObject/Method:SetIfNull/Param:2+'             => 'La valeur à mettre dans le champ',
-	'Class:cmdbAbstractObject/Method:AddValue'                       => 'AddValue (ajouter une valeur)',
-	'Class:cmdbAbstractObject/Method:AddValue+'                      => 'Ajouter une valeur à un champ',
-	'Class:cmdbAbstractObject/Method:AddValue/Param:1'               => 'Champ Cible',
-	'Class:cmdbAbstractObject/Method:AddValue/Param:1+'              => 'Le champ à modifier, dans l\'objet courant',
-	'Class:cmdbAbstractObject/Method:AddValue/Param:2'               => 'Valeur',
-	'Class:cmdbAbstractObject/Method:AddValue/Param:2+'              => 'Valeur décimal qui sera ajoutée. Cette valeur peut être négative',
-	'Class:cmdbAbstractObject/Method:SetComputedDate'                => 'SetComputedDate (remplir avec une date calculée)',
-	'Class:cmdbAbstractObject/Method:SetComputedDate+'               => 'Remplir un champ avec une date relative à celle d\'un autre champ',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:1'        => 'Champ Cible',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:1+'       => 'Le champ à initialiser, dans l\'objet courant',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:2'        => 'Modificateur',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:2+'       => 'Texte en anglais spécifiant la modification à appliquer sur le champ source, ex. "+3 days"',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:3'        => 'Champ source',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:3+'       => 'Champ utilisé comme base pour y appliquer le Modificateur',
-	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull'          => 'SetComputedDateIfNull (initialiser avec une date calculée)',
-	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull+'         => 'Remplir un champ vide avec une date relative à celle d\'un autre champ',
-	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:1'  => 'Champ Cible',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser' => 'SetCurrentUser (reinitialiser à l\'utilisateur courant)',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser+' => 'Initialiser un champ avec l\'utilisateur qui est en train d\'effectuer une action sur l\'objet',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1' => 'Champ Cible',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1+' => 'Le champ à initialiser, dans l\'objet courant. Si ce champ est une chaîne de caractère, alors le nom usuel sera utilisé. Dans les autres cas, ce sera l\'identifiant de l\'objet. Le nom usuel est le nom usuel de la personne attachée au compte utilisateur. Si aucune personne n\'est rattachée au compte utilisateur, alors le nom usuel est l\'identifiant de connexion.',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson' => 'SetCurrentPerson (initialiser à l\'utilisateur courant)',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson+' => 'Initialiser un champ avec la personne associée au compte de l\'utilisateur qui est en train d\'effectuer une action sur l\'objet',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1' => 'Champ Cible',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1+' => 'Le champ à initialiser, dans l\'objet courant. Si ce champ est une chaîne de caractère, alors le nom usuel sera utilisé. Dans les autres cas, ce sera l\'identifiant de l\'objet',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime' => 'SetElapsedTime (initialiser avec le temps passé)',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime+' => 'Initialiser un champ avec la durée écoulée depuis une date donnée par un autre champ (champ de référence)',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1' => 'Champ Cible',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1+' => 'Le champ à initialiser, dans l\'objet courant',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2' => 'Champ de Référence',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2+' => 'Le champ contenant la date de début',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3' => 'Jours et Heures Ouvrés',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3+' => 'Laisser ce champ vide pour bénéficier de la gestion des fenêtres de couverture, ou saisir "DefaultWorkingTimeComputer" pour passer en mode 24h/24 7j/7',
+	'Class:cmdbAbstractObject/Method:SetIfNull' => 'SetIfNull (initialiser)',
+	'Class:cmdbAbstractObject/Method:SetIfNull+' => 'Remplir seulement s\'il est vide, un champ avec une valeur statique',
+	'Class:cmdbAbstractObject/Method:SetIfNull/Param:1' => 'Champ Cible',
+	'Class:cmdbAbstractObject/Method:SetIfNull/Param:1+' => 'Le champ à initialiser, dans l\'objet courant',
+	'Class:cmdbAbstractObject/Method:SetIfNull/Param:2' => 'Valeur',
+	'Class:cmdbAbstractObject/Method:SetIfNull/Param:2+' => 'La valeur à mettre dans le champ',
+	'Class:cmdbAbstractObject/Method:AddValue' => 'AddValue (ajouter une valeur)',
+	'Class:cmdbAbstractObject/Method:AddValue+' => 'Ajouter une valeur à un champ',
+	'Class:cmdbAbstractObject/Method:AddValue/Param:1' => 'Champ Cible',
+	'Class:cmdbAbstractObject/Method:AddValue/Param:1+' => 'Le champ à modifier, dans l\'objet courant',
+	'Class:cmdbAbstractObject/Method:AddValue/Param:2' => 'Valeur',
+	'Class:cmdbAbstractObject/Method:AddValue/Param:2+' => 'Valeur décimal qui sera ajoutée. Cette valeur peut être négative',
+	'Class:cmdbAbstractObject/Method:SetComputedDate' => 'SetComputedDate (remplir avec une date calculée)',
+	'Class:cmdbAbstractObject/Method:SetComputedDate+' => 'Remplir un champ avec une date relative à celle d\'un autre champ',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:1' => 'Champ Cible',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:1+' => 'Le champ à initialiser, dans l\'objet courant',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:2' => 'Modificateur',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:2+' => 'Texte en anglais spécifiant la modification à appliquer sur le champ source, ex. "+3 days"',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:3' => 'Champ source',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:3+' => 'Champ utilisé comme base pour y appliquer le Modificateur',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull' => 'SetComputedDateIfNull (initialiser avec une date calculée)',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull+' => 'Remplir un champ vide avec une date relative à celle d\'un autre champ',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:1' => 'Champ Cible',
 	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:1+' => 'Le champ à initialiser, dans l\'objet courant',
-	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:2'  => 'Modificateur',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:2' => 'Modificateur',
 	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:2+' => 'Texte en anglais spécifiant la modification à appliquer sur le champ source, ex. "monday of next week"',
-	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:3'  => 'Champ source',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:3' => 'Champ source',
 	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:3+' => 'Champ utilisé comme base pour y appliquer le Modificateur',
-	'Class:cmdbAbstractObject/Method:Reset'                          => 'Réinitialiser',
-	'Class:cmdbAbstractObject/Method:Reset+'                         => 'Réinitialiser un champ à sa valeur par défaut',
-	'Class:cmdbAbstractObject/Method:Reset/Param:1'                  => 'Champ Cible',
-	'Class:cmdbAbstractObject/Method:Reset/Param:1+'                 => 'Le champ à réinitialiser, dans l\'objet courant',
-	'Class:cmdbAbstractObject/Method:Copy'                           => 'Copy (copier)',
-	'Class:cmdbAbstractObject/Method:Copy+'                          => 'Copier la valeur d\'un champ dans un autre',
-	'Class:cmdbAbstractObject/Method:Copy/Param:1'                   => 'Champ Cible',
-	'Class:cmdbAbstractObject/Method:Copy/Param:1+'                  => 'Le champ à initialiser, dans l\'objet courant',
-	'Class:cmdbAbstractObject/Method:Copy/Param:2'                   => 'Champ Source',
-	'Class:cmdbAbstractObject/Method:Copy/Param:2+'                  => 'Le champ dans lequel on va lire la valeur, dans l\'objet courant',
-	'Class:cmdbAbstractObject/Method:ApplyStimulus'                  => 'ApplyStimulus (appliquer un stimulus)',
-	'Class:cmdbAbstractObject/Method:ApplyStimulus+'                 => 'Applique le stimulus spécifié à l\'objet courant',
-	'Class:cmdbAbstractObject/Method:ApplyStimulus/Param:1'          => 'Code du stimulus',
-	'Class:cmdbAbstractObject/Method:ApplyStimulus/Param:1+'         => 'Un code de stimulus valide pour la classe courante',
-	'Class:ResponseTicketTTO/Interface:iMetricComputer'              => 'Temps d\'Assignation (TTO)',
-	'Class:ResponseTicketTTO/Interface:iMetricComputer+'             => 'Objectif calculé à partir d\'un SLT de type TTO',
-	'Class:ResponseTicketTTR/Interface:iMetricComputer'              => 'Temps de Résolution (TTR)',
-	'Class:ResponseTicketTTR/Interface:iMetricComputer+'             => 'Objectif calculé à partir d\'un SLT de type TTR',
+	'Class:cmdbAbstractObject/Method:Reset' => 'Réinitialiser',
+	'Class:cmdbAbstractObject/Method:Reset+' => 'Réinitialiser un champ à sa valeur par défaut',
+	'Class:cmdbAbstractObject/Method:Reset/Param:1' => 'Champ Cible',
+	'Class:cmdbAbstractObject/Method:Reset/Param:1+' => 'Le champ à réinitialiser, dans l\'objet courant',
+	'Class:cmdbAbstractObject/Method:Copy' => 'Copy (copier)',
+	'Class:cmdbAbstractObject/Method:Copy+' => 'Copier la valeur d\'un champ dans un autre',
+	'Class:cmdbAbstractObject/Method:Copy/Param:1' => 'Champ Cible',
+	'Class:cmdbAbstractObject/Method:Copy/Param:1+' => 'Le champ à initialiser, dans l\'objet courant',
+	'Class:cmdbAbstractObject/Method:Copy/Param:2' => 'Champ Source',
+	'Class:cmdbAbstractObject/Method:Copy/Param:2+' => 'Le champ dans lequel on va lire la valeur, dans l\'objet courant',
+	'Class:cmdbAbstractObject/Method:ApplyStimulus' => 'ApplyStimulus (appliquer un stimulus)',
+	'Class:cmdbAbstractObject/Method:ApplyStimulus+' => 'Applique le stimulus spécifié à l\'objet courant',
+	'Class:cmdbAbstractObject/Method:ApplyStimulus/Param:1' => 'Code du stimulus',
+	'Class:cmdbAbstractObject/Method:ApplyStimulus/Param:1+' => 'Un code de stimulus valide pour la classe courante',
+	'Class:ResponseTicketTTO/Interface:iMetricComputer' => 'Temps d\'Assignation (TTO)',
+	'Class:ResponseTicketTTO/Interface:iMetricComputer+' => 'Objectif calculé à partir d\'un SLT de type TTO',
+	'Class:ResponseTicketTTR/Interface:iMetricComputer' => 'Temps de Résolution (TTR)',
+	'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'Objectif calculé à partir d\'un SLT de type TTR',
 ));
-
-
 // 1:n relations custom labels for tooltip and pop-up title
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:Person/Attribute:tickets_list/UI:Links:Create:Button+' => 'Créer un %4$s',
@@ -255,6 +254,6 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:Ticket/Attribute:workorders_list/UI:Links:Remove:Button+' => 'Retirer cette %4$s',
 	'Class:Ticket/Attribute:workorders_list/UI:Links:Remove:Modal:Title' => 'Retirer cette %4$s de son %1$s',
 	'Class:Ticket/Attribute:workorders_list/UI:Links:Delete:Button+' => 'Supprimer cette %4$s',
-	'Class:Ticket/Attribute:workorders_list/UI:Links:Delete:Modal:Title' => 'Supprimer une %4$s',
+	'Class:Ticket/Attribute:workorders_list/UI:Links:Delete:Modal:Title' => 'Supprimer une %4$s'
 ));
 
diff --git a/datamodels/2.x/itop-tickets/dictionaries/hu.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/dictionaries/hu.dict.itop-tickets.php
index 0097521221..b538a6cae3 100644
--- a/datamodels/2.x/itop-tickets/dictionaries/hu.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/dictionaries/hu.dict.itop-tickets.php
@@ -20,57 +20,57 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:Ticket' => 'Hibajegy',
-    'Class:Ticket+' => '',
-    'Class:Ticket/Attribute:ref' => 'Referencia',
-    'Class:Ticket/Attribute:ref+' => '',
-    'Class:Ticket/Attribute:org_id' => 'Szervezeti egység',
-    'Class:Ticket/Attribute:org_id+' => '~~',
-    'Class:Ticket/Attribute:org_name' => 'Szervezeti egység név',
-    'Class:Ticket/Attribute:org_name+' => '~~',
-    'Class:Ticket/Attribute:caller_id' => 'Kérelmező',
-    'Class:Ticket/Attribute:caller_id+' => '~~',
-    'Class:Ticket/Attribute:caller_name' => 'Kérelmező név',
-    'Class:Ticket/Attribute:caller_name+' => '~~',
-    'Class:Ticket/Attribute:team_id' => 'Csapat',
-    'Class:Ticket/Attribute:team_id+' => '~~',
-    'Class:Ticket/Attribute:team_name' => 'Csapat név',
-    'Class:Ticket/Attribute:team_name+' => '~~',
-    'Class:Ticket/Attribute:agent_id' => 'Felelős',
-    'Class:Ticket/Attribute:agent_id+' => '~~',
-    'Class:Ticket/Attribute:agent_name' => 'Felelős neve',
-    'Class:Ticket/Attribute:agent_name+' => '~~',
-    'Class:Ticket/Attribute:title' => 'Cím',
-    'Class:Ticket/Attribute:title+' => '',
-    'Class:Ticket/Attribute:description' => 'Leírás',
-    'Class:Ticket/Attribute:description+' => '',
-    'Class:Ticket/Attribute:start_date' => 'Kezdő dátum',
-    'Class:Ticket/Attribute:start_date+' => '',
-    'Class:Ticket/Attribute:end_date' => 'Záró dátum',
-    'Class:Ticket/Attribute:end_date+' => '~~',
-    'Class:Ticket/Attribute:last_update' => 'Utolsó frissítés',
-    'Class:Ticket/Attribute:last_update+' => '~~',
-    'Class:Ticket/Attribute:close_date' => 'Lezárás dátum',
-    'Class:Ticket/Attribute:close_date+' => '~~',
-    'Class:Ticket/Attribute:private_log' => 'Privát napló',
-    'Class:Ticket/Attribute:private_log+' => '~~',
-    'Class:Ticket/Attribute:contacts_list' => 'Kapcsolattartók',
-    'Class:Ticket/Attribute:contacts_list+' => '',
-    'Class:Ticket/Attribute:functionalcis_list' => 'CI-k',
-    'Class:Ticket/Attribute:functionalcis_list+' => '',
-    'Class:Ticket/Attribute:workorders_list' => 'Munkautasítások',
-    'Class:Ticket/Attribute:workorders_list+' => 'Munkautasítások ehhez a hibajegyhez',
-    'Class:Ticket/Attribute:finalclass' => 'Típus',
-    'Class:Ticket/Attribute:finalclass+' => '',
-    'Class:Ticket/Attribute:operational_status' => 'Feladat állapot',
-    'Class:Ticket/Attribute:operational_status+' => '',
-    'Class:Ticket/Attribute:operational_status/Value:ongoing' => 'Folyamatban',
-    'Class:Ticket/Attribute:operational_status/Value:ongoing+' => 'Munka folyamatban',
-    'Class:Ticket/Attribute:operational_status/Value:resolved' => 'Megoldva',
-    'Class:Ticket/Attribute:operational_status/Value:resolved+' => '~~',
-    'Class:Ticket/Attribute:operational_status/Value:closed' => 'Lezárva',
-    'Class:Ticket/Attribute:operational_status/Value:closed+' => '~~',
-    'Ticket:ImpactAnalysis' => 'Hatáselemzés',
+	'Class:Ticket' => 'Hibajegy',
+	'Class:Ticket+' => '',
+	'Class:Ticket/Attribute:ref' => 'Referencia',
+	'Class:Ticket/Attribute:ref+' => '',
+	'Class:Ticket/Attribute:org_id' => 'Szervezeti egység',
+	'Class:Ticket/Attribute:org_id+' => '~~',
+	'Class:Ticket/Attribute:org_name' => 'Szervezeti egység név',
+	'Class:Ticket/Attribute:org_name+' => '~~',
+	'Class:Ticket/Attribute:caller_id' => 'Kérelmező',
+	'Class:Ticket/Attribute:caller_id+' => '~~',
+	'Class:Ticket/Attribute:caller_name' => 'Kérelmező név',
+	'Class:Ticket/Attribute:caller_name+' => '~~',
+	'Class:Ticket/Attribute:team_id' => 'Csapat',
+	'Class:Ticket/Attribute:team_id+' => '~~',
+	'Class:Ticket/Attribute:team_name' => 'Csapat név',
+	'Class:Ticket/Attribute:team_name+' => '~~',
+	'Class:Ticket/Attribute:agent_id' => 'Felelős',
+	'Class:Ticket/Attribute:agent_id+' => '~~',
+	'Class:Ticket/Attribute:agent_name' => 'Felelős neve',
+	'Class:Ticket/Attribute:agent_name+' => '~~',
+	'Class:Ticket/Attribute:title' => 'Cím',
+	'Class:Ticket/Attribute:title+' => '',
+	'Class:Ticket/Attribute:description' => 'Leírás',
+	'Class:Ticket/Attribute:description+' => '',
+	'Class:Ticket/Attribute:start_date' => 'Kezdő dátum',
+	'Class:Ticket/Attribute:start_date+' => '',
+	'Class:Ticket/Attribute:end_date' => 'Záró dátum',
+	'Class:Ticket/Attribute:end_date+' => '~~',
+	'Class:Ticket/Attribute:last_update' => 'Utolsó frissítés',
+	'Class:Ticket/Attribute:last_update+' => '~~',
+	'Class:Ticket/Attribute:close_date' => 'Lezárás dátum',
+	'Class:Ticket/Attribute:close_date+' => '~~',
+	'Class:Ticket/Attribute:private_log' => 'Privát napló',
+	'Class:Ticket/Attribute:private_log+' => '~~',
+	'Class:Ticket/Attribute:contacts_list' => 'Kapcsolattartók',
+	'Class:Ticket/Attribute:contacts_list+' => '',
+	'Class:Ticket/Attribute:functionalcis_list' => 'CI-k',
+	'Class:Ticket/Attribute:functionalcis_list+' => '',
+	'Class:Ticket/Attribute:workorders_list' => 'Munkautasítások',
+	'Class:Ticket/Attribute:workorders_list+' => 'Munkautasítások ehhez a hibajegyhez',
+	'Class:Ticket/Attribute:finalclass' => 'Típus',
+	'Class:Ticket/Attribute:finalclass+' => '',
+	'Class:Ticket/Attribute:operational_status' => 'Feladat állapot',
+	'Class:Ticket/Attribute:operational_status+' => '',
+	'Class:Ticket/Attribute:operational_status/Value:ongoing' => 'Folyamatban',
+	'Class:Ticket/Attribute:operational_status/Value:ongoing+' => 'Munka folyamatban',
+	'Class:Ticket/Attribute:operational_status/Value:resolved' => 'Megoldva',
+	'Class:Ticket/Attribute:operational_status/Value:resolved+' => '~~',
+	'Class:Ticket/Attribute:operational_status/Value:closed' => 'Lezárva',
+	'Class:Ticket/Attribute:operational_status/Value:closed+' => '~~',
+	'Ticket:ImpactAnalysis' => 'Hatáselemzés',
 ));
 
 
@@ -79,22 +79,25 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:lnkContactToTicket' => 'Kapcsolattartó / Hibajegy',
-    'Class:lnkContactToTicket+' => '~~',
-    'Class:lnkContactToTicket/Attribute:ticket_id' => 'Hibajegy',
-    'Class:lnkContactToTicket/Attribute:ticket_id+' => '~~',
-    'Class:lnkContactToTicket/Attribute:ticket_ref' => 'Hibajegy Ref.',
-    'Class:lnkContactToTicket/Attribute:ticket_ref+' => '~~',
-    'Class:lnkContactToTicket/Attribute:contact_id' => 'Kapcsolattartó',
-    'Class:lnkContactToTicket/Attribute:contact_id+' => '~~',
-    'Class:lnkContactToTicket/Attribute:contact_email' => 'Kapcsolattartó email',
-    'Class:lnkContactToTicket/Attribute:contact_email+' => '~~',
-    'Class:lnkContactToTicket/Attribute:role' => 'Beosztás (szöveg)',
-    'Class:lnkContactToTicket/Attribute:role+' => '~~',
-    'Class:lnkContactToTicket/Attribute:role_code' => 'Beosztás',
-    'Class:lnkContactToTicket/Attribute:role_code/Value:manual' => 'Kézzel hozzáadva',
-    'Class:lnkContactToTicket/Attribute:role_code/Value:computed' => 'Számított',
-    'Class:lnkContactToTicket/Attribute:role_code/Value:do_not_notify' => 'Ne értesítsen',
+	'Class:lnkContactToTicket' => 'Kapcsolattartó / Hibajegy',
+	'Class:lnkContactToTicket+' => '~~',
+	'Class:lnkContactToTicket/Name' => '%1$s / %2$s~~',
+	'Class:lnkContactToTicket/Attribute:ticket_id' => 'Hibajegy',
+	'Class:lnkContactToTicket/Attribute:ticket_id+' => '~~',
+	'Class:lnkContactToTicket/Attribute:ticket_ref' => 'Hibajegy Ref.',
+	'Class:lnkContactToTicket/Attribute:ticket_ref+' => '~~',
+	'Class:lnkContactToTicket/Attribute:contact_id' => 'Kapcsolattartó',
+	'Class:lnkContactToTicket/Attribute:contact_id+' => '~~',
+	'Class:lnkContactToTicket/Attribute:contact_name' => 'Contact name~~',
+	'Class:lnkContactToTicket/Attribute:contact_name+' => '~~',
+	'Class:lnkContactToTicket/Attribute:contact_email' => 'Kapcsolattartó email',
+	'Class:lnkContactToTicket/Attribute:contact_email+' => '~~',
+	'Class:lnkContactToTicket/Attribute:role' => 'Beosztás (szöveg)',
+	'Class:lnkContactToTicket/Attribute:role+' => '~~',
+	'Class:lnkContactToTicket/Attribute:role_code' => 'Beosztás',
+	'Class:lnkContactToTicket/Attribute:role_code/Value:manual' => 'Kézzel hozzáadva',
+	'Class:lnkContactToTicket/Attribute:role_code/Value:computed' => 'Számított',
+	'Class:lnkContactToTicket/Attribute:role_code/Value:do_not_notify' => 'Ne értesítsen',
 ));
 
 //
@@ -102,131 +105,131 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:WorkOrder' => 'Munkautasítás',
-    'Class:WorkOrder+' => '~~',
-    'Class:WorkOrder/Attribute:name' => 'Név',
-    'Class:WorkOrder/Attribute:name+' => '~~',
-    'Class:WorkOrder/Attribute:status' => 'Állapot',
-    'Class:WorkOrder/Attribute:status+' => '~~',
-    'Class:WorkOrder/Attribute:status/Value:open' => 'Nyitott',
-    'Class:WorkOrder/Attribute:status/Value:open+' => '~~',
-    'Class:WorkOrder/Attribute:status/Value:closed' => 'Lezárt',
-    'Class:WorkOrder/Attribute:status/Value:closed+' => '~~',
-    'Class:WorkOrder/Attribute:description' => 'Leírás',
-    'Class:WorkOrder/Attribute:description+' => '~~',
-    'Class:WorkOrder/Attribute:ticket_id' => 'Hibajegy',
-    'Class:WorkOrder/Attribute:ticket_id+' => '~~',
-    'Class:WorkOrder/Attribute:ticket_ref' => 'Hibajegy ref.',
-    'Class:WorkOrder/Attribute:ticket_ref+' => '~~',
-    'Class:WorkOrder/Attribute:team_id' => 'Csapat',
-    'Class:WorkOrder/Attribute:team_id+' => '~~',
-    'Class:WorkOrder/Attribute:team_name' => 'Csapat név',
-    'Class:WorkOrder/Attribute:team_name+' => '~~',
-    'Class:WorkOrder/Attribute:agent_id' => 'Felelős',
-    'Class:WorkOrder/Attribute:agent_id+' => '~~',
-    'Class:WorkOrder/Attribute:agent_email' => 'Felelős email címe',
-    'Class:WorkOrder/Attribute:agent_email+' => '~~',
-    'Class:WorkOrder/Attribute:start_date' => 'Kezdő dátum',
-    'Class:WorkOrder/Attribute:start_date+' => '~~',
-    'Class:WorkOrder/Attribute:end_date' => '',
-    'Class:WorkOrder/Attribute:end_date+' => 'Záró dátum',
-    'Class:WorkOrder/Attribute:log' => 'Napló',
-    'Class:WorkOrder/Attribute:log+' => '~~',
-    'Class:WorkOrder/Stimulus:ev_close' => 'Bezárás',
-    'Class:WorkOrder/Stimulus:ev_close+' => '~~',
+	'Class:WorkOrder' => 'Munkautasítás',
+	'Class:WorkOrder+' => '~~',
+	'Class:WorkOrder/Attribute:name' => 'Név',
+	'Class:WorkOrder/Attribute:name+' => '~~',
+	'Class:WorkOrder/Attribute:status' => 'Állapot',
+	'Class:WorkOrder/Attribute:status+' => '~~',
+	'Class:WorkOrder/Attribute:status/Value:open' => 'Nyitott',
+	'Class:WorkOrder/Attribute:status/Value:open+' => '~~',
+	'Class:WorkOrder/Attribute:status/Value:closed' => 'Lezárt',
+	'Class:WorkOrder/Attribute:status/Value:closed+' => '~~',
+	'Class:WorkOrder/Attribute:description' => 'Leírás',
+	'Class:WorkOrder/Attribute:description+' => '~~',
+	'Class:WorkOrder/Attribute:ticket_id' => 'Hibajegy',
+	'Class:WorkOrder/Attribute:ticket_id+' => '~~',
+	'Class:WorkOrder/Attribute:ticket_ref' => 'Hibajegy ref.',
+	'Class:WorkOrder/Attribute:ticket_ref+' => '~~',
+	'Class:WorkOrder/Attribute:team_id' => 'Csapat',
+	'Class:WorkOrder/Attribute:team_id+' => '~~',
+	'Class:WorkOrder/Attribute:team_name' => 'Csapat név',
+	'Class:WorkOrder/Attribute:team_name+' => '~~',
+	'Class:WorkOrder/Attribute:agent_id' => 'Felelős',
+	'Class:WorkOrder/Attribute:agent_id+' => '~~',
+	'Class:WorkOrder/Attribute:agent_email' => 'Felelős email címe',
+	'Class:WorkOrder/Attribute:agent_email+' => '~~',
+	'Class:WorkOrder/Attribute:start_date' => 'Kezdő dátum',
+	'Class:WorkOrder/Attribute:start_date+' => '~~',
+	'Class:WorkOrder/Attribute:end_date' => '',
+	'Class:WorkOrder/Attribute:end_date+' => 'Záró dátum',
+	'Class:WorkOrder/Attribute:log' => 'Napló',
+	'Class:WorkOrder/Attribute:log+' => '~~',
+	'Class:WorkOrder/Stimulus:ev_close' => 'Bezárás',
+	'Class:WorkOrder/Stimulus:ev_close+' => '~~',
 ));
 
 
 // Fieldset translation
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Ticket:baseinfo'                                                => 'Általános információk',
-    'Ticket:date'                                                    => 'Dátum',
-    'Ticket:contact'                                                 => 'Kapcsolattartók',
-    'Ticket:moreinfo'                                               => 'Kiegészítő információk',
-    'Ticket:relation'                                               => 'Kapcsolatok',
-    'Ticket:log'                                                    => 'Kommunikáció',
-    'Ticket:Type'                                                   => 'Minősítés',
-    'Ticket:support'                                                => 'Támogatás',
-    'Ticket:resolution'                                             => 'Megoldás',
-    'Ticket:SLA'                                                    => 'SLA jelentés',
-    'WorkOrder:Details'                                             => 'Részletek',
-    'WorkOrder:Moreinfo'                                            => 'További információk',
-    'Tickets:ResolvedFrom'                                          => '%1$s -ból automatikusan megoldva',
-    'Class:cmdbAbstractObject/Method:Set'                           => 'Set',
-    'Class:cmdbAbstractObject/Method:Set+'                          => 'Set a field with a static value~~',
-    'Class:cmdbAbstractObject/Method:Set/Param:1'                   => 'Célmező',
-    'Class:cmdbAbstractObject/Method:Set/Param:1+'                  => 'The field to set, in the current object~~',
-    'Class:cmdbAbstractObject/Method:Set/Param:2'                   => 'Érték',
-    'Class:cmdbAbstractObject/Method:Set/Param:2+'                  => 'The value to set~~',
-    'Class:cmdbAbstractObject/Method:SetCurrentDate'                => 'SetCurrentDate',
-    'Class:cmdbAbstractObject/Method:SetCurrentDate+'               => 'Set a field with the current date and time~~',
-    'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1'        => 'Célmező',
-    'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1+'       => 'The field to set, in the current object~~',
-    'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull'          => 'SetCurrentDateIfNull',
-    'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull+'         => 'Set an empty field with the current date and time~~',
-    'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull/Param:1'  => 'Célmező',
-    'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull/Param:1+' => 'The field to set, in the current object~~',
-    'Class:cmdbAbstractObject/Method:SetCurrentUser'                => 'SetCurrentUser',
-    'Class:cmdbAbstractObject/Method:SetCurrentUser+'               => 'Set a field with the currently logged in user~~',
-    'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1'        => 'Célmező',
-    'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1+'       => 'The field to set, in the current object. If the field is a string then the friendly name will be used, otherwise the identifier will be used. That friendly name is the name of the person if any is attached to the user, otherwise it is the login.~~',
-    'Class:cmdbAbstractObject/Method:SetCurrentPerson'              => 'SetCurrentPerson',
-    'Class:cmdbAbstractObject/Method:SetCurrentPerson+'             => 'Set a field with the currently logged in person (the \\"person\\" attached to the logged in \\"user\\").~~',
-    'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1'      => 'Célmező',
-    'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1+'     => 'The field to set, in the current object. If the field is a string then the friendly name will be used, otherwise the identifier will be used.~~',
-    'Class:cmdbAbstractObject/Method:SetElapsedTime'                => 'SetElapsedTime',
-    'Class:cmdbAbstractObject/Method:SetElapsedTime+'               => 'Set a field with the time (seconds) elapsed since a date given by another field~~',
-    'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1'        => 'Célmező',
-    'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1+'       => 'The field to set, in the current object~~',
-    'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2'        => 'Referencia mező',
-    'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2+'       => 'The field from which to get the reference date~~',
-    'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3'        => 'Munkaórák',
-    'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3+'       => 'Leave empty to rely on the standard working hours scheme, or set to \\"DefaultWorkingTimeComputer\\" to force a 24x7 scheme~~',
-    'Class:cmdbAbstractObject/Method:SetIfNull'                     => 'SetIfNull',
-    'Class:cmdbAbstractObject/Method:SetIfNull+'                    => 'Set a field only if it is empty, with a static value~~',
-    'Class:cmdbAbstractObject/Method:SetIfNull/Param:1'             => 'Célmező',
-    'Class:cmdbAbstractObject/Method:SetIfNull/Param:1+'            => 'The field to set, in the current object~~',
-    'Class:cmdbAbstractObject/Method:SetIfNull/Param:2'              => 'Érték',
-    'Class:cmdbAbstractObject/Method:SetIfNull/Param:2+'             => 'The value to set~~',
-    'Class:cmdbAbstractObject/Method:AddValue'                       => 'AddValue',
-    'Class:cmdbAbstractObject/Method:AddValue+'                      => 'Add a fixed value to a field~~',
-    'Class:cmdbAbstractObject/Method:AddValue/Param:1'               => 'Célmező',
-    'Class:cmdbAbstractObject/Method:AddValue/Param:1+'              => 'The field to modify, in the current object~~',
-    'Class:cmdbAbstractObject/Method:AddValue/Param:2'               => 'Érték',
-    'Class:cmdbAbstractObject/Method:AddValue/Param:2+'              => 'Decimal value which will be added, can be negative~~',
-    'Class:cmdbAbstractObject/Method:SetComputedDate'                => 'SetComputedDate',
-    'Class:cmdbAbstractObject/Method:SetComputedDate+'               => 'Set a field with a date computed from another field with extra logic~~',
-    'Class:cmdbAbstractObject/Method:SetComputedDate/Param:1'        => 'Célmező',
-    'Class:cmdbAbstractObject/Method:SetComputedDate/Param:1+'       => 'The field to set, in the current object~~',
-    'Class:cmdbAbstractObject/Method:SetComputedDate/Param:2'        => 'Módosító',
-    'Class:cmdbAbstractObject/Method:SetComputedDate/Param:2+'       => 'Textual information to modify the source date, eg. "+3 days"~~',
-    'Class:cmdbAbstractObject/Method:SetComputedDate/Param:3'        => 'Forrásmező',
-    'Class:cmdbAbstractObject/Method:SetComputedDate/Param:3+'       => 'The field used as source to apply the Modifier logic~~',
-    'Class:cmdbAbstractObject/Method:SetComputedDateIfNull'          => 'SetComputedDateIfNull',
-    'Class:cmdbAbstractObject/Method:SetComputedDateIfNull+'         => 'Set non empty field with a date computed from another field with extra logic~~',
-    'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:1'  => 'Célmező',
-    'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:1+' => 'The field to set, in the current object~~',
-    'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:2'  => 'Módosító',
-    'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:2+' => 'Textual information to modify the source date, eg. "+3 days"~~',
-    'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:3'  => 'Forrásmező',
-    'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:3+' => 'The field used as source to apply the Modifier logic~~',
-    'Class:cmdbAbstractObject/Method:Reset'                          => 'Visszaállítás',
-    'Class:cmdbAbstractObject/Method:Reset+'                         => 'Reset a field to its default value~~',
-    'Class:cmdbAbstractObject/Method:Reset/Param:1'                  => 'Célmező',
-    'Class:cmdbAbstractObject/Method:Reset/Param:1+'                 => 'The field to reset, in the current object~~',
-    'Class:cmdbAbstractObject/Method:Copy'                           => 'Másolás',
-    'Class:cmdbAbstractObject/Method:Copy+'                          => 'Copy the value of a field to another field~~',
-    'Class:cmdbAbstractObject/Method:Copy/Param:1'                   => 'Célmező',
-    'Class:cmdbAbstractObject/Method:Copy/Param:1+'                  => 'The field to set, in the current object~~',
-    'Class:cmdbAbstractObject/Method:Copy/Param:2'                   => 'Forrásmező',
-    'Class:cmdbAbstractObject/Method:Copy/Param:2+'                  => 'The field to get the value from, in the current object~~',
-    'Class:cmdbAbstractObject/Method:ApplyStimulus'                  => 'ApplyStimulus',
-    'Class:cmdbAbstractObject/Method:ApplyStimulus+'                 => 'Apply the specified stimulus to the current object~~',
-    'Class:cmdbAbstractObject/Method:ApplyStimulus/Param:1'          => 'Stimulus kód',
-    'Class:cmdbAbstractObject/Method:ApplyStimulus/Param:1+'         => 'A valid stimulus code for the current class~~',
-    'Class:ResponseTicketTTO/Interface:iMetricComputer'              => 'Time To Own~~',
-    'Class:ResponseTicketTTO/Interface:iMetricComputer+'             => 'Goal based on a SLT of type TTO~~',
-    'Class:ResponseTicketTTR/Interface:iMetricComputer'              => 'Megoldási idő',
-    'Class:ResponseTicketTTR/Interface:iMetricComputer+'             => 'Goal based on a SLT of type TTR~~',
+	'Ticket:baseinfo' => 'Általános információk',
+	'Ticket:date' => 'Dátum',
+	'Ticket:contact' => 'Kapcsolattartók',
+	'Ticket:moreinfo' => 'Kiegészítő információk',
+	'Ticket:relation' => 'Kapcsolatok',
+	'Ticket:log' => 'Kommunikáció',
+	'Ticket:Type' => 'Minősítés',
+	'Ticket:support' => 'Támogatás',
+	'Ticket:resolution' => 'Megoldás',
+	'Ticket:SLA' => 'SLA jelentés',
+	'WorkOrder:Details' => 'Részletek',
+	'WorkOrder:Moreinfo' => 'További információk',
+	'Tickets:ResolvedFrom' => '%1$s -ból automatikusan megoldva',
+	'Class:cmdbAbstractObject/Method:Set' => 'Set',
+	'Class:cmdbAbstractObject/Method:Set+' => 'Set a field with a static value~~',
+	'Class:cmdbAbstractObject/Method:Set/Param:1' => 'Célmező',
+	'Class:cmdbAbstractObject/Method:Set/Param:1+' => 'The field to set, in the current object~~',
+	'Class:cmdbAbstractObject/Method:Set/Param:2' => 'Érték',
+	'Class:cmdbAbstractObject/Method:Set/Param:2+' => 'The value to set~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate' => 'SetCurrentDate',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate+' => 'Set a field with the current date and time~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1' => 'Célmező',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1+' => 'The field to set, in the current object~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull' => 'SetCurrentDateIfNull',
+	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull+' => 'Set an empty field with the current date and time~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull/Param:1' => 'Célmező',
+	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull/Param:1+' => 'The field to set, in the current object~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser' => 'SetCurrentUser',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser+' => 'Set a field with the currently logged in user~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1' => 'Célmező',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1+' => 'The field to set, in the current object. If the field is a string then the friendly name will be used, otherwise the identifier will be used. That friendly name is the name of the person if any is attached to the user, otherwise it is the login.~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson' => 'SetCurrentPerson',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson+' => 'Set a field with the currently logged in person (the \\"person\\" attached to the logged in \\"user\\").~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1' => 'Célmező',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1+' => 'The field to set, in the current object. If the field is a string then the friendly name will be used, otherwise the identifier will be used.~~',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime' => 'SetElapsedTime',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime+' => 'Set a field with the time (seconds) elapsed since a date given by another field~~',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1' => 'Célmező',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1+' => 'The field to set, in the current object~~',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2' => 'Referencia mező',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2+' => 'The field from which to get the reference date~~',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3' => 'Munkaórák',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3+' => 'Leave empty to rely on the standard working hours scheme, or set to \\"DefaultWorkingTimeComputer\\" to force a 24x7 scheme~~',
+	'Class:cmdbAbstractObject/Method:SetIfNull' => 'SetIfNull',
+	'Class:cmdbAbstractObject/Method:SetIfNull+' => 'Set a field only if it is empty, with a static value~~',
+	'Class:cmdbAbstractObject/Method:SetIfNull/Param:1' => 'Célmező',
+	'Class:cmdbAbstractObject/Method:SetIfNull/Param:1+' => 'The field to set, in the current object~~',
+	'Class:cmdbAbstractObject/Method:SetIfNull/Param:2' => 'Érték',
+	'Class:cmdbAbstractObject/Method:SetIfNull/Param:2+' => 'The value to set~~',
+	'Class:cmdbAbstractObject/Method:AddValue' => 'AddValue',
+	'Class:cmdbAbstractObject/Method:AddValue+' => 'Add a fixed value to a field~~',
+	'Class:cmdbAbstractObject/Method:AddValue/Param:1' => 'Célmező',
+	'Class:cmdbAbstractObject/Method:AddValue/Param:1+' => 'The field to modify, in the current object~~',
+	'Class:cmdbAbstractObject/Method:AddValue/Param:2' => 'Érték',
+	'Class:cmdbAbstractObject/Method:AddValue/Param:2+' => 'Decimal value which will be added, can be negative~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDate' => 'SetComputedDate',
+	'Class:cmdbAbstractObject/Method:SetComputedDate+' => 'Set a field with a date computed from another field with extra logic~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:1' => 'Célmező',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:1+' => 'The field to set, in the current object~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:2' => 'Módosító',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:2+' => 'Textual information to modify the source date, eg. "+3 days"~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:3' => 'Forrásmező',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:3+' => 'The field used as source to apply the Modifier logic~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull' => 'SetComputedDateIfNull',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull+' => 'Set non empty field with a date computed from another field with extra logic~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:1' => 'Célmező',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:1+' => 'The field to set, in the current object~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:2' => 'Módosító',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:2+' => 'Textual information to modify the source date, eg. "+3 days"~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:3' => 'Forrásmező',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:3+' => 'The field used as source to apply the Modifier logic~~',
+	'Class:cmdbAbstractObject/Method:Reset' => 'Visszaállítás',
+	'Class:cmdbAbstractObject/Method:Reset+' => 'Reset a field to its default value~~',
+	'Class:cmdbAbstractObject/Method:Reset/Param:1' => 'Célmező',
+	'Class:cmdbAbstractObject/Method:Reset/Param:1+' => 'The field to reset, in the current object~~',
+	'Class:cmdbAbstractObject/Method:Copy' => 'Másolás',
+	'Class:cmdbAbstractObject/Method:Copy+' => 'Copy the value of a field to another field~~',
+	'Class:cmdbAbstractObject/Method:Copy/Param:1' => 'Célmező',
+	'Class:cmdbAbstractObject/Method:Copy/Param:1+' => 'The field to set, in the current object~~',
+	'Class:cmdbAbstractObject/Method:Copy/Param:2' => 'Forrásmező',
+	'Class:cmdbAbstractObject/Method:Copy/Param:2+' => 'The field to get the value from, in the current object~~',
+	'Class:cmdbAbstractObject/Method:ApplyStimulus' => 'ApplyStimulus',
+	'Class:cmdbAbstractObject/Method:ApplyStimulus+' => 'Apply the specified stimulus to the current object~~',
+	'Class:cmdbAbstractObject/Method:ApplyStimulus/Param:1' => 'Stimulus kód',
+	'Class:cmdbAbstractObject/Method:ApplyStimulus/Param:1+' => 'A valid stimulus code for the current class~~',
+	'Class:ResponseTicketTTO/Interface:iMetricComputer' => 'Time To Own~~',
+	'Class:ResponseTicketTTO/Interface:iMetricComputer+' => 'Goal based on a SLT of type TTO~~',
+	'Class:ResponseTicketTTR/Interface:iMetricComputer' => 'Megoldási idő',
+	'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'Goal based on a SLT of type TTR~~',
 ));
 
diff --git a/datamodels/2.x/itop-tickets/dictionaries/it.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/dictionaries/it.dict.itop-tickets.php
index b454817fe7..9ed07ca544 100644
--- a/datamodels/2.x/itop-tickets/dictionaries/it.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/dictionaries/it.dict.itop-tickets.php
@@ -81,12 +81,15 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:lnkContactToTicket' => 'Link Contact / Ticket~~',
 	'Class:lnkContactToTicket+' => '~~',
+	'Class:lnkContactToTicket/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToTicket/Attribute:ticket_id' => 'Ticket~~',
 	'Class:lnkContactToTicket/Attribute:ticket_id+' => '~~',
 	'Class:lnkContactToTicket/Attribute:ticket_ref' => 'Ref~~',
 	'Class:lnkContactToTicket/Attribute:ticket_ref+' => '~~',
 	'Class:lnkContactToTicket/Attribute:contact_id' => 'Contact~~',
 	'Class:lnkContactToTicket/Attribute:contact_id+' => '~~',
+	'Class:lnkContactToTicket/Attribute:contact_name' => 'Contact name~~',
+	'Class:lnkContactToTicket/Attribute:contact_name+' => '~~',
 	'Class:lnkContactToTicket/Attribute:contact_email' => 'Contact Email~~',
 	'Class:lnkContactToTicket/Attribute:contact_email+' => '~~',
 	'Class:lnkContactToTicket/Attribute:role' => 'Role (text)~~',
@@ -139,94 +142,94 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 
 // Fieldset translation
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Ticket:baseinfo'                                                => 'Infomazioni Generali',
-	'Ticket:date'                                                    => 'Date',
-	'Ticket:contact'                                                 => 'Contatti',
-	'Ticket:moreinfo'                                               => 'Più informazioni',
-	'Ticket:relation'                                               => 'Relazioni',
-	'Ticket:log'                                                    => 'Communicazioni',
-	'Ticket:Type'                                                   => 'Qualification~~',
-	'Ticket:support'                                                => 'Support~~',
-	'Ticket:resolution'                                             => 'Resolution~~',
-	'Ticket:SLA'                                                    => 'SLA report~~',
-	'WorkOrder:Details'                                             => 'Details~~',
-	'WorkOrder:Moreinfo'                                            => 'More information~~',
-	'Tickets:ResolvedFrom'                                          => 'Automatically resolved from %1$s~~',
-	'Class:cmdbAbstractObject/Method:Set'                           => 'Set~~',
-	'Class:cmdbAbstractObject/Method:Set+'                          => 'Set a field with a static value~~',
-	'Class:cmdbAbstractObject/Method:Set/Param:1'                   => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:Set/Param:1+'                  => 'The field to set, in the current object~~',
-	'Class:cmdbAbstractObject/Method:Set/Param:2'                   => 'Value~~',
-	'Class:cmdbAbstractObject/Method:Set/Param:2+'                  => 'The value to set~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentDate'                => 'SetCurrentDate~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentDate+'               => 'Set a field with the current date and time~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1'        => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1+'       => 'The field to set, in the current object~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull'          => 'SetCurrentDateIfNull~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull+'         => 'Set an empty field with the current date and time~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull/Param:1'  => 'Target Field~~',
+	'Ticket:baseinfo' => 'Infomazioni Generali',
+	'Ticket:date' => 'Date',
+	'Ticket:contact' => 'Contatti',
+	'Ticket:moreinfo' => 'Più informazioni',
+	'Ticket:relation' => 'Relazioni',
+	'Ticket:log' => 'Communicazioni',
+	'Ticket:Type' => 'Qualification~~',
+	'Ticket:support' => 'Support~~',
+	'Ticket:resolution' => 'Resolution~~',
+	'Ticket:SLA' => 'SLA report~~',
+	'WorkOrder:Details' => 'Details~~',
+	'WorkOrder:Moreinfo' => 'More information~~',
+	'Tickets:ResolvedFrom' => 'Automatically resolved from %1$s~~',
+	'Class:cmdbAbstractObject/Method:Set' => 'Set~~',
+	'Class:cmdbAbstractObject/Method:Set+' => 'Set a field with a static value~~',
+	'Class:cmdbAbstractObject/Method:Set/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:Set/Param:1+' => 'The field to set, in the current object~~',
+	'Class:cmdbAbstractObject/Method:Set/Param:2' => 'Value~~',
+	'Class:cmdbAbstractObject/Method:Set/Param:2+' => 'The value to set~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate' => 'SetCurrentDate~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate+' => 'Set a field with the current date and time~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1+' => 'The field to set, in the current object~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull' => 'SetCurrentDateIfNull~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull+' => 'Set an empty field with the current date and time~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull/Param:1' => 'Target Field~~',
 	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull/Param:1+' => 'The field to set, in the current object~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentUser'                => 'SetCurrentUser~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentUser+'               => 'Set a field with the currently logged in user~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1'        => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1+'       => 'The field to set, in the current object. If the field is a string then the friendly name will be used, otherwise the identifier will be used. That friendly name is the name of the person if any is attached to the user, otherwise it is the login.~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentPerson'              => 'SetCurrentPerson~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentPerson+'             => 'Set a field with the currently logged in person (the \\"person\\" attached to the logged in \\"user\\").~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1'      => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1+'     => 'The field to set, in the current object. If the field is a string then the friendly name will be used, otherwise the identifier will be used.~~',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime'                => 'SetElapsedTime~~',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime+'               => 'Set a field with the time (seconds) elapsed since a date given by another field~~',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1'        => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1+'       => 'The field to set, in the current object~~',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2'        => 'Reference Field~~',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2+'       => 'The field from which to get the reference date~~',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3'        => 'Working Hours~~',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3+'       => 'Leave empty to rely on the standard working hours scheme, or set to \\"DefaultWorkingTimeComputer\\" to force a 24x7 scheme~~',
-	'Class:cmdbAbstractObject/Method:SetIfNull'                     => 'SetIfNull~~',
-	'Class:cmdbAbstractObject/Method:SetIfNull+'                    => 'Set a field only if it is empty, with a static value~~',
-	'Class:cmdbAbstractObject/Method:SetIfNull/Param:1'             => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:SetIfNull/Param:1+'            => 'The field to set, in the current object~~',
-	'Class:cmdbAbstractObject/Method:SetIfNull/Param:2'              => 'Value~~',
-	'Class:cmdbAbstractObject/Method:SetIfNull/Param:2+'             => 'The value to set~~',
-	'Class:cmdbAbstractObject/Method:AddValue'                       => 'AddValue~~',
-	'Class:cmdbAbstractObject/Method:AddValue+'                      => 'Add a fixed value to a field~~',
-	'Class:cmdbAbstractObject/Method:AddValue/Param:1'               => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:AddValue/Param:1+'              => 'The field to modify, in the current object~~',
-	'Class:cmdbAbstractObject/Method:AddValue/Param:2'               => 'Value~~',
-	'Class:cmdbAbstractObject/Method:AddValue/Param:2+'              => 'Decimal value which will be added, can be negative~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDate'                => 'SetComputedDate~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDate+'               => 'Set a field with a date computed from another field with extra logic~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:1'        => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:1+'       => 'The field to set, in the current object~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:2'        => 'Modifier~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:2+'       => 'Textual information to modify the source date, eg. "+3 days"~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:3'        => 'Source field~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:3+'       => 'The field used as source to apply the Modifier logic~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull'          => 'SetComputedDateIfNull~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull+'         => 'Set non empty field with a date computed from another field with extra logic~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:1'  => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser' => 'SetCurrentUser~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser+' => 'Set a field with the currently logged in user~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1+' => 'The field to set, in the current object. If the field is a string then the friendly name will be used, otherwise the identifier will be used. That friendly name is the name of the person if any is attached to the user, otherwise it is the login.~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson' => 'SetCurrentPerson~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson+' => 'Set a field with the currently logged in person (the \\"person\\" attached to the logged in \\"user\\").~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1+' => 'The field to set, in the current object. If the field is a string then the friendly name will be used, otherwise the identifier will be used.~~',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime' => 'SetElapsedTime~~',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime+' => 'Set a field with the time (seconds) elapsed since a date given by another field~~',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1+' => 'The field to set, in the current object~~',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2' => 'Reference Field~~',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2+' => 'The field from which to get the reference date~~',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3' => 'Working Hours~~',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3+' => 'Leave empty to rely on the standard working hours scheme, or set to \\"DefaultWorkingTimeComputer\\" to force a 24x7 scheme~~',
+	'Class:cmdbAbstractObject/Method:SetIfNull' => 'SetIfNull~~',
+	'Class:cmdbAbstractObject/Method:SetIfNull+' => 'Set a field only if it is empty, with a static value~~',
+	'Class:cmdbAbstractObject/Method:SetIfNull/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:SetIfNull/Param:1+' => 'The field to set, in the current object~~',
+	'Class:cmdbAbstractObject/Method:SetIfNull/Param:2' => 'Value~~',
+	'Class:cmdbAbstractObject/Method:SetIfNull/Param:2+' => 'The value to set~~',
+	'Class:cmdbAbstractObject/Method:AddValue' => 'AddValue~~',
+	'Class:cmdbAbstractObject/Method:AddValue+' => 'Add a fixed value to a field~~',
+	'Class:cmdbAbstractObject/Method:AddValue/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:AddValue/Param:1+' => 'The field to modify, in the current object~~',
+	'Class:cmdbAbstractObject/Method:AddValue/Param:2' => 'Value~~',
+	'Class:cmdbAbstractObject/Method:AddValue/Param:2+' => 'Decimal value which will be added, can be negative~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDate' => 'SetComputedDate~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDate+' => 'Set a field with a date computed from another field with extra logic~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:1+' => 'The field to set, in the current object~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:2' => 'Modifier~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:2+' => 'Textual information to modify the source date, eg. "+3 days"~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:3' => 'Source field~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:3+' => 'The field used as source to apply the Modifier logic~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull' => 'SetComputedDateIfNull~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull+' => 'Set non empty field with a date computed from another field with extra logic~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:1' => 'Target Field~~',
 	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:1+' => 'The field to set, in the current object~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:2'  => 'Modifier~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:2' => 'Modifier~~',
 	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:2+' => 'Textual information to modify the source date, eg. "+3 days"~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:3'  => 'Source field~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:3' => 'Source field~~',
 	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:3+' => 'The field used as source to apply the Modifier logic~~',
-	'Class:cmdbAbstractObject/Method:Reset'                          => 'Reset~~',
-	'Class:cmdbAbstractObject/Method:Reset+'                         => 'Reset a field to its default value~~',
-	'Class:cmdbAbstractObject/Method:Reset/Param:1'                  => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:Reset/Param:1+'                 => 'The field to reset, in the current object~~',
-	'Class:cmdbAbstractObject/Method:Copy'                           => 'Copy~~',
-	'Class:cmdbAbstractObject/Method:Copy+'                          => 'Copy the value of a field to another field~~',
-	'Class:cmdbAbstractObject/Method:Copy/Param:1'                   => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:Copy/Param:1+'                  => 'The field to set, in the current object~~',
-	'Class:cmdbAbstractObject/Method:Copy/Param:2'                   => 'Source Field~~',
-	'Class:cmdbAbstractObject/Method:Copy/Param:2+'                  => 'The field to get the value from, in the current object~~',
-	'Class:cmdbAbstractObject/Method:ApplyStimulus'                  => 'ApplyStimulus~~',
-	'Class:cmdbAbstractObject/Method:ApplyStimulus+'                 => 'Apply the specified stimulus to the current object~~',
-	'Class:cmdbAbstractObject/Method:ApplyStimulus/Param:1'          => 'Stimulus code~~',
-	'Class:cmdbAbstractObject/Method:ApplyStimulus/Param:1+'         => 'A valid stimulus code for the current class~~',
-	'Class:ResponseTicketTTO/Interface:iMetricComputer'              => 'Time To Own~~',
-	'Class:ResponseTicketTTO/Interface:iMetricComputer+'             => 'Goal based on a SLT of type TTO~~',
-	'Class:ResponseTicketTTR/Interface:iMetricComputer'              => 'Time To Resolve~~',
-	'Class:ResponseTicketTTR/Interface:iMetricComputer+'             => 'Goal based on a SLT of type TTR~~',
+	'Class:cmdbAbstractObject/Method:Reset' => 'Reset~~',
+	'Class:cmdbAbstractObject/Method:Reset+' => 'Reset a field to its default value~~',
+	'Class:cmdbAbstractObject/Method:Reset/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:Reset/Param:1+' => 'The field to reset, in the current object~~',
+	'Class:cmdbAbstractObject/Method:Copy' => 'Copy~~',
+	'Class:cmdbAbstractObject/Method:Copy+' => 'Copy the value of a field to another field~~',
+	'Class:cmdbAbstractObject/Method:Copy/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:Copy/Param:1+' => 'The field to set, in the current object~~',
+	'Class:cmdbAbstractObject/Method:Copy/Param:2' => 'Source Field~~',
+	'Class:cmdbAbstractObject/Method:Copy/Param:2+' => 'The field to get the value from, in the current object~~',
+	'Class:cmdbAbstractObject/Method:ApplyStimulus' => 'ApplyStimulus~~',
+	'Class:cmdbAbstractObject/Method:ApplyStimulus+' => 'Apply the specified stimulus to the current object~~',
+	'Class:cmdbAbstractObject/Method:ApplyStimulus/Param:1' => 'Stimulus code~~',
+	'Class:cmdbAbstractObject/Method:ApplyStimulus/Param:1+' => 'A valid stimulus code for the current class~~',
+	'Class:ResponseTicketTTO/Interface:iMetricComputer' => 'Time To Own~~',
+	'Class:ResponseTicketTTO/Interface:iMetricComputer+' => 'Goal based on a SLT of type TTO~~',
+	'Class:ResponseTicketTTR/Interface:iMetricComputer' => 'Time To Resolve~~',
+	'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'Goal based on a SLT of type TTR~~',
 ));
 
diff --git a/datamodels/2.x/itop-tickets/dictionaries/ja.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/dictionaries/ja.dict.itop-tickets.php
index 9f3f3ec4ec..c33025f12b 100644
--- a/datamodels/2.x/itop-tickets/dictionaries/ja.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/dictionaries/ja.dict.itop-tickets.php
@@ -81,12 +81,15 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:lnkContactToTicket' => 'リンク 連絡先/チケット',
 	'Class:lnkContactToTicket+' => '',
+	'Class:lnkContactToTicket/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToTicket/Attribute:ticket_id' => 'チケット',
 	'Class:lnkContactToTicket/Attribute:ticket_id+' => '',
 	'Class:lnkContactToTicket/Attribute:ticket_ref' => '参照',
 	'Class:lnkContactToTicket/Attribute:ticket_ref+' => '',
 	'Class:lnkContactToTicket/Attribute:contact_id' => '連絡先',
 	'Class:lnkContactToTicket/Attribute:contact_id+' => '',
+	'Class:lnkContactToTicket/Attribute:contact_name' => 'Contact name~~',
+	'Class:lnkContactToTicket/Attribute:contact_name+' => '~~',
 	'Class:lnkContactToTicket/Attribute:contact_email' => '連絡先電子メール',
 	'Class:lnkContactToTicket/Attribute:contact_email+' => '',
 	'Class:lnkContactToTicket/Attribute:role' => '役割',
@@ -139,94 +142,94 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 
 // Fieldset translation
 Dict::Add('JA JP', 'Japanese', '日本語', array(
-	'Ticket:baseinfo'                                                => '基本情報',
-	'Ticket:date'                                                    => '日付',
-	'Ticket:contact'                                                 => '連絡先',
-	'Ticket:moreinfo'                                               => '追加情報',
-	'Ticket:relation'                                               => '関係',
-	'Ticket:log'                                                    => 'コミュニケーション',
-	'Ticket:Type'                                                   => '条件',
-	'Ticket:support'                                                => 'サポート',
-	'Ticket:resolution'                                             => '解決',
-	'Ticket:SLA'                                                    => 'SLA レポート',
-	'WorkOrder:Details'                                             => '詳細',
-	'WorkOrder:Moreinfo'                                            => '追加情報',
-	'Tickets:ResolvedFrom'                                          => 'Automatically resolved from %1$s~~',
-	'Class:cmdbAbstractObject/Method:Set'                           => 'Set~~',
-	'Class:cmdbAbstractObject/Method:Set+'                          => 'Set a field with a static value~~',
-	'Class:cmdbAbstractObject/Method:Set/Param:1'                   => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:Set/Param:1+'                  => 'The field to set, in the current object~~',
-	'Class:cmdbAbstractObject/Method:Set/Param:2'                   => 'Value~~',
-	'Class:cmdbAbstractObject/Method:Set/Param:2+'                  => 'The value to set~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentDate'                => 'SetCurrentDate~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentDate+'               => 'Set a field with the current date and time~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1'        => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1+'       => 'The field to set, in the current object~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull'          => 'SetCurrentDateIfNull~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull+'         => 'Set an empty field with the current date and time~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull/Param:1'  => 'Target Field~~',
+	'Ticket:baseinfo' => '基本情報',
+	'Ticket:date' => '日付',
+	'Ticket:contact' => '連絡先',
+	'Ticket:moreinfo' => '追加情報',
+	'Ticket:relation' => '関係',
+	'Ticket:log' => 'コミュニケーション',
+	'Ticket:Type' => '条件',
+	'Ticket:support' => 'サポート',
+	'Ticket:resolution' => '解決',
+	'Ticket:SLA' => 'SLA レポート',
+	'WorkOrder:Details' => '詳細',
+	'WorkOrder:Moreinfo' => '追加情報',
+	'Tickets:ResolvedFrom' => 'Automatically resolved from %1$s~~',
+	'Class:cmdbAbstractObject/Method:Set' => 'Set~~',
+	'Class:cmdbAbstractObject/Method:Set+' => 'Set a field with a static value~~',
+	'Class:cmdbAbstractObject/Method:Set/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:Set/Param:1+' => 'The field to set, in the current object~~',
+	'Class:cmdbAbstractObject/Method:Set/Param:2' => 'Value~~',
+	'Class:cmdbAbstractObject/Method:Set/Param:2+' => 'The value to set~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate' => 'SetCurrentDate~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate+' => 'Set a field with the current date and time~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1+' => 'The field to set, in the current object~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull' => 'SetCurrentDateIfNull~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull+' => 'Set an empty field with the current date and time~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull/Param:1' => 'Target Field~~',
 	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull/Param:1+' => 'The field to set, in the current object~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentUser'                => 'SetCurrentUser~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentUser+'               => 'Set a field with the currently logged in user~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1'        => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1+'       => 'The field to set, in the current object. If the field is a string then the friendly name will be used, otherwise the identifier will be used. That friendly name is the name of the person if any is attached to the user, otherwise it is the login.~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentPerson'              => 'SetCurrentPerson~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentPerson+'             => 'Set a field with the currently logged in person (the \\"person\\" attached to the logged in \\"user\\").~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1'      => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1+'     => 'The field to set, in the current object. If the field is a string then the friendly name will be used, otherwise the identifier will be used.~~',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime'                => 'SetElapsedTime~~',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime+'               => 'Set a field with the time (seconds) elapsed since a date given by another field~~',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1'        => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1+'       => 'The field to set, in the current object~~',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2'        => 'Reference Field~~',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2+'       => 'The field from which to get the reference date~~',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3'        => 'Working Hours~~',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3+'       => 'Leave empty to rely on the standard working hours scheme, or set to \\"DefaultWorkingTimeComputer\\" to force a 24x7 scheme~~',
-	'Class:cmdbAbstractObject/Method:SetIfNull'                     => 'SetIfNull~~',
-	'Class:cmdbAbstractObject/Method:SetIfNull+'                    => 'Set a field only if it is empty, with a static value~~',
-	'Class:cmdbAbstractObject/Method:SetIfNull/Param:1'             => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:SetIfNull/Param:1+'            => 'The field to set, in the current object~~',
-	'Class:cmdbAbstractObject/Method:SetIfNull/Param:2'              => 'Value~~',
-	'Class:cmdbAbstractObject/Method:SetIfNull/Param:2+'             => 'The value to set~~',
-	'Class:cmdbAbstractObject/Method:AddValue'                       => 'AddValue~~',
-	'Class:cmdbAbstractObject/Method:AddValue+'                      => 'Add a fixed value to a field~~',
-	'Class:cmdbAbstractObject/Method:AddValue/Param:1'               => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:AddValue/Param:1+'              => 'The field to modify, in the current object~~',
-	'Class:cmdbAbstractObject/Method:AddValue/Param:2'               => 'Value~~',
-	'Class:cmdbAbstractObject/Method:AddValue/Param:2+'              => 'Decimal value which will be added, can be negative~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDate'                => 'SetComputedDate~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDate+'               => 'Set a field with a date computed from another field with extra logic~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:1'        => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:1+'       => 'The field to set, in the current object~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:2'        => 'Modifier~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:2+'       => 'Textual information to modify the source date, eg. "+3 days"~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:3'        => 'Source field~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:3+'       => 'The field used as source to apply the Modifier logic~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull'          => 'SetComputedDateIfNull~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull+'         => 'Set non empty field with a date computed from another field with extra logic~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:1'  => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser' => 'SetCurrentUser~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser+' => 'Set a field with the currently logged in user~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1+' => 'The field to set, in the current object. If the field is a string then the friendly name will be used, otherwise the identifier will be used. That friendly name is the name of the person if any is attached to the user, otherwise it is the login.~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson' => 'SetCurrentPerson~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson+' => 'Set a field with the currently logged in person (the \\"person\\" attached to the logged in \\"user\\").~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1+' => 'The field to set, in the current object. If the field is a string then the friendly name will be used, otherwise the identifier will be used.~~',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime' => 'SetElapsedTime~~',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime+' => 'Set a field with the time (seconds) elapsed since a date given by another field~~',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1+' => 'The field to set, in the current object~~',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2' => 'Reference Field~~',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2+' => 'The field from which to get the reference date~~',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3' => 'Working Hours~~',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3+' => 'Leave empty to rely on the standard working hours scheme, or set to \\"DefaultWorkingTimeComputer\\" to force a 24x7 scheme~~',
+	'Class:cmdbAbstractObject/Method:SetIfNull' => 'SetIfNull~~',
+	'Class:cmdbAbstractObject/Method:SetIfNull+' => 'Set a field only if it is empty, with a static value~~',
+	'Class:cmdbAbstractObject/Method:SetIfNull/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:SetIfNull/Param:1+' => 'The field to set, in the current object~~',
+	'Class:cmdbAbstractObject/Method:SetIfNull/Param:2' => 'Value~~',
+	'Class:cmdbAbstractObject/Method:SetIfNull/Param:2+' => 'The value to set~~',
+	'Class:cmdbAbstractObject/Method:AddValue' => 'AddValue~~',
+	'Class:cmdbAbstractObject/Method:AddValue+' => 'Add a fixed value to a field~~',
+	'Class:cmdbAbstractObject/Method:AddValue/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:AddValue/Param:1+' => 'The field to modify, in the current object~~',
+	'Class:cmdbAbstractObject/Method:AddValue/Param:2' => 'Value~~',
+	'Class:cmdbAbstractObject/Method:AddValue/Param:2+' => 'Decimal value which will be added, can be negative~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDate' => 'SetComputedDate~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDate+' => 'Set a field with a date computed from another field with extra logic~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:1+' => 'The field to set, in the current object~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:2' => 'Modifier~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:2+' => 'Textual information to modify the source date, eg. "+3 days"~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:3' => 'Source field~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:3+' => 'The field used as source to apply the Modifier logic~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull' => 'SetComputedDateIfNull~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull+' => 'Set non empty field with a date computed from another field with extra logic~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:1' => 'Target Field~~',
 	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:1+' => 'The field to set, in the current object~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:2'  => 'Modifier~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:2' => 'Modifier~~',
 	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:2+' => 'Textual information to modify the source date, eg. "+3 days"~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:3'  => 'Source field~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:3' => 'Source field~~',
 	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:3+' => 'The field used as source to apply the Modifier logic~~',
-	'Class:cmdbAbstractObject/Method:Reset'                          => 'Reset~~',
-	'Class:cmdbAbstractObject/Method:Reset+'                         => 'Reset a field to its default value~~',
-	'Class:cmdbAbstractObject/Method:Reset/Param:1'                  => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:Reset/Param:1+'                 => 'The field to reset, in the current object~~',
-	'Class:cmdbAbstractObject/Method:Copy'                           => 'Copy~~',
-	'Class:cmdbAbstractObject/Method:Copy+'                          => 'Copy the value of a field to another field~~',
-	'Class:cmdbAbstractObject/Method:Copy/Param:1'                   => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:Copy/Param:1+'                  => 'The field to set, in the current object~~',
-	'Class:cmdbAbstractObject/Method:Copy/Param:2'                   => 'Source Field~~',
-	'Class:cmdbAbstractObject/Method:Copy/Param:2+'                  => 'The field to get the value from, in the current object~~',
-	'Class:cmdbAbstractObject/Method:ApplyStimulus'                  => 'ApplyStimulus~~',
-	'Class:cmdbAbstractObject/Method:ApplyStimulus+'                 => 'Apply the specified stimulus to the current object~~',
-	'Class:cmdbAbstractObject/Method:ApplyStimulus/Param:1'          => 'Stimulus code~~',
-	'Class:cmdbAbstractObject/Method:ApplyStimulus/Param:1+'         => 'A valid stimulus code for the current class~~',
-	'Class:ResponseTicketTTO/Interface:iMetricComputer'              => 'Time To Own~~',
-	'Class:ResponseTicketTTO/Interface:iMetricComputer+'             => 'Goal based on a SLT of type TTO~~',
-	'Class:ResponseTicketTTR/Interface:iMetricComputer'              => 'Time To Resolve~~',
-	'Class:ResponseTicketTTR/Interface:iMetricComputer+'             => 'Goal based on a SLT of type TTR~~',
+	'Class:cmdbAbstractObject/Method:Reset' => 'Reset~~',
+	'Class:cmdbAbstractObject/Method:Reset+' => 'Reset a field to its default value~~',
+	'Class:cmdbAbstractObject/Method:Reset/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:Reset/Param:1+' => 'The field to reset, in the current object~~',
+	'Class:cmdbAbstractObject/Method:Copy' => 'Copy~~',
+	'Class:cmdbAbstractObject/Method:Copy+' => 'Copy the value of a field to another field~~',
+	'Class:cmdbAbstractObject/Method:Copy/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:Copy/Param:1+' => 'The field to set, in the current object~~',
+	'Class:cmdbAbstractObject/Method:Copy/Param:2' => 'Source Field~~',
+	'Class:cmdbAbstractObject/Method:Copy/Param:2+' => 'The field to get the value from, in the current object~~',
+	'Class:cmdbAbstractObject/Method:ApplyStimulus' => 'ApplyStimulus~~',
+	'Class:cmdbAbstractObject/Method:ApplyStimulus+' => 'Apply the specified stimulus to the current object~~',
+	'Class:cmdbAbstractObject/Method:ApplyStimulus/Param:1' => 'Stimulus code~~',
+	'Class:cmdbAbstractObject/Method:ApplyStimulus/Param:1+' => 'A valid stimulus code for the current class~~',
+	'Class:ResponseTicketTTO/Interface:iMetricComputer' => 'Time To Own~~',
+	'Class:ResponseTicketTTO/Interface:iMetricComputer+' => 'Goal based on a SLT of type TTO~~',
+	'Class:ResponseTicketTTR/Interface:iMetricComputer' => 'Time To Resolve~~',
+	'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'Goal based on a SLT of type TTR~~',
 ));
 
diff --git a/datamodels/2.x/itop-tickets/dictionaries/nl.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/dictionaries/nl.dict.itop-tickets.php
index 5d5df8a5a7..2e40fb787e 100644
--- a/datamodels/2.x/itop-tickets/dictionaries/nl.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/dictionaries/nl.dict.itop-tickets.php
@@ -100,12 +100,15 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:lnkContactToTicket' => 'Link Contact / Ticket',
 	'Class:lnkContactToTicket+' => '',
+	'Class:lnkContactToTicket/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToTicket/Attribute:ticket_id' => 'Ticket',
 	'Class:lnkContactToTicket/Attribute:ticket_id+' => '',
 	'Class:lnkContactToTicket/Attribute:ticket_ref' => 'Ref',
 	'Class:lnkContactToTicket/Attribute:ticket_ref+' => '',
 	'Class:lnkContactToTicket/Attribute:contact_id' => 'Contact',
 	'Class:lnkContactToTicket/Attribute:contact_id+' => '',
+	'Class:lnkContactToTicket/Attribute:contact_name' => 'Contact name~~',
+	'Class:lnkContactToTicket/Attribute:contact_name+' => '~~',
 	'Class:lnkContactToTicket/Attribute:contact_email' => 'E-mailadres contact',
 	'Class:lnkContactToTicket/Attribute:contact_email+' => '',
 	'Class:lnkContactToTicket/Attribute:role' => 'Rol',
@@ -158,94 +161,94 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 
 // Fieldset translation
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Ticket:baseinfo'                                                => 'Globale informatie',
-	'Ticket:date'                                                    => 'Data',
-	'Ticket:contact'                                                 => 'Contacten',
-	'Ticket:moreinfo'                                               => 'Meer informatie',
-	'Ticket:relation'                                               => 'Relaties',
-	'Ticket:log'                                                    => 'Communicatie',
-	'Ticket:Type'                                                   => 'Kwalificaties',
-	'Ticket:support'                                                => 'Support',
-	'Ticket:resolution'                                             => 'Oplossing',
-	'Ticket:SLA'                                                    => 'Rapportage SLA',
-	'WorkOrder:Details'                                             => 'Details',
-	'WorkOrder:Moreinfo'                                            => 'Meer informatie',
-	'Tickets:ResolvedFrom'                                          => 'Automatisch afgerond door %1$s',
-	'Class:cmdbAbstractObject/Method:Set'                           => 'Stel in op waarde',
-	'Class:cmdbAbstractObject/Method:Set+'                          => 'Stel in veldwaarde in op een statische waarde',
-	'Class:cmdbAbstractObject/Method:Set/Param:1'                   => 'Doelveld',
-	'Class:cmdbAbstractObject/Method:Set/Param:1+'                  => 'Het veld dat voor het huidige object ingesteld moet worden',
-	'Class:cmdbAbstractObject/Method:Set/Param:2'                   => 'Waarde',
-	'Class:cmdbAbstractObject/Method:Set/Param:2+'                  => 'De waarde die moet ingesteld worden',
-	'Class:cmdbAbstractObject/Method:SetCurrentDate'                => 'Stel in op huidige datum',
-	'Class:cmdbAbstractObject/Method:SetCurrentDate+'               => 'Stel de veldwaarde in op de huidige datum',
-	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1'        => 'Doelveld',
-	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1+'       => 'Het veld dat voor het huidige object ingesteld moet worden',
-	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull'          => 'SetCurrentDateIfNull',
-	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull+'         => 'Vult het huidige tijdstip in als het veld leeg is.',
-	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull/Param:1'  => 'Doelveld',
+	'Ticket:baseinfo' => 'Globale informatie',
+	'Ticket:date' => 'Data',
+	'Ticket:contact' => 'Contacten',
+	'Ticket:moreinfo' => 'Meer informatie',
+	'Ticket:relation' => 'Relaties',
+	'Ticket:log' => 'Communicatie',
+	'Ticket:Type' => 'Kwalificaties',
+	'Ticket:support' => 'Support',
+	'Ticket:resolution' => 'Oplossing',
+	'Ticket:SLA' => 'Rapportage SLA',
+	'WorkOrder:Details' => 'Details',
+	'WorkOrder:Moreinfo' => 'Meer informatie',
+	'Tickets:ResolvedFrom' => 'Automatisch afgerond door %1$s',
+	'Class:cmdbAbstractObject/Method:Set' => 'Stel in op waarde',
+	'Class:cmdbAbstractObject/Method:Set+' => 'Stel in veldwaarde in op een statische waarde',
+	'Class:cmdbAbstractObject/Method:Set/Param:1' => 'Doelveld',
+	'Class:cmdbAbstractObject/Method:Set/Param:1+' => 'Het veld dat voor het huidige object ingesteld moet worden',
+	'Class:cmdbAbstractObject/Method:Set/Param:2' => 'Waarde',
+	'Class:cmdbAbstractObject/Method:Set/Param:2+' => 'De waarde die moet ingesteld worden',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate' => 'Stel in op huidige datum',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate+' => 'Stel de veldwaarde in op de huidige datum',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1' => 'Doelveld',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1+' => 'Het veld dat voor het huidige object ingesteld moet worden',
+	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull' => 'SetCurrentDateIfNull',
+	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull+' => 'Vult het huidige tijdstip in als het veld leeg is.',
+	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull/Param:1' => 'Doelveld',
 	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull/Param:1+' => 'Het veld dat voor het huidige object ingesteld moet worden',
-	'Class:cmdbAbstractObject/Method:SetCurrentUser'                => 'Stel in op huidige gebruiker',
-	'Class:cmdbAbstractObject/Method:SetCurrentUser+'               => 'Stel de veldwaarde in op de huidige gebruiker',
-	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1'        => 'Doelveld',
-	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1+'       => 'Het veld dat voor het huidige object ingesteld moet worden. Als het veldtype tekst is, wordt de friendly name gebruikt, anders de ID. De friendly name is de naam van de persoon indien gekend, anders wordt dit de login.',
-	'Class:cmdbAbstractObject/Method:SetCurrentPerson'              => 'Stel in op huidige persoon',
-	'Class:cmdbAbstractObject/Method:SetCurrentPerson+'             => 'Stel de veldwaarde in op de huidige persoon (= de persoon gelinkt aan de gebruikersaccount).',
-	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1'      => 'Doelveld',
-	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1+'     => 'Het veld dat voor het huidige object ingesteld moet worden. Als het veldtype tekst is, wordt de friendly name gebruikt, anders de ID.',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime'                => 'Stel in op verlopen tijd',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime+'               => 'Stel een veld in op de tijd (in seconden) die voorbijgegaan is sinds een tijdstip gedefinieerd in een ander veld.',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1'        => 'Doelveld',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1+'       => 'Het veld dat voor het huidige object ingesteld moet worden',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2'        => 'Referentieveld',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2+'       => 'Het veld waarin de referentiedatum opgegeven is',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3'        => 'Werkuren',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3+'       => 'Laat leeg om te berekenen op basis van het standaard werkschema, of stel in op "DefaultWorkingTimeComputer" om een 24x7-tijdschema af te dwingen.',
-	'Class:cmdbAbstractObject/Method:SetIfNull'                     => 'SetIfNull',
-	'Class:cmdbAbstractObject/Method:SetIfNull+'                    => 'Stel de veldwaarde in op een voorgedefinieerde waarde, als het veld leeg is.',
-	'Class:cmdbAbstractObject/Method:SetIfNull/Param:1'             => 'Doelveld',
-	'Class:cmdbAbstractObject/Method:SetIfNull/Param:1+'            => 'Het veld dat voor het huidige object ingesteld moet worden',
-	'Class:cmdbAbstractObject/Method:SetIfNull/Param:2'              => 'Waarde',
-	'Class:cmdbAbstractObject/Method:SetIfNull/Param:2+'             => 'De waarde die ingesteld moet worden',
-	'Class:cmdbAbstractObject/Method:AddValue'                       => 'AddValue',
-	'Class:cmdbAbstractObject/Method:AddValue+'                      => 'Voeg een voorgedefinieerde waarde toe aan een veld',
-	'Class:cmdbAbstractObject/Method:AddValue/Param:1'               => 'Doelveld',
-	'Class:cmdbAbstractObject/Method:AddValue/Param:1+'              => 'Het veld dat voor het huidige object ingesteld moet worden',
-	'Class:cmdbAbstractObject/Method:AddValue/Param:2'               => 'Waarde',
-	'Class:cmdbAbstractObject/Method:AddValue/Param:2+'              => 'Decimale waarde die toegevoegd moet worden. Dit kan ook een negatieve waarde zijn.',
-	'Class:cmdbAbstractObject/Method:SetComputedDate'                => 'SetComputedDate',
-	'Class:cmdbAbstractObject/Method:SetComputedDate+'               => 'Stel de veldwaarde in op een tijdstip berekend aan de hand van een ander veld met extra logica toegepast.',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:1'        => 'Doelveld',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:1+'       => 'Het veld dat voor het huidige object ingesteld moet worden',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:2'        => 'Aanpassing',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:2+'       => 'Aanpassing in tekstvorm (moet in het Engels), bv. "+3 days"',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:3'        => 'Bronveld',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:3+'       => 'Het veld waarop het nieuwe tijd gebaseerd is',
-	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull'          => 'SetComputedDateIfNull',
-	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull+'         => 'Stel in op een tijdstip berekend aan de hand van een ander veld met extra logica toegepast, als het veld leeg is.',
-	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:1'  => 'Doelveld',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser' => 'Stel in op huidige gebruiker',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser+' => 'Stel de veldwaarde in op de huidige gebruiker',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1' => 'Doelveld',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1+' => 'Het veld dat voor het huidige object ingesteld moet worden. Als het veldtype tekst is, wordt de friendly name gebruikt, anders de ID. De friendly name is de naam van de persoon indien gekend, anders wordt dit de login.',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson' => 'Stel in op huidige persoon',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson+' => 'Stel de veldwaarde in op de huidige persoon (= de persoon gelinkt aan de gebruikersaccount).',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1' => 'Doelveld',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1+' => 'Het veld dat voor het huidige object ingesteld moet worden. Als het veldtype tekst is, wordt de friendly name gebruikt, anders de ID.',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime' => 'Stel in op verlopen tijd',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime+' => 'Stel een veld in op de tijd (in seconden) die voorbijgegaan is sinds een tijdstip gedefinieerd in een ander veld.',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1' => 'Doelveld',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1+' => 'Het veld dat voor het huidige object ingesteld moet worden',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2' => 'Referentieveld',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2+' => 'Het veld waarin de referentiedatum opgegeven is',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3' => 'Werkuren',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3+' => 'Laat leeg om te berekenen op basis van het standaard werkschema, of stel in op "DefaultWorkingTimeComputer" om een 24x7-tijdschema af te dwingen.',
+	'Class:cmdbAbstractObject/Method:SetIfNull' => 'SetIfNull',
+	'Class:cmdbAbstractObject/Method:SetIfNull+' => 'Stel de veldwaarde in op een voorgedefinieerde waarde, als het veld leeg is.',
+	'Class:cmdbAbstractObject/Method:SetIfNull/Param:1' => 'Doelveld',
+	'Class:cmdbAbstractObject/Method:SetIfNull/Param:1+' => 'Het veld dat voor het huidige object ingesteld moet worden',
+	'Class:cmdbAbstractObject/Method:SetIfNull/Param:2' => 'Waarde',
+	'Class:cmdbAbstractObject/Method:SetIfNull/Param:2+' => 'De waarde die ingesteld moet worden',
+	'Class:cmdbAbstractObject/Method:AddValue' => 'AddValue',
+	'Class:cmdbAbstractObject/Method:AddValue+' => 'Voeg een voorgedefinieerde waarde toe aan een veld',
+	'Class:cmdbAbstractObject/Method:AddValue/Param:1' => 'Doelveld',
+	'Class:cmdbAbstractObject/Method:AddValue/Param:1+' => 'Het veld dat voor het huidige object ingesteld moet worden',
+	'Class:cmdbAbstractObject/Method:AddValue/Param:2' => 'Waarde',
+	'Class:cmdbAbstractObject/Method:AddValue/Param:2+' => 'Decimale waarde die toegevoegd moet worden. Dit kan ook een negatieve waarde zijn.',
+	'Class:cmdbAbstractObject/Method:SetComputedDate' => 'SetComputedDate',
+	'Class:cmdbAbstractObject/Method:SetComputedDate+' => 'Stel de veldwaarde in op een tijdstip berekend aan de hand van een ander veld met extra logica toegepast.',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:1' => 'Doelveld',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:1+' => 'Het veld dat voor het huidige object ingesteld moet worden',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:2' => 'Aanpassing',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:2+' => 'Aanpassing in tekstvorm (moet in het Engels), bv. "+3 days"',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:3' => 'Bronveld',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:3+' => 'Het veld waarop het nieuwe tijd gebaseerd is',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull' => 'SetComputedDateIfNull',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull+' => 'Stel in op een tijdstip berekend aan de hand van een ander veld met extra logica toegepast, als het veld leeg is.',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:1' => 'Doelveld',
 	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:1+' => 'Het veld dat voor het huidige object ingesteld moet worden',
-	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:2'  => 'Aanpassing',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:2' => 'Aanpassing',
 	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:2+' => 'Aanpassing in tekstvorm (moet in het Engels), bv. "+3 days"',
-	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:3'  => 'Bronveld',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:3' => 'Bronveld',
 	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:3+' => 'Het veld waarop het nieuwe tijd gebaseerd is',
-	'Class:cmdbAbstractObject/Method:Reset'                          => 'Reset',
-	'Class:cmdbAbstractObject/Method:Reset+'                         => 'Reset een veld naar de standaardwaarde.',
-	'Class:cmdbAbstractObject/Method:Reset/Param:1'                  => 'Doelveld',
-	'Class:cmdbAbstractObject/Method:Reset/Param:1+'                 => 'Het veld dat voor het huidige object ingesteld moet worden',
-	'Class:cmdbAbstractObject/Method:Copy'                           => 'Kopieer',
-	'Class:cmdbAbstractObject/Method:Copy+'                          => 'Kopieer de waarde van een veld naar een ander veld',
-	'Class:cmdbAbstractObject/Method:Copy/Param:1'                   => 'Doelveld',
-	'Class:cmdbAbstractObject/Method:Copy/Param:1+'                  => 'Het veld dat voor het huidige object ingesteld moet worden',
-	'Class:cmdbAbstractObject/Method:Copy/Param:2'                   => 'Bronveld',
-	'Class:cmdbAbstractObject/Method:Copy/Param:2+'                  => 'Het veld van het huidige object dat overgenomen moet worden',
-	'Class:cmdbAbstractObject/Method:ApplyStimulus'                  => 'Stimulus uitvoeren',
-	'Class:cmdbAbstractObject/Method:ApplyStimulus+'                 => 'Voert een stimulus uit op het huidige object',
-	'Class:cmdbAbstractObject/Method:ApplyStimulus/Param:1'          => 'Stimuluscode',
-	'Class:cmdbAbstractObject/Method:ApplyStimulus/Param:1+'         => 'Een geldige stimuluscode voor de huidige klasse',
-	'Class:ResponseTicketTTO/Interface:iMetricComputer'              => 'Time To Own',
-	'Class:ResponseTicketTTO/Interface:iMetricComputer+'             => 'Doel gebaseerd op een SLT (TTO)',
-	'Class:ResponseTicketTTR/Interface:iMetricComputer'              => 'Time To Resolve',
-	'Class:ResponseTicketTTR/Interface:iMetricComputer+'             => 'Doel gebaseerd op een SLT (TTR)',
+	'Class:cmdbAbstractObject/Method:Reset' => 'Reset',
+	'Class:cmdbAbstractObject/Method:Reset+' => 'Reset een veld naar de standaardwaarde.',
+	'Class:cmdbAbstractObject/Method:Reset/Param:1' => 'Doelveld',
+	'Class:cmdbAbstractObject/Method:Reset/Param:1+' => 'Het veld dat voor het huidige object ingesteld moet worden',
+	'Class:cmdbAbstractObject/Method:Copy' => 'Kopieer',
+	'Class:cmdbAbstractObject/Method:Copy+' => 'Kopieer de waarde van een veld naar een ander veld',
+	'Class:cmdbAbstractObject/Method:Copy/Param:1' => 'Doelveld',
+	'Class:cmdbAbstractObject/Method:Copy/Param:1+' => 'Het veld dat voor het huidige object ingesteld moet worden',
+	'Class:cmdbAbstractObject/Method:Copy/Param:2' => 'Bronveld',
+	'Class:cmdbAbstractObject/Method:Copy/Param:2+' => 'Het veld van het huidige object dat overgenomen moet worden',
+	'Class:cmdbAbstractObject/Method:ApplyStimulus' => 'Stimulus uitvoeren',
+	'Class:cmdbAbstractObject/Method:ApplyStimulus+' => 'Voert een stimulus uit op het huidige object',
+	'Class:cmdbAbstractObject/Method:ApplyStimulus/Param:1' => 'Stimuluscode',
+	'Class:cmdbAbstractObject/Method:ApplyStimulus/Param:1+' => 'Een geldige stimuluscode voor de huidige klasse',
+	'Class:ResponseTicketTTO/Interface:iMetricComputer' => 'Time To Own',
+	'Class:ResponseTicketTTO/Interface:iMetricComputer+' => 'Doel gebaseerd op een SLT (TTO)',
+	'Class:ResponseTicketTTR/Interface:iMetricComputer' => 'Time To Resolve',
+	'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'Doel gebaseerd op een SLT (TTR)',
 ));
 
diff --git a/datamodels/2.x/itop-tickets/dictionaries/pl.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/dictionaries/pl.dict.itop-tickets.php
index 289ac359c1..9ae9a36b8c 100644
--- a/datamodels/2.x/itop-tickets/dictionaries/pl.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/dictionaries/pl.dict.itop-tickets.php
@@ -94,12 +94,15 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:lnkContactToTicket' => 'Połączenie Kontakt / Zgłoszenie',
 	'Class:lnkContactToTicket+' => '',
+	'Class:lnkContactToTicket/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToTicket/Attribute:ticket_id' => 'Zgłoszenie',
 	'Class:lnkContactToTicket/Attribute:ticket_id+' => '',
 	'Class:lnkContactToTicket/Attribute:ticket_ref' => 'Powiązanie',
 	'Class:lnkContactToTicket/Attribute:ticket_ref+' => '',
 	'Class:lnkContactToTicket/Attribute:contact_id' => 'Kontakt',
 	'Class:lnkContactToTicket/Attribute:contact_id+' => '',
+	'Class:lnkContactToTicket/Attribute:contact_name' => 'Contact name~~',
+	'Class:lnkContactToTicket/Attribute:contact_name+' => '~~',
 	'Class:lnkContactToTicket/Attribute:contact_email' => 'E-mail kontaktu',
 	'Class:lnkContactToTicket/Attribute:contact_email+' => '',
 	'Class:lnkContactToTicket/Attribute:role' => 'Rola (tekst)',
@@ -152,94 +155,94 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 
 // Fieldset translation
 Dict::Add('PL PL', 'Polish', 'Polski', array(
-	'Ticket:baseinfo'                                                => 'Informacje ogólne',
-	'Ticket:date'                                                    => 'Daty',
-	'Ticket:contact'                                                 => 'Kontakty',
-	'Ticket:moreinfo'                                               => 'Więcej informacji',
-	'Ticket:relation'                                               => 'Relacje',
-	'Ticket:log'                                                    => 'Komunikacja',
-	'Ticket:Type'                                                   => 'Kwalifikacja',
-	'Ticket:support'                                                => 'Wsparcie',
-	'Ticket:resolution'                                             => 'Analiza',
-	'Ticket:SLA'                                                    => 'Raport SLA',
-	'WorkOrder:Details'                                             => 'Szczegóły',
-	'WorkOrder:Moreinfo'                                            => 'Więcej informacji',
-	'Tickets:ResolvedFrom'                                          => 'Automatycznie rozwiązane z %1$s',
-	'Class:cmdbAbstractObject/Method:Set'                           => 'Ustawienia',
-	'Class:cmdbAbstractObject/Method:Set+'                          => 'Ustaw pole z wartością statyczną',
-	'Class:cmdbAbstractObject/Method:Set/Param:1'                   => 'Pole docelowe',
-	'Class:cmdbAbstractObject/Method:Set/Param:1+'                  => 'Pole do ustawienia w bieżącym obiekcie',
-	'Class:cmdbAbstractObject/Method:Set/Param:2'                   => 'Wartość',
-	'Class:cmdbAbstractObject/Method:Set/Param:2+'                  => 'Wartość do ustawienia',
-	'Class:cmdbAbstractObject/Method:SetCurrentDate'                => 'SetCurrentDate',
-	'Class:cmdbAbstractObject/Method:SetCurrentDate+'               => 'Ustaw pole z aktualną datą i godziną',
-	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1'        => 'Pole docelowe',
-	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1+'       => 'Pole do ustawienia w bieżącym obiekcie',
-	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull'          => 'Ustaw aktualną datę, jeśli wartość null',
-	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull+'         => 'Ustaw puste pole z bieżącą datą i godziną',
-	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull/Param:1'  => 'Pole docelowe',
+	'Ticket:baseinfo' => 'Informacje ogólne',
+	'Ticket:date' => 'Daty',
+	'Ticket:contact' => 'Kontakty',
+	'Ticket:moreinfo' => 'Więcej informacji',
+	'Ticket:relation' => 'Relacje',
+	'Ticket:log' => 'Komunikacja',
+	'Ticket:Type' => 'Kwalifikacja',
+	'Ticket:support' => 'Wsparcie',
+	'Ticket:resolution' => 'Analiza',
+	'Ticket:SLA' => 'Raport SLA',
+	'WorkOrder:Details' => 'Szczegóły',
+	'WorkOrder:Moreinfo' => 'Więcej informacji',
+	'Tickets:ResolvedFrom' => 'Automatycznie rozwiązane z %1$s',
+	'Class:cmdbAbstractObject/Method:Set' => 'Ustawienia',
+	'Class:cmdbAbstractObject/Method:Set+' => 'Ustaw pole z wartością statyczną',
+	'Class:cmdbAbstractObject/Method:Set/Param:1' => 'Pole docelowe',
+	'Class:cmdbAbstractObject/Method:Set/Param:1+' => 'Pole do ustawienia w bieżącym obiekcie',
+	'Class:cmdbAbstractObject/Method:Set/Param:2' => 'Wartość',
+	'Class:cmdbAbstractObject/Method:Set/Param:2+' => 'Wartość do ustawienia',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate' => 'SetCurrentDate',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate+' => 'Ustaw pole z aktualną datą i godziną',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1' => 'Pole docelowe',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1+' => 'Pole do ustawienia w bieżącym obiekcie',
+	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull' => 'Ustaw aktualną datę, jeśli wartość null',
+	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull+' => 'Ustaw puste pole z bieżącą datą i godziną',
+	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull/Param:1' => 'Pole docelowe',
 	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull/Param:1+' => 'Pole do ustawienia w bieżącym obiekcie',
-	'Class:cmdbAbstractObject/Method:SetCurrentUser'                => 'SetCurrentUser',
-	'Class:cmdbAbstractObject/Method:SetCurrentUser+'               => 'Ustaw pole z aktualnie zalogowanym użytkownikiem',
-	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1'        => 'Pole docelowe',
-	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1+'       => 'Pole do ustawienia w bieżącym obiekcie. Jeśli pole jest ciągiem, zostanie użyta przyjazna nazwa, w przeciwnym razie zostanie użyty identyfikator. Ta przyjazna nazwa to nazwisko osoby, jeśli jakakolwiek jest dołączona do użytkownika, w przeciwnym razie jest to login.',
-	'Class:cmdbAbstractObject/Method:SetCurrentPerson'              => 'SetCurrentPerson',
-	'Class:cmdbAbstractObject/Method:SetCurrentPerson+'             => 'Ustaw pole z aktualnie zalogowaną osobą ("osobą" dołączoną do zalogowanego "użytkownika").',
-	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1'      => 'Pole docelowe',
-	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1+'     => 'Pole do ustawienia w bieżącym obiekcie. Jeśli pole jest ciągiem, zostanie użyta przyjazna nazwa, w przeciwnym razie zostanie użyty identyfikator.',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime'                => 'SetElapsedTime',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime+'               => 'Ustaw pole z czasem (w sekundach), jaki upłynął od daty podanej w innym polu',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1'        => 'Pole docelowe',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1+'       => 'Pole do ustawienia w bieżącym obiekcie',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2'        => 'Pole odniesienia',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2+'       => 'Pole, z którego ma zostać pobrana data odniesienia',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3'        => 'Godziny pracy',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3+'       => 'Pozostaw puste, aby polegać na standardowym schemacie godzin pracy, lub ustaw na „DefaultWorkingTimeComputer”, aby wymusić schemat 24x7',
-	'Class:cmdbAbstractObject/Method:SetIfNull'                     => 'SetIfNull',
-	'Class:cmdbAbstractObject/Method:SetIfNull+'                    => 'Ustaw pole tylko wtedy, gdy jest puste, z wartością statyczną',
-	'Class:cmdbAbstractObject/Method:SetIfNull/Param:1'             => 'Pole docelowe',
-	'Class:cmdbAbstractObject/Method:SetIfNull/Param:1+'            => 'Pole do ustawienia w bieżącym obiekcie',
-	'Class:cmdbAbstractObject/Method:SetIfNull/Param:2'              => 'Wartość',
-	'Class:cmdbAbstractObject/Method:SetIfNull/Param:2+'             => 'Wartość do ustawienia',
-	'Class:cmdbAbstractObject/Method:AddValue'                       => 'AddValue',
-	'Class:cmdbAbstractObject/Method:AddValue+'                      => 'Dodaj stałą wartość do pola',
-	'Class:cmdbAbstractObject/Method:AddValue/Param:1'               => 'Pole docelowe',
-	'Class:cmdbAbstractObject/Method:AddValue/Param:1+'              => 'Pole do modyfikacji w bieżącym obiekcie',
-	'Class:cmdbAbstractObject/Method:AddValue/Param:2'               => 'Wartość',
-	'Class:cmdbAbstractObject/Method:AddValue/Param:2+'              => 'Wartość dziesiętna, która zostanie dodana, może być ujemna',
-	'Class:cmdbAbstractObject/Method:SetComputedDate'                => 'SetComputedDate',
-	'Class:cmdbAbstractObject/Method:SetComputedDate+'               => 'Ustaw pole z datą obliczoną z innego pola z dodatkową logiką',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:1'        => 'Pole docelowe',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:1+'       => 'Pole do ustawienia w bieżącym obiekcie',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:2'        => 'Modyfikator',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:2+'       => 'Informacje tekstowe umożliwiające modyfikację daty źródłowej, np. "+3 dni"',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:3'        => 'Pole źródłowe',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:3+'       => 'Pole używane jako źródło do zastosowania logiki modyfikatora',
-	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull'          => 'SetComputedDateIfNull',
-	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull+'         => 'Ustaw niepuste pole z datą obliczoną z innego pola z dodatkową logiką',
-	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:1'  => 'Pole docelowe',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser' => 'SetCurrentUser',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser+' => 'Ustaw pole z aktualnie zalogowanym użytkownikiem',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1' => 'Pole docelowe',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1+' => 'Pole do ustawienia w bieżącym obiekcie. Jeśli pole jest ciągiem, zostanie użyta przyjazna nazwa, w przeciwnym razie zostanie użyty identyfikator. Ta przyjazna nazwa to nazwisko osoby, jeśli jakakolwiek jest dołączona do użytkownika, w przeciwnym razie jest to login.',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson' => 'SetCurrentPerson',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson+' => 'Ustaw pole z aktualnie zalogowaną osobą ("osobą" dołączoną do zalogowanego "użytkownika").',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1' => 'Pole docelowe',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1+' => 'Pole do ustawienia w bieżącym obiekcie. Jeśli pole jest ciągiem, zostanie użyta przyjazna nazwa, w przeciwnym razie zostanie użyty identyfikator.',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime' => 'SetElapsedTime',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime+' => 'Ustaw pole z czasem (w sekundach), jaki upłynął od daty podanej w innym polu',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1' => 'Pole docelowe',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1+' => 'Pole do ustawienia w bieżącym obiekcie',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2' => 'Pole odniesienia',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2+' => 'Pole, z którego ma zostać pobrana data odniesienia',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3' => 'Godziny pracy',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3+' => 'Pozostaw puste, aby polegać na standardowym schemacie godzin pracy, lub ustaw na „DefaultWorkingTimeComputer”, aby wymusić schemat 24x7',
+	'Class:cmdbAbstractObject/Method:SetIfNull' => 'SetIfNull',
+	'Class:cmdbAbstractObject/Method:SetIfNull+' => 'Ustaw pole tylko wtedy, gdy jest puste, z wartością statyczną',
+	'Class:cmdbAbstractObject/Method:SetIfNull/Param:1' => 'Pole docelowe',
+	'Class:cmdbAbstractObject/Method:SetIfNull/Param:1+' => 'Pole do ustawienia w bieżącym obiekcie',
+	'Class:cmdbAbstractObject/Method:SetIfNull/Param:2' => 'Wartość',
+	'Class:cmdbAbstractObject/Method:SetIfNull/Param:2+' => 'Wartość do ustawienia',
+	'Class:cmdbAbstractObject/Method:AddValue' => 'AddValue',
+	'Class:cmdbAbstractObject/Method:AddValue+' => 'Dodaj stałą wartość do pola',
+	'Class:cmdbAbstractObject/Method:AddValue/Param:1' => 'Pole docelowe',
+	'Class:cmdbAbstractObject/Method:AddValue/Param:1+' => 'Pole do modyfikacji w bieżącym obiekcie',
+	'Class:cmdbAbstractObject/Method:AddValue/Param:2' => 'Wartość',
+	'Class:cmdbAbstractObject/Method:AddValue/Param:2+' => 'Wartość dziesiętna, która zostanie dodana, może być ujemna',
+	'Class:cmdbAbstractObject/Method:SetComputedDate' => 'SetComputedDate',
+	'Class:cmdbAbstractObject/Method:SetComputedDate+' => 'Ustaw pole z datą obliczoną z innego pola z dodatkową logiką',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:1' => 'Pole docelowe',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:1+' => 'Pole do ustawienia w bieżącym obiekcie',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:2' => 'Modyfikator',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:2+' => 'Informacje tekstowe umożliwiające modyfikację daty źródłowej, np. "+3 dni"',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:3' => 'Pole źródłowe',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:3+' => 'Pole używane jako źródło do zastosowania logiki modyfikatora',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull' => 'SetComputedDateIfNull',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull+' => 'Ustaw niepuste pole z datą obliczoną z innego pola z dodatkową logiką',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:1' => 'Pole docelowe',
 	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:1+' => 'Pole do ustawienia w bieżącym obiekcie',
-	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:2'  => 'Modyfikator',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:2' => 'Modyfikator',
 	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:2+' => 'Informacje tekstowe umożliwiające modyfikację daty źródłowej, np. "+3 dni"',
-	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:3'  => 'Pole źródłowe',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:3' => 'Pole źródłowe',
 	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:3+' => 'Pole używane jako źródło do zastosowania logiki modyfikatora',
-	'Class:cmdbAbstractObject/Method:Reset'                          => 'Resetuj',
-	'Class:cmdbAbstractObject/Method:Reset+'                         => 'Zresetuj pole do wartości domyślnej',
-	'Class:cmdbAbstractObject/Method:Reset/Param:1'                  => 'Pole docelowe',
-	'Class:cmdbAbstractObject/Method:Reset/Param:1+'                 => 'Pole do zresetowania w bieżącym obiekcie',
-	'Class:cmdbAbstractObject/Method:Copy'                           => 'Kopiuj',
-	'Class:cmdbAbstractObject/Method:Copy+'                          => 'Skopiuj wartość pola do innego pola',
-	'Class:cmdbAbstractObject/Method:Copy/Param:1'                   => 'Pole docelowe',
-	'Class:cmdbAbstractObject/Method:Copy/Param:1+'                  => 'Pole do ustawienia w bieżącym obiekcie',
-	'Class:cmdbAbstractObject/Method:Copy/Param:2'                   => 'Source Field',
-	'Class:cmdbAbstractObject/Method:Copy/Param:2+'                  => 'Pole, z którego ma zostać pobrana wartość, w bieżącym obiekcie',
-	'Class:cmdbAbstractObject/Method:ApplyStimulus'                  => 'ApplyStimulus',
-	'Class:cmdbAbstractObject/Method:ApplyStimulus+'                 => 'Zastosuj określony impuls do bieżącego obiektu',
-	'Class:cmdbAbstractObject/Method:ApplyStimulus/Param:1'          => 'Kod impulsu',
-	'Class:cmdbAbstractObject/Method:ApplyStimulus/Param:1+'         => 'Prawidłowy kod impulsu dla bieżącej klasy',
-	'Class:ResponseTicketTTO/Interface:iMetricComputer'              => 'Czas do podjęcia TTO',
-	'Class:ResponseTicketTTO/Interface:iMetricComputer+'             => 'Cel oparty na SLT typu TTO',
-	'Class:ResponseTicketTTR/Interface:iMetricComputer'              => 'Czas na rozwiązanie TTR',
-	'Class:ResponseTicketTTR/Interface:iMetricComputer+'             => 'Cel oparty na SLT typu TTR',
+	'Class:cmdbAbstractObject/Method:Reset' => 'Resetuj',
+	'Class:cmdbAbstractObject/Method:Reset+' => 'Zresetuj pole do wartości domyślnej',
+	'Class:cmdbAbstractObject/Method:Reset/Param:1' => 'Pole docelowe',
+	'Class:cmdbAbstractObject/Method:Reset/Param:1+' => 'Pole do zresetowania w bieżącym obiekcie',
+	'Class:cmdbAbstractObject/Method:Copy' => 'Kopiuj',
+	'Class:cmdbAbstractObject/Method:Copy+' => 'Skopiuj wartość pola do innego pola',
+	'Class:cmdbAbstractObject/Method:Copy/Param:1' => 'Pole docelowe',
+	'Class:cmdbAbstractObject/Method:Copy/Param:1+' => 'Pole do ustawienia w bieżącym obiekcie',
+	'Class:cmdbAbstractObject/Method:Copy/Param:2' => 'Source Field',
+	'Class:cmdbAbstractObject/Method:Copy/Param:2+' => 'Pole, z którego ma zostać pobrana wartość, w bieżącym obiekcie',
+	'Class:cmdbAbstractObject/Method:ApplyStimulus' => 'ApplyStimulus',
+	'Class:cmdbAbstractObject/Method:ApplyStimulus+' => 'Zastosuj określony impuls do bieżącego obiektu',
+	'Class:cmdbAbstractObject/Method:ApplyStimulus/Param:1' => 'Kod impulsu',
+	'Class:cmdbAbstractObject/Method:ApplyStimulus/Param:1+' => 'Prawidłowy kod impulsu dla bieżącej klasy',
+	'Class:ResponseTicketTTO/Interface:iMetricComputer' => 'Czas do podjęcia TTO',
+	'Class:ResponseTicketTTO/Interface:iMetricComputer+' => 'Cel oparty na SLT typu TTO',
+	'Class:ResponseTicketTTR/Interface:iMetricComputer' => 'Czas na rozwiązanie TTR',
+	'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'Cel oparty na SLT typu TTR',
 ));
 
diff --git a/datamodels/2.x/itop-tickets/dictionaries/pt_br.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/dictionaries/pt_br.dict.itop-tickets.php
index 78741f4e7c..b7a596abcc 100755
--- a/datamodels/2.x/itop-tickets/dictionaries/pt_br.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/dictionaries/pt_br.dict.itop-tickets.php
@@ -95,12 +95,15 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:lnkContactToTicket' => 'Link Contato / Solicitação',
 	'Class:lnkContactToTicket+' => '',
+	'Class:lnkContactToTicket/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToTicket/Attribute:ticket_id' => 'Solicitação',
 	'Class:lnkContactToTicket/Attribute:ticket_id+' => '',
 	'Class:lnkContactToTicket/Attribute:ticket_ref' => 'Ref.',
 	'Class:lnkContactToTicket/Attribute:ticket_ref+' => '',
 	'Class:lnkContactToTicket/Attribute:contact_id' => 'Contato',
 	'Class:lnkContactToTicket/Attribute:contact_id+' => '',
+	'Class:lnkContactToTicket/Attribute:contact_name' => 'Contact name~~',
+	'Class:lnkContactToTicket/Attribute:contact_name+' => '~~',
 	'Class:lnkContactToTicket/Attribute:contact_email' => 'E-mail do contato',
 	'Class:lnkContactToTicket/Attribute:contact_email+' => '',
 	'Class:lnkContactToTicket/Attribute:role' => 'Função (texto)',
@@ -153,94 +156,94 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 
 // Fieldset translation
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Ticket:baseinfo'                                               => 'Informações gerais',
-	'Ticket:date'                                                   => 'Datas',
-	'Ticket:contact'                                                => 'Contatos',
-	'Ticket:moreinfo'                                               => 'Mais informações',
-	'Ticket:relation'                                               => 'Relações',
-	'Ticket:log'                                                    => 'Comunicação',
-	'Ticket:Type'                                                   => 'Priorização',
-	'Ticket:support'                                                => 'Suporte',
-	'Ticket:resolution'                                             => 'Solução',
-	'Ticket:SLA'                                                    => 'Relatório de SLA',
-	'WorkOrder:Details'                                             => 'Detalhes',
-	'WorkOrder:Moreinfo'                                            => 'Mais informações',
-	'Tickets:ResolvedFrom'                                          => 'Resolvido automaticamente de %1$s',
-	'Class:cmdbAbstractObject/Method:Set'                           => 'Set',
-	'Class:cmdbAbstractObject/Method:Set+'                          => 'Defina um campo com um valor estático',
-	'Class:cmdbAbstractObject/Method:Set/Param:1'                   => 'Campo alvo',
-	'Class:cmdbAbstractObject/Method:Set/Param:1+'                  => 'O campo a definir, no objeto atual',
-	'Class:cmdbAbstractObject/Method:Set/Param:2'                   => 'Valor',
-	'Class:cmdbAbstractObject/Method:Set/Param:2+'                  => 'O valor para definir',
-	'Class:cmdbAbstractObject/Method:SetCurrentDate'                => 'SetCurrentDate',
-	'Class:cmdbAbstractObject/Method:SetCurrentDate+'               => 'Defina um campo com a data e hora atual',
-	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1'        => 'Campo alvo',
-	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1+'       => 'O campo a definir, no objeto atual',
-	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull'          => 'SetCurrentDateIfNull',
-	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull+'         => 'Defina um campo vazio com a data e a hora atuais',
-	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull/Param:1'  => 'Target Field',
+	'Ticket:baseinfo' => 'Informações gerais',
+	'Ticket:date' => 'Datas',
+	'Ticket:contact' => 'Contatos',
+	'Ticket:moreinfo' => 'Mais informações',
+	'Ticket:relation' => 'Relações',
+	'Ticket:log' => 'Comunicação',
+	'Ticket:Type' => 'Priorização',
+	'Ticket:support' => 'Suporte',
+	'Ticket:resolution' => 'Solução',
+	'Ticket:SLA' => 'Relatório de SLA',
+	'WorkOrder:Details' => 'Detalhes',
+	'WorkOrder:Moreinfo' => 'Mais informações',
+	'Tickets:ResolvedFrom' => 'Resolvido automaticamente de %1$s',
+	'Class:cmdbAbstractObject/Method:Set' => 'Set',
+	'Class:cmdbAbstractObject/Method:Set+' => 'Defina um campo com um valor estático',
+	'Class:cmdbAbstractObject/Method:Set/Param:1' => 'Campo alvo',
+	'Class:cmdbAbstractObject/Method:Set/Param:1+' => 'O campo a definir, no objeto atual',
+	'Class:cmdbAbstractObject/Method:Set/Param:2' => 'Valor',
+	'Class:cmdbAbstractObject/Method:Set/Param:2+' => 'O valor para definir',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate' => 'SetCurrentDate',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate+' => 'Defina um campo com a data e hora atual',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1' => 'Campo alvo',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1+' => 'O campo a definir, no objeto atual',
+	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull' => 'SetCurrentDateIfNull',
+	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull+' => 'Defina um campo vazio com a data e a hora atuais',
+	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull/Param:1' => 'Target Field',
 	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull/Param:1+' => 'O campo a definir, no objeto atual',
-	'Class:cmdbAbstractObject/Method:SetCurrentUser'                => 'SetCurrentUser',
-	'Class:cmdbAbstractObject/Method:SetCurrentUser+'               => 'Defina um campo com o usuário atualmente logado',
-	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1'        => 'Campo alvo',
-	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1+'       => 'O campo a definir, no objeto atual. Se o campo for uma string, o nome amigável do usuário será usado, caso contrário, o identificador será usado. Esse nome amigável é o nome da pessoa, se houver algum nome amigável atribuído ao usuário, caso contrário, será usado o login',
-	'Class:cmdbAbstractObject/Method:SetCurrentPerson'              => 'SetCurrentPerson',
-	'Class:cmdbAbstractObject/Method:SetCurrentPerson+'             => 'Defina um campo com a pessoa atualmente logada (a \\"pessoa\\" anexada ao \\"usuário\\")',
-	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1'      => 'Campo alvo',
-	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1+'     => 'O campo a definir, no objeto atual. Se o campo for uma string, o nome amigável será usado, caso contrário, o identificador será usado',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime'                => 'SetElapsedTime',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime+'               => 'Defina um campo com o tempo (segundos) decorrido desde a data especificada por outro campo',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1'        => 'Campo alvo',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1+'       => 'O campo a definir, no objeto atual',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2'        => 'Campo de Referência',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2+'       => 'O campo do qual obter a data de referência',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3'        => 'Horário de trabalho',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3+'       => 'Deixe em branco para confiar no esquema padrão de horas de trabalho, ou configure para \\"DefaultWorkingTimeComputer\\" para forçar um esquema de 24x7',
-	'Class:cmdbAbstractObject/Method:SetIfNull'                     => 'SetIfNull',
-	'Class:cmdbAbstractObject/Method:SetIfNull+'                    => 'Defina um campo somente se ele estiver vazio, com um valor estático',
-	'Class:cmdbAbstractObject/Method:SetIfNull/Param:1'             => 'Campo alvo',
-	'Class:cmdbAbstractObject/Method:SetIfNull/Param:1+'            => 'O campo a definir, no objeto atual',
-	'Class:cmdbAbstractObject/Method:SetIfNull/Param:2'              => 'Valor',
-	'Class:cmdbAbstractObject/Method:SetIfNull/Param:2+'             => 'O valor a definir',
-	'Class:cmdbAbstractObject/Method:AddValue'                       => 'AddValue',
-	'Class:cmdbAbstractObject/Method:AddValue+'                      => 'Adicione um valor fixo a um campo',
-	'Class:cmdbAbstractObject/Method:AddValue/Param:1'               => 'Campo alvo',
-	'Class:cmdbAbstractObject/Method:AddValue/Param:1+'              => 'O campo a modificar, no objeto atual',
-	'Class:cmdbAbstractObject/Method:AddValue/Param:2'               => 'Valor',
-	'Class:cmdbAbstractObject/Method:AddValue/Param:2+'              => 'O valor decimal que será adicionado, pode ser negativo',
-	'Class:cmdbAbstractObject/Method:SetComputedDate'                => 'SetComputedDate',
-	'Class:cmdbAbstractObject/Method:SetComputedDate+'               => 'Defina um campo com uma data computada a partir de outro campo com lógica extra',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:1'        => 'Campo alvo',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:1+'       => 'O campo a definir, no objeto atual',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:2'        => 'Modificador',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:2+'       => 'Informações textuais para modificar a data de origem, por exemplo "+3 days"',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:3'        => 'Source field',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:3+'       => 'O campo usado como fonte para aplicar a lógica do Modificador',
-	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull'          => 'SetComputedDateIfNull',
-	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull+'         => 'Defina um campo com uma data computada a partir de outro campo com lógica extra',
-	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:1'  => 'Campo alvo',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser' => 'SetCurrentUser',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser+' => 'Defina um campo com o usuário atualmente logado',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1' => 'Campo alvo',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1+' => 'O campo a definir, no objeto atual. Se o campo for uma string, o nome amigável do usuário será usado, caso contrário, o identificador será usado. Esse nome amigável é o nome da pessoa, se houver algum nome amigável atribuído ao usuário, caso contrário, será usado o login',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson' => 'SetCurrentPerson',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson+' => 'Defina um campo com a pessoa atualmente logada (a \\"pessoa\\" anexada ao \\"usuário\\")',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1' => 'Campo alvo',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1+' => 'O campo a definir, no objeto atual. Se o campo for uma string, o nome amigável será usado, caso contrário, o identificador será usado',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime' => 'SetElapsedTime',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime+' => 'Defina um campo com o tempo (segundos) decorrido desde a data especificada por outro campo',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1' => 'Campo alvo',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1+' => 'O campo a definir, no objeto atual',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2' => 'Campo de Referência',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2+' => 'O campo do qual obter a data de referência',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3' => 'Horário de trabalho',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3+' => 'Deixe em branco para confiar no esquema padrão de horas de trabalho, ou configure para \\"DefaultWorkingTimeComputer\\" para forçar um esquema de 24x7',
+	'Class:cmdbAbstractObject/Method:SetIfNull' => 'SetIfNull',
+	'Class:cmdbAbstractObject/Method:SetIfNull+' => 'Defina um campo somente se ele estiver vazio, com um valor estático',
+	'Class:cmdbAbstractObject/Method:SetIfNull/Param:1' => 'Campo alvo',
+	'Class:cmdbAbstractObject/Method:SetIfNull/Param:1+' => 'O campo a definir, no objeto atual',
+	'Class:cmdbAbstractObject/Method:SetIfNull/Param:2' => 'Valor',
+	'Class:cmdbAbstractObject/Method:SetIfNull/Param:2+' => 'O valor a definir',
+	'Class:cmdbAbstractObject/Method:AddValue' => 'AddValue',
+	'Class:cmdbAbstractObject/Method:AddValue+' => 'Adicione um valor fixo a um campo',
+	'Class:cmdbAbstractObject/Method:AddValue/Param:1' => 'Campo alvo',
+	'Class:cmdbAbstractObject/Method:AddValue/Param:1+' => 'O campo a modificar, no objeto atual',
+	'Class:cmdbAbstractObject/Method:AddValue/Param:2' => 'Valor',
+	'Class:cmdbAbstractObject/Method:AddValue/Param:2+' => 'O valor decimal que será adicionado, pode ser negativo',
+	'Class:cmdbAbstractObject/Method:SetComputedDate' => 'SetComputedDate',
+	'Class:cmdbAbstractObject/Method:SetComputedDate+' => 'Defina um campo com uma data computada a partir de outro campo com lógica extra',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:1' => 'Campo alvo',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:1+' => 'O campo a definir, no objeto atual',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:2' => 'Modificador',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:2+' => 'Informações textuais para modificar a data de origem, por exemplo "+3 days"',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:3' => 'Source field',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:3+' => 'O campo usado como fonte para aplicar a lógica do Modificador',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull' => 'SetComputedDateIfNull',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull+' => 'Defina um campo com uma data computada a partir de outro campo com lógica extra',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:1' => 'Campo alvo',
 	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:1+' => 'O campo a definir, no objeto atual',
-	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:2'  => 'Modificador',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:2' => 'Modificador',
 	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:2+' => 'Informações textuais para modificar a data de origem, ex. "+3 days"',
-	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:3'  => 'Campo de origem',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:3' => 'Campo de origem',
 	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:3+' => 'O campo usado como fonte para aplicar a lógica do Modificador',
-	'Class:cmdbAbstractObject/Method:Reset'                          => 'Redefinir',
-	'Class:cmdbAbstractObject/Method:Reset+'                         => 'Redefinir um campo para seu valor padrão',
-	'Class:cmdbAbstractObject/Method:Reset/Param:1'                  => 'Campo alvo',
-	'Class:cmdbAbstractObject/Method:Reset/Param:1+'                 => 'O campo a redefinir, no objeto atual',
-	'Class:cmdbAbstractObject/Method:Copy'                           => 'Copy',
-	'Class:cmdbAbstractObject/Method:Copy+'                          => 'Copie o valor de um campo para outro campo',
-	'Class:cmdbAbstractObject/Method:Copy/Param:1'                   => 'Campo alvo',
-	'Class:cmdbAbstractObject/Method:Copy/Param:1+'                  => 'O campo a definir, no objeto atual',
-	'Class:cmdbAbstractObject/Method:Copy/Param:2'                   => 'Campo de origem',
-	'Class:cmdbAbstractObject/Method:Copy/Param:2+'                  => 'O campo a obter o valor de, no objeto atual',
-	'Class:cmdbAbstractObject/Method:ApplyStimulus'                  => 'ApplyStimulus',
-	'Class:cmdbAbstractObject/Method:ApplyStimulus+'                 => 'Aplique o estímulo especificado ao objeto atual',
-	'Class:cmdbAbstractObject/Method:ApplyStimulus/Param:1'          => 'Código de estímulo',
-	'Class:cmdbAbstractObject/Method:ApplyStimulus/Param:1+'         => 'Um código de estímulo válido para a classe atual',
-	'Class:ResponseTicketTTO/Interface:iMetricComputer'              => 'Time To Own',
-	'Class:ResponseTicketTTO/Interface:iMetricComputer+'             => 'Objetivo baseado em um SLT do tipo TTO',
-	'Class:ResponseTicketTTR/Interface:iMetricComputer'              => 'Time To Resolve',
-	'Class:ResponseTicketTTR/Interface:iMetricComputer+'             => 'Objetivo baseado em um SLT do tipo TTR',
+	'Class:cmdbAbstractObject/Method:Reset' => 'Redefinir',
+	'Class:cmdbAbstractObject/Method:Reset+' => 'Redefinir um campo para seu valor padrão',
+	'Class:cmdbAbstractObject/Method:Reset/Param:1' => 'Campo alvo',
+	'Class:cmdbAbstractObject/Method:Reset/Param:1+' => 'O campo a redefinir, no objeto atual',
+	'Class:cmdbAbstractObject/Method:Copy' => 'Copy',
+	'Class:cmdbAbstractObject/Method:Copy+' => 'Copie o valor de um campo para outro campo',
+	'Class:cmdbAbstractObject/Method:Copy/Param:1' => 'Campo alvo',
+	'Class:cmdbAbstractObject/Method:Copy/Param:1+' => 'O campo a definir, no objeto atual',
+	'Class:cmdbAbstractObject/Method:Copy/Param:2' => 'Campo de origem',
+	'Class:cmdbAbstractObject/Method:Copy/Param:2+' => 'O campo a obter o valor de, no objeto atual',
+	'Class:cmdbAbstractObject/Method:ApplyStimulus' => 'ApplyStimulus',
+	'Class:cmdbAbstractObject/Method:ApplyStimulus+' => 'Aplique o estímulo especificado ao objeto atual',
+	'Class:cmdbAbstractObject/Method:ApplyStimulus/Param:1' => 'Código de estímulo',
+	'Class:cmdbAbstractObject/Method:ApplyStimulus/Param:1+' => 'Um código de estímulo válido para a classe atual',
+	'Class:ResponseTicketTTO/Interface:iMetricComputer' => 'Time To Own',
+	'Class:ResponseTicketTTO/Interface:iMetricComputer+' => 'Objetivo baseado em um SLT do tipo TTO',
+	'Class:ResponseTicketTTR/Interface:iMetricComputer' => 'Time To Resolve',
+	'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'Objetivo baseado em um SLT do tipo TTR',
 ));
 
diff --git a/datamodels/2.x/itop-tickets/dictionaries/ru.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/dictionaries/ru.dict.itop-tickets.php
index f56ac40e2d..a9bdc6e639 100644
--- a/datamodels/2.x/itop-tickets/dictionaries/ru.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/dictionaries/ru.dict.itop-tickets.php
@@ -73,12 +73,15 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:lnkContactToTicket' => 'Связь Контакт/Тикет',
 	'Class:lnkContactToTicket+' => '',
+	'Class:lnkContactToTicket/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToTicket/Attribute:ticket_id' => 'Тикет',
 	'Class:lnkContactToTicket/Attribute:ticket_id+' => '',
 	'Class:lnkContactToTicket/Attribute:ticket_ref' => 'Связь',
 	'Class:lnkContactToTicket/Attribute:ticket_ref+' => '',
 	'Class:lnkContactToTicket/Attribute:contact_id' => 'Контакт',
 	'Class:lnkContactToTicket/Attribute:contact_id+' => '',
+	'Class:lnkContactToTicket/Attribute:contact_name' => 'Contact name~~',
+	'Class:lnkContactToTicket/Attribute:contact_name+' => '~~',
 	'Class:lnkContactToTicket/Attribute:contact_email' => 'Email контакта',
 	'Class:lnkContactToTicket/Attribute:contact_email+' => '',
 	'Class:lnkContactToTicket/Attribute:role' => 'Роль (текст)',
@@ -131,94 +134,94 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 
 // Fieldset translation
 Dict::Add('RU RU', 'Russian', 'Русский', array(
-	'Ticket:baseinfo'                                                => 'Общая информация',
-	'Ticket:date'                                                    => 'Даты',
-	'Ticket:contact'                                                 => 'Контакты',
-	'Ticket:moreinfo'                                               => 'Дополнительная информация',
-	'Ticket:relation'                                               => 'Зависимости',
-	'Ticket:log'                                                    => 'Журнал',
-	'Ticket:Type'                                                   => 'Приоритет',
-	'Ticket:support'                                                => 'Поддержка',
-	'Ticket:resolution'                                             => 'Решение',
-	'Ticket:SLA'                                                    => 'Отчёт SLA',
-	'WorkOrder:Details'                                             => 'Детали',
-	'WorkOrder:Moreinfo'                                            => 'Дополнительная информация',
-	'Tickets:ResolvedFrom'                                          => 'Автоматическое решение из %1$s',
-	'Class:cmdbAbstractObject/Method:Set'                           => 'Set~~',
-	'Class:cmdbAbstractObject/Method:Set+'                          => 'Set a field with a static value~~',
-	'Class:cmdbAbstractObject/Method:Set/Param:1'                   => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:Set/Param:1+'                  => 'The field to set, in the current object~~',
-	'Class:cmdbAbstractObject/Method:Set/Param:2'                   => 'Value~~',
-	'Class:cmdbAbstractObject/Method:Set/Param:2+'                  => 'The value to set~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentDate'                => 'SetCurrentDate~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentDate+'               => 'Set a field with the current date and time~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1'        => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1+'       => 'The field to set, in the current object~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull'          => 'SetCurrentDateIfNull~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull+'         => 'Set an empty field with the current date and time~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull/Param:1'  => 'Target Field~~',
+	'Ticket:baseinfo' => 'Общая информация',
+	'Ticket:date' => 'Даты',
+	'Ticket:contact' => 'Контакты',
+	'Ticket:moreinfo' => 'Дополнительная информация',
+	'Ticket:relation' => 'Зависимости',
+	'Ticket:log' => 'Журнал',
+	'Ticket:Type' => 'Приоритет',
+	'Ticket:support' => 'Поддержка',
+	'Ticket:resolution' => 'Решение',
+	'Ticket:SLA' => 'Отчёт SLA',
+	'WorkOrder:Details' => 'Детали',
+	'WorkOrder:Moreinfo' => 'Дополнительная информация',
+	'Tickets:ResolvedFrom' => 'Автоматическое решение из %1$s',
+	'Class:cmdbAbstractObject/Method:Set' => 'Set~~',
+	'Class:cmdbAbstractObject/Method:Set+' => 'Set a field with a static value~~',
+	'Class:cmdbAbstractObject/Method:Set/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:Set/Param:1+' => 'The field to set, in the current object~~',
+	'Class:cmdbAbstractObject/Method:Set/Param:2' => 'Value~~',
+	'Class:cmdbAbstractObject/Method:Set/Param:2+' => 'The value to set~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate' => 'SetCurrentDate~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate+' => 'Set a field with the current date and time~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1+' => 'The field to set, in the current object~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull' => 'SetCurrentDateIfNull~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull+' => 'Set an empty field with the current date and time~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull/Param:1' => 'Target Field~~',
 	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull/Param:1+' => 'The field to set, in the current object~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentUser'                => 'SetCurrentUser~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentUser+'               => 'Set a field with the currently logged in user~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1'        => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1+'       => 'The field to set, in the current object. If the field is a string then the friendly name will be used, otherwise the identifier will be used. That friendly name is the name of the person if any is attached to the user, otherwise it is the login.~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentPerson'              => 'SetCurrentPerson~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentPerson+'             => 'Set a field with the currently logged in person (the "person" attached to the logged in "user").~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1'      => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1+'     => 'The field to set, in the current object. If the field is a string then the friendly name will be used, otherwise the identifier will be used.~~',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime'                => 'SetElapsedTime~~',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime+'               => 'Set a field with the time (seconds) elapsed since a date given by another field~~',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1'        => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1+'       => 'The field to set, in the current object~~',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2'        => 'Reference Field~~',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2+'       => 'The field from which to get the reference date~~',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3'        => 'Working Hours~~',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3+'       => 'Leave empty to rely on the standard working hours scheme, or set to "DefaultWorkingTimeComputer" to force a 24x7 scheme~~',
-	'Class:cmdbAbstractObject/Method:SetIfNull'                     => 'SetIfNull~~',
-	'Class:cmdbAbstractObject/Method:SetIfNull+'                    => 'Set a field only if it is empty, with a static value~~',
-	'Class:cmdbAbstractObject/Method:SetIfNull/Param:1'             => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:SetIfNull/Param:1+'            => 'The field to set, in the current object~~',
-	'Class:cmdbAbstractObject/Method:SetIfNull/Param:2'              => 'Value~~',
-	'Class:cmdbAbstractObject/Method:SetIfNull/Param:2+'             => 'The value to set~~',
-	'Class:cmdbAbstractObject/Method:AddValue'                       => 'AddValue~~',
-	'Class:cmdbAbstractObject/Method:AddValue+'                      => 'Add a fixed value to a field~~',
-	'Class:cmdbAbstractObject/Method:AddValue/Param:1'               => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:AddValue/Param:1+'              => 'The field to modify, in the current object~~',
-	'Class:cmdbAbstractObject/Method:AddValue/Param:2'               => 'Value~~',
-	'Class:cmdbAbstractObject/Method:AddValue/Param:2+'              => 'Decimal value which will be added, can be negative~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDate'                => 'SetComputedDate~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDate+'               => 'Set a field with a date computed from another field with extra logic~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:1'        => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:1+'       => 'The field to set, in the current object~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:2'        => 'Modifier~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:2+'       => 'Textual information to modify the source date, eg. "+3 days"~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:3'        => 'Source field~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:3+'       => 'The field used as source to apply the Modifier logic~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull'          => 'SetComputedDateIfNull~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull+'         => 'Set non empty field with a date computed from another field with extra logic~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:1'  => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser' => 'SetCurrentUser~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser+' => 'Set a field with the currently logged in user~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1+' => 'The field to set, in the current object. If the field is a string then the friendly name will be used, otherwise the identifier will be used. That friendly name is the name of the person if any is attached to the user, otherwise it is the login.~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson' => 'SetCurrentPerson~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson+' => 'Set a field with the currently logged in person (the "person" attached to the logged in "user").~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1+' => 'The field to set, in the current object. If the field is a string then the friendly name will be used, otherwise the identifier will be used.~~',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime' => 'SetElapsedTime~~',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime+' => 'Set a field with the time (seconds) elapsed since a date given by another field~~',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1+' => 'The field to set, in the current object~~',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2' => 'Reference Field~~',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2+' => 'The field from which to get the reference date~~',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3' => 'Working Hours~~',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3+' => 'Leave empty to rely on the standard working hours scheme, or set to "DefaultWorkingTimeComputer" to force a 24x7 scheme~~',
+	'Class:cmdbAbstractObject/Method:SetIfNull' => 'SetIfNull~~',
+	'Class:cmdbAbstractObject/Method:SetIfNull+' => 'Set a field only if it is empty, with a static value~~',
+	'Class:cmdbAbstractObject/Method:SetIfNull/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:SetIfNull/Param:1+' => 'The field to set, in the current object~~',
+	'Class:cmdbAbstractObject/Method:SetIfNull/Param:2' => 'Value~~',
+	'Class:cmdbAbstractObject/Method:SetIfNull/Param:2+' => 'The value to set~~',
+	'Class:cmdbAbstractObject/Method:AddValue' => 'AddValue~~',
+	'Class:cmdbAbstractObject/Method:AddValue+' => 'Add a fixed value to a field~~',
+	'Class:cmdbAbstractObject/Method:AddValue/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:AddValue/Param:1+' => 'The field to modify, in the current object~~',
+	'Class:cmdbAbstractObject/Method:AddValue/Param:2' => 'Value~~',
+	'Class:cmdbAbstractObject/Method:AddValue/Param:2+' => 'Decimal value which will be added, can be negative~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDate' => 'SetComputedDate~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDate+' => 'Set a field with a date computed from another field with extra logic~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:1+' => 'The field to set, in the current object~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:2' => 'Modifier~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:2+' => 'Textual information to modify the source date, eg. "+3 days"~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:3' => 'Source field~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:3+' => 'The field used as source to apply the Modifier logic~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull' => 'SetComputedDateIfNull~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull+' => 'Set non empty field with a date computed from another field with extra logic~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:1' => 'Target Field~~',
 	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:1+' => 'The field to set, in the current object~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:2'  => 'Modifier~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:2' => 'Modifier~~',
 	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:2+' => 'Textual information to modify the source date, eg. "+3 days"~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:3'  => 'Source field~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:3' => 'Source field~~',
 	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:3+' => 'The field used as source to apply the Modifier logic~~',
-	'Class:cmdbAbstractObject/Method:Reset'                          => 'Reset~~',
-	'Class:cmdbAbstractObject/Method:Reset+'                         => 'Reset a field to its default value~~',
-	'Class:cmdbAbstractObject/Method:Reset/Param:1'                  => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:Reset/Param:1+'                 => 'The field to reset, in the current object~~',
-	'Class:cmdbAbstractObject/Method:Copy'                           => 'Copy~~',
-	'Class:cmdbAbstractObject/Method:Copy+'                          => 'Copy the value of a field to another field~~',
-	'Class:cmdbAbstractObject/Method:Copy/Param:1'                   => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:Copy/Param:1+'                  => 'The field to set, in the current object~~',
-	'Class:cmdbAbstractObject/Method:Copy/Param:2'                   => 'Source Field~~',
-	'Class:cmdbAbstractObject/Method:Copy/Param:2+'                  => 'The field to get the value from, in the current object~~',
-	'Class:cmdbAbstractObject/Method:ApplyStimulus'                  => 'ApplyStimulus~~',
-	'Class:cmdbAbstractObject/Method:ApplyStimulus+'                 => 'Apply the specified stimulus to the current object~~',
-	'Class:cmdbAbstractObject/Method:ApplyStimulus/Param:1'          => 'Stimulus code~~',
-	'Class:cmdbAbstractObject/Method:ApplyStimulus/Param:1+'         => 'A valid stimulus code for the current class~~',
-	'Class:ResponseTicketTTO/Interface:iMetricComputer'              => 'Time To Own~~',
-	'Class:ResponseTicketTTO/Interface:iMetricComputer+'             => 'Goal based on a SLT of type TTO~~',
-	'Class:ResponseTicketTTR/Interface:iMetricComputer'              => 'Time To Resolve~~',
-	'Class:ResponseTicketTTR/Interface:iMetricComputer+'             => 'Goal based on a SLT of type TTR~~',
+	'Class:cmdbAbstractObject/Method:Reset' => 'Reset~~',
+	'Class:cmdbAbstractObject/Method:Reset+' => 'Reset a field to its default value~~',
+	'Class:cmdbAbstractObject/Method:Reset/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:Reset/Param:1+' => 'The field to reset, in the current object~~',
+	'Class:cmdbAbstractObject/Method:Copy' => 'Copy~~',
+	'Class:cmdbAbstractObject/Method:Copy+' => 'Copy the value of a field to another field~~',
+	'Class:cmdbAbstractObject/Method:Copy/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:Copy/Param:1+' => 'The field to set, in the current object~~',
+	'Class:cmdbAbstractObject/Method:Copy/Param:2' => 'Source Field~~',
+	'Class:cmdbAbstractObject/Method:Copy/Param:2+' => 'The field to get the value from, in the current object~~',
+	'Class:cmdbAbstractObject/Method:ApplyStimulus' => 'ApplyStimulus~~',
+	'Class:cmdbAbstractObject/Method:ApplyStimulus+' => 'Apply the specified stimulus to the current object~~',
+	'Class:cmdbAbstractObject/Method:ApplyStimulus/Param:1' => 'Stimulus code~~',
+	'Class:cmdbAbstractObject/Method:ApplyStimulus/Param:1+' => 'A valid stimulus code for the current class~~',
+	'Class:ResponseTicketTTO/Interface:iMetricComputer' => 'Time To Own~~',
+	'Class:ResponseTicketTTO/Interface:iMetricComputer+' => 'Goal based on a SLT of type TTO~~',
+	'Class:ResponseTicketTTR/Interface:iMetricComputer' => 'Time To Resolve~~',
+	'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'Goal based on a SLT of type TTR~~',
 ));
 
diff --git a/datamodels/2.x/itop-tickets/dictionaries/sk.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/dictionaries/sk.dict.itop-tickets.php
index 4e4a860537..d8eb4284ac 100644
--- a/datamodels/2.x/itop-tickets/dictionaries/sk.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/dictionaries/sk.dict.itop-tickets.php
@@ -94,12 +94,15 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:lnkContactToTicket' => 'väzba - Kontakt / Ticket',
 	'Class:lnkContactToTicket+' => '',
+	'Class:lnkContactToTicket/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToTicket/Attribute:ticket_id' => 'Ticket',
 	'Class:lnkContactToTicket/Attribute:ticket_id+' => '',
 	'Class:lnkContactToTicket/Attribute:ticket_ref' => 'Referencia na Ticket',
 	'Class:lnkContactToTicket/Attribute:ticket_ref+' => '',
 	'Class:lnkContactToTicket/Attribute:contact_id' => 'Kontakt',
 	'Class:lnkContactToTicket/Attribute:contact_id+' => '',
+	'Class:lnkContactToTicket/Attribute:contact_name' => 'Contact name~~',
+	'Class:lnkContactToTicket/Attribute:contact_name+' => '~~',
 	'Class:lnkContactToTicket/Attribute:contact_email' => 'Email kontaktu',
 	'Class:lnkContactToTicket/Attribute:contact_email+' => '',
 	'Class:lnkContactToTicket/Attribute:role' => 'Rola',
@@ -152,94 +155,94 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 
 // Fieldset translation
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
-	'Ticket:baseinfo'                                                => 'Všeobecné informácia',
-	'Ticket:date'                                                    => 'Dátumy',
-	'Ticket:contact'                                                 => 'Kontakt',
-	'Ticket:moreinfo'                                               => 'Viac informácií',
-	'Ticket:relation'                                               => 'Vzťahy',
-	'Ticket:log'                                                    => 'Komunikácie',
-	'Ticket:Type'                                                   => 'Kvalifikácia',
-	'Ticket:support'                                                => 'Podpora',
-	'Ticket:resolution'                                             => 'Riešenie',
-	'Ticket:SLA'                                                    => 'SLA report',
-	'WorkOrder:Details'                                             => 'Detaily',
-	'WorkOrder:Moreinfo'                                            => 'Viac informácií',
-	'Tickets:ResolvedFrom'                                          => 'Automatically resolved from %1$s~~',
-	'Class:cmdbAbstractObject/Method:Set'                           => 'Set~~',
-	'Class:cmdbAbstractObject/Method:Set+'                          => 'Set a field with a static value~~',
-	'Class:cmdbAbstractObject/Method:Set/Param:1'                   => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:Set/Param:1+'                  => 'The field to set, in the current object~~',
-	'Class:cmdbAbstractObject/Method:Set/Param:2'                   => 'Value~~',
-	'Class:cmdbAbstractObject/Method:Set/Param:2+'                  => 'The value to set~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentDate'                => 'SetCurrentDate~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentDate+'               => 'Set a field with the current date and time~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1'        => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1+'       => 'The field to set, in the current object~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull'          => 'SetCurrentDateIfNull~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull+'         => 'Set an empty field with the current date and time~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull/Param:1'  => 'Target Field~~',
+	'Ticket:baseinfo' => 'Všeobecné informácia',
+	'Ticket:date' => 'Dátumy',
+	'Ticket:contact' => 'Kontakt',
+	'Ticket:moreinfo' => 'Viac informácií',
+	'Ticket:relation' => 'Vzťahy',
+	'Ticket:log' => 'Komunikácie',
+	'Ticket:Type' => 'Kvalifikácia',
+	'Ticket:support' => 'Podpora',
+	'Ticket:resolution' => 'Riešenie',
+	'Ticket:SLA' => 'SLA report',
+	'WorkOrder:Details' => 'Detaily',
+	'WorkOrder:Moreinfo' => 'Viac informácií',
+	'Tickets:ResolvedFrom' => 'Automatically resolved from %1$s~~',
+	'Class:cmdbAbstractObject/Method:Set' => 'Set~~',
+	'Class:cmdbAbstractObject/Method:Set+' => 'Set a field with a static value~~',
+	'Class:cmdbAbstractObject/Method:Set/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:Set/Param:1+' => 'The field to set, in the current object~~',
+	'Class:cmdbAbstractObject/Method:Set/Param:2' => 'Value~~',
+	'Class:cmdbAbstractObject/Method:Set/Param:2+' => 'The value to set~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate' => 'SetCurrentDate~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate+' => 'Set a field with the current date and time~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1+' => 'The field to set, in the current object~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull' => 'SetCurrentDateIfNull~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull+' => 'Set an empty field with the current date and time~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull/Param:1' => 'Target Field~~',
 	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull/Param:1+' => 'The field to set, in the current object~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentUser'                => 'SetCurrentUser~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentUser+'               => 'Set a field with the currently logged in user~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1'        => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1+'       => 'The field to set, in the current object. If the field is a string then the friendly name will be used, otherwise the identifier will be used. That friendly name is the name of the person if any is attached to the user, otherwise it is the login.~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentPerson'              => 'SetCurrentPerson~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentPerson+'             => 'Set a field with the currently logged in person (the "person" attached to the logged in "user").~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1'      => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1+'     => 'The field to set, in the current object. If the field is a string then the friendly name will be used, otherwise the identifier will be used.~~',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime'                => 'SetElapsedTime~~',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime+'               => 'Set a field with the time (seconds) elapsed since a date given by another field~~',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1'        => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1+'       => 'The field to set, in the current object~~',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2'        => 'Reference Field~~',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2+'       => 'The field from which to get the reference date~~',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3'        => 'Working Hours~~',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3+'       => 'Leave empty to rely on the standard working hours scheme, or set to "DefaultWorkingTimeComputer" to force a 24x7 scheme~~',
-	'Class:cmdbAbstractObject/Method:SetIfNull'                     => 'SetIfNull~~',
-	'Class:cmdbAbstractObject/Method:SetIfNull+'                    => 'Set a field only if it is empty, with a static value~~',
-	'Class:cmdbAbstractObject/Method:SetIfNull/Param:1'             => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:SetIfNull/Param:1+'            => 'The field to set, in the current object~~',
-	'Class:cmdbAbstractObject/Method:SetIfNull/Param:2'              => 'Value~~',
-	'Class:cmdbAbstractObject/Method:SetIfNull/Param:2+'             => 'The value to set~~',
-	'Class:cmdbAbstractObject/Method:AddValue'                       => 'AddValue~~',
-	'Class:cmdbAbstractObject/Method:AddValue+'                      => 'Add a fixed value to a field~~',
-	'Class:cmdbAbstractObject/Method:AddValue/Param:1'               => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:AddValue/Param:1+'              => 'The field to modify, in the current object~~',
-	'Class:cmdbAbstractObject/Method:AddValue/Param:2'               => 'Value~~',
-	'Class:cmdbAbstractObject/Method:AddValue/Param:2+'              => 'Decimal value which will be added, can be negative~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDate'                => 'SetComputedDate~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDate+'               => 'Set a field with a date computed from another field with extra logic~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:1'        => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:1+'       => 'The field to set, in the current object~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:2'        => 'Modifier~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:2+'       => 'Textual information to modify the source date, eg. "+3 days"~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:3'        => 'Source field~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:3+'       => 'The field used as source to apply the Modifier logic~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull'          => 'SetComputedDateIfNull~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull+'         => 'Set non empty field with a date computed from another field with extra logic~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:1'  => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser' => 'SetCurrentUser~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser+' => 'Set a field with the currently logged in user~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1+' => 'The field to set, in the current object. If the field is a string then the friendly name will be used, otherwise the identifier will be used. That friendly name is the name of the person if any is attached to the user, otherwise it is the login.~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson' => 'SetCurrentPerson~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson+' => 'Set a field with the currently logged in person (the "person" attached to the logged in "user").~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1+' => 'The field to set, in the current object. If the field is a string then the friendly name will be used, otherwise the identifier will be used.~~',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime' => 'SetElapsedTime~~',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime+' => 'Set a field with the time (seconds) elapsed since a date given by another field~~',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1+' => 'The field to set, in the current object~~',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2' => 'Reference Field~~',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2+' => 'The field from which to get the reference date~~',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3' => 'Working Hours~~',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3+' => 'Leave empty to rely on the standard working hours scheme, or set to "DefaultWorkingTimeComputer" to force a 24x7 scheme~~',
+	'Class:cmdbAbstractObject/Method:SetIfNull' => 'SetIfNull~~',
+	'Class:cmdbAbstractObject/Method:SetIfNull+' => 'Set a field only if it is empty, with a static value~~',
+	'Class:cmdbAbstractObject/Method:SetIfNull/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:SetIfNull/Param:1+' => 'The field to set, in the current object~~',
+	'Class:cmdbAbstractObject/Method:SetIfNull/Param:2' => 'Value~~',
+	'Class:cmdbAbstractObject/Method:SetIfNull/Param:2+' => 'The value to set~~',
+	'Class:cmdbAbstractObject/Method:AddValue' => 'AddValue~~',
+	'Class:cmdbAbstractObject/Method:AddValue+' => 'Add a fixed value to a field~~',
+	'Class:cmdbAbstractObject/Method:AddValue/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:AddValue/Param:1+' => 'The field to modify, in the current object~~',
+	'Class:cmdbAbstractObject/Method:AddValue/Param:2' => 'Value~~',
+	'Class:cmdbAbstractObject/Method:AddValue/Param:2+' => 'Decimal value which will be added, can be negative~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDate' => 'SetComputedDate~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDate+' => 'Set a field with a date computed from another field with extra logic~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:1+' => 'The field to set, in the current object~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:2' => 'Modifier~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:2+' => 'Textual information to modify the source date, eg. "+3 days"~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:3' => 'Source field~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:3+' => 'The field used as source to apply the Modifier logic~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull' => 'SetComputedDateIfNull~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull+' => 'Set non empty field with a date computed from another field with extra logic~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:1' => 'Target Field~~',
 	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:1+' => 'The field to set, in the current object~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:2'  => 'Modifier~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:2' => 'Modifier~~',
 	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:2+' => 'Textual information to modify the source date, eg. "+3 days"~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:3'  => 'Source field~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:3' => 'Source field~~',
 	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:3+' => 'The field used as source to apply the Modifier logic~~',
-	'Class:cmdbAbstractObject/Method:Reset'                          => 'Reset~~',
-	'Class:cmdbAbstractObject/Method:Reset+'                         => 'Reset a field to its default value~~',
-	'Class:cmdbAbstractObject/Method:Reset/Param:1'                  => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:Reset/Param:1+'                 => 'The field to reset, in the current object~~',
-	'Class:cmdbAbstractObject/Method:Copy'                           => 'Copy~~',
-	'Class:cmdbAbstractObject/Method:Copy+'                          => 'Copy the value of a field to another field~~',
-	'Class:cmdbAbstractObject/Method:Copy/Param:1'                   => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:Copy/Param:1+'                  => 'The field to set, in the current object~~',
-	'Class:cmdbAbstractObject/Method:Copy/Param:2'                   => 'Source Field~~',
-	'Class:cmdbAbstractObject/Method:Copy/Param:2+'                  => 'The field to get the value from, in the current object~~',
-	'Class:cmdbAbstractObject/Method:ApplyStimulus'                  => 'ApplyStimulus~~',
-	'Class:cmdbAbstractObject/Method:ApplyStimulus+'                 => 'Apply the specified stimulus to the current object~~',
-	'Class:cmdbAbstractObject/Method:ApplyStimulus/Param:1'          => 'Stimulus code~~',
-	'Class:cmdbAbstractObject/Method:ApplyStimulus/Param:1+'         => 'A valid stimulus code for the current class~~',
-	'Class:ResponseTicketTTO/Interface:iMetricComputer'              => 'Time To Own~~',
-	'Class:ResponseTicketTTO/Interface:iMetricComputer+'             => 'Goal based on a SLT of type TTO~~',
-	'Class:ResponseTicketTTR/Interface:iMetricComputer'              => 'Time To Resolve~~',
-	'Class:ResponseTicketTTR/Interface:iMetricComputer+'             => 'Goal based on a SLT of type TTR~~',
+	'Class:cmdbAbstractObject/Method:Reset' => 'Reset~~',
+	'Class:cmdbAbstractObject/Method:Reset+' => 'Reset a field to its default value~~',
+	'Class:cmdbAbstractObject/Method:Reset/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:Reset/Param:1+' => 'The field to reset, in the current object~~',
+	'Class:cmdbAbstractObject/Method:Copy' => 'Copy~~',
+	'Class:cmdbAbstractObject/Method:Copy+' => 'Copy the value of a field to another field~~',
+	'Class:cmdbAbstractObject/Method:Copy/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:Copy/Param:1+' => 'The field to set, in the current object~~',
+	'Class:cmdbAbstractObject/Method:Copy/Param:2' => 'Source Field~~',
+	'Class:cmdbAbstractObject/Method:Copy/Param:2+' => 'The field to get the value from, in the current object~~',
+	'Class:cmdbAbstractObject/Method:ApplyStimulus' => 'ApplyStimulus~~',
+	'Class:cmdbAbstractObject/Method:ApplyStimulus+' => 'Apply the specified stimulus to the current object~~',
+	'Class:cmdbAbstractObject/Method:ApplyStimulus/Param:1' => 'Stimulus code~~',
+	'Class:cmdbAbstractObject/Method:ApplyStimulus/Param:1+' => 'A valid stimulus code for the current class~~',
+	'Class:ResponseTicketTTO/Interface:iMetricComputer' => 'Time To Own~~',
+	'Class:ResponseTicketTTO/Interface:iMetricComputer+' => 'Goal based on a SLT of type TTO~~',
+	'Class:ResponseTicketTTR/Interface:iMetricComputer' => 'Time To Resolve~~',
+	'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'Goal based on a SLT of type TTR~~',
 ));
 
diff --git a/datamodels/2.x/itop-tickets/dictionaries/tr.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/dictionaries/tr.dict.itop-tickets.php
index c254d09978..56ec1e2791 100644
--- a/datamodels/2.x/itop-tickets/dictionaries/tr.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/dictionaries/tr.dict.itop-tickets.php
@@ -99,12 +99,15 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:lnkContactToTicket' => 'Kişi / Çağrı kaydı bağla',
 	'Class:lnkContactToTicket+' => '~~',
+	'Class:lnkContactToTicket/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToTicket/Attribute:ticket_id' => 'Çağrı Kaydı',
 	'Class:lnkContactToTicket/Attribute:ticket_id+' => '~~',
 	'Class:lnkContactToTicket/Attribute:ticket_ref' => 'Ref',
 	'Class:lnkContactToTicket/Attribute:ticket_ref+' => '~~',
 	'Class:lnkContactToTicket/Attribute:contact_id' => 'Kişi',
 	'Class:lnkContactToTicket/Attribute:contact_id+' => '~~',
+	'Class:lnkContactToTicket/Attribute:contact_name' => 'Contact name~~',
+	'Class:lnkContactToTicket/Attribute:contact_name+' => '~~',
 	'Class:lnkContactToTicket/Attribute:contact_email' => 'İletişim e-postası',
 	'Class:lnkContactToTicket/Attribute:contact_email+' => '~~',
 	'Class:lnkContactToTicket/Attribute:role' => 'Rol (metin)',
@@ -157,94 +160,94 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 
 // Fieldset translation
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Ticket:baseinfo'                                                => 'Genel Bilgi',
-	'Ticket:date'                                                    => 'Tarihler',
-	'Ticket:contact'                                                 => 'Kişiler',
-	'Ticket:moreinfo'                                               => 'Daha fazla bilgi',
-	'Ticket:relation'                                               => 'İlişkiler',
-	'Ticket:log'                                                    => 'İletişim',
-	'Ticket:Type'                                                   => 'Yeterlilik',
-	'Ticket:support'                                                => 'Destek',
-	'Ticket:resolution'                                             => 'Çözünürlük',
-	'Ticket:SLA'                                                    => 'SLA raporu',
-	'WorkOrder:Details'                                             => 'Ayrıntılar',
-	'WorkOrder:Moreinfo'                                            => 'Daha fazla bilgi',
-	'Tickets:ResolvedFrom'                                          => '%1$s\'den otomatik olarak çözüldü,',
-	'Class:cmdbAbstractObject/Method:Set'                           => 'Ayarla',
-	'Class:cmdbAbstractObject/Method:Set+'                          => 'Sabit değeri olan bir alanı ayarlayın',
-	'Class:cmdbAbstractObject/Method:Set/Param:1'                   => 'Hedef alanı',
-	'Class:cmdbAbstractObject/Method:Set/Param:1+'                  => 'Ayarlanan alan, geçerli nesnede',
-	'Class:cmdbAbstractObject/Method:Set/Param:2'                   => 'Değer',
-	'Class:cmdbAbstractObject/Method:Set/Param:2+'                  => 'Ayarlanan değer',
-	'Class:cmdbAbstractObject/Method:SetCurrentDate'                => 'Güncel tarihi ayarla',
-	'Class:cmdbAbstractObject/Method:SetCurrentDate+'               => 'Güncel tarih ve saatle bir alan ayarlayın',
-	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1'        => 'Hedef alanı',
-	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1+'       => 'Ayarlanan alan, geçerli nesnede',
-	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull'          => 'SetCurrentDateIfNull~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull+'         => 'Set an empty field with the current date and time~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull/Param:1'  => 'Target Field~~',
+	'Ticket:baseinfo' => 'Genel Bilgi',
+	'Ticket:date' => 'Tarihler',
+	'Ticket:contact' => 'Kişiler',
+	'Ticket:moreinfo' => 'Daha fazla bilgi',
+	'Ticket:relation' => 'İlişkiler',
+	'Ticket:log' => 'İletişim',
+	'Ticket:Type' => 'Yeterlilik',
+	'Ticket:support' => 'Destek',
+	'Ticket:resolution' => 'Çözünürlük',
+	'Ticket:SLA' => 'SLA raporu',
+	'WorkOrder:Details' => 'Ayrıntılar',
+	'WorkOrder:Moreinfo' => 'Daha fazla bilgi',
+	'Tickets:ResolvedFrom' => '%1$s\'den otomatik olarak çözüldü,',
+	'Class:cmdbAbstractObject/Method:Set' => 'Ayarla',
+	'Class:cmdbAbstractObject/Method:Set+' => 'Sabit değeri olan bir alanı ayarlayın',
+	'Class:cmdbAbstractObject/Method:Set/Param:1' => 'Hedef alanı',
+	'Class:cmdbAbstractObject/Method:Set/Param:1+' => 'Ayarlanan alan, geçerli nesnede',
+	'Class:cmdbAbstractObject/Method:Set/Param:2' => 'Değer',
+	'Class:cmdbAbstractObject/Method:Set/Param:2+' => 'Ayarlanan değer',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate' => 'Güncel tarihi ayarla',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate+' => 'Güncel tarih ve saatle bir alan ayarlayın',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1' => 'Hedef alanı',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1+' => 'Ayarlanan alan, geçerli nesnede',
+	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull' => 'SetCurrentDateIfNull~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull+' => 'Set an empty field with the current date and time~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull/Param:1' => 'Target Field~~',
 	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull/Param:1+' => 'The field to set, in the current object~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentUser'                => 'Mevcut kullanıcıyı ayarla',
-	'Class:cmdbAbstractObject/Method:SetCurrentUser+'               => 'Oturum açmış olan kullanıcıyla bir alan ayarlayın',
-	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1'        => 'Hedef alanı',
-	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1+'       => 'Mevcut nesnede ayarlanan alan. Alan bir dize ise, bilinen ad kullanılacak, aksi takdirde tanımlayıcı kullanılacaktır. Bu bilinen ad, kullanıcıya atandığı takdirde geçerlidir.Aksi halde giriş yapılan kullanıcı adı geçerlidir.',
-	'Class:cmdbAbstractObject/Method:SetCurrentPerson'              => 'Mevcut kullanıcıyı ayarla',
-	'Class:cmdbAbstractObject/Method:SetCurrentPerson+'             => 'Oturum açmış kişiyle bir alan ayarlayın.',
-	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1'      => 'Hedef alanı',
-	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1+'     => 'Mevcut nesnede ayarlanan alan. Alan bir dize ise, bilinen ad kullanılacaktır, aksi takdirde tanımlayıcı kullanılacaktır.',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime'                => 'Geçen zamanı ayarla',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime+'               => 'Başka bir alan tarafından belirlenmiş tarihten geçen süreye göre  bir alanı ayarla (saniye)',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1'        => 'Hedef alanı',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1+'       => 'Ayarlanan alan, geçerli nesnede',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2'        => 'Referans alanı',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2+'       => 'Referans tarihi elde etmek için alan',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3'        => 'Çalışma saatleri',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3+'       => 'Standart çalışma saatleri şemasına uymak için boş bırakın veya 24x7 şemasını oluşturmak için \\"DefaultWorkingTimecomputer\\" olarak ayarlayın',
-	'Class:cmdbAbstractObject/Method:SetIfNull'                     => 'SetIfNull~~',
-	'Class:cmdbAbstractObject/Method:SetIfNull+'                    => 'Set a field only if it is empty, with a static value~~',
-	'Class:cmdbAbstractObject/Method:SetIfNull/Param:1'             => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:SetIfNull/Param:1+'            => 'The field to set, in the current object~~',
-	'Class:cmdbAbstractObject/Method:SetIfNull/Param:2'              => 'Value~~',
-	'Class:cmdbAbstractObject/Method:SetIfNull/Param:2+'             => 'The value to set~~',
-	'Class:cmdbAbstractObject/Method:AddValue'                       => 'AddValue~~',
-	'Class:cmdbAbstractObject/Method:AddValue+'                      => 'Add a fixed value to a field~~',
-	'Class:cmdbAbstractObject/Method:AddValue/Param:1'               => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:AddValue/Param:1+'              => 'The field to modify, in the current object~~',
-	'Class:cmdbAbstractObject/Method:AddValue/Param:2'               => 'Value~~',
-	'Class:cmdbAbstractObject/Method:AddValue/Param:2+'              => 'Decimal value which will be added, can be negative~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDate'                => 'SetComputedDate~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDate+'               => 'Set a field with a date computed from another field with extra logic~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:1'        => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:1+'       => 'The field to set, in the current object~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:2'        => 'Modifier~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:2+'       => 'Textual information to modify the source date, eg. "+3 days"~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:3'        => 'Source field~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:3+'       => 'The field used as source to apply the Modifier logic~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull'          => 'SetComputedDateIfNull~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull+'         => 'Set non empty field with a date computed from another field with extra logic~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:1'  => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser' => 'Mevcut kullanıcıyı ayarla',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser+' => 'Oturum açmış olan kullanıcıyla bir alan ayarlayın',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1' => 'Hedef alanı',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1+' => 'Mevcut nesnede ayarlanan alan. Alan bir dize ise, bilinen ad kullanılacak, aksi takdirde tanımlayıcı kullanılacaktır. Bu bilinen ad, kullanıcıya atandığı takdirde geçerlidir.Aksi halde giriş yapılan kullanıcı adı geçerlidir.',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson' => 'Mevcut kullanıcıyı ayarla',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson+' => 'Oturum açmış kişiyle bir alan ayarlayın.',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1' => 'Hedef alanı',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1+' => 'Mevcut nesnede ayarlanan alan. Alan bir dize ise, bilinen ad kullanılacaktır, aksi takdirde tanımlayıcı kullanılacaktır.',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime' => 'Geçen zamanı ayarla',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime+' => 'Başka bir alan tarafından belirlenmiş tarihten geçen süreye göre  bir alanı ayarla (saniye)',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1' => 'Hedef alanı',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1+' => 'Ayarlanan alan, geçerli nesnede',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2' => 'Referans alanı',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2+' => 'Referans tarihi elde etmek için alan',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3' => 'Çalışma saatleri',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3+' => 'Standart çalışma saatleri şemasına uymak için boş bırakın veya 24x7 şemasını oluşturmak için \\"DefaultWorkingTimecomputer\\" olarak ayarlayın',
+	'Class:cmdbAbstractObject/Method:SetIfNull' => 'SetIfNull~~',
+	'Class:cmdbAbstractObject/Method:SetIfNull+' => 'Set a field only if it is empty, with a static value~~',
+	'Class:cmdbAbstractObject/Method:SetIfNull/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:SetIfNull/Param:1+' => 'The field to set, in the current object~~',
+	'Class:cmdbAbstractObject/Method:SetIfNull/Param:2' => 'Value~~',
+	'Class:cmdbAbstractObject/Method:SetIfNull/Param:2+' => 'The value to set~~',
+	'Class:cmdbAbstractObject/Method:AddValue' => 'AddValue~~',
+	'Class:cmdbAbstractObject/Method:AddValue+' => 'Add a fixed value to a field~~',
+	'Class:cmdbAbstractObject/Method:AddValue/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:AddValue/Param:1+' => 'The field to modify, in the current object~~',
+	'Class:cmdbAbstractObject/Method:AddValue/Param:2' => 'Value~~',
+	'Class:cmdbAbstractObject/Method:AddValue/Param:2+' => 'Decimal value which will be added, can be negative~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDate' => 'SetComputedDate~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDate+' => 'Set a field with a date computed from another field with extra logic~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:1+' => 'The field to set, in the current object~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:2' => 'Modifier~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:2+' => 'Textual information to modify the source date, eg. "+3 days"~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:3' => 'Source field~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:3+' => 'The field used as source to apply the Modifier logic~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull' => 'SetComputedDateIfNull~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull+' => 'Set non empty field with a date computed from another field with extra logic~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:1' => 'Target Field~~',
 	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:1+' => 'The field to set, in the current object~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:2'  => 'Modifier~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:2' => 'Modifier~~',
 	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:2+' => 'Textual information to modify the source date, eg. "+3 days"~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:3'  => 'Source field~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:3' => 'Source field~~',
 	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:3+' => 'The field used as source to apply the Modifier logic~~',
-	'Class:cmdbAbstractObject/Method:Reset'                          => 'Sıfırla',
-	'Class:cmdbAbstractObject/Method:Reset+'                         => 'Bir alanı varsayılan değerine sıfırlayın',
-	'Class:cmdbAbstractObject/Method:Reset/Param:1'                  => 'Hedef alanı',
-	'Class:cmdbAbstractObject/Method:Reset/Param:1+'                 => 'Sıfırlanan alan, mevcut nesnede',
-	'Class:cmdbAbstractObject/Method:Copy'                           => 'Kopyala',
-	'Class:cmdbAbstractObject/Method:Copy+'                          => 'Bir alanın değerini başka bir alana kopyalayın',
-	'Class:cmdbAbstractObject/Method:Copy/Param:1'                   => 'Hedef alanı',
-	'Class:cmdbAbstractObject/Method:Copy/Param:1+'                  => 'Ayarlanan alan, geçerli nesnede',
-	'Class:cmdbAbstractObject/Method:Copy/Param:2'                   => 'Kaynak alanı',
-	'Class:cmdbAbstractObject/Method:Copy/Param:2+'                  => 'Mevcut nesnede değeri elde etmek için alan',
-	'Class:cmdbAbstractObject/Method:ApplyStimulus'                  => 'ApplyStimulus~~',
-	'Class:cmdbAbstractObject/Method:ApplyStimulus+'                 => 'Apply the specified stimulus to the current object~~',
-	'Class:cmdbAbstractObject/Method:ApplyStimulus/Param:1'          => 'Stimulus code~~',
-	'Class:cmdbAbstractObject/Method:ApplyStimulus/Param:1+'         => 'A valid stimulus code for the current class~~',
-	'Class:ResponseTicketTTO/Interface:iMetricComputer'              => 'Sahip Olunacak Zaman',
-	'Class:ResponseTicketTTO/Interface:iMetricComputer+'             => 'TTO tipi bir SLT\'ye dayalı hedef',
-	'Class:ResponseTicketTTR/Interface:iMetricComputer'              => 'Çözme zamanı',
-	'Class:ResponseTicketTTR/Interface:iMetricComputer+'             => 'TTR tipi  bir SLT\'ye dayalı hedef',
+	'Class:cmdbAbstractObject/Method:Reset' => 'Sıfırla',
+	'Class:cmdbAbstractObject/Method:Reset+' => 'Bir alanı varsayılan değerine sıfırlayın',
+	'Class:cmdbAbstractObject/Method:Reset/Param:1' => 'Hedef alanı',
+	'Class:cmdbAbstractObject/Method:Reset/Param:1+' => 'Sıfırlanan alan, mevcut nesnede',
+	'Class:cmdbAbstractObject/Method:Copy' => 'Kopyala',
+	'Class:cmdbAbstractObject/Method:Copy+' => 'Bir alanın değerini başka bir alana kopyalayın',
+	'Class:cmdbAbstractObject/Method:Copy/Param:1' => 'Hedef alanı',
+	'Class:cmdbAbstractObject/Method:Copy/Param:1+' => 'Ayarlanan alan, geçerli nesnede',
+	'Class:cmdbAbstractObject/Method:Copy/Param:2' => 'Kaynak alanı',
+	'Class:cmdbAbstractObject/Method:Copy/Param:2+' => 'Mevcut nesnede değeri elde etmek için alan',
+	'Class:cmdbAbstractObject/Method:ApplyStimulus' => 'ApplyStimulus~~',
+	'Class:cmdbAbstractObject/Method:ApplyStimulus+' => 'Apply the specified stimulus to the current object~~',
+	'Class:cmdbAbstractObject/Method:ApplyStimulus/Param:1' => 'Stimulus code~~',
+	'Class:cmdbAbstractObject/Method:ApplyStimulus/Param:1+' => 'A valid stimulus code for the current class~~',
+	'Class:ResponseTicketTTO/Interface:iMetricComputer' => 'Sahip Olunacak Zaman',
+	'Class:ResponseTicketTTO/Interface:iMetricComputer+' => 'TTO tipi bir SLT\'ye dayalı hedef',
+	'Class:ResponseTicketTTR/Interface:iMetricComputer' => 'Çözme zamanı',
+	'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'TTR tipi  bir SLT\'ye dayalı hedef',
 ));
 
diff --git a/datamodels/2.x/itop-tickets/dictionaries/zh_cn.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/dictionaries/zh_cn.dict.itop-tickets.php
index d70cd8ba00..393c21882f 100644
--- a/datamodels/2.x/itop-tickets/dictionaries/zh_cn.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/dictionaries/zh_cn.dict.itop-tickets.php
@@ -94,12 +94,15 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:lnkContactToTicket' => '关联 联系人/工单',
 	'Class:lnkContactToTicket+' => '',
+	'Class:lnkContactToTicket/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToTicket/Attribute:ticket_id' => '工单',
 	'Class:lnkContactToTicket/Attribute:ticket_id+' => '',
 	'Class:lnkContactToTicket/Attribute:ticket_ref' => '工单编号',
 	'Class:lnkContactToTicket/Attribute:ticket_ref+' => '',
 	'Class:lnkContactToTicket/Attribute:contact_id' => '联系人',
 	'Class:lnkContactToTicket/Attribute:contact_id+' => '',
+	'Class:lnkContactToTicket/Attribute:contact_name' => 'Contact name~~',
+	'Class:lnkContactToTicket/Attribute:contact_name+' => '~~',
 	'Class:lnkContactToTicket/Attribute:contact_email' => '邮箱',
 	'Class:lnkContactToTicket/Attribute:contact_email+' => '',
 	'Class:lnkContactToTicket/Attribute:role' => '角色 (文本)',
@@ -152,94 +155,94 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 
 // Fieldset translation
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Ticket:baseinfo'                                                => '基本信息',
-	'Ticket:date'                                                    => '日期信息',
-	'Ticket:contact'                                                 => '联系人',
-	'Ticket:moreinfo'                                               => '更多信息',
-	'Ticket:relation'                                               => '相关信息',
-	'Ticket:log'                                                    => '日志',
-	'Ticket:Type'                                                   => '风险评估',
-	'Ticket:support'                                                => '支持信息',
-	'Ticket:resolution'                                             => '解决方案',
-	'Ticket:SLA'                                                    => 'SLA 报告',
-	'WorkOrder:Details'                                             => '详情',
-	'WorkOrder:Moreinfo'                                            => '更多信息',
-	'Tickets:ResolvedFrom'                                          => '从 %1$s 自动解决',
-	'Class:cmdbAbstractObject/Method:Set'                           => '设置',
-	'Class:cmdbAbstractObject/Method:Set+'                          => '填写固定值',
-	'Class:cmdbAbstractObject/Method:Set/Param:1'                   => '目标字段',
-	'Class:cmdbAbstractObject/Method:Set/Param:1+'                  => '填写当前对象',
-	'Class:cmdbAbstractObject/Method:Set/Param:2'                   => '值',
-	'Class:cmdbAbstractObject/Method:Set/Param:2+'                  => '要设置的值',
-	'Class:cmdbAbstractObject/Method:SetCurrentDate'                => '设置为当前日期',
-	'Class:cmdbAbstractObject/Method:SetCurrentDate+'               => '填写当前日期和时间',
-	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1'        => '目标字段',
-	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1+'       => '填写当前对象',
-	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull'          => 'SetCurrentDateIfNull~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull+'         => 'Set an empty field with the current date and time~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull/Param:1'  => 'Target Field~~',
+	'Ticket:baseinfo' => '基本信息',
+	'Ticket:date' => '日期信息',
+	'Ticket:contact' => '联系人',
+	'Ticket:moreinfo' => '更多信息',
+	'Ticket:relation' => '相关信息',
+	'Ticket:log' => '日志',
+	'Ticket:Type' => '风险评估',
+	'Ticket:support' => '支持信息',
+	'Ticket:resolution' => '解决方案',
+	'Ticket:SLA' => 'SLA 报告',
+	'WorkOrder:Details' => '详情',
+	'WorkOrder:Moreinfo' => '更多信息',
+	'Tickets:ResolvedFrom' => '从 %1$s 自动解决',
+	'Class:cmdbAbstractObject/Method:Set' => '设置',
+	'Class:cmdbAbstractObject/Method:Set+' => '填写固定值',
+	'Class:cmdbAbstractObject/Method:Set/Param:1' => '目标字段',
+	'Class:cmdbAbstractObject/Method:Set/Param:1+' => '填写当前对象',
+	'Class:cmdbAbstractObject/Method:Set/Param:2' => '值',
+	'Class:cmdbAbstractObject/Method:Set/Param:2+' => '要设置的值',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate' => '设置为当前日期',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate+' => '填写当前日期和时间',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1' => '目标字段',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1+' => '填写当前对象',
+	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull' => 'SetCurrentDateIfNull~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull+' => 'Set an empty field with the current date and time~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull/Param:1' => 'Target Field~~',
 	'Class:cmdbAbstractObject/Method:SetCurrentDateIfNull/Param:1+' => 'The field to set, in the current object~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentUser'                => '设置为当前用户',
-	'Class:cmdbAbstractObject/Method:SetCurrentUser+'               => '填写当前登录用户',
-	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1'        => '目标字段',
-	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1+'       => 'The field to set, in the current object. If the field is a string then the friendly name will be used, otherwise the identifier will be used. That friendly name is the name of the person if any is attached to the user, otherwise it is the login.',
-	'Class:cmdbAbstractObject/Method:SetCurrentPerson'              => '设置为当前个体',
-	'Class:cmdbAbstractObject/Method:SetCurrentPerson+'             => 'Set a field with the currently logged in person (the "person" attached to the logged in "user").',
-	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1'      => '目标字段',
-	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1+'     => '填写当前对象,如果填写字符串则是昵称.',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime'                => '设置已过时间',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime+'               => 'Set a field with the time (seconds) elapsed since a date given by another field',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1'        => '目标字段',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1+'       => 'The field to set, in the current object',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2'        => '参考字段',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2+'       => 'The field from which to get the reference date',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3'        => '工作时间',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3+'       => 'Leave empty to rely on the standard working hours scheme, or set to "DefaultWorkingTimeComputer" to force a 24x7 scheme',
-	'Class:cmdbAbstractObject/Method:SetIfNull'                     => 'SetIfNull~~',
-	'Class:cmdbAbstractObject/Method:SetIfNull+'                    => 'Set a field only if it is empty, with a static value~~',
-	'Class:cmdbAbstractObject/Method:SetIfNull/Param:1'             => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:SetIfNull/Param:1+'            => 'The field to set, in the current object~~',
-	'Class:cmdbAbstractObject/Method:SetIfNull/Param:2'              => 'Value~~',
-	'Class:cmdbAbstractObject/Method:SetIfNull/Param:2+'             => 'The value to set~~',
-	'Class:cmdbAbstractObject/Method:AddValue'                       => 'AddValue~~',
-	'Class:cmdbAbstractObject/Method:AddValue+'                      => 'Add a fixed value to a field~~',
-	'Class:cmdbAbstractObject/Method:AddValue/Param:1'               => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:AddValue/Param:1+'              => 'The field to modify, in the current object~~',
-	'Class:cmdbAbstractObject/Method:AddValue/Param:2'               => 'Value~~',
-	'Class:cmdbAbstractObject/Method:AddValue/Param:2+'              => 'Decimal value which will be added, can be negative~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDate'                => 'SetComputedDate~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDate+'               => 'Set a field with a date computed from another field with extra logic~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:1'        => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:1+'       => 'The field to set, in the current object~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:2'        => 'Modifier~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:2+'       => 'Textual information to modify the source date, eg. "+3 days"~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:3'        => 'Source field~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:3+'       => 'The field used as source to apply the Modifier logic~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull'          => 'SetComputedDateIfNull~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull+'         => 'Set non empty field with a date computed from another field with extra logic~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:1'  => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser' => '设置为当前用户',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser+' => '填写当前登录用户',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1' => '目标字段',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1+' => 'The field to set, in the current object. If the field is a string then the friendly name will be used, otherwise the identifier will be used. That friendly name is the name of the person if any is attached to the user, otherwise it is the login.',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson' => '设置为当前个体',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson+' => 'Set a field with the currently logged in person (the "person" attached to the logged in "user").',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1' => '目标字段',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1+' => '填写当前对象,如果填写字符串则是昵称.',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime' => '设置已过时间',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime+' => 'Set a field with the time (seconds) elapsed since a date given by another field',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1' => '目标字段',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1+' => 'The field to set, in the current object',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2' => '参考字段',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2+' => 'The field from which to get the reference date',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3' => '工作时间',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3+' => 'Leave empty to rely on the standard working hours scheme, or set to "DefaultWorkingTimeComputer" to force a 24x7 scheme',
+	'Class:cmdbAbstractObject/Method:SetIfNull' => 'SetIfNull~~',
+	'Class:cmdbAbstractObject/Method:SetIfNull+' => 'Set a field only if it is empty, with a static value~~',
+	'Class:cmdbAbstractObject/Method:SetIfNull/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:SetIfNull/Param:1+' => 'The field to set, in the current object~~',
+	'Class:cmdbAbstractObject/Method:SetIfNull/Param:2' => 'Value~~',
+	'Class:cmdbAbstractObject/Method:SetIfNull/Param:2+' => 'The value to set~~',
+	'Class:cmdbAbstractObject/Method:AddValue' => 'AddValue~~',
+	'Class:cmdbAbstractObject/Method:AddValue+' => 'Add a fixed value to a field~~',
+	'Class:cmdbAbstractObject/Method:AddValue/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:AddValue/Param:1+' => 'The field to modify, in the current object~~',
+	'Class:cmdbAbstractObject/Method:AddValue/Param:2' => 'Value~~',
+	'Class:cmdbAbstractObject/Method:AddValue/Param:2+' => 'Decimal value which will be added, can be negative~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDate' => 'SetComputedDate~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDate+' => 'Set a field with a date computed from another field with extra logic~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:1+' => 'The field to set, in the current object~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:2' => 'Modifier~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:2+' => 'Textual information to modify the source date, eg. "+3 days"~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:3' => 'Source field~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDate/Param:3+' => 'The field used as source to apply the Modifier logic~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull' => 'SetComputedDateIfNull~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull+' => 'Set non empty field with a date computed from another field with extra logic~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:1' => 'Target Field~~',
 	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:1+' => 'The field to set, in the current object~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:2'  => 'Modifier~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:2' => 'Modifier~~',
 	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:2+' => 'Textual information to modify the source date, eg. "+3 days"~~',
-	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:3'  => 'Source field~~',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:3' => 'Source field~~',
 	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:3+' => 'The field used as source to apply the Modifier logic~~',
-	'Class:cmdbAbstractObject/Method:Reset'                          => '重置',
-	'Class:cmdbAbstractObject/Method:Reset+'                         => '重置为默认值',
-	'Class:cmdbAbstractObject/Method:Reset/Param:1'                  => '目标字段',
-	'Class:cmdbAbstractObject/Method:Reset/Param:1+'                 => '填写当前对象',
-	'Class:cmdbAbstractObject/Method:Copy'                           => '复制',
-	'Class:cmdbAbstractObject/Method:Copy+'                          => '复制当前值到另外一个地方',
-	'Class:cmdbAbstractObject/Method:Copy/Param:1'                   => '目标字段',
-	'Class:cmdbAbstractObject/Method:Copy/Param:1+'                  => '填写当前对象',
-	'Class:cmdbAbstractObject/Method:Copy/Param:2'                   => '源字段',
-	'Class:cmdbAbstractObject/Method:Copy/Param:2+'                  => '此字段从当前对象获取值',
-	'Class:cmdbAbstractObject/Method:ApplyStimulus'                  => 'ApplyStimulus',
-	'Class:cmdbAbstractObject/Method:ApplyStimulus+'                 => 'Apply the specified stimulus to the current object',
-	'Class:cmdbAbstractObject/Method:ApplyStimulus/Param:1'          => 'Stimulus code',
-	'Class:cmdbAbstractObject/Method:ApplyStimulus/Param:1+'         => 'A valid stimulus code for the current class',
-	'Class:ResponseTicketTTO/Interface:iMetricComputer'              => '响应时间',
-	'Class:ResponseTicketTTO/Interface:iMetricComputer+'             => 'SLT 的响应时间',
-	'Class:ResponseTicketTTR/Interface:iMetricComputer'              => '解决时间',
-	'Class:ResponseTicketTTR/Interface:iMetricComputer+'             => 'SLT 的解决时间',
+	'Class:cmdbAbstractObject/Method:Reset' => '重置',
+	'Class:cmdbAbstractObject/Method:Reset+' => '重置为默认值',
+	'Class:cmdbAbstractObject/Method:Reset/Param:1' => '目标字段',
+	'Class:cmdbAbstractObject/Method:Reset/Param:1+' => '填写当前对象',
+	'Class:cmdbAbstractObject/Method:Copy' => '复制',
+	'Class:cmdbAbstractObject/Method:Copy+' => '复制当前值到另外一个地方',
+	'Class:cmdbAbstractObject/Method:Copy/Param:1' => '目标字段',
+	'Class:cmdbAbstractObject/Method:Copy/Param:1+' => '填写当前对象',
+	'Class:cmdbAbstractObject/Method:Copy/Param:2' => '源字段',
+	'Class:cmdbAbstractObject/Method:Copy/Param:2+' => '此字段从当前对象获取值',
+	'Class:cmdbAbstractObject/Method:ApplyStimulus' => 'ApplyStimulus',
+	'Class:cmdbAbstractObject/Method:ApplyStimulus+' => 'Apply the specified stimulus to the current object',
+	'Class:cmdbAbstractObject/Method:ApplyStimulus/Param:1' => 'Stimulus code',
+	'Class:cmdbAbstractObject/Method:ApplyStimulus/Param:1+' => 'A valid stimulus code for the current class',
+	'Class:ResponseTicketTTO/Interface:iMetricComputer' => '响应时间',
+	'Class:ResponseTicketTTO/Interface:iMetricComputer+' => 'SLT 的响应时间',
+	'Class:ResponseTicketTTR/Interface:iMetricComputer' => '解决时间',
+	'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'SLT 的解决时间',
 ));
 
diff --git a/datamodels/2.x/itop-virtualization-mgmt/datamodel.itop-virtualization-mgmt.xml b/datamodels/2.x/itop-virtualization-mgmt/datamodel.itop-virtualization-mgmt.xml
index 269a661489..2143d896ad 100644
--- a/datamodels/2.x/itop-virtualization-mgmt/datamodel.itop-virtualization-mgmt.xml
+++ b/datamodels/2.x/itop-virtualization-mgmt/datamodel.itop-virtualization-mgmt.xml
@@ -69,7 +69,6 @@
           <count_max>0</count_max>
           <ext_key_to_remote>volume_id</ext_key_to_remote>
           <duplicates/>
-          <read_only>false</read_only>
         </field>
       </fields>
       <methods/>
@@ -184,8 +183,6 @@
           <edit_mode>add_only</edit_mode>
           <count_min>0</count_min>
           <count_max>0</count_max>
-          <relation_type>link</relation_type>
-          <read_only>false</read_only>
         </field>
       </fields>
       <presentation>
@@ -473,8 +470,6 @@
           <edit_mode>add_only</edit_mode>
           <count_min>0</count_min>
           <count_max>0</count_max>
-          <relation_type>link</relation_type>
-          <read_only>false</read_only>
         </field>
         <field id="redundancy" xsi:type="AttributeRedundancySettings">
           <sql>redundancy</sql>
@@ -676,8 +671,6 @@
           <tracking_level>all</tracking_level>
           <count_min>0</count_min>
           <count_max>0</count_max>
-          <relation_type>property</relation_type>
-          <read_only>false</read_only>
         </field>
         <field id="managementip" xsi:type="AttributeIPAddress">
           <sql>managementip</sql>
diff --git a/datamodels/2.x/itop-virtualization-mgmt/dictionaries/pl.dict.itop-virtualization-mgmt.php b/datamodels/2.x/itop-virtualization-mgmt/dictionaries/pl.dict.itop-virtualization-mgmt.php
index 8c8116fcf2..01c3735422 100644
--- a/datamodels/2.x/itop-virtualization-mgmt/dictionaries/pl.dict.itop-virtualization-mgmt.php
+++ b/datamodels/2.x/itop-virtualization-mgmt/dictionaries/pl.dict.itop-virtualization-mgmt.php
@@ -20,7 +20,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/>
  */
-
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	// Dictionary entries go here
 ));
diff --git a/datamodels/2.x/itop-welcome-itil/tr.dict.itop-welcome-itil.php b/datamodels/2.x/itop-welcome-itil/tr.dict.itop-welcome-itil.php
deleted file mode 100644
index de2e2ec934..0000000000
--- a/datamodels/2.x/itop-welcome-itil/tr.dict.itop-welcome-itil.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-// Copyright (C) 2010-2023 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   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.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-/**
- * @copyright   Copyright (C) 2010-2023 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Menu:DataSources' => 'Senkronizasyon veri kaynakları',
-	'Menu:DataSources+' => 'Tüm senkronizasyon veri kaynakları',
-	'Menu:WelcomeMenu' => 'Hoşgeldiniz',
-	'Menu:WelcomeMenu+' => ITOP_APPLICATION_SHORT.'\'a Hoşgeldiniz',
-	'Menu:WelcomeMenuPage' => 'Hoşgeldiniz',
-	'Menu:WelcomeMenuPage+' => ITOP_APPLICATION_SHORT.'\'a Hoşgeldiniz',
-	'Menu:AdminTools' => 'Yönetim araçları',
-	'Menu:AdminTools+' => 'Yönetim araçları',
-	'Menu:AdminTools?' => 'Yönetici profiline izin verilen araçlar',
-	'Menu:DataModelMenu' => 'Veri modeli',
-	'Menu:DataModelMenu+' => 'Veri modeli Özeti',
-	'Menu:ExportMenu' => 'Dışarı ver',
-	'Menu:ExportMenu+' => 'Sorgu sonucunu HTML, CSV veya XML olarak dışarı aktar',
-	'Menu:NotificationsMenu' => 'Uyarılar',
-	'Menu:NotificationsMenu+' => 'Uyarıların yapılandırılması',
-	'Menu:AuditCategories' => 'Denetleme kategorileri',
-	'Menu:AuditCategories+' => 'Denetleme kategorileri',
-	'Menu:Notifications:Title' => 'Denetleme kategorileri',
-	'Menu:RunQueriesMenu' => 'Sorgu çalıştır',
-	'Menu:RunQueriesMenu+' => 'Sorgu çalıştır',
-	'Menu:QueryMenu' => 'Sorgu deyişleri kitabı',
-	'Menu:QueryMenu+' => 'Sorgu deyişleri kitabı',
-	'Menu:UniversalSearchMenu' => 'Genel sorgu',
-	'Menu:UniversalSearchMenu+' => 'Herhangi bir arama...',
-	'Menu:UserManagementMenu' => 'Kullanıcı yönetimi',
-	'Menu:UserManagementMenu+' => 'Kullanıcı yönetimi',
-	'Menu:ProfilesMenu' => 'Profiller',
-	'Menu:ProfilesMenu+' => 'Profiller',
-	'Menu:ProfilesMenu:Title' => 'Profiller',
-	'Menu:UserAccountsMenu' => 'Kullanıcı hesapları',
-	'Menu:UserAccountsMenu+' => 'Kullanıcı hesapları',
-	'Menu:UserAccountsMenu:Title' => 'Kullanıcı hesapları',
-	'Menu:MyShortcuts' => 'Kısayollarım',
-	'Menu:UserManagement' => 'User management~~',
-	'Menu:Queries' => 'Queries~~',
-	'Menu:ConfigurationTools' => 'Configuration~~',
-));
-
-//
-// Class: AbstractResource
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:AbstractResource' => 'Abstract Resource~~',
-	'Class:AbstractResource+' => '~~',
-));
-
-//
-// Class: ResourceAdminMenu
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:ResourceAdminMenu' => 'Resource Admin Menu~~',
-	'Class:ResourceAdminMenu+' => '~~',
-));
-
-//
-// Class: ResourceRunQueriesMenu
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:ResourceRunQueriesMenu' => 'Resource Run Queries Menu~~',
-	'Class:ResourceRunQueriesMenu+' => '~~',
-));
-
-//
-// Class: Action
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:ResourceSystemMenu' => 'Resource System Menu~~',
-	'Class:ResourceSystemMenu+' => '~~',
-));
diff --git a/dictionaries/core/orm-value/orm-document/cs.dictionary.itop.orm-document.php b/dictionaries/core/orm-value/orm-document/cs.dictionary.itop.orm-document.php
new file mode 100644
index 0000000000..e42dcfdb5a
--- /dev/null
+++ b/dictionaries/core/orm-value/orm-document/cs.dictionary.itop.orm-document.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Localized data
+ *
+ * @copyright Copyright (C) 2010-2023 Combodo SARL
+ * @license    http://opensource.org/licenses/AGPL-3.0
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * 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', [
+	'Core:ormValue:ormDocument:DownloadsCount' => '%1s~~',
+	'Core:ormValue:ormDocument:DownloadsCount+' => 'Downloaded %1$s time(s)~~',
+]);
diff --git a/dictionaries/core/orm-value/orm-document/da.dictionary.itop.orm-document.php b/dictionaries/core/orm-value/orm-document/da.dictionary.itop.orm-document.php
new file mode 100644
index 0000000000..e8fede5113
--- /dev/null
+++ b/dictionaries/core/orm-value/orm-document/da.dictionary.itop.orm-document.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Localized data
+ *
+ * @copyright Copyright (C) 2010-2023 Combodo SARL
+ * @license    http://opensource.org/licenses/AGPL-3.0
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * 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', [
+	'Core:ormValue:ormDocument:DownloadsCount' => '%1s~~',
+	'Core:ormValue:ormDocument:DownloadsCount+' => 'Downloaded %1$s time(s)~~',
+]);
diff --git a/dictionaries/core/orm-value/orm-document/de.dictionary.itop.orm-document.php b/dictionaries/core/orm-value/orm-document/de.dictionary.itop.orm-document.php
new file mode 100644
index 0000000000..f55996aad0
--- /dev/null
+++ b/dictionaries/core/orm-value/orm-document/de.dictionary.itop.orm-document.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Localized data
+ *
+ * @copyright Copyright (C) 2010-2023 Combodo SARL
+ * @license    http://opensource.org/licenses/AGPL-3.0
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * 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', [
+	'Core:ormValue:ormDocument:DownloadsCount' => '%1s',
+	'Core:ormValue:ormDocument:DownloadsCount+' => '%1$s mal heruntergeladen',
+]);
diff --git a/dictionaries/core/orm-value/orm-document/es_cr.dictionary.itop.orm-document.php b/dictionaries/core/orm-value/orm-document/es_cr.dictionary.itop.orm-document.php
new file mode 100644
index 0000000000..92be19253d
--- /dev/null
+++ b/dictionaries/core/orm-value/orm-document/es_cr.dictionary.itop.orm-document.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Localized data
+ *
+ * @copyright Copyright (C) 2010-2023 Combodo SARL
+ * @license    http://opensource.org/licenses/AGPL-3.0
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * 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', [
+	'Core:ormValue:ormDocument:DownloadsCount' => '%1s~~',
+	'Core:ormValue:ormDocument:DownloadsCount+' => 'Downloaded %1$s time(s)~~',
+]);
diff --git a/dictionaries/core/orm-value/orm-document/fr.dictionary.itop.orm-document.php b/dictionaries/core/orm-value/orm-document/fr.dictionary.itop.orm-document.php
index 7a805192bf..13cc0b9fa1 100644
--- a/dictionaries/core/orm-value/orm-document/fr.dictionary.itop.orm-document.php
+++ b/dictionaries/core/orm-value/orm-document/fr.dictionary.itop.orm-document.php
@@ -20,7 +20,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/>
  */
-
 Dict::Add('FR FR', 'French', 'Français', [
 	'Core:ormValue:ormDocument:DownloadsCount' => '%1s',
 	'Core:ormValue:ormDocument:DownloadsCount+' => 'Téléchargé %1$s fois',
diff --git a/dictionaries/core/orm-value/orm-document/hu.dictionary.itop.orm-document.php b/dictionaries/core/orm-value/orm-document/hu.dictionary.itop.orm-document.php
new file mode 100644
index 0000000000..5edb651ff5
--- /dev/null
+++ b/dictionaries/core/orm-value/orm-document/hu.dictionary.itop.orm-document.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Localized data
+ *
+ * @copyright Copyright (C) 2010-2023 Combodo SARL
+ * @license    http://opensource.org/licenses/AGPL-3.0
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * 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', [
+	'Core:ormValue:ormDocument:DownloadsCount' => '%1s~~',
+	'Core:ormValue:ormDocument:DownloadsCount+' => 'Downloaded %1$s time(s)~~',
+]);
diff --git a/dictionaries/core/orm-value/orm-document/it.dictionary.itop.orm-document.php b/dictionaries/core/orm-value/orm-document/it.dictionary.itop.orm-document.php
new file mode 100644
index 0000000000..c9ec6eb474
--- /dev/null
+++ b/dictionaries/core/orm-value/orm-document/it.dictionary.itop.orm-document.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Localized data
+ *
+ * @copyright Copyright (C) 2010-2023 Combodo SARL
+ * @license    http://opensource.org/licenses/AGPL-3.0
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * 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', [
+	'Core:ormValue:ormDocument:DownloadsCount' => '%1s~~',
+	'Core:ormValue:ormDocument:DownloadsCount+' => 'Downloaded %1$s time(s)~~',
+]);
diff --git a/dictionaries/core/orm-value/orm-document/ja.dictionary.itop.orm-document.php b/dictionaries/core/orm-value/orm-document/ja.dictionary.itop.orm-document.php
new file mode 100644
index 0000000000..970701a3d9
--- /dev/null
+++ b/dictionaries/core/orm-value/orm-document/ja.dictionary.itop.orm-document.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Localized data
+ *
+ * @copyright Copyright (C) 2010-2023 Combodo SARL
+ * @license    http://opensource.org/licenses/AGPL-3.0
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * 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', '日本語', [
+	'Core:ormValue:ormDocument:DownloadsCount' => '%1s~~',
+	'Core:ormValue:ormDocument:DownloadsCount+' => 'Downloaded %1$s time(s)~~',
+]);
diff --git a/dictionaries/core/orm-value/orm-document/nl.dictionary.itop.orm-document.php b/dictionaries/core/orm-value/orm-document/nl.dictionary.itop.orm-document.php
new file mode 100644
index 0000000000..a80cfbd283
--- /dev/null
+++ b/dictionaries/core/orm-value/orm-document/nl.dictionary.itop.orm-document.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Localized data
+ *
+ * @copyright Copyright (C) 2010-2023 Combodo SARL
+ * @license    http://opensource.org/licenses/AGPL-3.0
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * 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', [
+	'Core:ormValue:ormDocument:DownloadsCount' => '%1s~~',
+	'Core:ormValue:ormDocument:DownloadsCount+' => 'Downloaded %1$s time(s)~~',
+]);
diff --git a/dictionaries/core/orm-value/orm-document/pl.dictionary.itop.orm-document.php b/dictionaries/core/orm-value/orm-document/pl.dictionary.itop.orm-document.php
new file mode 100644
index 0000000000..24c58e7c4d
--- /dev/null
+++ b/dictionaries/core/orm-value/orm-document/pl.dictionary.itop.orm-document.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Localized data
+ *
+ * @copyright Copyright (C) 2010-2023 Combodo SARL
+ * @license    http://opensource.org/licenses/AGPL-3.0
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * 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('PL PL', 'Polish', 'Polski', [
+	'Core:ormValue:ormDocument:DownloadsCount' => '%1s~~',
+	'Core:ormValue:ormDocument:DownloadsCount+' => 'Downloaded %1$s time(s)~~',
+]);
diff --git a/dictionaries/core/orm-value/orm-document/pt_br.dictionary.itop.orm-document.php b/dictionaries/core/orm-value/orm-document/pt_br.dictionary.itop.orm-document.php
new file mode 100644
index 0000000000..b79767cedf
--- /dev/null
+++ b/dictionaries/core/orm-value/orm-document/pt_br.dictionary.itop.orm-document.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Localized data
+ *
+ * @copyright Copyright (C) 2010-2023 Combodo SARL
+ * @license    http://opensource.org/licenses/AGPL-3.0
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * 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', [
+	'Core:ormValue:ormDocument:DownloadsCount' => '%1s~~',
+	'Core:ormValue:ormDocument:DownloadsCount+' => 'Downloaded %1$s time(s)~~',
+]);
diff --git a/dictionaries/core/orm-value/orm-document/ru.dictionary.itop.orm-document.php b/dictionaries/core/orm-value/orm-document/ru.dictionary.itop.orm-document.php
new file mode 100644
index 0000000000..65999e80b3
--- /dev/null
+++ b/dictionaries/core/orm-value/orm-document/ru.dictionary.itop.orm-document.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Localized data
+ *
+ * @copyright Copyright (C) 2010-2023 Combodo SARL
+ * @license    http://opensource.org/licenses/AGPL-3.0
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * 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', 'Русский', [
+	'Core:ormValue:ormDocument:DownloadsCount' => '%1s~~',
+	'Core:ormValue:ormDocument:DownloadsCount+' => 'Downloaded %1$s time(s)~~',
+]);
diff --git a/dictionaries/core/orm-value/orm-document/sk.dictionary.itop.orm-document.php b/dictionaries/core/orm-value/orm-document/sk.dictionary.itop.orm-document.php
new file mode 100644
index 0000000000..f6f832eaef
--- /dev/null
+++ b/dictionaries/core/orm-value/orm-document/sk.dictionary.itop.orm-document.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Localized data
+ *
+ * @copyright Copyright (C) 2010-2023 Combodo SARL
+ * @license    http://opensource.org/licenses/AGPL-3.0
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * 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', [
+	'Core:ormValue:ormDocument:DownloadsCount' => '%1s~~',
+	'Core:ormValue:ormDocument:DownloadsCount+' => 'Downloaded %1$s time(s)~~',
+]);
diff --git a/dictionaries/core/orm-value/orm-document/tr.dictionary.itop.orm-document.php b/dictionaries/core/orm-value/orm-document/tr.dictionary.itop.orm-document.php
new file mode 100644
index 0000000000..cebd3a2d9f
--- /dev/null
+++ b/dictionaries/core/orm-value/orm-document/tr.dictionary.itop.orm-document.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Localized data
+ *
+ * @copyright Copyright (C) 2010-2023 Combodo SARL
+ * @license    http://opensource.org/licenses/AGPL-3.0
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * 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', [
+	'Core:ormValue:ormDocument:DownloadsCount' => '%1s~~',
+	'Core:ormValue:ormDocument:DownloadsCount+' => 'Downloaded %1$s time(s)~~',
+]);
diff --git a/dictionaries/core/orm-value/orm-document/zh_cn.dictionary.itop.orm-document.php b/dictionaries/core/orm-value/orm-document/zh_cn.dictionary.itop.orm-document.php
new file mode 100644
index 0000000000..cbdf1206ef
--- /dev/null
+++ b/dictionaries/core/orm-value/orm-document/zh_cn.dictionary.itop.orm-document.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Localized data
+ *
+ * @copyright Copyright (C) 2010-2023 Combodo SARL
+ * @license    http://opensource.org/licenses/AGPL-3.0
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * 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', '简体中文', [
+	'Core:ormValue:ormDocument:DownloadsCount' => '%1s~~',
+	'Core:ormValue:ormDocument:DownloadsCount+' => 'Downloaded %1$s time(s)~~',
+]);
diff --git a/dictionaries/core/uniqueness-rule/cs.dictionary.itop.uniqueness-rule.php b/dictionaries/core/uniqueness-rule/cs.dictionary.itop.uniqueness-rule.php
new file mode 100644
index 0000000000..a90ac17984
--- /dev/null
+++ b/dictionaries/core/uniqueness-rule/cs.dictionary.itop.uniqueness-rule.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Localized data
+ *
+ * @copyright Copyright (C) 2010-2023 Combodo SARL
+ * @license    http://opensource.org/licenses/AGPL-3.0
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * 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', [
+	'Class:cmdbAbstractObject/UniquenessRule:no_duplicate' => '%1$s: %2$s is already linked to %3$s: %4$s, duplicates are not allowed on this relation.~~',
+]);
diff --git a/dictionaries/core/uniqueness-rule/da.dictionary.itop.uniqueness-rule.php b/dictionaries/core/uniqueness-rule/da.dictionary.itop.uniqueness-rule.php
new file mode 100644
index 0000000000..2435664070
--- /dev/null
+++ b/dictionaries/core/uniqueness-rule/da.dictionary.itop.uniqueness-rule.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Localized data
+ *
+ * @copyright Copyright (C) 2010-2023 Combodo SARL
+ * @license    http://opensource.org/licenses/AGPL-3.0
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * 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', [
+	'Class:cmdbAbstractObject/UniquenessRule:no_duplicate' => '%1$s: %2$s is already linked to %3$s: %4$s, duplicates are not allowed on this relation.~~',
+]);
diff --git a/dictionaries/core/uniqueness-rule/de.dictionary.itop.uniqueness-rule.php b/dictionaries/core/uniqueness-rule/de.dictionary.itop.uniqueness-rule.php
new file mode 100644
index 0000000000..a7af6df096
--- /dev/null
+++ b/dictionaries/core/uniqueness-rule/de.dictionary.itop.uniqueness-rule.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Localized data
+ *
+ * @copyright Copyright (C) 2010-2023 Combodo SARL
+ * @license    http://opensource.org/licenses/AGPL-3.0
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * 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', [
+	'Class:cmdbAbstractObject/UniquenessRule:no_duplicate' => '%1$s: %2$s ist bereits mit einer/einem %3$s verknüpft: %4$s, doppelte Einträge sind in dieser Verknüpfung nicht erlaubt.',
+]);
diff --git a/dictionaries/core/uniqueness-rule/es_cr.dictionary.itop.uniqueness-rule.php b/dictionaries/core/uniqueness-rule/es_cr.dictionary.itop.uniqueness-rule.php
new file mode 100644
index 0000000000..51af9fa98c
--- /dev/null
+++ b/dictionaries/core/uniqueness-rule/es_cr.dictionary.itop.uniqueness-rule.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Localized data
+ *
+ * @copyright Copyright (C) 2010-2023 Combodo SARL
+ * @license    http://opensource.org/licenses/AGPL-3.0
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * 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', [
+	'Class:cmdbAbstractObject/UniquenessRule:no_duplicate' => '%1$s: %2$s is already linked to %3$s: %4$s, duplicates are not allowed on this relation.~~',
+]);
diff --git a/dictionaries/core/uniqueness-rule/fr.dictionary.itop.uniqueness-rule.php b/dictionaries/core/uniqueness-rule/fr.dictionary.itop.uniqueness-rule.php
index 98dc7051de..a43fbe1830 100644
--- a/dictionaries/core/uniqueness-rule/fr.dictionary.itop.uniqueness-rule.php
+++ b/dictionaries/core/uniqueness-rule/fr.dictionary.itop.uniqueness-rule.php
@@ -20,7 +20,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/>
  */
-
 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:cmdbAbstractObject/UniquenessRule:no_duplicate' => '%1$s : %2$s est déjà lié(e) à un(e) %3$s : %4$s, les doublons ne sont pas autorisés sur cette relation.',
 ]);
diff --git a/dictionaries/core/uniqueness-rule/hu.dictionary.itop.uniqueness-rule.php b/dictionaries/core/uniqueness-rule/hu.dictionary.itop.uniqueness-rule.php
new file mode 100644
index 0000000000..6d9956058e
--- /dev/null
+++ b/dictionaries/core/uniqueness-rule/hu.dictionary.itop.uniqueness-rule.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Localized data
+ *
+ * @copyright Copyright (C) 2010-2023 Combodo SARL
+ * @license    http://opensource.org/licenses/AGPL-3.0
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * 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', [
+	'Class:cmdbAbstractObject/UniquenessRule:no_duplicate' => '%1$s: %2$s is already linked to %3$s: %4$s, duplicates are not allowed on this relation.~~',
+]);
diff --git a/dictionaries/core/uniqueness-rule/it.dictionary.itop.uniqueness-rule.php b/dictionaries/core/uniqueness-rule/it.dictionary.itop.uniqueness-rule.php
new file mode 100644
index 0000000000..857c5e04d6
--- /dev/null
+++ b/dictionaries/core/uniqueness-rule/it.dictionary.itop.uniqueness-rule.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Localized data
+ *
+ * @copyright Copyright (C) 2010-2023 Combodo SARL
+ * @license    http://opensource.org/licenses/AGPL-3.0
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * 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', [
+	'Class:cmdbAbstractObject/UniquenessRule:no_duplicate' => '%1$s: %2$s is already linked to %3$s: %4$s, duplicates are not allowed on this relation.~~',
+]);
diff --git a/dictionaries/core/uniqueness-rule/ja.dictionary.itop.uniqueness-rule.php b/dictionaries/core/uniqueness-rule/ja.dictionary.itop.uniqueness-rule.php
new file mode 100644
index 0000000000..32193640ba
--- /dev/null
+++ b/dictionaries/core/uniqueness-rule/ja.dictionary.itop.uniqueness-rule.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Localized data
+ *
+ * @copyright Copyright (C) 2010-2023 Combodo SARL
+ * @license    http://opensource.org/licenses/AGPL-3.0
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * 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', '日本語', [
+	'Class:cmdbAbstractObject/UniquenessRule:no_duplicate' => '%1$s: %2$s is already linked to %3$s: %4$s, duplicates are not allowed on this relation.~~',
+]);
diff --git a/dictionaries/core/uniqueness-rule/nl.dictionary.itop.uniqueness-rule.php b/dictionaries/core/uniqueness-rule/nl.dictionary.itop.uniqueness-rule.php
new file mode 100644
index 0000000000..696749f3bc
--- /dev/null
+++ b/dictionaries/core/uniqueness-rule/nl.dictionary.itop.uniqueness-rule.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Localized data
+ *
+ * @copyright Copyright (C) 2010-2023 Combodo SARL
+ * @license    http://opensource.org/licenses/AGPL-3.0
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * 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', [
+	'Class:cmdbAbstractObject/UniquenessRule:no_duplicate' => '%1$s: %2$s is already linked to %3$s: %4$s, duplicates are not allowed on this relation.~~',
+]);
diff --git a/dictionaries/core/uniqueness-rule/pl.dictionary.itop.uniqueness-rule.php b/dictionaries/core/uniqueness-rule/pl.dictionary.itop.uniqueness-rule.php
new file mode 100644
index 0000000000..69c7492cfa
--- /dev/null
+++ b/dictionaries/core/uniqueness-rule/pl.dictionary.itop.uniqueness-rule.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Localized data
+ *
+ * @copyright Copyright (C) 2010-2023 Combodo SARL
+ * @license    http://opensource.org/licenses/AGPL-3.0
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * 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('PL PL', 'Polish', 'Polski', [
+	'Class:cmdbAbstractObject/UniquenessRule:no_duplicate' => '%1$s: %2$s is already linked to %3$s: %4$s, duplicates are not allowed on this relation.~~',
+]);
diff --git a/dictionaries/core/uniqueness-rule/pt_br.dictionary.itop.uniqueness-rule.php b/dictionaries/core/uniqueness-rule/pt_br.dictionary.itop.uniqueness-rule.php
new file mode 100644
index 0000000000..80c5817118
--- /dev/null
+++ b/dictionaries/core/uniqueness-rule/pt_br.dictionary.itop.uniqueness-rule.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Localized data
+ *
+ * @copyright Copyright (C) 2010-2023 Combodo SARL
+ * @license    http://opensource.org/licenses/AGPL-3.0
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * 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', [
+	'Class:cmdbAbstractObject/UniquenessRule:no_duplicate' => '%1$s: %2$s is already linked to %3$s: %4$s, duplicates are not allowed on this relation.~~',
+]);
diff --git a/dictionaries/core/uniqueness-rule/ru.dictionary.itop.uniqueness-rule.php b/dictionaries/core/uniqueness-rule/ru.dictionary.itop.uniqueness-rule.php
new file mode 100644
index 0000000000..6bef41d3b8
--- /dev/null
+++ b/dictionaries/core/uniqueness-rule/ru.dictionary.itop.uniqueness-rule.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Localized data
+ *
+ * @copyright Copyright (C) 2010-2023 Combodo SARL
+ * @license    http://opensource.org/licenses/AGPL-3.0
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * 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', 'Русский', [
+	'Class:cmdbAbstractObject/UniquenessRule:no_duplicate' => '%1$s: %2$s is already linked to %3$s: %4$s, duplicates are not allowed on this relation.~~',
+]);
diff --git a/dictionaries/core/uniqueness-rule/sk.dictionary.itop.uniqueness-rule.php b/dictionaries/core/uniqueness-rule/sk.dictionary.itop.uniqueness-rule.php
new file mode 100644
index 0000000000..aef71736ca
--- /dev/null
+++ b/dictionaries/core/uniqueness-rule/sk.dictionary.itop.uniqueness-rule.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Localized data
+ *
+ * @copyright Copyright (C) 2010-2023 Combodo SARL
+ * @license    http://opensource.org/licenses/AGPL-3.0
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * 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', [
+	'Class:cmdbAbstractObject/UniquenessRule:no_duplicate' => '%1$s: %2$s is already linked to %3$s: %4$s, duplicates are not allowed on this relation.~~',
+]);
diff --git a/dictionaries/core/uniqueness-rule/tr.dictionary.itop.uniqueness-rule.php b/dictionaries/core/uniqueness-rule/tr.dictionary.itop.uniqueness-rule.php
new file mode 100644
index 0000000000..0a5f643e6f
--- /dev/null
+++ b/dictionaries/core/uniqueness-rule/tr.dictionary.itop.uniqueness-rule.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Localized data
+ *
+ * @copyright Copyright (C) 2010-2023 Combodo SARL
+ * @license    http://opensource.org/licenses/AGPL-3.0
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * 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', [
+	'Class:cmdbAbstractObject/UniquenessRule:no_duplicate' => '%1$s: %2$s is already linked to %3$s: %4$s, duplicates are not allowed on this relation.~~',
+]);
diff --git a/dictionaries/core/uniqueness-rule/zh_cn.dictionary.itop.uniqueness-rule.php b/dictionaries/core/uniqueness-rule/zh_cn.dictionary.itop.uniqueness-rule.php
new file mode 100644
index 0000000000..c38ba0106c
--- /dev/null
+++ b/dictionaries/core/uniqueness-rule/zh_cn.dictionary.itop.uniqueness-rule.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Localized data
+ *
+ * @copyright Copyright (C) 2010-2023 Combodo SARL
+ * @license    http://opensource.org/licenses/AGPL-3.0
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * 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', '简体中文', [
+	'Class:cmdbAbstractObject/UniquenessRule:no_duplicate' => '%1$s: %2$s is already linked to %3$s: %4$s, duplicates are not allowed on this relation.~~',
+]);
diff --git a/dictionaries/cs.dictionary.itop.core.php b/dictionaries/cs.dictionary.itop.core.php
index 1fa9a92081..bf67929c26 100755
--- a/dictionaries/cs.dictionary.itop.core.php
+++ b/dictionaries/cs.dictionary.itop.core.php
@@ -25,57 +25,42 @@
  */
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Core:DeletedObjectLabel' => '%1s (odstraněn)',
-	'Core:DeletedObjectTip'   => 'Objekt byl odstraněn %1$s (%2$s)',
-
+	'Core:DeletedObjectTip' => 'Objekt byl odstraněn %1$s (%2$s)',
 	'Core:UnknownObjectLabel' => 'Objekt nenalezen (třída: %1$s, id: %2$d)',
-	'Core:UnknownObjectTip'   => 'Objekt nemohl být nalezen. Je možné, že byl odstraněn před nějakou dobou a protokol byl mezitím vyčištěn.',
-
+	'Core:UnknownObjectTip' => 'Objekt nemohl být nalezen. Je možné, že byl odstraněn před nějakou dobou a protokol byl mezitím vyčištěn.',
 	'Core:UniquenessDefaultError' => 'Uniqueness rule \'%1$s\' in error~~',
-	'Core:CheckConsistencyError'  => 'Consistency rules not followed: %1$s~~',
-	'Core:CheckValueError'        => 'Unexpected value for attribute \'%1$s\' (%2$s) : %3$s~~',
-
-	'Core:AttributeLinkedSet'  => 'Pole objektů',
+	'Core:CheckConsistencyError' => 'Consistency rules not followed: %1$s~~',
+	'Core:CheckValueError' => 'Unexpected value for attribute \'%1$s\' (%2$s) : %3$s~~',
+	'Core:AttributeLinkedSet' => 'Pole objektů',
 	'Core:AttributeLinkedSet+' => 'Jakékoli objekty stejné třídy, nebo podtřídy',
-
 	'Core:AttributeLinkedSetDuplicatesFound' => 'Duplicates in the \'%1$s\' field : %2$s~~',
-
-	'Core:AttributeDashboard'  => 'Dashboard~~',
+	'Core:AttributeDashboard' => 'Dashboard~~',
 	'Core:AttributeDashboard+' => '',
-
-	'Core:AttributePhoneNumber'  => 'Phone number~~',
+	'Core:AttributePhoneNumber' => 'Phone number~~',
 	'Core:AttributePhoneNumber+' => '',
-
 	'Core:AttributeObsolescenceDate' => 'Obsolescence date~~',
 	'Core:AttributeObsolescenceDate+' => '',
-
 	'Core:AttributeTagSet' => 'List of tags~~',
 	'Core:AttributeTagSet+' => '',
 	'Core:AttributeSet:placeholder' => 'click to add~~',
 	'Core:AttributeClassAttCodeSet:ItemLabel:AttributeFromClass' => '%1$s (%2$s)~~',
 	'Core:AttributeClassAttCodeSet:ItemLabel:AttributeFromOneChildClass' => '%1$s (%2$s from %3$s)~~',
 	'Core:AttributeClassAttCodeSet:ItemLabel:AttributeFromSeveralChildClasses' => '%1$s (%2$s from child classes)~~',
-
 	'Core:AttributeCaseLog' => 'Log~~',
 	'Core:AttributeCaseLog+' => '',
-
 	'Core:AttributeMetaEnum' => 'Computed enum~~',
 	'Core:AttributeMetaEnum+' => '',
-
 	'Core:AttributeLinkedSetIndirect' => 'Pole objektů (N-N)',
 	'Core:AttributeLinkedSetIndirect+' => 'Jakékoli objekty stejné třídy, nebo podtřídy',
-
 	'Core:AttributeInteger' => 'Celé číslo (integer)',
 	'Core:AttributeInteger+' => 'Celé číslo (může být záporné)',
-
 	'Core:AttributeDecimal' => 'Desetinné číslo (decimal)',
 	'Core:AttributeDecimal+' => 'Desetinné číslo (může být záporné)',
-
 	'Core:AttributeBoolean' => 'Boolean',
 	'Core:AttributeBoolean+' => '',
 	'Core:AttributeBoolean/Value:null' => '',
 	'Core:AttributeBoolean/Value:yes' => 'Yes~~',
 	'Core:AttributeBoolean/Value:no' => 'No~~',
-
 	'Core:AttributeArchiveFlag' => 'Archive flag~~',
 	'Core:AttributeArchiveFlag/Value:yes' => 'Yes~~',
 	'Core:AttributeArchiveFlag/Value:yes+' => 'This object is visible only in archive mode~~',
@@ -84,7 +69,6 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Core:AttributeArchiveFlag/Label+' => '',
 	'Core:AttributeArchiveDate/Label' => 'Archive date~~',
 	'Core:AttributeArchiveDate/Label+' => '',
-
 	'Core:AttributeObsolescenceFlag' => 'Obsolescence flag~~',
 	'Core:AttributeObsolescenceFlag/Value:yes' => 'Yes~~',
 	'Core:AttributeObsolescenceFlag/Value:yes+' => 'This object is excluded from the impact analysis, and hidden from search results~~',
@@ -93,54 +77,38 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Core:AttributeObsolescenceFlag/Label+' => 'Computed dynamically on other attributes~~',
 	'Core:AttributeObsolescenceDate/Label' => 'Obsolescence date~~',
 	'Core:AttributeObsolescenceDate/Label+' => 'Approximative date at which the object has been considered obsolete~~',
-
 	'Core:AttributeString' => 'Řetězec (string)',
 	'Core:AttributeString+' => 'Alfanumerický řetězec',
-
 	'Core:AttributeClass' => 'Třída (class)',
 	'Core:AttributeClass+' => '',
-
 	'Core:AttributeApplicationLanguage' => 'Jazyk',
 	'Core:AttributeApplicationLanguage+' => 'Jazyk a země (CS CZ)',
-
 	'Core:AttributeFinalClass' => 'Třída (auto)',
 	'Core:AttributeFinalClass+' => 'Skutečná třída objektu (automaticky vytvořeno jádrem)',
-
 	'Core:AttributePassword' => 'Heslo',
 	'Core:AttributePassword+' => 'Heslo k externímu zařízení',
-
 	'Core:AttributeEncryptedString' => 'Šifrovaný řetězec',
 	'Core:AttributeEncryptedString+' => 'Řetězec šifrovaný lokálním klíčem',
 	'Core:AttributeEncryptUnknownLibrary' => 'Encryption library specified (%1$s) unknown~~',
 	'Core:AttributeEncryptFailedToDecrypt' => '** decryption error **~~',
-
 	'Core:AttributeText' => 'Text',
 	'Core:AttributeText+' => 'Víceřádkový řetězec znaků',
-
 	'Core:AttributeHTML' => 'HTML',
 	'Core:AttributeHTML+' => 'HTML řetězec',
-
 	'Core:AttributeEmailAddress' => 'Emailová addresa',
 	'Core:AttributeEmailAddress+' => 'Emailová addresa',
-
 	'Core:AttributeIPAddress' => 'IP adresa',
 	'Core:AttributeIPAddress+' => '',
-
 	'Core:AttributeOQL' => 'OQL',
 	'Core:AttributeOQL+' => 'Výraz v jazyce OQL',
-
 	'Core:AttributeEnum' => 'Enum',
 	'Core:AttributeEnum+' => 'Seznam předdefinovaných alfanumerických řetězců',
-
 	'Core:AttributeTemplateString' => 'Šablona - řetězec',
 	'Core:AttributeTemplateString+' => 'Řetězec obsahující zástupné symboly',
-
 	'Core:AttributeTemplateText' => 'Šablona - text',
 	'Core:AttributeTemplateText+' => 'Text obsahující zástupné symboly',
-
 	'Core:AttributeTemplateHTML' => 'Šablona - HTML',
 	'Core:AttributeTemplateHTML+' => 'HTML obsahující zástupné symboly',
-
 	'Core:AttributeDateTime' => 'Datum a čas',
 	'Core:AttributeDateTime+' => 'Datum a čas (rok-měsíc-den hh:mm:ss)',
 	'Core:AttributeDateTime?SmartSearch' => '
@@ -158,7 +126,6 @@ Operátory:<br/>
 <p>
 Je-li čas vynechán, bude nastaveno 00:00:00
 </p>',
-
 	'Core:AttributeDate' => 'Datum',
 	'Core:AttributeDate+' => 'Datum (rok-měsíc-den)',
 	'Core:AttributeDate?SmartSearch' => '
@@ -173,43 +140,30 @@ Operátory:<br/>
     <b>&lt;</b><em>datum</em><br/>
     <b>[</b><em>datum</em>,<em>datum</em><b>]</b>
 </p>',
-
 	'Core:AttributeDeadline' => 'Uzávěrka',
 	'Core:AttributeDeadline+' => 'Datum, zobrazeno relativně k aktuálnímu času',
-
 	'Core:AttributeExternalKey' => 'Externí klíč',
 	'Core:AttributeExternalKey+' => 'Externí (cizí) klíč',
-
 	'Core:AttributeHierarchicalKey' => 'Hierarchický klíč',
 	'Core:AttributeHierarchicalKey+' => 'Externí (cizí) klíč nadřízené položky',
-
 	'Core:AttributeExternalField' => 'Externí pole',
 	'Core:AttributeExternalField+' => 'Pole mapované na externí klíč',
-
 	'Core:AttributeURL' => 'URL',
 	'Core:AttributeURL+' => 'Absolutní nebo relativní URL jako textový řetězec',
-
 	'Core:AttributeBlob' => 'Blob',
 	'Core:AttributeBlob+' => 'Jakýkoli binární obsah (dokument)',
-
 	'Core:AttributeOneWayPassword' => 'Jednosměrně šifrované heslo',
 	'Core:AttributeOneWayPassword+' => '',
-
 	'Core:AttributeTable' => 'Tabulka',
 	'Core:AttributeTable+' => 'Dvourozměrné indexované pole',
-
 	'Core:AttributePropertySet' => 'Vlastnosti',
 	'Core:AttributePropertySet+' => 'Seznam vlastností bez typu (název a hodnota)',
-
 	'Core:AttributeFriendlyName' => 'Popisný název',
 	'Core:AttributeFriendlyName+' => 'Atribut vyplněný automaticky; popisný název je složen z několika dalších atributů',
-
 	'Core:FriendlyName-Label' => 'Popisný název',
 	'Core:FriendlyName-Description' => 'Popisný název',
-
 	'Core:AttributeTag' => 'Tags~~',
 	'Core:AttributeTag+' => '',
-	
 	'Core:Context=REST/JSON' => 'REST~~',
 	'Core:Context=Synchro' => 'Synchro~~',
 	'Core:Context=Setup' => 'Setup~~',
@@ -487,6 +441,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:Action' => 'Vlastní akce',
 	'Class:Action+' => '',
+	'Class:Action/ComplementaryName' => '%1$s: %2$s~~',
 	'Class:Action/Attribute:name' => 'Název',
 	'Class:Action/Attribute:name+' => '',
 	'Class:Action/Attribute:description' => 'Popis',
@@ -554,6 +509,22 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:ActionEmail/Attribute:importance/Value:normal+' => '',
 	'Class:ActionEmail/Attribute:importance/Value:high' => 'high',
 	'Class:ActionEmail/Attribute:importance/Value:high+' => '',
+	'Class:ActionEmail/Attribute:language' => 'Language~~',
+	'Class:ActionEmail/Attribute:language+' => 'Language to use for placeholders ($xxx$) inside the message (state, importance, priority, etc)~~',
+	'Class:ActionEmail/Attribute:html_template' => 'HTML template~~',
+	'Class:ActionEmail/Attribute:html_template+' => 'Optional HTML template wrapping around the content of the \'Body\' attribute below, useful for tailored email layouts (in the template, content of the \'Body\' attribute will replace the $content$ placeholder)~~',
+	'Class:ActionEmail/Attribute:ignore_notify' => 'Ignore the Notify flag~~',
+	'Class:ActionEmail/Attribute:ignore_notify+' => 'If set to \'Yes\' the \'Notify\' flag on Contacts has no effect.~~',
+	'Class:ActionEmail/Attribute:ignore_notify/Value:no' => 'No~~',
+	'Class:ActionEmail/Attribute:ignore_notify/Value:yes' => 'Yes~~',
+	'ActionEmail:main' => 'Message~~',
+	'ActionEmail:trigger' => 'Triggers~~',
+	'ActionEmail:recipients' => 'Contacts~~',
+	'ActionEmail:preview_tab' => 'Preview~~',
+	'ActionEmail:preview_tab+' => 'Preview of the eMail template~~',
+	'ActionEmail:preview_warning' => 'The actual eMail may look different in the eMail client than this preview in your browser.~~',
+	'ActionEmail:preview_more_info' => 'For more information about the CSS features supported by the different eMail clients, refer to %1$s~~',
+	'ActionEmail:content_placeholder_missing' => 'The placeholder "%1$s" was not found in the HTML template. The content of the field "%2$s" will not be included in the generated emails.~~',
 ));
 
 //
@@ -563,6 +534,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:Trigger' => 'Trigger',
 	'Class:Trigger+' => '',
+	'Class:Trigger/ComplementaryName' => '%1$s, %2$s~~',
 	'Class:Trigger/Attribute:description' => 'Popis',
 	'Class:Trigger/Attribute:description+' => 'Krátký popis',
 	'Class:Trigger/Attribute:action_list' => 'Spouštěné akce',
@@ -571,6 +543,8 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:Trigger/Attribute:finalclass+' => '',
 	'Class:Trigger/Attribute:context' => 'Context~~',
 	'Class:Trigger/Attribute:context+' => 'Context to allow the trigger to start~~',
+	'Class:Trigger/Attribute:complement' => 'Additional information~~',
+	'Class:Trigger/Attribute:complement+' => 'Further information as provided in english, by this trigger~~',
 ));
 
 //
@@ -666,6 +640,17 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:TriggerOnObjectMention/Attribute:mentioned_filter+' => 'Limit the list of mentioned objects which will activate the trigger. If empty, any mentioned object (of any class) will activate it.~~',
 ));
 
+//
+// Class: TriggerOnAttributeBlobDownload
+//
+
+Dict::Add('CS CZ', 'Czech', 'Čeština', array(
+	'Class:TriggerOnAttributeBlobDownload' => 'Trigger (on object\'s document download)~~',
+	'Class:TriggerOnAttributeBlobDownload+' => 'Trigger on object\'s document field download of [a child class of] the given class~~',
+	'Class:TriggerOnAttributeBlobDownload/Attribute:target_attcodes' => 'Target fields~~',
+	'Class:TriggerOnAttributeBlobDownload/Attribute:target_attcodes+' => '~~',
+));
+
 //
 // Class: TriggerOnThresholdReached
 //
@@ -702,11 +687,13 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 // Synchro Data Source
 //
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
+	'Class:SynchroDataSource' => 'Zdroje dat pro synchronizaci',
 	'Class:SynchroDataSource/Attribute:name' => 'Název',
 	'Class:SynchroDataSource/Attribute:name+' => '',
 	'Class:SynchroDataSource/Attribute:description' => 'Popis',
 	'Class:SynchroDataSource/Attribute:status' => 'Stav',
 	'Class:SynchroDataSource/Attribute:scope_class' => 'Cílová třída',
+	'Class:SynchroDataSource/Attribute:scope_class+' => 'A Synchro Data Source can only populate a single '.ITOP_APPLICATION_SHORT.' class~~',
 	'Class:SynchroDataSource/Attribute:user_id' => 'Uživatel',
 	'Class:SynchroDataSource/Attribute:notify_contact_id' => 'Kontakt k upozornění',
 	'Class:SynchroDataSource/Attribute:notify_contact_id+' => '',
@@ -715,6 +702,8 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:SynchroDataSource/Attribute:url_application' => 'Aplikace',
 	'Class:SynchroDataSource/Attribute:url_application+' => 'Hypertextový odkaz na '.ITOP_APPLICATION_SHORT.' objekt v externí aplikaci, se kterou je '.ITOP_APPLICATION_SHORT.' synchronizován (pokud je to relevantní). Možné zástupné symboly: $this->attribute$ a $replica->primary_key$',
 	'Class:SynchroDataSource/Attribute:reconciliation_policy' => 'Způsob párování',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy+' => '"Use the attributes": '.ITOP_APPLICATION_SHORT.' object matches replica values for each Synchro attributes flagged for Reconciliation.
+"Use primary_key": the column primary_key of the replica is expected to contain the identifier of the '.ITOP_APPLICATION_SHORT.' object~~',
 	'Class:SynchroDataSource/Attribute:full_load_periodicity' => 'Interval mezi dvěma kompletními načteními',
 	'Class:SynchroDataSource/Attribute:full_load_periodicity+' => 'Kompletní načtení všech dat musí proběhnout nejméně tak často, jak je uvedeno zde',
 	'Class:SynchroDataSource/Attribute:action_on_zero' => 'Akce pro nula výsledků',
@@ -734,6 +723,33 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:SynchroDataSource/Attribute:delete_policy_retention+' => 'V případě, že je nastaveno pravidlo "Aktualizovat a odstranit", zastaralé objekty budou před smazáním zachovány po tuto dobu',
 	'Class:SynchroDataSource/Attribute:database_table_name' => 'Tabulka dat',
 	'Class:SynchroDataSource/Attribute:database_table_name+' => 'Název tabulky pro ukládání dat z tohoto zdroje. Bude vytvořen automaticky, pokud necháte pole prázdné.',
+	'Class:SynchroDataSource/Attribute:status/Value:implementation' => 'Implementace',
+	'Class:SynchroDataSource/Attribute:status/Value:obsolete' => 'Zastaralý',
+	'Class:SynchroDataSource/Attribute:status/Value:production' => 'V produkci',
+	'Class:SynchroDataSource/Attribute:scope_restriction' => 'Omezení rozsahu',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_attributes' => 'Použít atributy',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_primary_key' => 'Použít pole primary_key',
+	'Class:SynchroDataSource/Attribute:action_on_zero/Value:create' => 'Vytvořit nový',
+	'Class:SynchroDataSource/Attribute:action_on_zero/Value:error' => 'Chyba',
+	'Class:SynchroDataSource/Attribute:action_on_one/Value:error' => 'Chyba',
+	'Class:SynchroDataSource/Attribute:action_on_one/Value:update' => 'Aktualizovat',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:create' => 'Vytvořit nový',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:error' => 'Chyba',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:take_first' => 'Vzít první (náhodný?)',
+	'Class:SynchroDataSource/Attribute:delete_policy' => 'Pravidla odstraňování',
+	'Class:SynchroDataSource/Attribute:delete_policy+' => 'What to do when a replica becomes obsolete:
+"Ignore": do nothing, the associated object remains as is in iTop.
+"Delete": Delete the associated object in iTop (and the replica in the data table).
+"Update": Update the associated object as specified by the Update rules (see below).
+"Update then Delete": apply the "Update rules". When Retention Duration expires, execute a "Delete" ~~',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:delete' => 'Odstranit',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:ignore' => 'Ignorovat',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:update' => 'Aktualizovat',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:update_then_delete' => 'Aktualizovat a odstranit',
+	'Class:SynchroDataSource/Attribute:attribute_list' => 'Seznam atributů',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:administrators' => 'Administrátoři',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:everybody' => 'Kdokoli',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:nobody' => 'Nikdo',
 	'SynchroDataSource:Description' => 'Popis',
 	'SynchroDataSource:Reconciliation' => 'Hledání a párování',
 	'SynchroDataSource:Deletion' => 'Pravidla odstraňování',
@@ -758,8 +774,10 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Core:Synchro:NeverRun' => 'Tato synchronizace ještě nebyla spuštěna. Žádné záznamy.',
 	'Core:Synchro:SynchroEndedOn_Date' => 'Poslední synchronizace skončila %1$s.',
 	'Core:Synchro:SynchroRunningStartedOn_Date' => 'Synchronizace která byla spuštěna %1$s stále běží',
-	'Menu:DataSources' => 'Zdroje dat pro synchronizaci', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:DataSources+' => 'Všechny zdroje dat pro synchronizaci', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataSources' => 'Zdroje dat pro synchronizaci',
+    // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataSources+' => 'Všechny zdroje dat pro synchronizaci',
+    // Duplicated into itop-welcome-itil (will be removed from here...)
 	'Core:Synchro:label_repl_ignored' => 'Ignorovaný (%1$s)',
 	'Core:Synchro:label_repl_disappeared' => 'Chybí (%1$s)',
 	'Core:Synchro:label_repl_existing' => 'Existující (%1$s)',
@@ -823,29 +841,6 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:CMDBChangeOpSetAttributeEncrypted/Attribute:prevstring' => 'Předchozí hodnota',
 	'Class:CMDBChangeOpSetAttributeCaseLog' => 'Protokol událostí',
 	'Class:CMDBChangeOpSetAttributeCaseLog/Attribute:lastentry' => 'Poslední záznam',
-	'Class:SynchroDataSource' => 'Zdroje dat pro synchronizaci',
-	'Class:SynchroDataSource/Attribute:status/Value:implementation' => 'Implementace',
-	'Class:SynchroDataSource/Attribute:status/Value:obsolete' => 'Zastaralý',
-	'Class:SynchroDataSource/Attribute:status/Value:production' => 'V produkci',
-	'Class:SynchroDataSource/Attribute:scope_restriction' => 'Omezení rozsahu',
-	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_attributes' => 'Použít atributy',
-	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_primary_key' => 'Použít pole primary_key',
-	'Class:SynchroDataSource/Attribute:action_on_zero/Value:create' => 'Vytvořit nový',
-	'Class:SynchroDataSource/Attribute:action_on_zero/Value:error' => 'Chyba',
-	'Class:SynchroDataSource/Attribute:action_on_one/Value:error' => 'Chyba',
-	'Class:SynchroDataSource/Attribute:action_on_one/Value:update' => 'Aktualizovat',
-	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:create' => 'Vytvořit nový',
-	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:error' => 'Chyba',
-	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:take_first' => 'Vzít první (náhodný?)',
-	'Class:SynchroDataSource/Attribute:delete_policy' => 'Pravidla odstraňování',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:delete' => 'Odstranit',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:ignore' => 'Ignorovat',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:update' => 'Aktualizovat',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:update_then_delete' => 'Aktualizovat a odstranit',
-	'Class:SynchroDataSource/Attribute:attribute_list' => 'Seznam atributů',
-	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:administrators' => 'Administrátoři',
-	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:everybody' => 'Kdokoli',
-	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:nobody' => 'Nikdo',
 	'Class:SynchroAttribute' => 'Atribut pro synchronizaci',
 	'Class:SynchroAttribute/Attribute:sync_source_id' => 'Zdroj dat pro synchronizaci',
 	'Class:SynchroAttribute/Attribute:attcode' => 'Kód atributu',
@@ -906,19 +901,16 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:appUserPreferences/Attribute:preferences' => 'Předvolby',
 	'Core:ExecProcess:Code1' => 'Chybní příkaz, nebo příkaz skončil s chybou (např chybný název skriptu)',
 	'Core:ExecProcess:Code255' => 'PHP Error (parsing/runtime)',
-
-	// Attribute Duration
+    // Attribute Duration
 	'Core:Duration_Seconds' => '%1$ds',
 	'Core:Duration_Minutes_Seconds' => '%1$dmin %2$ds',
 	'Core:Duration_Hours_Minutes_Seconds' => '%1$dh %2$dmin %3$ds',
 	'Core:Duration_Days_Hours_Minutes_Seconds' => '%1$sd %2$dh %3$dmin %4$ds',
-
-	// Explain working time computing
+    // Explain working time computing
 	'Core:ExplainWTC:ElapsedTime' => 'Uplynulý čas ("%1$s")',
 	'Core:ExplainWTC:StopWatch-TimeSpent' => 'Čas strávený na "%1$s"',
 	'Core:ExplainWTC:StopWatch-Deadline' => 'Uzávěrka pro "%1$s" v %2$d%%',
-
-	// Bulk export
+    // Bulk export
 	'Core:BulkExport:MissingParameter_Param' => 'Chybějící parametr "%1$s"',
 	'Core:BulkExport:InvalidParameter_Query' => 'Chybná hodnota parametru "query". Neznám žádný záznam odpovídající následujícímu id: "%1$s".',
 	'Core:BulkExport:ExportFormatPrompt' => 'Formát exportu:',
@@ -970,20 +962,34 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Core:BulkExport:DateTimeFormatDefault_Example' => 'Default format (%1$s), e.g. %2$s~~',
 	'Core:BulkExport:DateTimeFormatCustom_Format' => 'Custom format: %1$s~~',
 	'Core:BulkExport:PDF:PageNumber' => 'Page %1$s~~',
-	'Core:DateTime:Placeholder_d' => 'DD~~', // Day of the month: 2 digits (with leading zero)
-	'Core:DateTime:Placeholder_j' => 'D~~', // Day of the month: 1 or 2 digits (without leading zero)
-	'Core:DateTime:Placeholder_m' => 'MM~~', // Month on 2 digits i.e. 01-12
-	'Core:DateTime:Placeholder_n' => 'M~~', // Month on 1 or 2 digits 1-12
-	'Core:DateTime:Placeholder_Y' => 'YYYY~~', // Year on 4 digits
-	'Core:DateTime:Placeholder_y' => 'YY~~', // Year on 2 digits
-	'Core:DateTime:Placeholder_H' => 'hh~~', // Hour 00..23
-	'Core:DateTime:Placeholder_h' => 'h~~', // Hour 01..12
-	'Core:DateTime:Placeholder_G' => 'hh~~', // Hour 0..23
-	'Core:DateTime:Placeholder_g' => 'h~~', // Hour 1..12
-	'Core:DateTime:Placeholder_a' => 'am/pm~~', // am/pm (lowercase)
-	'Core:DateTime:Placeholder_A' => 'AM/PM~~', // AM/PM (uppercase)
-	'Core:DateTime:Placeholder_i' => 'mm~~', // minutes, 2 digits: 00..59
-	'Core:DateTime:Placeholder_s' => 'ss~~', // seconds, 2 digits 00..59
+	'Core:DateTime:Placeholder_d' => 'DD~~',
+    // Day of the month: 2 digits (with leading zero)
+	'Core:DateTime:Placeholder_j' => 'D~~',
+    // Day of the month: 1 or 2 digits (without leading zero)
+	'Core:DateTime:Placeholder_m' => 'MM~~',
+    // Month on 2 digits i.e. 01-12
+	'Core:DateTime:Placeholder_n' => 'M~~',
+    // Month on 1 or 2 digits 1-12
+	'Core:DateTime:Placeholder_Y' => 'YYYY~~',
+    // Year on 4 digits
+	'Core:DateTime:Placeholder_y' => 'YY~~',
+    // Year on 2 digits
+	'Core:DateTime:Placeholder_H' => 'hh~~',
+    // Hour 00..23
+	'Core:DateTime:Placeholder_h' => 'h~~',
+    // Hour 01..12
+	'Core:DateTime:Placeholder_G' => 'hh~~',
+    // Hour 0..23
+	'Core:DateTime:Placeholder_g' => 'h~~',
+    // Hour 1..12
+	'Core:DateTime:Placeholder_a' => 'am/pm~~',
+    // am/pm (lowercase)
+	'Core:DateTime:Placeholder_A' => 'AM/PM~~',
+    // AM/PM (uppercase)
+	'Core:DateTime:Placeholder_i' => 'mm~~',
+    // minutes, 2 digits: 00..59
+	'Core:DateTime:Placeholder_s' => 'ss~~',
+    // seconds, 2 digits 00..59
 	'Core:Validator:Default' => 'Nesprávný formát',
 	'Core:Validator:Mandatory' => 'Vyplňte prosím toto pole',
 	'Core:Validator:MustBeInteger' => 'Musí být celé číslo',
@@ -996,7 +1002,6 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:TagSetFieldData' => '%2$s for class %1$s~~',
 	'Class:TagSetFieldData+' => '',
-
 	'Class:TagSetFieldData/Attribute:code' => 'Code~~',
 	'Class:TagSetFieldData/Attribute:code+' => 'Internal code. Must contain at least 3 alphanumeric characters~~',
 	'Class:TagSetFieldData/Attribute:label' => 'Label~~',
@@ -1006,7 +1011,6 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:TagSetFieldData/Attribute:finalclass' => 'Tag class~~',
 	'Class:TagSetFieldData/Attribute:obj_class' => 'Object class~~',
 	'Class:TagSetFieldData/Attribute:obj_attcode' => 'Field code~~',
-
 	'Core:TagSetFieldData:ErrorDeleteUsedTag' => 'Used tags cannot be deleted~~',
 	'Core:TagSetFieldData:ErrorDuplicateTagCodeOrLabel' => 'Tags codes or labels must be unique~~',
 	'Core:TagSetFieldData:ErrorTagCodeSyntax' => 'Tags code must contain between 3 and %1$d alphanumeric characters~~',
@@ -1093,8 +1097,8 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:AsyncTask/Attribute:last_error+' => '',
 	'Class:AsyncTask/Attribute:last_attempt' => 'Last attempt~~',
 	'Class:AsyncTask/Attribute:last_attempt+' => '',
-    'Class:AsyncTask:InvalidConfig_Class_Keys' => 'Invalid format for the configuration of "async_task_retries[%1$s]". Expecting an array with the following keys: %2$s~~',
-    'Class:AsyncTask:InvalidConfig_Class_InvalidKey_Keys' => 'Invalid format for the configuration of "async_task_retries[%1$s]": unexpected key "%2$s". Expecting only the following keys: %3$s~~',
+	'Class:AsyncTask:InvalidConfig_Class_Keys' => 'Invalid format for the configuration of "async_task_retries[%1$s]". Expecting an array with the following keys: %2$s~~',
+	'Class:AsyncTask:InvalidConfig_Class_InvalidKey_Keys' => 'Invalid format for the configuration of "async_task_retries[%1$s]": unexpected key "%2$s". Expecting only the following keys: %3$s~~',
 ));
 
 //
diff --git a/dictionaries/cs.dictionary.itop.ui.php b/dictionaries/cs.dictionary.itop.ui.php
index 2958f0d6e7..965b5f1b96 100755
--- a/dictionaries/cs.dictionary.itop.ui.php
+++ b/dictionaries/cs.dictionary.itop.ui.php
@@ -25,6 +25,12 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:AuditCategory/Attribute:definition_set+' => 'OQL výraz definující množinu objektů pro audit',
 	'Class:AuditCategory/Attribute:rules_list' => 'Pravidla pro audit',
 	'Class:AuditCategory/Attribute:rules_list+' => 'Pravidla pro tuto kategorii auditu',
+	'Class:AuditCategory/Attribute:ok_error_tolerance' => 'Warning threshold~~',
+	'Class:AuditCategory/Attribute:ok_error_tolerance+' => 'Percentage of invalid objects below which the result is a warning (orange)~~',
+	'Class:AuditCategory/Attribute:warning_error_tolerance' => 'Error threshold~~',
+	'Class:AuditCategory/Attribute:warning_error_tolerance+' => 'Percentage of invalid objects below which the result is in error (red)~~',
+	'Class:AuditCategory/Attribute:domains_list' => 'Domains~~',
+	'Class:AuditCategory/Attribute:domains_list+' => 'Domains which includes this category~~',
 ));
 
 //
@@ -52,7 +58,42 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:AuditRule/Attribute:category_id' => 'Kategorie',
 	'Class:AuditRule/Attribute:category_id+' => 'Kategorie pro toto pravidlo',
 	'Class:AuditRule/Attribute:category_name' => 'Kategorie',
-	'Class:AuditRule/Attribute:category_name+' => 'Název kategorie pro toto pravidlo',
+	'Class:AuditRule/Attribute:category_name+' => 'Název kategorie pro toto pravidlo'
+));
+
+//
+// Class: AuditDomain
+//
+
+Dict::Add('CS CZ', 'Czech', 'Čeština', array(
+	'Class:AuditDomain' => 'Audit Domain~~',
+	'Class:AuditDomain+' => 'Audit domains allow to group the audit categories.
+Domain usually correspond to who is responsible for checking and fixing errors~~',
+	'Class:AuditDomain/Attribute:name' => 'Name~~',
+	'Class:AuditDomain/Attribute:name+' => 'Its a segmentation of the Audit by who is in charge of fixing it or just interested~~',
+	'Class:AuditDomain/Attribute:description' => 'Description~~',
+	'Class:AuditDomain/Attribute:description+' => '~~',
+	'Class:AuditDomain/Attribute:icon' => 'Icon~~',
+	'Class:AuditDomain/Attribute:icon+' => '~~',
+	'Class:AuditDomain/Attribute:categories_list' => 'Categories~~',
+	'Class:AuditDomain/Attribute:categories_list+' => 'Related audit categories. When running the audit on a domain, all related audit categories are checked and only those.~~',
+));
+
+//
+// Class: lnkAuditCategoryToAuditDomain
+//
+
+Dict::Add('CS CZ', 'Czech', 'Čeština', array(
+	'Class:lnkAuditCategoryToAuditDomain' => 'Link AuditCategory / AuditDomain~~',
+	'Class:lnkAuditCategoryToAuditDomain+' => '~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:category_id' => 'Category~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:category_id+' => 'Audit Category~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:category_name' => 'Category name~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:category_name+' => 'Audit category name~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:domain_id' => 'Domain~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:domain_id+' => 'Audit domain~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:domain_name' => 'Domain name~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:domain_name+' => 'Audit domain name~~',
 ));
 
 //
@@ -70,6 +111,16 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:Query/Attribute:is_template+' => 'Usable as source for recipient OQL in Notifications~~',
 	'Class:Query/Attribute:is_template/Value:yes' => 'Yes~~',
 	'Class:Query/Attribute:is_template/Value:no' => 'No~~',
+	'Class:Query/Attribute:export_count' => 'Export counter~~',
+	'Class:Query/Attribute:export_count+' => 'Counter reflecting the number of time this query has been executed~~',
+	'Class:Query/Attribute:export_last_date' => 'Last export~~',
+	'Class:Query/Attribute:export_last_date+' => 'Date and time of the last export execution~~',
+	'Class:Query/Attribute:export_last_user_id' => 'User~~',
+	'Class:Query/Attribute:export_last_user_id+' => 'The user who executed the last export~~',
+	'Class:Query/Attribute:export_last_user_contact' => 'Contact~~',
+	'Class:Query/Attribute:export_last_user_contact+' => 'The contact who executed the last export~~',
+	'Query:baseinfo' => 'General information~~',
+	'Query:exportInfo' => 'Export information~~',
 	'Class:QueryOQL/Attribute:fields' => 'Atributy',
 	'Class:QueryOQL/Attribute:fields+' => 'Seznam atributů oddělených čárkami',
 	'Class:QueryOQL' => 'OQL dotaz',
@@ -118,7 +169,6 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:User/Attribute:status+' => '',
 	'Class:User/Attribute:status/Value:enabled' => 'Aktivní',
 	'Class:User/Attribute:status/Value:disabled' => 'Neaktivní',
-
 	'Class:User/Error:LoginMustBeUnique' => 'Uživatelské jméno musí být jedinečné - "%1s" je již použito.',
 	'Class:User/Error:AtLeastOneProfileIsNeeded' => 'Uživateli musí být přidělen alespoň jeden profil.',
 	'Class:User/Error:ProfileNotAllowed' => 'Profile "%1$s" cannot be added it will deny the access to backoffice~~',
@@ -327,6 +377,29 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Expression:Unit:Short:YEAR' => 'y~~',
 ));
 
+//
+// Duplicated into itop-welcome-itil ( will be removed from here...)
+//
+Dict::Add('CS CZ', 'Czech', 'Čeština', array(
+	'Menu:WelcomeMenu' => 'Vítejte',
+	'Menu:WelcomeMenu+' => 'Vítejte v '.ITOP_APPLICATION_SHORT,
+	'Menu:WelcomeMenuPage' => 'Vítejte',
+	'Menu:WelcomeMenuPage+' => 'Vítejte v '.ITOP_APPLICATION_SHORT,
+	'Menu:AdminTools' => 'Administrace',
+	'Menu:AdminTools+' => 'Nástroje pro administraci',
+	'Menu:AdminTools?' => 'Nástroje přístupné pouze uživatelům, kteří mají potřbná oprávnění',
+	'Menu:CSVImportMenu' => 'CSV import',
+	'Menu:CSVImportMenu+' => 'Hromadné vytvoření nebo aktualizace',
+	'Menu:DataModelMenu' => 'Datový model',
+	'Menu:DataModelMenu+' => 'Přehled datového modelu',
+	'Menu:ExportMenu' => 'Exportovat',
+	'Menu:ExportMenu+' => 'Exportovat výsledky jakéhokoli dotazu do HTML, CSV nebo XML',
+	'Menu:NotificationsMenu' => 'Upozornění',
+	'Menu:NotificationsMenu+' => 'Konfigurace upozornění',
+	'Menu:MyShortcuts' => 'Mé odkazy',
+	'Menu:DataAdministration' => 'Správa dat',
+	'Menu:DataAdministration+' => 'Správa dat',
+));
 
 //
 // String from the User Interface: menu, messages, buttons, etc...
@@ -336,12 +409,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'BooleanLabel:yes' => 'ano',
 	'BooleanLabel:no' => 'ne',
 	'UI:Login:Title' => ITOP_APPLICATION_SHORT.' login~~',
-	'Menu:WelcomeMenu' => 'Vítejte',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:WelcomeMenu+' => 'Vítejte v '.ITOP_APPLICATION_SHORT, // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:WelcomeMenuPage' => 'Vítejte',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:WelcomeMenuPage+' => 'Vítejte v '.ITOP_APPLICATION_SHORT, // Duplicated into itop-welcome-itil (will be removed from here...)
 	'UI:WelcomeMenu:Title' => 'Vítejte v '.ITOP_APPLICATION_SHORT,
-
 	'UI:WelcomeMenu:LeftBlock' => '<p>'.ITOP_APPLICATION_SHORT.' je komplexní „opensource” provozní IT portál.</p>
 <ul>Obsahuje:
 <li>Kompletní CMDB (databázi pro správu konfigurací) sloužící pro dokumentování a správu evidovaného IT.</li>
@@ -352,7 +420,6 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 <li>Úvodní obrazovku poskytující rychlý a aktuální přehled o Vašem IT.</li>
 </ul>
 <p>Každý modul může být nastaven "krok za krokem" nezávisle na ostatních modulech.</p>',
-
 	'UI:WelcomeMenu:RightBlock' => '<p>'.ITOP_APPLICATION_SHORT.' je servisně orientovaný produkt, který umožňuje správcům IT velmi jednoduše spravovat více zákazníků nebo organizací.
 <ul>iTop přináší mnoho dalších výhod umožňujících "optimální" nastavení podnikových procesů které:
 <li>Zvyšují účinnost řízení IT.</li>
@@ -368,7 +435,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 <li>Spravovat Vaše nejdůležitější IT aktivum - Dokumentaci.</li>
 </ul>
 </p>',
-	'UI:WelcomeMenu:Text'=> '<div>Congratulations, you landed on '.ITOP_APPLICATION.' '.ITOP_VERSION_NAME.'!</div>
+	'UI:WelcomeMenu:Text' => '<div>Congratulations, you landed on '.ITOP_APPLICATION.' '.ITOP_VERSION_NAME.'!</div>
 
 <div>This version features a brand new modern and accessible backoffice design.</div>
 
@@ -389,6 +456,7 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:Button:GlobalSearch' => 'Hledat',
 	'UI:Button:Search' => ' Hledat ',
 	'UI:Button:Clear' => ' Clear ~~',
+	'UI:Button:Confirm' => ' Confirm ~~',
 	'UI:Button:SearchInHierarchy' => 'Search in hierarchy~~',
 	'UI:Button:Query' => ' Query ',
 	'UI:Button:Ok' => 'Ok',
@@ -429,7 +497,6 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:UserPref:DoNotShowAgain' => 'Do not show again~~',
 	'UI:InputFile:NoFileSelected' => 'No File Selected~~',
 	'UI:InputFile:SelectFile' => 'Select a file~~',
-
 	'UI:SearchToggle' => 'Hledání',
 	'UI:ClickToCreateNew' => 'Nový objekt (%1$s)~~',
 	'UI:SearchFor_Class' => 'Hledat objekty třídy %1$s',
@@ -449,7 +516,6 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:Error:CannotWriteToTmp_Dir' => 'Nemohu zapisovat do dočasného adresáře (tmp). upload_tmp_dir = "%1$s".',
 	'UI:Error:UploadStoppedByExtension_FileName' => 'Nahrávání zastaveno díky příponě. (Původní jméno souboru = "%1$s").',
 	'UI:Error:UploadFailedUnknownCause_Code' => 'Nahrávání selhalo z neznámé příčiny. (Kód chyby = "%1$s").',
-
 	'UI:Error:1ParametersMissing' => 'Chyba: pro tuto operaci musí být uveden následující parametr: %1$s.',
 	'UI:Error:2ParametersMissing' => 'Chyba: pro tuto operaci musí být uvedeny následující parametry: %1$s a %2$s.',
 	'UI:Error:3ParametersMissing' => 'Chyba: pro tuto operaci musí být uvedeny následující parametry: %1$s, %2$s a %3$s.',
@@ -471,9 +537,7 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:Error:MaintenanceMode' => 'Application is currently in maintenance~~',
 	'UI:Error:MaintenanceTitle' => 'Maintenance~~',
 	'UI:Error:InvalidToken' => 'Error: the requested operation has already been performed (CSRF token not found)~~',
-
 	'UI:Error:SMTP:UnknownVendor' => 'OAuth SMTP provider %1$s does not exist  (email_transport_smtp.oauth.provider)~~',
-
 	'UI:GroupBy:Count' => 'Množství',
 	'UI:GroupBy:Count+' => 'Množství prvků',
 	'UI:CountOfObjects' => 'Počet objektů odpovídajícíh ktritériím: %1$d',
@@ -502,6 +566,7 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:Menu:OtherActions' => 'Další akce',
 	'UI:Menu:Transitions' => 'Transitions~~',
 	'UI:Menu:OtherTransitions' => 'Other transitions~~',
+	'UI:Menu:View' => 'View this object~~',
 	'UI:Menu:New' => 'Nový...',
 	'UI:Menu:Add' => 'Přidat...',
 	'UI:Menu:Manage' => 'Spravovat...',
@@ -510,6 +575,9 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:Menu:Modify' => 'Upravit...',
 	'UI:Menu:Delete' => 'Odstranit...',
 	'UI:Menu:BulkDelete' => 'Odstranit...',
+	'UI:Menu:BulkDelete_Class' => 'Delete %1$s objects...~~',
+	'UI:Menu:BulkDelete_Link' => 'Delete %1$s...~~',
+	'UI:Menu:BulkDelete_Remote' => 'Delete %1$s...~~',
 	'UI:UndefinedObject' => 'nedefinováno',
 	'UI:Document:OpenInNewWindow:Download' => 'Otevřít v novém okně: %1$s, Stáhnout: %2$s',
 	'UI:SplitDateTime-Date' => 'datum',
@@ -542,7 +610,6 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:Login:ResetPassword' => 'Zaslat nyní!',
 	'UI:Login:ResetPwdFailed' => 'Chyba při odesílání emailu: %1$s',
 	'UI:Login:SeparatorOr' => 'Or~~',
-
 	'UI:ResetPwd-Error-WrongLogin' => '\'%1$s\' není platné uživatelské jméno',
 	'UI:ResetPwd-Error-NotPossible' => 'obnova hesla u externích účtů není možná.',
 	'UI:ResetPwd-Error-FixedPwd' => 'obnova hesla u tohoto účtu není povolená.',
@@ -553,50 +620,49 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:ResetPwd-EmailSent' => 'Please check your email box and follow the instructions. If you receive no email, please check the login you typed.~~',
 	'UI:ResetPwd-EmailSubject' => 'Obnovení hesla pro '.ITOP_APPLICATION_SHORT,
 	'UI:ResetPwd-EmailBody' => '<body><p>Vyžádali jste obovení hesla pro '.ITOP_APPLICATION_SHORT.'.</p><p>Pokračujte kliknutím na následující <a href="%1$s">jednorázový odkaz</a> a zadejte nové heslo.</p>',
-
 	'UI:ResetPwd-Title' => 'Obnovení hesla',
 	'UI:ResetPwd-Error-InvalidToken' => 'Omlouváme se, ale heslo již bylo obnoveno nebo jste obdrželi více emailů. Ujistěte se, že používate odkaz z posledního emailu který jste obdrželi.',
 	'UI:ResetPwd-Error-EnterPassword' => 'Vložte nové heslo k účtu \'%1$s\'.',
 	'UI:ResetPwd-Ready' => 'Heslo bylo obnoveno.',
 	'UI:ResetPwd-Login' => 'Pro přihlášení klikněte zde...',
-
-	'UI:Login:About'                               => '',
-	'UI:Login:ChangeYourPassword'                  => 'Změnit heslo',
-	'UI:Login:OldPasswordPrompt'                   => 'Původní heslo',
-	'UI:Login:NewPasswordPrompt'                   => 'Nové heslo',
-	'UI:Login:RetypeNewPasswordPrompt'             => 'Znovu nové heslo',
-	'UI:Login:IncorrectOldPassword'                => 'Chyba: původní heslo je nesprávné',
-	'UI:LogOffMenu'                                => 'Odhlásit',
+	'UI:Login:About' => '',
+	'UI:Login:ChangeYourPassword' => 'Změnit heslo',
+	'UI:Login:OldPasswordPrompt' => 'Původní heslo',
+	'UI:Login:NewPasswordPrompt' => 'Nové heslo',
+	'UI:Login:RetypeNewPasswordPrompt' => 'Znovu nové heslo',
+	'UI:Login:IncorrectOldPassword' => 'Chyba: původní heslo je nesprávné',
+	'UI:LogOffMenu' => 'Odhlásit',
 	'UI:LogOff:ThankYou' => 'Děkujeme za užívání '.ITOP_APPLICATION_SHORT,
-	'UI:LogOff:ClickHereToLoginAgain'              => 'Klikněte zde pro nové přihlášení...',
-	'UI:ChangePwdMenu'                             => 'Změnit heslo',
-	'UI:Login:PasswordChanged'                     => 'Heslo nastaveno úspěšně!',
+	'UI:LogOff:ClickHereToLoginAgain' => 'Klikněte zde pro nové přihlášení...',
+	'UI:ChangePwdMenu' => 'Změnit heslo',
+	'UI:Login:PasswordChanged' => 'Heslo nastaveno úspěšně!',
+	'UI:Login:PasswordNotChanged' => 'Error: Password is the same!~~',
 	'UI:AccessRO-All' => ITOP_APPLICATION_SHORT.' je pouze ke čtení',
 	'UI:AccessRO-Users' => ITOP_APPLICATION_SHORT.' je pouze ke čtení pro koncové uživatele',
-	'UI:ApplicationEnvironment'                    => 'Aplikační prostředí: %1$s',
-	'UI:Login:RetypePwdDoesNotMatch'               => 'Nová hesla se neshodují!',
-	'UI:Button:Login'                              => 'Přihlásit',
-	'UI:Login:Error:AccessRestricted'              => 'Přístup je omezen. Kontaktujte administrátora.',
-	'UI:Login:Error:AccessAdmin'                   => 'Přístup vyhrazen osobám s administrátorskými právy. Kontaktujte administrátora.',
-	'UI:Login:Error:WrongOrganizationName'         => 'Unknown organization~~',
+	'UI:ApplicationEnvironment' => 'Aplikační prostředí: %1$s',
+	'UI:Login:RetypePwdDoesNotMatch' => 'Nová hesla se neshodují!',
+	'UI:Button:Login' => 'Přihlásit',
+	'UI:Login:Error:AccessRestricted' => 'Přístup je omezen. Kontaktujte administrátora.',
+	'UI:Login:Error:AccessAdmin' => 'Přístup vyhrazen osobám s administrátorskými právy. Kontaktujte administrátora.',
+	'UI:Login:Error:WrongOrganizationName' => 'Unknown organization~~',
 	'UI:Login:Error:MultipleContactsHaveSameEmail' => 'Multiple contacts have the same e-mail~~',
-	'UI:Login:Error:NoValidProfiles'               => 'No valid profile provided~~',
-	'UI:CSVImport:MappingSelectOne'                => '-- zvolte jednu z možností --',
-	'UI:CSVImport:MappingNotApplicable'            => '-- ignorovat --',
-	'UI:CSVImport:NoData'                          => 'Žádná data!',
-	'UI:Title:DataPreview'                         => 'Náhled dat',
-	'UI:CSVImport:ErrorOnlyOneColumn'              => 'Chyba: Data obsahují pouze jeden sloupec. Zvolili jste odpovídající znak pro oddělení položek?',
-	'UI:CSVImport:FieldName'                       => 'Pole %1$d',
-	'UI:CSVImport:DataLine1'                       => '1. řádek dat',
-	'UI:CSVImport:DataLine2'                       => '2. řádek dat',
-	'UI:CSVImport:idField'                         => 'id (primární klíč)',
+	'UI:Login:Error:NoValidProfiles' => 'No valid profile provided~~',
+	'UI:CSVImport:MappingSelectOne' => '-- zvolte jednu z možností --',
+	'UI:CSVImport:MappingNotApplicable' => '-- ignorovat --',
+	'UI:CSVImport:NoData' => 'Žádná data!',
+	'UI:Title:DataPreview' => 'Náhled dat',
+	'UI:CSVImport:ErrorOnlyOneColumn' => 'Chyba: Data obsahují pouze jeden sloupec. Zvolili jste odpovídající znak pro oddělení položek?',
+	'UI:CSVImport:FieldName' => 'Pole %1$d',
+	'UI:CSVImport:DataLine1' => '1. řádek dat',
+	'UI:CSVImport:DataLine2' => '2. řádek dat',
+	'UI:CSVImport:idField' => 'id (primární klíč)',
 	'UI:Title:BulkImport' => ITOP_APPLICATION_SHORT.' - hromadný import',
-	'UI:Title:BulkImport+'                         => 'Průvodce importem CSV',
-	'UI:Title:BulkSynchro_nbItem_ofClass_class'    => 'Synchronizace %1$d objektů třídy %2$s',
-	'UI:CSVImport:ClassesSelectOne'                => '-- zvolte jednu z možností --',
-	'UI:CSVImport:ErrorExtendedAttCode'            => 'Interní chyba: "%1$s" je nesprávný kód, protože "%2$s" není externím klíčem třídy "%3$s"',
-	'UI:CSVImport:ObjectsWillStayUnchanged'        => '%1$d objekt(ů) zůstane nezměněno.',
-	'UI:CSVImport:ObjectsWillBeModified'           => '%1$d objekt(ů) bude upraveno.',
+	'UI:Title:BulkImport+' => 'Průvodce importem CSV',
+	'UI:Title:BulkSynchro_nbItem_ofClass_class' => 'Synchronizace %1$d objektů třídy %2$s',
+	'UI:CSVImport:ClassesSelectOne' => '-- zvolte jednu z možností --',
+	'UI:CSVImport:ErrorExtendedAttCode' => 'Interní chyba: "%1$s" je nesprávný kód, protože "%2$s" není externím klíčem třídy "%3$s"',
+	'UI:CSVImport:ObjectsWillStayUnchanged' => '%1$d objekt(ů) zůstane nezměněno.',
+	'UI:CSVImport:ObjectsWillBeModified' => '%1$d objekt(ů) bude upraveno.',
 	'UI:CSVImport:ObjectsWillBeAdded' => '%1$d objekt(ů) bude přidáno.',
 	'UI:CSVImport:ObjectsWillHaveErrors' => '%1$d objekt(ů) bude mít chyby.',
 	'UI:CSVImport:ObjectsRemainedUnchanged' => '%1$d objekt(ů) zůstalo nezměněných.',
@@ -642,11 +708,14 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:UniversalSearchTitle' => ITOP_APPLICATION_SHORT.' - Univerzální hledání',
 	'UI:UniversalSearch:Error' => 'Chyba: %1$s',
 	'UI:UniversalSearch:LabelSelectTheClass' => 'Vyberte třídu pro hledání: ',
-
 	'UI:CSVReport-Value-Modified' => 'Upraveno',
 	'UI:CSVReport-Value-SetIssue' => 'invalid value for attribute~~',
 	'UI:CSVReport-Value-ChangeIssue' => '\'%1$s\' is an invalid value~~',
 	'UI:CSVReport-Value-NoMatch' => 'No match for value \'%1$s\'~~',
+	'UI:CSVReport-Value-NoMatch-PossibleValues' => 'Some possible \'%1$s\' value(s): %2$s~~',
+	'UI:CSVReport-Value-NoMatch-NoObject' => 'There are no \'%1$s\' objects~~',
+	'UI:CSVReport-Value-NoMatch-NoObject-ForCurrentUser' => 'There are no \'%1$s\' objects found with your current profile~~',
+	'UI:CSVReport-Value-NoMatch-SomeObjectNotVisibleForCurrentUser' => 'There are some \'%1$s\' objects not visible with your current profile~~',
 	'UI:CSVReport-Value-Missing' => 'Chybí povinná hodnota',
 	'UI:CSVReport-Value-Ambiguous' => 'Nejednoznačné: nalezeno %1$s objektů',
 	'UI:CSVReport-Row-Unchanged' => 'nezměněn',
@@ -660,15 +729,16 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:CSVReport-Value-Issue-Readonly' => 'Atribut \'%1$s\' je pouze ke čtení a nemůže být upraven (stávající hodnota: %2$s, navrhovaná hodnota: %3$s)',
 	'UI:CSVReport-Value-Issue-Format' => 'Nepodařilo se zpracovat vstup: %1$s',
 	'UI:CSVReport-Value-Issue-NoMatch' => 'Neočekávaná hodnota atributu \'%1$s\': nenalezena shoda, zkontrolujte zadání',
+	'UI:CSVReport-Value-Issue-AllowedValues' => 'Allowed \'%1$s\' value(s): %2$s~~',
 	'UI:CSVReport-Value-Issue-Unknown' => 'Neočekávaná hodnota atributu \'%1$s\': %2$s',
 	'UI:CSVReport-Row-Issue-Inconsistent' => 'Atributy spolu nejsou v souladu: %1$s',
 	'UI:CSVReport-Row-Issue-Attribute' => 'Neočekávané hodnoty atributů',
 	'UI:CSVReport-Row-Issue-MissingExtKey' => 'Nemůže být vytvořen z důvodu chybějícího externího klíče: %1$s',
 	'UI:CSVReport-Row-Issue-DateFormat' => 'špatný formát data',
+	'UI:CSVReport-Row-Issue-ExpectedDateFormat' => 'Expected format: %1$s~~',
 	'UI:CSVReport-Row-Issue-Reconciliation' => 'sladění selhalo',
 	'UI:CSVReport-Row-Issue-Ambiguous' => 'nejednoznačné sladění',
 	'UI:CSVReport-Row-Issue-Internal' => 'Interní chyba: %1$s, %2$s',
-
 	'UI:CSVReport-Icon-Unchanged' => 'Nezměněno',
 	'UI:CSVReport-Icon-Modified' => 'Upraveno',
 	'UI:CSVReport-Icon-Missing' => 'Chybí',
@@ -683,14 +753,32 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:CSVReport-Stats-Errors' => '%1$.0f %% načtených objektů obsahuje chyby a bude ignorováno.',
 	'UI:CSVReport-Stats-Created' => '%1$.0f %% načtených objektů bude vytvořeno.',
 	'UI:CSVReport-Stats-Modified' => '%1$.0f %% načtených objektů bude upraveno.',
-
 	'UI:CSVExport:AdvancedMode' => 'Pokročilý režim',
 	'UI:CSVExport:AdvancedMode+' => 'V pokročilém režimu jsou vyexportovány další sloupce: id objektu, id externích klíčů a jejich slaďovacích atributů.',
 	'UI:CSVExport:LostChars' => 'Problém s kódováním',
 	'UI:CSVExport:LostChars+' => 'CSV soubor bude kódován v %1$s. '.ITOP_APPLICATION_SHORT.' zjistil, že některé charaktery nejsou s tímto kódováním kompatibilní. Tyto znaky budou nahrazeny zástupným znakem, nebo budou vynechány. Kontaktujte administrátora pro změnu kódování (parametr \'csv_file_default_charset\').',
-
 	'UI:Audit:Title' => ITOP_APPLICATION_SHORT.' - CMDB Audit',
 	'UI:Audit:InteractiveAudit' => 'Interaktivní Audit',
+	'UI:Audit:Interactive:All:Title' => 'Audit results~~',
+	'UI:Audit:Interactive:All:SubTitle' => 'Full audit: includes all rules, all categories, all domains~~',
+	'UI:Audit:Interactive:All:BreadCrumb' => 'Full audit~~',
+	'UI:Audit:Interactive:All:BreadCrumb+' => 'Audit results for all rules~~',
+	'UI:Audit:Interactive:Categories:Title' => 'Audit results for categories: %1$s~~',
+	'UI:Audit:Interactive:Categories:SubTitle' => 'Audit results for all the rules belonging to one of those %1$s categories~~',
+	'UI:Audit:Interactive:Categories:BreadCrumb' => 'Categories~~',
+	'UI:Audit:Interactive:Categories:BreadCrumb+' => 'Audit categories: %1$s~~',
+	'UI:Audit:Interactive:Domain:Title' => 'Audit results for Domain: %1$s~~',
+	'UI:Audit:Interactive:Domain:SubTitle' => 'Audit results for all the rules belonging to a category related to the domain: %1$s~~',
+	'UI:Audit:Interactive:Domain:BreadCrumb' => '%1$s~~',
+	'UI:Audit:Interactive:Domain:BreadCrumb+' => 'Audit for Domain: %1$s~~',
+	'UI:Audit:Interactive:Selection:Title' => 'Selection of an audit~~',
+	'UI:Audit:Interactive:Selection:SubTitle' => 'Select a domain to get the results limited to this domain or select "All categories" to get a full audit (can take time or even fail if too much data to audit)~~',
+	'UI:Audit:Interactive:Selection:BreadCrumb' => 'Selection~~',
+	'UI:Audit:Interactive:Selection:BreadCrumb+' => 'Selection of an Audit to run~~',
+	'UI:Audit:Interactive:Selection:BadgeAll' => 'All categories~~',
+	'UI:Audit:Interactive:Button:Back' => 'Back to the audit~~',
+	'UI:Audit:Interactive:Button:Configuration' => 'Audit configuration~~',
+	'UI:Audit:ViewRules' => 'Check the rules~~',
 	'UI:Audit:HeaderAuditRule' => 'Pravidlo auditu',
 	'UI:Audit:HeaderNbObjects' => 'Počet objektů',
 	'UI:Audit:HeaderNbErrors' => 'Počet chyb',
@@ -706,8 +794,6 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:Audit:Dashboard:ObjectsInError' => 'Objects in errors~~',
 	'UI:Audit:Dashboard:ObjectsValidated' => 'Objects validated~~',
 	'UI:Audit:AuditCategory:Subtitle' => '%1$s errors ouf of %2$s - %3$s%%~~',
-
-
 	'UI:RunQuery:Title' => ITOP_APPLICATION_SHORT.' - Vyhodnocení OQL dotazu',
 	'UI:RunQuery:QueryExamples' => 'Příklady dotazů',
 	'UI:RunQuery:QueryResults' => 'Query Results~~',
@@ -746,7 +832,6 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:Schema:Label' => 'Název',
 	'UI:Schema:Label+' => 'Název atributu',
 	'UI:Schema:Type' => 'Typ',
-
 	'UI:Schema:Type+' => 'Datový typ atributu',
 	'UI:Schema:Origin' => 'Původ',
 	'UI:Schema:Origin+' => 'Základní třída, ve které je tento atribut definován',
@@ -794,6 +879,16 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:Schema:DisplaySelector/Code' => 'Code~~',
 	'UI:Schema:Attribute/Filter' => 'Filter~~',
 	'UI:Schema:DefaultNullValue' => 'Default null : "%1$s"~~',
+	'UI:Schema:Events' => 'Events~~',
+	'UI:Schema:Events:Defined' => 'Defined events~~',
+	'UI:Schema:Events:NoEvent' => 'No event defined~~',
+	'UI:Schema:Events:Listeners' => 'Event listeners~~',
+	'UI:Schema:Events:NoListener' => 'No event listener~~',
+	'UI:Schema:Events:Event' => 'Event~~',
+	'UI:Schema:Events:Description' => 'Description~~',
+	'UI:Schema:Events:Listener' => 'Listener~~',
+	'UI:Schema:Events:Rank' => 'Rank~~',
+	'UI:Schema:Events:Module' => 'Module~~',
 	'UI:LinksWidget:Autocomplete+' => 'Zadejte první tři znaky...',
 	'UI:Edit:SearchQuery' => 'Select a predefined query~~',
 	'UI:Edit:TestQuery' => 'Otestovat dotaz',
@@ -885,7 +980,6 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:SystemIntrusion' => 'Přístup odepřen. Vyžadujete operaci, která vám není povolena.',
 	'UI:FatalErrorMessage' => 'Závažná chyba, '.ITOP_APPLICATION_SHORT.' nemůže pokračovat.',
 	'UI:Error_Details' => 'Chyba: %1$s',
-
 	'UI:PageTitle:ProfileProjections' => ITOP_APPLICATION_SHORT.' správa uživatelů - projekce profilů',
 	'UI:UserManagement:Class' => 'Třída',
 	'UI:UserManagement:Class+' => 'Třída objektů',
@@ -920,66 +1014,42 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:UserManagement:NoLifeCycleApplicable' => 'nedefinováno',
 	'UI:UserManagement:NoLifeCycleApplicable+' => 'Pro tuto třídu nebyl definován žádný životní cyklus',
 	'UI:UserManagement:GrantMatrix' => 'Matice oprávnění',
-
-	'Menu:AdminTools' => 'Administrace',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:AdminTools+' => 'Nástroje pro administraci',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:AdminTools?' => 'Nástroje přístupné pouze uživatelům, kteří mají potřbná oprávnění',// Duplicated into itop-welcome-itil (will be removed from here...)
 	'Menu:SystemTools' => 'System~~',
-
 	'UI:ChangeManagementMenu' => 'Řízení změn',
 	'UI:ChangeManagementMenu+' => 'Řízení změn',
 	'UI:ChangeManagementMenu:Title' => 'Přehled změn',
 	'UI-ChangeManagementMenu-ChangesByType' => 'Změny podle typu',
 	'UI-ChangeManagementMenu-ChangesByStatus' => 'Změny podle stavu',
 	'UI-ChangeManagementMenu-ChangesNotYetAssigned' => 'Nepřidělené změny',
-
 	'UI:ConfigurationManagementMenu' => 'Správa konfigurací',
 	'UI:ConfigurationManagementMenu+' => 'Správa konfigurací',
 	'UI:ConfigurationManagementMenu:Title' => 'Přehled infrastruktury',
 	'UI-ConfigurationManagementMenu-InfraByType' => 'Objekty infrastruktury podle typu',
 	'UI-ConfigurationManagementMenu-InfraByStatus' => 'Objekty infrastruktury podle stavu',
-
 	'UI:ConfigMgmtMenuOverview:Title' => 'Dashboard pro správu konfigurací (Configuration management)',
 	'UI-ConfigMgmtMenuOverview-FunctionalCIbyStatus' => 'Konfigurační položky podle stavu',
 	'UI-ConfigMgmtMenuOverview-FunctionalCIByType' => 'Konfigurační položky podle typu',
-
 	'UI:RequestMgmtMenuOverview:Title' => 'Dashboard pro správu požadavků (Request management)',
 	'UI-RequestManagementOverview-RequestByService' => 'Požadavky uživatelů podle služby',
 	'UI-RequestManagementOverview-RequestByPriority' => 'Požadavky uživatelů podle priority',
 	'UI-RequestManagementOverview-RequestUnassigned' => 'Nepřidělené požadavky',
-
 	'UI:IncidentMgmtMenuOverview:Title' => 'Dashboard pro správu incidentů (Incident management)',
 	'UI-IncidentManagementOverview-IncidentByService' => 'Incidenty podle služby',
 	'UI-IncidentManagementOverview-IncidentByPriority' => 'Incidenty podle priority',
 	'UI-IncidentManagementOverview-IncidentUnassigned' => 'Nepřidělené incidenty',
-
 	'UI:ChangeMgmtMenuOverview:Title' => 'Dashboard pro řízení změn (Change management)',
 	'UI-ChangeManagementOverview-ChangeByType' => 'Změny podle typu',
 	'UI-ChangeManagementOverview-ChangeUnassigned' => 'Nepřidělené změny',
 	'UI-ChangeManagementOverview-ChangeWithOutage' => 'Výpadky z důvodu změn',
-
 	'UI:ServiceMgmtMenuOverview:Title' => 'Dashboard pro správu služeb (Service Management)',
 	'UI-ServiceManagementOverview-CustomerContractToRenew' => 'Smlouvy se zákazníky k obnovení do 30 dní',
 	'UI-ServiceManagementOverview-ProviderContractToRenew' => 'Smlouvy s poskytovateli k obnovení do 30 dní',
-
 	'UI:ContactsMenu' => 'Kontakty',
 	'UI:ContactsMenu+' => 'Kontakty',
 	'UI:ContactsMenu:Title' => 'Přehled kontaktů',
 	'UI-ContactsMenu-ContactsByLocation' => 'Kontakty podle umístění',
 	'UI-ContactsMenu-ContactsByType' => 'Kontakty podle typu',
 	'UI-ContactsMenu-ContactsByStatus' => 'Kontakty podle stavu',
-
-	'Menu:CSVImportMenu' => 'CSV import',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:CSVImportMenu+' => 'Hromadné vytvoření nebo aktualizace',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:DataModelMenu' => 'Datový model',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:DataModelMenu+' => 'Přehled datového modelu',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:ExportMenu' => 'Exportovat',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:ExportMenu+' => 'Exportovat výsledky jakéhokoli dotazu do HTML, CSV nebo XML',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:NotificationsMenu' => 'Upozornění',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:NotificationsMenu+' => 'Konfigurace upozornění',// Duplicated into itop-welcome-itil (will be removed from here...)
 	'UI:NotificationsMenu:Title' => 'Konfigurace upozornění',
 	'UI:NotificationsMenu:Help' => 'Nápověda',
 	'UI:NotificationsMenu:HelpContent' => '<p>Upozornění v '.ITOP_APPLICATION_SHORT.' jsou plně nastavitelné. Jsou založena na dvou druzích objektů: <i>triggery (spouštěče) a akce</i>.</p>
@@ -1008,53 +1078,18 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:NotificationsMenu:Actions:ActionWebhook' => 'Webhook actions (outgoing integrations)~~',
 	'UI:NotificationsMenu:Actions:Action' => 'Other actions~~',
 	'UI:NotificationsMenu:AvailableActions' => 'Dostupné akce',
-
 	'Menu:TagAdminMenu' => 'Tags configuration~~',
 	'Menu:TagAdminMenu+' => 'Tags values management~~',
 	'UI:TagAdminMenu:Title' => 'Tags configuration~~',
 	'UI:TagAdminMenu:NoTags' => 'No Tag field configured~~',
 	'UI:TagSetFieldData:Error' => 'Error: %1$s~~',
-
-	'Menu:AuditCategories' => 'Kategorie auditu',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:AuditCategories+' => 'Kategorie auditu',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:Notifications:Title' => 'Kategorie auditu',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:RunQueriesMenu' => 'Provést dotaz',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:RunQueriesMenu+' => 'Provést dotaz',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:QueryMenu' => 'Knihovna dotazů',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:QueryMenu+' => 'Knihovna dotazů',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:DataAdministration' => 'Správa dat',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:DataAdministration+' => 'Správa dat',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:UniversalSearchMenu' => 'Univerzální hledání',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UniversalSearchMenu+' => 'Hledejte cokoli...',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:UserManagementMenu' => 'Správa uživatelů',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UserManagementMenu+' => 'Správa uživatelů',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:ProfilesMenu' => 'Profily (Role)',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:ProfilesMenu+' => 'Profily (Role)',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:ProfilesMenu:Title' => 'Profily (Role)',
-	// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:UserAccountsMenu' => 'Uživatelské účty',
-	// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UserAccountsMenu+' => 'Uživatelské účty',
-	// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UserAccountsMenu:Title' => 'Uživatelské účty',
-	// Duplicated into itop-welcome-itil (will be removed from here...)
-
 	'UI:iTopVersion:Short' => '%1$s verze %2$s',
 	'UI:iTopVersion:Long' => '%1$s verze %2$s-%3$s ze dne %4$s',
 	'UI:PropertiesTab' => 'Vlastnosti',
-
 	'UI:OpenDocumentInNewWindow_' => 'Otevřít~~',
 	'UI:DownloadDocument_' => 'Stáhnout~~',
 	'UI:Document:NoPreview' => 'Pro tento typ dokumentu není k dispozici žádný náhled',
 	'UI:Download-CSV' => 'Stáhnout %1$s',
-
 	'UI:DeadlineMissedBy_duration' => 'Zmeškáno o %1$s',
 	'UI:Deadline_LessThan1Min' => 'méně než 1 min',
 	'UI:Deadline_Minutes' => '%1$d min',
@@ -1097,7 +1132,7 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:RelationTooltip:ImpactedItems_N_of_M' => 'Počet zasažených objektů: %1$d / %2$d',
 	'UI:RelationTooltip:CriticalThreshold_N_of_M' => 'Prahová hranice: %1$d / %2$d',
 	'Portal:Title' => ITOP_APPLICATION_SHORT.' uživatelský portál',
-	'Portal:NoRequestMgmt' => 'Byli jste přesměrováni na tuto stránku, protože k vašemu účtu je přidělen profil \'Portal user\'. '.ITOP_APPLICATION_SHORT.' však nebyl nainstalován s funkcí \'Request Management\'. Kontaktujte prosím vašeho administrátora.',
+	'Portal:NoRequestMgmt' => 'Byli jste přesměrováni na tuto stránku, protože k vašemu účtu je přidělen profil \'Portal user\'. '.ITOP_APPLICATION_SHORT.' však nebyl nainstalován s funkcí \'Request Management\'.Kontaktujte prosím vašeho administrátora.',
 	'Portal:Refresh' => 'Obnovit',
 	'Portal:Back' => 'Zpět',
 	'Portal:WelcomeUserOrg' => 'Vítejte, %1$s (%2$s)',
@@ -1133,9 +1168,13 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'Enum:Undefined' => 'Nedefinováno',
 	'UI:DurationForm_Days_Hours_Minutes_Seconds' => '%1$sd %2$sh %3$sm %4$ss',
 	'UI:ModifyAllPageTitle' => 'Upravit vše',
+	'UI:Modify_ObjectsOf_Class' => 'Modifying objects of class %1$s~~',
 	'UI:Modify_N_ObjectsOf_Class' => 'Úprava %1$d objektů třídy %2$s',
 	'UI:Modify_M_ObjectsOf_Class_OutOf_N' => 'Úprava %1$d objektů třídy %2$s ze %3$d',
 	'UI:Menu:ModifyAll' => 'Upravit...',
+	'UI:Menu:ModifyAll_Class' => 'Modify %1$s objects...~~',
+	'UI:Menu:ModifyAll_Link' => 'Modify %1$s...~~',
+	'UI:Menu:ModifyAll_Remote' => 'Modify %1$s...~~',
 	'UI:Button:ModifyAll' => 'Upravit vše',
 	'UI:Button:PreviewModifications' => 'Náhled úprav >>',
 	'UI:ModifiedObject' => 'Objekt upraven',
@@ -1195,7 +1234,6 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:PrintResolution:LetterLandscape' => 'Letter Landscape~~',
 	'UI:Toggle:SwitchToStandardDashboard' => 'Switch to standard dashboard~~',
 	'UI:Toggle:SwitchToCustomDashboard' => 'Switch to custom dashboard~~',
-
 	'UI:ConfigureThisList' => 'Konfigurovat tento seznam...',
 	'UI:ListConfigurationTitle' => 'Konfigurace seznamu',
 	'UI:ColumnsAndSortOrder' => 'Sloupce a jejich řazení:',
@@ -1211,10 +1249,8 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:ExtField_AsRemoteField' => '%1$s (%2$s)',
 	'UI:Button:MoveUp' => 'Posunout nahoru',
 	'UI:Button:MoveDown' => 'Posunout dolů',
-
 	'UI:OQL:UnknownClassAndFix' => 'Neznámá třída "%1$s". Můžete zkusit "%2$s".',
 	'UI:OQL:UnknownClassNoFix' => 'Neznámá třída "%1$s"',
-
 	'UI:Dashboard:EditCustom' => 'Edit custom version...~~',
 	'UI:Dashboard:CreateCustom' => 'Create a custom version...~~',
 	'UI:Dashboard:DeleteCustom' => 'Delete custom version...~~',
@@ -1225,13 +1261,10 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:ImportDashboardText' => 'Vyberte šablonu dashboardu k importu:',
 	'UI:Dashboard:Actions' => 'Dashboard actions~~',
 	'UI:Dashboard:NotUpToDateUntilContainerSaved' => 'This dashboard displays information that does not include the on-going changes.~~',
-
-
 	'UI:DashletCreation:Title' => 'Vytvořit nový dashlet',
 	'UI:DashletCreation:Dashboard' => 'Dashboard',
 	'UI:DashletCreation:DashletType' => 'Typ dashletu',
 	'UI:DashletCreation:EditNow' => 'Upravit dashboard',
-
 	'UI:DashboardEdit:Title' => 'Upravit dashboard',
 	'UI:DashboardEdit:DashboardTitle' => 'Nadpis',
 	'UI:DashboardEdit:AutoReload' => 'Automatické obnovování',
@@ -1239,38 +1272,31 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:DashboardEdit:AutoReloadSec+' => 'Minimální povolená hodnota je %1$d sekund',
 	'UI:DashboardEdit:Revert' => 'Revert~~',
 	'UI:DashboardEdit:Apply' => 'Apply~~',
-
 	'UI:DashboardEdit:Layout' => 'Uspořádání',
 	'UI:DashboardEdit:Properties' => 'Dashboard - vlastnosti',
 	'UI:DashboardEdit:Dashlets' => 'Dostupné dashlety',
 	'UI:DashboardEdit:DashletProperties' => 'Dashlet - vlastnosti',
-
 	'UI:Form:Property' => 'Vlastnost',
 	'UI:Form:Value' => 'Hodnota',
-
 	'UI:DashletUnknown:Label' => 'Unknown~~',
 	'UI:DashletUnknown:Description' => 'Unknown dashlet (might have been uninstalled)~~',
 	'UI:DashletUnknown:RenderText:View' => 'Unable to render this dashlet.~~',
 	'UI:DashletUnknown:RenderText:Edit' => 'Unable to render this dashlet (class "%1$s"). Check with your administrator if it is still available.~~',
 	'UI:DashletUnknown:RenderNoDataText:Edit' => 'No preview available for this dashlet (class "%1$s").~~',
 	'UI:DashletUnknown:Prop-XMLConfiguration' => 'Configuration (shown as raw XML)~~',
-
 	'UI:DashletProxy:Label' => 'Proxy~~',
 	'UI:DashletProxy:Description' => 'Proxy dashlet~~',
 	'UI:DashletProxy:RenderNoDataText:Edit' => 'No preview available for this third-party dashlet (class "%1$s").~~',
 	'UI:DashletProxy:Prop-XMLConfiguration' => 'Configuration (shown as raw XML)~~',
-
 	'UI:DashletPlainText:Label' => 'Text',
 	'UI:DashletPlainText:Description' => 'Prostý text (bez formátování)',
 	'UI:DashletPlainText:Prop-Text' => 'Text',
 	'UI:DashletPlainText:Prop-Text:Default' => 'Vložte text...',
-
 	'UI:DashletObjectList:Label' => 'Seznam objektů',
 	'UI:DashletObjectList:Description' => '',
 	'UI:DashletObjectList:Prop-Title' => 'Titul',
 	'UI:DashletObjectList:Prop-Query' => 'Dotaz',
 	'UI:DashletObjectList:Prop-Menu' => 'Menu',
-
 	'UI:DashletGroupBy:Prop-Title' => 'Titul',
 	'UI:DashletGroupBy:Prop-Query' => 'Dotaz',
 	'UI:DashletGroupBy:Prop-Style' => 'Styl',
@@ -1284,24 +1310,20 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfWeek' => '%1$s (den týdne)',
 	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfMonth' => '%1$s (den měsíce)',
 	'UI:DashletGroupBy:MissingGroupBy' => 'Vyberte prosím pole, podle kterého budou objekty seskupeny',
-
 	'UI:DashletGroupByPie:Label' => 'Koláčový graf',
 	'UI:DashletGroupByPie:Description' => 'Koláčový graf',
 	'UI:DashletGroupByBars:Label' => 'Sloupcový graf',
 	'UI:DashletGroupByBars:Description' => 'Sloupcový graf',
 	'UI:DashletGroupByTable:Label' => 'Seskupit dle (tabulka)',
 	'UI:DashletGroupByTable:Description' => 'Seznam (seskupeno dle pole)',
-
-	// New in 2.5
+    // New in 2.5
 	'UI:DashletGroupBy:Prop-Function' => 'Aggregation function~~',
 	'UI:DashletGroupBy:Prop-FunctionAttribute' => 'Function attribute~~',
 	'UI:DashletGroupBy:Prop-OrderDirection' => 'Direction~~',
 	'UI:DashletGroupBy:Prop-OrderField' => 'Order by~~',
 	'UI:DashletGroupBy:Prop-Limit' => 'Limit~~',
-
 	'UI:DashletGroupBy:Order:asc' => 'Ascending~~',
 	'UI:DashletGroupBy:Order:desc' => 'Descending~~',
-
 	'UI:GroupBy:count' => 'Count~~',
 	'UI:GroupBy:count+' => 'Number of elements~~',
 	'UI:GroupBy:sum' => 'Sum~~',
@@ -1312,14 +1334,12 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:GroupBy:min+' => 'Minimum of %1$s~~',
 	'UI:GroupBy:max' => 'Maximum~~',
 	'UI:GroupBy:max+' => 'Maximum of %1$s~~',
-	// ---
-
+    // ---
 	'UI:DashletHeaderStatic:Label' => 'Hlavička',
 	'UI:DashletHeaderStatic:Description' => 'Zobrazí horizontální oddělovač',
 	'UI:DashletHeaderStatic:Prop-Title' => 'Titul',
 	'UI:DashletHeaderStatic:Prop-Title:Default' => 'Kontakty',
 	'UI:DashletHeaderStatic:Prop-Icon' => 'Ikona',
-
 	'UI:DashletHeaderDynamic:Label' => 'Hlavička se statistikami',
 	'UI:DashletHeaderDynamic:Description' => 'Hlavička se statistikami',
 	'UI:DashletHeaderDynamic:Prop-Title' => 'Titul',
@@ -1330,11 +1350,9 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:DashletHeaderDynamic:Prop-Query' => 'Dotaz',
 	'UI:DashletHeaderDynamic:Prop-GroupBy' => 'Seskupit dle',
 	'UI:DashletHeaderDynamic:Prop-Values' => 'Hodnoty',
-
 	'UI:DashletBadge:Label' => 'Ikona',
 	'UI:DashletBadge:Description' => 'Ikona objektu se schopností vytvářet a hledat',
 	'UI:DashletBadge:Prop-Class' => 'Třída',
-
 	'DayOfWeek-Sunday' => 'Neděle',
 	'DayOfWeek-Monday' => 'Pondělí',
 	'DayOfWeek-Tuesday' => 'Úterý',
@@ -1354,8 +1372,7 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'Month-10' => 'Říjen',
 	'Month-11' => 'Listopad',
 	'Month-12' => 'Prosinec',
-
-	// Short version for the DatePicker
+    // Short version for the DatePicker
 	'DayOfWeek-Sunday-Min' => 'Ne',
 	'DayOfWeek-Monday-Min' => 'Po',
 	'DayOfWeek-Tuesday-Min' => 'Út',
@@ -1375,13 +1392,13 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'Month-10-Short' => 'Říj',
 	'Month-11-Short' => 'Lis',
 	'Month-12-Short' => 'Pro',
-	'Calendar-FirstDayOfWeek' => '1',// 0 = Sunday, 1 = Monday, etc...
-
+	'Calendar-FirstDayOfWeek' => '1',
+    // 0 = Sunday, 1 = Monday, etc...
 	'UI:Menu:ShortcutList' => 'Vytvořit odkaz',
+	'UI:Menu:FilterList' => 'Display list with search criteria~~',
 	'UI:ShortcutRenameDlg:Title' => 'Přejmenovat odkaz',
 	'UI:ShortcutListDlg:Title' => 'Vytvořit odkaz na seznam',
 	'UI:ShortcutDelete:Confirm' => 'Potvrďte prosím, že chcete odkaz odstranit.',
-	'Menu:MyShortcuts' => 'Mé odkazy',// Duplicated into itop-welcome-itil (will be removed from here...)
 	'Class:Shortcut' => 'Odkaz',
 	'Class:Shortcut+' => '',
 	'Class:Shortcut/Attribute:name' => 'Název',
@@ -1395,12 +1412,10 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'Class:ShortcutOQL/Attribute:auto_reload/Value:custom' => 'Vlastní interval',
 	'Class:ShortcutOQL/Attribute:auto_reload_sec' => 'Interval pro automatické obnovování (v sekundách)',
 	'Class:ShortcutOQL/Attribute:auto_reload_sec/tip' => 'Minimální povolená hodnota je %1$d sekund',
-
 	'UI:FillAllMandatoryFields' => 'Vyplňte prosím všechna povinná pole.',
 	'UI:ValueMustBeSet' => 'Toto pole je poviné',
 	'UI:ValueMustBeChanged' => 'Hodnota musí být změněna',
 	'UI:ValueInvalidFormat' => 'Nesprávný formát',
-
 	'UI:CSVImportConfirmTitle' => 'Potvrďte prosím operaci',
 	'UI:CSVImportConfirmMessage' => 'Jste si jisti, že to chcete udělat?',
 	'UI:CSVImportError_items' => 'Chyby: %1$d',
@@ -1426,11 +1441,9 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
       <tr><td>i</td><td>minuty (2 znaky, např. 00..59)</td></tr>
       <tr><td>s</td><td>sekundy (2 znaky, např. 00..59)</td></tr>
     </table>',
-
 	'UI:Button:Remove' => 'Odstranit',
 	'UI:AddAnExisting_Class' => 'Přidat objekty typu %1$s...',
 	'UI:SelectionOf_Class' => 'Výběr objektů typu %1$s',
-
 	'UI:AboutBox' => 'O '.ITOP_APPLICATION_SHORT.'...',
 	'UI:About:Title' => 'O '.ITOP_APPLICATION_SHORT,
 	'UI:About:DataModel' => 'Datový model',
@@ -1440,12 +1453,10 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:About:ManualExtensionSource' => 'Extension~~',
 	'UI:About:Extension_Version' => 'Version: %1$s~~',
 	'UI:About:RemoteExtensionSource' => 'Data~~',
-
 	'UI:DisconnectedDlgMessage' => 'Byli jste odpojeni. Pokud chcete aplikaci nadále používat, musíte se znovu přihlásit.',
 	'UI:DisconnectedDlgTitle' => 'Varování!',
 	'UI:LoginAgain' => 'Znovu přihlásit',
 	'UI:StayOnThePage' => 'Zůstat na této stránce',
-
 	'ExcelExporter:ExportMenu' => 'Export do Excelu',
 	'ExcelExporter:ExportDialogTitle' => 'Export do Excelu',
 	'ExcelExporter:ExportButton' => 'Export',
@@ -1458,7 +1469,6 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'ExcelExport:Statistics' => 'Statistiky',
 	'portal:legacy_portal' => 'Uživatelský portál',
 	'portal:backoffice' => ITOP_APPLICATION_SHORT.' Back-Office',
-
 	'UI:CurrentObjectIsLockedBy_User' => 'Objekt je uzamčen, protože ho nyní upravuje %1$s.',
 	'UI:CurrentObjectIsLockedBy_User_Explanation' => 'Objekt právě upravuje %1$s. Vaše úpravy nemohou být odeslány, protože by byly přepsány.',
 	'UI:CurrentObjectIsSoftLockedBy_User' => 'The object is currently being modified by %1$s. You\'ll be able to submit your modifications once they have finished.~~',
@@ -1466,43 +1476,36 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:CurrentObjectLockExpired_Explanation' => 'Objekt byl znovu odemčen. Nemůžete odeslat své úpravy, protože objekt mezitím mohl být upraven někým jiným.',
 	'UI:ConcurrentLockKilled' => 'Váš zámek tohoto objektu byl odstraněn někým jiným.',
 	'UI:Menu:KillConcurrentLock' => 'Odtranit zámek. (Znemožní uložení úprav osobě, která zámek vytvořila)',
-
 	'UI:Menu:ExportPDF' => 'PDF export',
 	'UI:Menu:PrintableVersion' => 'Verze pro tisk',
-
 	'UI:BrowseInlineImages' => 'Procházet obrázky...',
 	'UI:UploadInlineImageLegend' => 'Nahrát nový obrázek',
 	'UI:SelectInlineImageToUpload' => 'Vyberte obrázek',
 	'UI:AvailableInlineImagesLegend' => 'Dostupné obrázky',
 	'UI:NoInlineImage' => 'Na serveru není dostupný žádný obrázek. Nahrajte nějaký pomocí tlačítka výše.',
-
 	'UI:ToggleFullScreen' => 'Přepnout zobrazení',
 	'UI:Button:ResetImage' => 'Obnovit původní obrázek',
 	'UI:Button:RemoveImage' => 'Odebrat obrázek',
 	'UI:Button:UploadImage' => 'Upload an image from the disk~~',
 	'UI:UploadNotSupportedInThisMode' => 'Úprava obrázků není v tomto režimu podporována.',
-
 	'UI:Button:RemoveDocument' => 'Remove the document~~',
-
-	// Search form
+    // Search form
 	'UI:Search:Toggle' => 'Minimize / Expand~~',
 	'UI:Search:AutoSubmit:DisabledHint' => 'Auto submit has been disabled for this class~~',
 	'UI:Search:Obsolescence:DisabledHint' => 'Based on your preferences, obsolete data are hidden~~',
 	'UI:Search:NoAutoSubmit:ExplainText' => 'Add some criterion on the search box or click the search button to view the objects.~~',
 	'UI:Search:Criterion:MoreMenu:AddCriteria' => 'Add new criteria~~',
-	// - Add new criteria button
+    // - Add new criteria button
 	'UI:Search:AddCriteria:List:RecentlyUsed:Title' => 'Recently used~~',
 	'UI:Search:AddCriteria:List:MostPopular:Title' => 'Most popular~~',
 	'UI:Search:AddCriteria:List:Others:Title' => 'Others~~',
 	'UI:Search:AddCriteria:List:RecentlyUsed:Placeholder' => 'None yet.~~',
-
-	// - Criteria header actions
+    // - Criteria header actions
 	'UI:Search:Criteria:Toggle' => 'Minimize / Expand~~',
 	'UI:Search:Criteria:Remove' => 'Remove~~',
 	'UI:Search:Criteria:Locked' => 'Locked~~',
-
-	// - Criteria titles
-	//   - Default widget
+    // - Criteria titles
+    //   - Default widget
 	'UI:Search:Criteria:Title:Default:Any' => '%1$s: Any~~',
 	'UI:Search:Criteria:Title:Default:Empty' => '%1$s is empty~~',
 	'UI:Search:Criteria:Title:Default:NotEmpty' => '%1$s is not empty~~',
@@ -1524,53 +1527,57 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:Search:Criteria:Title:Default:Between:All' => '%1$s: Any~~',
 	'UI:Search:Criteria:Title:Default:Between:From' => '%1$s from %2$s~~',
 	'UI:Search:Criteria:Title:Default:Between:Until' => '%1$s up to %2$s~~',
-	//   - Numeric widget
-	//   None yet
-	//   - DateTime widget
+    //   - Numeric widget
+    //   None yet
+    //   - DateTime widget
 	'UI:Search:Criteria:Title:DateTime:Between' => '%2$s <= 1$s <= %3$s~~',
-	//   - Enum widget
+    //   - Enum widget
 	'UI:Search:Criteria:Title:Enum:In' => '%1$s: %2$s~~',
 	'UI:Search:Criteria:Title:Enum:In:Many' => '%1$s: %2$s and %3$s others~~',
 	'UI:Search:Criteria:Title:Enum:In:All' => '%1$s: Any~~',
-	//   - TagSet widget
+    //   - TagSet widget
 	'UI:Search:Criteria:Title:TagSet:Matches' => '%1$s: %2$s~~',
-	//   - External key widget
+    //   - External key widget
 	'UI:Search:Criteria:Title:ExternalKey:Empty' => '%1$s is defined~~',
 	'UI:Search:Criteria:Title:ExternalKey:NotEmpty' => '%1$s is not defined~~',
 	'UI:Search:Criteria:Title:ExternalKey:Equals' => '%1$s %2$s~~',
 	'UI:Search:Criteria:Title:ExternalKey:In' => '%1$s: %2$s~~',
 	'UI:Search:Criteria:Title:ExternalKey:In:Many' => '%1$s: %2$s and %3$s others~~',
 	'UI:Search:Criteria:Title:ExternalKey:In:All' => '%1$s: Any~~',
-	//   - Hierarchical key widget
+    //   - Hierarchical key widget
 	'UI:Search:Criteria:Title:HierarchicalKey:Empty' => '%1$s is defined~~',
 	'UI:Search:Criteria:Title:HierarchicalKey:NotEmpty' => '%1$s is not defined~~',
 	'UI:Search:Criteria:Title:HierarchicalKey:Equals' => '%1$s %2$s~~',
 	'UI:Search:Criteria:Title:HierarchicalKey:In' => '%1$s: %2$s~~',
 	'UI:Search:Criteria:Title:HierarchicalKey:In:Many' => '%1$s: %2$s and %3$s others~~',
 	'UI:Search:Criteria:Title:HierarchicalKey:In:All' => '%1$s: Any~~',
-
-	// - Criteria operators
-	//   - Default widget
+    // - Criteria operators
+    //   - Default widget
 	'UI:Search:Criteria:Operator:Default:Empty' => 'Is empty~~',
 	'UI:Search:Criteria:Operator:Default:NotEmpty' => 'Is not empty~~',
 	'UI:Search:Criteria:Operator:Default:Equals' => 'Equals~~',
 	'UI:Search:Criteria:Operator:Default:Between' => 'Between~~',
-	//   - String widget
+    //   - String widget
 	'UI:Search:Criteria:Operator:String:Contains' => 'Contains~~',
 	'UI:Search:Criteria:Operator:String:StartsWith' => 'Starts with~~',
 	'UI:Search:Criteria:Operator:String:EndsWith' => 'Ends with~~',
 	'UI:Search:Criteria:Operator:String:RegExp' => 'Regular exp.~~',
-	//   - Numeric widget
-	'UI:Search:Criteria:Operator:Numeric:Equals' => 'Equals~~',// => '=',
-	'UI:Search:Criteria:Operator:Numeric:GreaterThan' => 'Greater~~',// => '>',
-	'UI:Search:Criteria:Operator:Numeric:GreaterThanOrEquals' => 'Greater / equals~~',// > '>=',
-	'UI:Search:Criteria:Operator:Numeric:LessThan' => 'Less~~',// => '<',
-	'UI:Search:Criteria:Operator:Numeric:LessThanOrEquals' => 'Less / equals~~',// > '<=',
-	'UI:Search:Criteria:Operator:Numeric:Different' => 'Different~~',// => '≠',
-	//   - Tag Set Widget
+    //   - Numeric widget
+	'UI:Search:Criteria:Operator:Numeric:Equals' => 'Equals~~',
+    // => '=',
+	'UI:Search:Criteria:Operator:Numeric:GreaterThan' => 'Greater~~',
+    // => '>',
+	'UI:Search:Criteria:Operator:Numeric:GreaterThanOrEquals' => 'Greater / equals~~',
+    // > '>=',
+	'UI:Search:Criteria:Operator:Numeric:LessThan' => 'Less~~',
+    // => '<',
+	'UI:Search:Criteria:Operator:Numeric:LessThanOrEquals' => 'Less / equals~~',
+    // > '<=',
+	'UI:Search:Criteria:Operator:Numeric:Different' => 'Different~~',
+    // => '≠',
+    //   - Tag Set Widget
 	'UI:Search:Criteria:Operator:TagSet:Matches' => 'Matches~~',
-
-	// - Other translations
+    // - Other translations
 	'UI:Search:Value:Filter:Placeholder' => 'Filter...~~',
 	'UI:Search:Value:Search:Placeholder' => 'Search...~~',
 	'UI:Search:Value:Autocomplete:StartTyping' => 'Start typing for possible values.~~',
@@ -1578,8 +1585,7 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:Search:Value:Autocomplete:NoResult' => 'No result.~~',
 	'UI:Search:Value:Toggler:CheckAllNone' => 'Check all / none~~',
 	'UI:Search:Value:Toggler:CheckAllNoneFiltered' => 'Check all / none visibles~~',
-
-	// - Widget other translations
+    // - Widget other translations
 	'UI:Search:Criteria:Numeric:From' => 'From~~',
 	'UI:Search:Criteria:Numeric:Until' => 'To~~',
 	'UI:Search:Criteria:Numeric:PlaceholderFrom' => 'Any~~',
@@ -1593,10 +1599,8 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:Search:Criteria:DateTime:PlaceholderUntil' => 'Any date~~',
 	'UI:Search:Criteria:DateTime:PlaceholderUntilTime' => 'Any date~~',
 	'UI:Search:Criteria:HierarchicalKey:ChildrenIncluded:Hint' => 'Children of the selected objects will be included.~~',
-
 	'UI:Search:Criteria:Raw:Filtered' => 'Filtered~~',
 	'UI:Search:Criteria:Raw:FilteredOn' => 'Filtered on %1$s~~',
-
 	'UI:StateChanged' => 'State changed~~',
 ));
 
@@ -1607,16 +1611,13 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Expression:Operator:AND' => ' AND ~~',
 	'Expression:Operator:OR' => ' OR ~~',
 	'Expression:Operator:=' => ': ~~',
-
 	'Expression:Unit:Short:DAY' => 'd~~',
 	'Expression:Unit:Short:WEEK' => 'w~~',
 	'Expression:Unit:Short:MONTH' => 'm~~',
 	'Expression:Unit:Short:YEAR' => 'y~~',
-
 	'Expression:Unit:Long:DAY' => 'day(s)~~',
 	'Expression:Unit:Long:HOUR' => 'hour(s)~~',
 	'Expression:Unit:Long:MINUTE' => 'minute(s)~~',
-
 	'Expression:Verb:NOW' => 'now~~',
 	'Expression:Verb:ISNULL' => ': undefined~~',
 ));
@@ -1640,46 +1641,32 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Menu:DataSources' => 'Zdroje dat pro synchronizaci',
 	'Menu:DataSources+' => 'Všechny zdroje dat pro synchronizaci',
-	'Menu:WelcomeMenu' => 'Vítejte',
-	'Menu:WelcomeMenu+' => 'Vítejte v '.ITOP_APPLICATION_SHORT,
-	'Menu:WelcomeMenuPage' => 'Vítejte',
-	'Menu:WelcomeMenuPage+' => 'Vítejte v '.ITOP_APPLICATION_SHORT,
-	'Menu:AdminTools' => 'Administrace',
-	'Menu:AdminTools+' => 'Nástroje pro administraci',
-	'Menu:AdminTools?' => 'Nástroje přístupné pouze uživatelům, kteří mají potřbná oprávnění',
-	'Menu:DataModelMenu' => 'Datový model',
-	'Menu:DataModelMenu+' => 'Přehled datového modelu',
-	'Menu:ExportMenu' => 'Exportovat',
-	'Menu:ExportMenu+' => 'Exportovat výsledky jakéhokoli dotazu do HTML, CSV nebo XML',
-	'Menu:NotificationsMenu' => 'Upozornění',
-	'Menu:NotificationsMenu+' => 'Konfigurace upozornění',
 	'Menu:AuditCategories' => 'Kategorie auditu',
 	'Menu:AuditCategories+' => 'Kategorie auditu',
 	'Menu:Notifications:Title' => 'Kategorie auditu',
-	'Menu:RunQueriesMenu'         => 'Provést dotaz',
-	'Menu:RunQueriesMenu+'        => 'Provést dotaz',
-	'Menu:QueryMenu'              => 'Knihovna dotazů',
-	'Menu:QueryMenu+'             => 'Knihovna dotazů',
-	'Menu:UniversalSearchMenu'    => 'Univerzální hledání',
-	'Menu:UniversalSearchMenu+'   => 'Hledejte cokoli...',
-	'Menu:UserManagementMenu'     => 'Správa uživatelů',
-	'Menu:UserManagementMenu+'    => 'Správa uživatelů',
-	'Menu:ProfilesMenu'           => 'Profily (Role)',
-	'Menu:ProfilesMenu+'          => 'Profily (Role)',
-	'Menu:ProfilesMenu:Title'     => 'Profily (Role)',
-	'Menu:UserAccountsMenu'       => 'Uživatelské účty',
-	'Menu:UserAccountsMenu+'      => 'Uživatelské účty',
+	'Menu:AuditCategories:Title' => 'Audit configuration~~',
+	'Menu:RunQueriesMenu' => 'Provést dotaz',
+	'Menu:RunQueriesMenu+' => 'Provést dotaz',
+	'Menu:QueryMenu' => 'Knihovna dotazů',
+	'Menu:QueryMenu+' => 'Knihovna dotazů',
+	'Menu:UniversalSearchMenu' => 'Univerzální hledání',
+	'Menu:UniversalSearchMenu+' => 'Hledejte cokoli...',
+	'Menu:UserManagementMenu' => 'Správa uživatelů',
+	'Menu:UserManagementMenu+' => 'Správa uživatelů',
+	'Menu:ProfilesMenu' => 'Profily (Role)',
+	'Menu:ProfilesMenu+' => 'Profily (Role)',
+	'Menu:ProfilesMenu:Title' => 'Profily (Role)',
+	'Menu:UserAccountsMenu' => 'Uživatelské účty',
+	'Menu:UserAccountsMenu+' => 'Uživatelské účty',
 	'Menu:UserAccountsMenu:Title' => 'Uživatelské účty',
-	'Menu:MyShortcuts'            => 'Mé odkazy',
-	'Menu:UserManagement'         => 'User Management~~',
-	'Menu:Queries'                => 'Queries~~',
-	'Menu:ConfigurationTools'     => 'Configuration~~',
+	'Menu:UserManagement' => 'User Management~~',
+	'Menu:Queries' => 'Queries~~',
+	'Menu:ConfigurationTools' => 'Configuration~~'
 ));
-
 // Additional language entries not present in English dict
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'UI:Toggle:StandardDashboard' => 'Standard~~',
-	'UI:Toggle:CustomDashboard'   => 'Custom~~',
-	'UI:Dashboard:Edit'           => 'Upravit tuto stránku...',
-	'UI:Dashboard:Revert'         => 'Vrátit se k původní verzi...',
+	'UI:Toggle:CustomDashboard' => 'Custom~~',
+	'UI:Dashboard:Edit' => 'Upravit tuto stránku...',
+	'UI:Dashboard:Revert' => 'Vrátit se k původní verzi...'
 ));
diff --git a/dictionaries/da.dictionary.itop.core.php b/dictionaries/da.dictionary.itop.core.php
index d0e3dfa36e..3f915d120f 100644
--- a/dictionaries/da.dictionary.itop.core.php
+++ b/dictionaries/da.dictionary.itop.core.php
@@ -24,56 +24,41 @@
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Core:DeletedObjectLabel' => '%1s (slettet)',
 	'Core:DeletedObjectTip' => 'Objektet er slettet på %1$s (%2$s)',
-
 	'Core:UnknownObjectLabel' => 'Objektet ikke fundet (klasse: %1$s, id: %2$d)',
 	'Core:UnknownObjectTip' => 'Objektet kunne ikke findes. Det kan være slettet, uden at loggen er blevt tømt.',
-
 	'Core:UniquenessDefaultError' => 'Uniqueness rule \'%1$s\' in error~~',
 	'Core:CheckConsistencyError' => 'Consistency rules not followed: %1$s~~',
 	'Core:CheckValueError' => 'Unexpected value for attribute \'%1$s\' (%2$s) : %3$s~~',
-
 	'Core:AttributeLinkedSet' => 'Array af objekter',
 	'Core:AttributeLinkedSet+' => '',
-
 	'Core:AttributeLinkedSetDuplicatesFound' => 'Duplicates in the \'%1$s\' field : %2$s~~',
-
 	'Core:AttributeDashboard' => 'Dashboard~~',
 	'Core:AttributeDashboard+' => '',
-
 	'Core:AttributePhoneNumber' => 'Phone number~~',
 	'Core:AttributePhoneNumber+' => '',
-
 	'Core:AttributeObsolescenceDate' => 'Obsolescence date~~',
 	'Core:AttributeObsolescenceDate+' => '',
-
 	'Core:AttributeTagSet' => 'List of tags~~',
 	'Core:AttributeTagSet+' => '',
 	'Core:AttributeSet:placeholder' => 'click to add~~',
 	'Core:AttributeClassAttCodeSet:ItemLabel:AttributeFromClass' => '%1$s (%2$s)~~',
 	'Core:AttributeClassAttCodeSet:ItemLabel:AttributeFromOneChildClass' => '%1$s (%2$s from %3$s)~~',
 	'Core:AttributeClassAttCodeSet:ItemLabel:AttributeFromSeveralChildClasses' => '%1$s (%2$s from child classes)~~',
-
 	'Core:AttributeCaseLog' => 'Log~~',
 	'Core:AttributeCaseLog+' => '',
-
 	'Core:AttributeMetaEnum' => 'Computed enum~~',
 	'Core:AttributeMetaEnum+' => '',
-
 	'Core:AttributeLinkedSetIndirect' => 'Array af objekter (N-N)',
 	'Core:AttributeLinkedSetIndirect+' => '',
-
 	'Core:AttributeInteger' => 'Integer',
 	'Core:AttributeInteger+' => '',
-
 	'Core:AttributeDecimal' => 'Decimal',
 	'Core:AttributeDecimal+' => '',
-
 	'Core:AttributeBoolean' => 'Boolean',
 	'Core:AttributeBoolean+' => '',
 	'Core:AttributeBoolean/Value:null' => '',
 	'Core:AttributeBoolean/Value:yes' => 'Yes~~',
 	'Core:AttributeBoolean/Value:no' => 'No~~',
-
 	'Core:AttributeArchiveFlag' => 'Archive flag~~',
 	'Core:AttributeArchiveFlag/Value:yes' => 'Yes~~',
 	'Core:AttributeArchiveFlag/Value:yes+' => 'This object is visible only in archive mode~~',
@@ -82,7 +67,6 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Core:AttributeArchiveFlag/Label+' => '',
 	'Core:AttributeArchiveDate/Label' => 'Archive date~~',
 	'Core:AttributeArchiveDate/Label+' => '',
-
 	'Core:AttributeObsolescenceFlag' => 'Obsolescence flag~~',
 	'Core:AttributeObsolescenceFlag/Value:yes' => 'Yes~~',
 	'Core:AttributeObsolescenceFlag/Value:yes+' => 'This object is excluded from the impact analysis, and hidden from search results~~',
@@ -91,54 +75,38 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Core:AttributeObsolescenceFlag/Label+' => 'Computed dynamically on other attributes~~',
 	'Core:AttributeObsolescenceDate/Label' => 'Obsolescence date~~',
 	'Core:AttributeObsolescenceDate/Label+' => 'Approximative date at which the object has been considered obsolete~~',
-
 	'Core:AttributeString' => 'String',
 	'Core:AttributeString+' => '',
-
 	'Core:AttributeClass' => 'Class',
 	'Core:AttributeClass+' => '',
-
 	'Core:AttributeApplicationLanguage' => 'Bruger sprog',
 	'Core:AttributeApplicationLanguage+' => '',
-
 	'Core:AttributeFinalClass' => 'Klasse (auto)',
 	'Core:AttributeFinalClass+' => '',
-
 	'Core:AttributePassword' => 'Password',
 	'Core:AttributePassword+' => '',
-
 	'Core:AttributeEncryptedString' => 'Krypteret streng',
 	'Core:AttributeEncryptedString+' => '',
 	'Core:AttributeEncryptUnknownLibrary' => 'Encryption library specified (%1$s) unknown~~',
 	'Core:AttributeEncryptFailedToDecrypt' => '** decryption error **~~',
-
 	'Core:AttributeText' => 'Tekst',
 	'Core:AttributeText+' => '',
-
 	'Core:AttributeHTML' => 'HTML',
 	'Core:AttributeHTML+' => '',
-
 	'Core:AttributeEmailAddress' => 'Email adresse',
 	'Core:AttributeEmailAddress+' => '',
-
 	'Core:AttributeIPAddress' => 'IP adresse',
 	'Core:AttributeIPAddress+' => '',
-
 	'Core:AttributeOQL' => 'OQL',
 	'Core:AttributeOQL+' => '',
-
 	'Core:AttributeEnum' => 'Enum',
 	'Core:AttributeEnum+' => '',
-
 	'Core:AttributeTemplateString' => 'Template streng',
 	'Core:AttributeTemplateString+' => '',
-
 	'Core:AttributeTemplateText' => 'Template tekst',
 	'Core:AttributeTemplateText+' => '',
-
 	'Core:AttributeTemplateHTML' => 'Template HTML',
 	'Core:AttributeTemplateHTML+' => '',
-
 	'Core:AttributeDateTime' => 'Dato/tid',
 	'Core:AttributeDateTime+' => '',
 	'Core:AttributeDateTime?SmartSearch' => '
@@ -156,7 +124,6 @@ Operators:<br/>
 <p>
 If the time is omitted, it defaults to 00:00:00
 </p>~~',
-
 	'Core:AttributeDate' => 'Dato',
 	'Core:AttributeDate+' => '',
 	'Core:AttributeDate?SmartSearch' => '
@@ -171,43 +138,30 @@ Operators:<br/>
 	<b>&lt;</b><em>date</em><br/>
 	<b>[</b><em>date</em>,<em>date</em><b>]</b>
 </p>',
-
 	'Core:AttributeDeadline' => 'Deadline',
 	'Core:AttributeDeadline+' => '',
-
 	'Core:AttributeExternalKey' => 'Ekstern nøgle',
 	'Core:AttributeExternalKey+' => '',
-
 	'Core:AttributeHierarchicalKey' => 'Hierarchical Nøgle',
 	'Core:AttributeHierarchicalKey+' => '',
-
 	'Core:AttributeExternalField' => 'Eksternt felt',
 	'Core:AttributeExternalField+' => '',
-
 	'Core:AttributeURL' => 'URL',
 	'Core:AttributeURL+' => '',
-
 	'Core:AttributeBlob' => 'Blob',
 	'Core:AttributeBlob+' => '',
-
 	'Core:AttributeOneWayPassword' => 'En vejs password',
 	'Core:AttributeOneWayPassword+' => '',
-
 	'Core:AttributeTable' => 'Tabel',
 	'Core:AttributeTable+' => '',
-
 	'Core:AttributePropertySet' => 'Egenskaber',
 	'Core:AttributePropertySet+' => '',
-
 	'Core:AttributeFriendlyName' => 'Friendly navn',
 	'Core:AttributeFriendlyName+' => '',
-
 	'Core:FriendlyName-Label' => 'Friendly navn',
 	'Core:FriendlyName-Description' => 'Friendly navn',
-
 	'Core:AttributeTag' => 'Tags~~',
 	'Core:AttributeTag+' => '',
-	
 	'Core:Context=REST/JSON' => 'REST~~',
 	'Core:Context=Synchro' => 'Synchro~~',
 	'Core:Context=Setup' => 'Setup~~',
@@ -485,6 +439,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:Action' => 'Brugerdefineret handling',
 	'Class:Action+' => '',
+	'Class:Action/ComplementaryName' => '%1$s: %2$s~~',
 	'Class:Action/Attribute:name' => 'Navn',
 	'Class:Action/Attribute:name+' => '',
 	'Class:Action/Attribute:description' => 'Beskrivelse',
@@ -552,6 +507,22 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:ActionEmail/Attribute:importance/Value:normal+' => '',
 	'Class:ActionEmail/Attribute:importance/Value:high' => 'Høj',
 	'Class:ActionEmail/Attribute:importance/Value:high+' => '',
+	'Class:ActionEmail/Attribute:language' => 'Language~~',
+	'Class:ActionEmail/Attribute:language+' => 'Language to use for placeholders ($xxx$) inside the message (state, importance, priority, etc)~~',
+	'Class:ActionEmail/Attribute:html_template' => 'HTML template~~',
+	'Class:ActionEmail/Attribute:html_template+' => 'Optional HTML template wrapping around the content of the \'Body\' attribute below, useful for tailored email layouts (in the template, content of the \'Body\' attribute will replace the $content$ placeholder)~~',
+	'Class:ActionEmail/Attribute:ignore_notify' => 'Ignore the Notify flag~~',
+	'Class:ActionEmail/Attribute:ignore_notify+' => 'If set to \'Yes\' the \'Notify\' flag on Contacts has no effect.~~',
+	'Class:ActionEmail/Attribute:ignore_notify/Value:no' => 'No~~',
+	'Class:ActionEmail/Attribute:ignore_notify/Value:yes' => 'Yes~~',
+	'ActionEmail:main' => 'Message~~',
+	'ActionEmail:trigger' => 'Triggers~~',
+	'ActionEmail:recipients' => 'Contacts~~',
+	'ActionEmail:preview_tab' => 'Preview~~',
+	'ActionEmail:preview_tab+' => 'Preview of the eMail template~~',
+	'ActionEmail:preview_warning' => 'The actual eMail may look different in the eMail client than this preview in your browser.~~',
+	'ActionEmail:preview_more_info' => 'For more information about the CSS features supported by the different eMail clients, refer to %1$s~~',
+	'ActionEmail:content_placeholder_missing' => 'The placeholder "%1$s" was not found in the HTML template. The content of the field "%2$s" will not be included in the generated emails.~~',
 ));
 
 //
@@ -561,6 +532,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:Trigger' => 'Triggere',
 	'Class:Trigger+' => '',
+	'Class:Trigger/ComplementaryName' => '%1$s, %2$s~~',
 	'Class:Trigger/Attribute:description' => 'Beskrivelse',
 	'Class:Trigger/Attribute:description+' => '',
 	'Class:Trigger/Attribute:action_list' => 'Triggerede handlinger',
@@ -569,6 +541,8 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:Trigger/Attribute:finalclass+' => '',
 	'Class:Trigger/Attribute:context' => 'Context~~',
 	'Class:Trigger/Attribute:context+' => 'Context to allow the trigger to start~~',
+	'Class:Trigger/Attribute:complement' => 'Additional information~~',
+	'Class:Trigger/Attribute:complement+' => 'Further information as provided in english, by this trigger~~',
 ));
 
 //
@@ -664,6 +638,17 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:TriggerOnObjectMention/Attribute:mentioned_filter+' => 'Limit the list of mentioned objects which will activate the trigger. If empty, any mentioned object (of any class) will activate it.~~',
 ));
 
+//
+// Class: TriggerOnAttributeBlobDownload
+//
+
+Dict::Add('DA DA', 'Danish', 'Dansk', array(
+	'Class:TriggerOnAttributeBlobDownload' => 'Trigger (on object\'s document download)~~',
+	'Class:TriggerOnAttributeBlobDownload+' => 'Trigger on object\'s document field download of [a child class of] the given class~~',
+	'Class:TriggerOnAttributeBlobDownload/Attribute:target_attcodes' => 'Target fields~~',
+	'Class:TriggerOnAttributeBlobDownload/Attribute:target_attcodes+' => '~~',
+));
+
 //
 // Class: TriggerOnThresholdReached
 //
@@ -700,11 +685,13 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 // Synchro Data Source
 //
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
+	'Class:SynchroDataSource' => 'Synchro Data Kilde',
 	'Class:SynchroDataSource/Attribute:name' => 'Navn',
 	'Class:SynchroDataSource/Attribute:name+' => '',
 	'Class:SynchroDataSource/Attribute:description' => 'Beskrivelse',
 	'Class:SynchroDataSource/Attribute:status' => 'Status',
 	'Class:SynchroDataSource/Attribute:scope_class' => 'Target klasse',
+	'Class:SynchroDataSource/Attribute:scope_class+' => 'A Synchro Data Source can only populate a single '.ITOP_APPLICATION_SHORT.' class~~',
 	'Class:SynchroDataSource/Attribute:user_id' => 'Bruger',
 	'Class:SynchroDataSource/Attribute:notify_contact_id' => 'Kontakt som skal adviseres',
 	'Class:SynchroDataSource/Attribute:notify_contact_id+' => '',
@@ -713,6 +700,8 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:SynchroDataSource/Attribute:url_application' => 'Applikation\'s hyperlink',
 	'Class:SynchroDataSource/Attribute:url_application+' => '',
 	'Class:SynchroDataSource/Attribute:reconciliation_policy' => 'Afstemnings politik',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy+' => '"Use the attributes": '.ITOP_APPLICATION_SHORT.' object matches replica values for each Synchro attributes flagged for Reconciliation.
+"Use primary_key": the column primary_key of the replica is expected to contain the identifier of the '.ITOP_APPLICATION_SHORT.' object~~',
 	'Class:SynchroDataSource/Attribute:full_load_periodicity' => 'Full load interval',
 	'Class:SynchroDataSource/Attribute:full_load_periodicity+' => '',
 	'Class:SynchroDataSource/Attribute:action_on_zero' => 'Handling på nul',
@@ -732,6 +721,33 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:SynchroDataSource/Attribute:delete_policy_retention+' => '',
 	'Class:SynchroDataSource/Attribute:database_table_name' => 'Data table',
 	'Class:SynchroDataSource/Attribute:database_table_name+' => '',
+	'Class:SynchroDataSource/Attribute:status/Value:implementation' => 'Implementering',
+	'Class:SynchroDataSource/Attribute:status/Value:obsolete' => 'Forældet',
+	'Class:SynchroDataSource/Attribute:status/Value:production' => 'Produktion',
+	'Class:SynchroDataSource/Attribute:scope_restriction' => 'Scope restriction',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_attributes' => 'Brug attributterne',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_primary_key' => 'Brug primær nøgle feltet',
+	'Class:SynchroDataSource/Attribute:action_on_zero/Value:create' => 'Opret',
+	'Class:SynchroDataSource/Attribute:action_on_zero/Value:error' => 'Fejl',
+	'Class:SynchroDataSource/Attribute:action_on_one/Value:error' => 'Fejl',
+	'Class:SynchroDataSource/Attribute:action_on_one/Value:update' => 'Opdater',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:create' => 'Opret',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:error' => 'Fejl',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:take_first' => 'Tag den første (vilkårlig?)',
+	'Class:SynchroDataSource/Attribute:delete_policy' => 'Slet Politik',
+	'Class:SynchroDataSource/Attribute:delete_policy+' => 'What to do when a replica becomes obsolete:
+"Ignore": do nothing, the associated object remains as is in iTop.
+"Delete": Delete the associated object in iTop (and the replica in the data table).
+"Update": Update the associated object as specified by the Update rules (see below).
+"Update then Delete": apply the "Update rules". When Retention Duration expires, execute a "Delete" ~~',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:delete' => 'Slet',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:ignore' => 'Ignorer',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:update' => 'Opdater',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:update_then_delete' => 'Opdater derefter Slet',
+	'Class:SynchroDataSource/Attribute:attribute_list' => 'Attribut Liste',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:administrators' => 'Kun Administratorer',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:everybody' => 'Enhver har tilladelse til at slette sådanne elementer',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:nobody' => 'Ingen',
 	'SynchroDataSource:Description' => 'Beskrivelse',
 	'SynchroDataSource:Reconciliation' => 'Søg &amp; afstemning',
 	'SynchroDataSource:Deletion' => 'Slette regler',
@@ -756,8 +772,10 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Core:Synchro:NeverRun' => 'Denne synkronisering har aldrig været kørt. Endnu ingen log.',
 	'Core:Synchro:SynchroEndedOn_Date' => 'Sidste synkronisering sluttede den %1$s.',
 	'Core:Synchro:SynchroRunningStartedOn_Date' => 'Synkroniseringen der startede den %1$s kører stadig...',
-	'Menu:DataSources' => 'Synkroniserings Data Kilder', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:DataSources+' => '', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataSources' => 'Synkroniserings Data Kilder',
+    // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataSources+' => '',
+    // Duplicated into itop-welcome-itil (will be removed from here...)
 	'Core:Synchro:label_repl_ignored' => 'Ignoreret (%1$s)',
 	'Core:Synchro:label_repl_disappeared' => 'Forsvundet (%1$s)',
 	'Core:Synchro:label_repl_existing' => 'Eksisterer (%1$s)',
@@ -821,29 +839,6 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:CMDBChangeOpSetAttributeEncrypted/Attribute:prevstring' => 'Tidligere værdi',
 	'Class:CMDBChangeOpSetAttributeCaseLog' => 'Sags Log',
 	'Class:CMDBChangeOpSetAttributeCaseLog/Attribute:lastentry' => 'Sidste Entry',
-	'Class:SynchroDataSource' => 'Synchro Data Kilde',
-	'Class:SynchroDataSource/Attribute:status/Value:implementation' => 'Implementering',
-	'Class:SynchroDataSource/Attribute:status/Value:obsolete' => 'Forældet',
-	'Class:SynchroDataSource/Attribute:status/Value:production' => 'Produktion',
-	'Class:SynchroDataSource/Attribute:scope_restriction' => 'Scope restriction',
-	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_attributes' => 'Brug attributterne',
-	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_primary_key' => 'Brug primær nøgle feltet',
-	'Class:SynchroDataSource/Attribute:action_on_zero/Value:create' => 'Opret',
-	'Class:SynchroDataSource/Attribute:action_on_zero/Value:error' => 'Fejl',
-	'Class:SynchroDataSource/Attribute:action_on_one/Value:error' => 'Fejl',
-	'Class:SynchroDataSource/Attribute:action_on_one/Value:update' => 'Opdater',
-	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:create' => 'Opret',
-	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:error' => 'Fejl',
-	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:take_first' => 'Tag den første (vilkårlig?)',
-	'Class:SynchroDataSource/Attribute:delete_policy' => 'Slet Politik',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:delete' => 'Slet',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:ignore' => 'Ignorer',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:update' => 'Opdater',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:update_then_delete' => 'Opdater derefter Slet',
-	'Class:SynchroDataSource/Attribute:attribute_list' => 'Attribut Liste',
-	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:administrators' => 'Kun Administratorer',
-	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:everybody' => 'Enhver har tilladelse til at slette sådanne elementer',
-	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:nobody' => 'Ingen',
 	'Class:SynchroAttribute' => 'Synchro Attribute~~',
 	'Class:SynchroAttribute/Attribute:sync_source_id' => 'Synchro Data Kilde',
 	'Class:SynchroAttribute/Attribute:attcode' => 'Attribut Kode',
@@ -904,19 +899,16 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:appUserPreferences/Attribute:preferences' => 'Inst.',
 	'Core:ExecProcess:Code1' => 'Forkert kommando eller kommandoen afsluttede med fejl (f.eks. forkert script navn)',
 	'Core:ExecProcess:Code255' => 'PHP Error (parsing, or runtime)',
-
-	// Attribute Duration
+    // Attribute Duration
 	'Core:Duration_Seconds' => '%1$ds',
 	'Core:Duration_Minutes_Seconds' => '%1$dmin %2$ds',
 	'Core:Duration_Hours_Minutes_Seconds' => '%1$dh %2$dmin %3$ds',
 	'Core:Duration_Days_Hours_Minutes_Seconds' => '%1$sd %2$dh %3$dmin %4$ds',
-
-	// Explain working time computing
+    // Explain working time computing
 	'Core:ExplainWTC:ElapsedTime' => 'Time elapsed (stored as \\"%1$s\\")~~',
 	'Core:ExplainWTC:StopWatch-TimeSpent' => 'Time spent for \\"%1$s\\"~~',
 	'Core:ExplainWTC:StopWatch-Deadline' => 'Deadline for \\"%1$s\\" at %2$d%%~~',
-
-	// Bulk export
+    // Bulk export
 	'Core:BulkExport:MissingParameter_Param' => 'Missing parameter \\"%1$s\\"~~',
 	'Core:BulkExport:InvalidParameter_Query' => 'Invalid value for the parameter \\"query\\". There is no Query Phrasebook corresponding to the id: \\"%1$s\\".~~',
 	'Core:BulkExport:ExportFormatPrompt' => 'Export format:~~',
@@ -968,20 +960,34 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Core:BulkExport:DateTimeFormatDefault_Example' => 'Default format (%1$s), e.g. %2$s~~',
 	'Core:BulkExport:DateTimeFormatCustom_Format' => 'Custom format: %1$s~~',
 	'Core:BulkExport:PDF:PageNumber' => 'Page %1$s~~',
-	'Core:DateTime:Placeholder_d' => 'DD~~', // Day of the month: 2 digits (with leading zero)
-	'Core:DateTime:Placeholder_j' => 'D~~', // Day of the month: 1 or 2 digits (without leading zero)
-	'Core:DateTime:Placeholder_m' => 'MM~~', // Month on 2 digits i.e. 01-12
-	'Core:DateTime:Placeholder_n' => 'M~~', // Month on 1 or 2 digits 1-12
-	'Core:DateTime:Placeholder_Y' => 'YYYY~~', // Year on 4 digits
-	'Core:DateTime:Placeholder_y' => 'YY~~', // Year on 2 digits
-	'Core:DateTime:Placeholder_H' => 'hh~~', // Hour 00..23
-	'Core:DateTime:Placeholder_h' => 'h~~', // Hour 01..12
-	'Core:DateTime:Placeholder_G' => 'hh~~', // Hour 0..23
-	'Core:DateTime:Placeholder_g' => 'h~~', // Hour 1..12
-	'Core:DateTime:Placeholder_a' => 'am/pm~~', // am/pm (lowercase)
-	'Core:DateTime:Placeholder_A' => 'AM/PM~~', // AM/PM (uppercase)
-	'Core:DateTime:Placeholder_i' => 'mm~~', // minutes, 2 digits: 00..59
-	'Core:DateTime:Placeholder_s' => 'ss~~', // seconds, 2 digits 00..59
+	'Core:DateTime:Placeholder_d' => 'DD~~',
+    // Day of the month: 2 digits (with leading zero)
+	'Core:DateTime:Placeholder_j' => 'D~~',
+    // Day of the month: 1 or 2 digits (without leading zero)
+	'Core:DateTime:Placeholder_m' => 'MM~~',
+    // Month on 2 digits i.e. 01-12
+	'Core:DateTime:Placeholder_n' => 'M~~',
+    // Month on 1 or 2 digits 1-12
+	'Core:DateTime:Placeholder_Y' => 'YYYY~~',
+    // Year on 4 digits
+	'Core:DateTime:Placeholder_y' => 'YY~~',
+    // Year on 2 digits
+	'Core:DateTime:Placeholder_H' => 'hh~~',
+    // Hour 00..23
+	'Core:DateTime:Placeholder_h' => 'h~~',
+    // Hour 01..12
+	'Core:DateTime:Placeholder_G' => 'hh~~',
+    // Hour 0..23
+	'Core:DateTime:Placeholder_g' => 'h~~',
+    // Hour 1..12
+	'Core:DateTime:Placeholder_a' => 'am/pm~~',
+    // am/pm (lowercase)
+	'Core:DateTime:Placeholder_A' => 'AM/PM~~',
+    // AM/PM (uppercase)
+	'Core:DateTime:Placeholder_i' => 'mm~~',
+    // minutes, 2 digits: 00..59
+	'Core:DateTime:Placeholder_s' => 'ss~~',
+    // seconds, 2 digits 00..59
 	'Core:Validator:Default' => 'Wrong format~~',
 	'Core:Validator:Mandatory' => 'Please, fill this field~~',
 	'Core:Validator:MustBeInteger' => 'Must be an integer~~',
@@ -994,7 +1000,6 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:TagSetFieldData' => '%2$s for class %1$s~~',
 	'Class:TagSetFieldData+' => '',
-
 	'Class:TagSetFieldData/Attribute:code' => 'Code~~',
 	'Class:TagSetFieldData/Attribute:code+' => 'Internal code. Must contain at least 3 alphanumeric characters~~',
 	'Class:TagSetFieldData/Attribute:label' => 'Label~~',
@@ -1004,7 +1009,6 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:TagSetFieldData/Attribute:finalclass' => 'Tag class~~',
 	'Class:TagSetFieldData/Attribute:obj_class' => 'Object class~~',
 	'Class:TagSetFieldData/Attribute:obj_attcode' => 'Field code~~',
-
 	'Core:TagSetFieldData:ErrorDeleteUsedTag' => 'Used tags cannot be deleted~~',
 	'Core:TagSetFieldData:ErrorDuplicateTagCodeOrLabel' => 'Tags codes or labels must be unique~~',
 	'Core:TagSetFieldData:ErrorTagCodeSyntax' => 'Tags code must contain between 3 and %1$d alphanumeric characters~~',
@@ -1091,8 +1095,8 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:AsyncTask/Attribute:last_error+' => '',
 	'Class:AsyncTask/Attribute:last_attempt' => 'Last attempt~~',
 	'Class:AsyncTask/Attribute:last_attempt+' => '',
-    'Class:AsyncTask:InvalidConfig_Class_Keys' => 'Invalid format for the configuration of "async_task_retries[%1$s]". Expecting an array with the following keys: %2$s~~',
-    'Class:AsyncTask:InvalidConfig_Class_InvalidKey_Keys' => 'Invalid format for the configuration of "async_task_retries[%1$s]": unexpected key "%2$s". Expecting only the following keys: %3$s~~',
+	'Class:AsyncTask:InvalidConfig_Class_Keys' => 'Invalid format for the configuration of "async_task_retries[%1$s]". Expecting an array with the following keys: %2$s~~',
+	'Class:AsyncTask:InvalidConfig_Class_InvalidKey_Keys' => 'Invalid format for the configuration of "async_task_retries[%1$s]": unexpected key "%2$s". Expecting only the following keys: %3$s~~',
 ));
 
 //
diff --git a/dictionaries/da.dictionary.itop.ui.php b/dictionaries/da.dictionary.itop.ui.php
index 86d3a797a6..841c7427d2 100644
--- a/dictionaries/da.dictionary.itop.ui.php
+++ b/dictionaries/da.dictionary.itop.ui.php
@@ -14,6 +14,12 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:AuditCategory/Attribute:definition_set+' => 'OQL begreber, der definerer omfanget af objekter, der skal auditeres',
 	'Class:AuditCategory/Attribute:rules_list' => 'Audit-regler',
 	'Class:AuditCategory/Attribute:rules_list+' => 'Audit-regler for denne kategori',
+	'Class:AuditCategory/Attribute:ok_error_tolerance' => 'Warning threshold~~',
+	'Class:AuditCategory/Attribute:ok_error_tolerance+' => 'Percentage of invalid objects below which the result is a warning (orange)~~',
+	'Class:AuditCategory/Attribute:warning_error_tolerance' => 'Error threshold~~',
+	'Class:AuditCategory/Attribute:warning_error_tolerance+' => 'Percentage of invalid objects below which the result is in error (red)~~',
+	'Class:AuditCategory/Attribute:domains_list' => 'Domains~~',
+	'Class:AuditCategory/Attribute:domains_list+' => 'Domains which includes this category~~',
 ));
 
 //
@@ -41,7 +47,42 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:AuditRule/Attribute:category_id' => 'Kategori',
 	'Class:AuditRule/Attribute:category_id+' => 'Kategori for denne regel',
 	'Class:AuditRule/Attribute:category_name' => 'Kategori',
-	'Class:AuditRule/Attribute:category_name+' => 'Kategorinavn for denne regel',
+	'Class:AuditRule/Attribute:category_name+' => 'Kategorinavn for denne regel'
+));
+
+//
+// Class: AuditDomain
+//
+
+Dict::Add('DA DA', 'Danish', 'Dansk', array(
+	'Class:AuditDomain' => 'Audit Domain~~',
+	'Class:AuditDomain+' => 'Audit domains allow to group the audit categories.
+Domain usually correspond to who is responsible for checking and fixing errors~~',
+	'Class:AuditDomain/Attribute:name' => 'Name~~',
+	'Class:AuditDomain/Attribute:name+' => 'Its a segmentation of the Audit by who is in charge of fixing it or just interested~~',
+	'Class:AuditDomain/Attribute:description' => 'Description~~',
+	'Class:AuditDomain/Attribute:description+' => '~~',
+	'Class:AuditDomain/Attribute:icon' => 'Icon~~',
+	'Class:AuditDomain/Attribute:icon+' => '~~',
+	'Class:AuditDomain/Attribute:categories_list' => 'Categories~~',
+	'Class:AuditDomain/Attribute:categories_list+' => 'Related audit categories. When running the audit on a domain, all related audit categories are checked and only those.~~',
+));
+
+//
+// Class: lnkAuditCategoryToAuditDomain
+//
+
+Dict::Add('DA DA', 'Danish', 'Dansk', array(
+	'Class:lnkAuditCategoryToAuditDomain' => 'Link AuditCategory / AuditDomain~~',
+	'Class:lnkAuditCategoryToAuditDomain+' => '~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:category_id' => 'Category~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:category_id+' => 'Audit Category~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:category_name' => 'Category name~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:category_name+' => 'Audit category name~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:domain_id' => 'Domain~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:domain_id+' => 'Audit domain~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:domain_name' => 'Domain name~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:domain_name+' => 'Audit domain name~~',
 ));
 
 //
@@ -59,6 +100,16 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:Query/Attribute:is_template+' => 'Usable as source for recipient OQL in Notifications~~',
 	'Class:Query/Attribute:is_template/Value:yes' => 'Yes~~',
 	'Class:Query/Attribute:is_template/Value:no' => 'No~~',
+	'Class:Query/Attribute:export_count' => 'Export counter~~',
+	'Class:Query/Attribute:export_count+' => 'Counter reflecting the number of time this query has been executed~~',
+	'Class:Query/Attribute:export_last_date' => 'Last export~~',
+	'Class:Query/Attribute:export_last_date+' => 'Date and time of the last export execution~~',
+	'Class:Query/Attribute:export_last_user_id' => 'User~~',
+	'Class:Query/Attribute:export_last_user_id+' => 'The user who executed the last export~~',
+	'Class:Query/Attribute:export_last_user_contact' => 'Contact~~',
+	'Class:Query/Attribute:export_last_user_contact+' => 'The contact who executed the last export~~',
+	'Query:baseinfo' => 'General information~~',
+	'Query:exportInfo' => 'Export information~~',
 	'Class:QueryOQL/Attribute:fields' => 'Felter',
 	'Class:QueryOQL/Attribute:fields+' => '',
 	'Class:QueryOQL' => 'OQL forespørgsel',
@@ -107,7 +158,6 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:User/Attribute:status+' => 'Whether the user account is enabled or disabled.~~',
 	'Class:User/Attribute:status/Value:enabled' => 'Enabled~~',
 	'Class:User/Attribute:status/Value:disabled' => 'Disabled~~',
-
 	'Class:User/Error:LoginMustBeUnique' => 'Login skal være entydig - "%1s" er allerede i brug.',
 	'Class:User/Error:AtLeastOneProfileIsNeeded' => 'Mindst en profil skal knyttes til denne bruger.',
 	'Class:User/Error:ProfileNotAllowed' => 'Profile "%1$s" cannot be added it will deny the access to backoffice~~',
@@ -316,6 +366,29 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Expression:Unit:Short:YEAR' => 'y~~',
 ));
 
+//
+// Duplicated into itop-welcome-itil ( will be removed from here...)
+//
+Dict::Add('DA DA', 'Danish', 'Dansk', array(
+	'Menu:WelcomeMenu' => 'Velkomen',
+	'Menu:WelcomeMenu+' => 'Velkommen til '.ITOP_APPLICATION_SHORT,
+	'Menu:WelcomeMenuPage' => 'Velkomen',
+	'Menu:WelcomeMenuPage+' => 'Velkommen til '.ITOP_APPLICATION_SHORT,
+	'Menu:AdminTools' => 'Admin værktøjer',
+	'Menu:AdminTools+' => 'Administration tools~~',
+	'Menu:AdminTools?' => 'Værktøjer kun tilgængelige for brugere med administrator profil',
+	'Menu:CSVImportMenu' => 'CSV import',
+	'Menu:CSVImportMenu+' => '',
+	'Menu:DataModelMenu' => 'Data model~~',
+	'Menu:DataModelMenu+' => 'Overview of the data model~~',
+	'Menu:ExportMenu' => 'Export~~',
+	'Menu:ExportMenu+' => 'Export the results of any query in HTML, CSV or XML~~',
+	'Menu:NotificationsMenu' => 'Notifikationer',
+	'Menu:NotificationsMenu+' => 'Configuration of the Notifications~~',
+	'Menu:MyShortcuts' => 'Mine Genveje',
+	'Menu:DataAdministration' => 'Data administration~~',
+	'Menu:DataAdministration+' => '~~',
+));
 
 //
 // String from the User Interface: menu, messages, buttons, etc...
@@ -325,12 +398,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'BooleanLabel:yes' => 'yes~~',
 	'BooleanLabel:no' => 'no~~',
 	'UI:Login:Title' => ITOP_APPLICATION_SHORT.' login~~',
-	'Menu:WelcomeMenu' => 'Velkomen',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:WelcomeMenu+' => 'Velkommen til '.ITOP_APPLICATION_SHORT, // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:WelcomeMenuPage' => 'Velkomen',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:WelcomeMenuPage+' => 'Velkommen til '.ITOP_APPLICATION_SHORT, // Duplicated into itop-welcome-itil (will be removed from here...)
 	'UI:WelcomeMenu:Title' => 'Velkommen til '.ITOP_APPLICATION_SHORT,
-
 	'UI:WelcomeMenu:LeftBlock' => '<p>'.ITOP_APPLICATION_SHORT.' er en komplet, OpenSource, webbaseret IT-Service-Management-Værktøj.</p>
 <ul>Den inkluderer:
 <li>En komplet CMDB (Configuration management database) til at dokumentere og styre IT-portfolioen.</li>
@@ -341,7 +409,6 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 <li>Dashboards for hurtigt overblik over IT.</li>
 </ul>
 <p>Alle moduler kan installeres, step by step, uafhængigt af hinanden.</p>',
-
 	'UI:WelcomeMenu:RightBlock' => '<p>'.ITOP_APPLICATION_SHORT.' er service udbyder orienteret, det tillader let IT teknikere at administrere flere kunder eller organisationer.
 <ul>iTop, leverer et feature-rich sæt af forretnings processer som:
 <li>Forøger IT administrationens effektivitet</li> 
@@ -357,7 +424,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 <li>Manage the most important asset of your IT: Documentation.</li>
 </ul>
 </p>~~',
-	'UI:WelcomeMenu:Text'=> '<div>Congratulations, you landed on '.ITOP_APPLICATION.' '.ITOP_VERSION_NAME.'!</div>
+	'UI:WelcomeMenu:Text' => '<div>Congratulations, you landed on '.ITOP_APPLICATION.' '.ITOP_VERSION_NAME.'!</div>
 
 <div>This version features a brand new modern and accessible backoffice design.</div>
 
@@ -378,6 +445,7 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:Button:GlobalSearch' => 'Søg',
 	'UI:Button:Search' => ' Søg ',
 	'UI:Button:Clear' => ' Clear ~~',
+	'UI:Button:Confirm' => ' Confirm ~~',
 	'UI:Button:SearchInHierarchy' => 'Search in hierarchy~~',
 	'UI:Button:Query' => ' Forespørgsel ',
 	'UI:Button:Ok' => 'Ok',
@@ -418,7 +486,6 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:UserPref:DoNotShowAgain' => 'Do not show again~~',
 	'UI:InputFile:NoFileSelected' => 'No File Selected~~',
 	'UI:InputFile:SelectFile' => 'Select a file~~',
-
 	'UI:SearchToggle' => 'Søg',
 	'UI:ClickToCreateNew' => 'Opret nyt objekt af typen %1$s~~',
 	'UI:SearchFor_Class' => 'Søg efter objekter af typen %1$s',
@@ -438,7 +505,6 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:Error:CannotWriteToTmp_Dir' => 'Kan ikke skrive den midlertidige fil til disken: upload_tmp_dir = "%1$s".',
 	'UI:Error:UploadStoppedByExtension_FileName' => 'Upload stoppet på grund af filtype. (Original fil navn = "%1$s").',
 	'UI:Error:UploadFailedUnknownCause_Code' => 'Fil upload fejlede, ukendt årsag. (Fejl kode = "%1$s").',
-
 	'UI:Error:1ParametersMissing' => 'Fejl: følgende parameter skal angives for denne operation: %1$s.',
 	'UI:Error:2ParametersMissing' => 'Fejl: følgende parametre skal angives for denne operation: %1$s and %2$s.',
 	'UI:Error:3ParametersMissing' => 'Fejl: følgende parametre skal angives for denne operation: %1$s, %2$s and %3$s.',
@@ -460,9 +526,7 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:Error:MaintenanceMode' => 'Application is currently in maintenance~~',
 	'UI:Error:MaintenanceTitle' => 'Maintenance~~',
 	'UI:Error:InvalidToken' => 'Error: the requested operation has already been performed (CSRF token not found)~~',
-
 	'UI:Error:SMTP:UnknownVendor' => 'OAuth SMTP provider %1$s does not exist  (email_transport_smtp.oauth.provider)~~',
-
 	'UI:GroupBy:Count' => 'Antal',
 	'UI:GroupBy:Count+' => 'Antal af elementer',
 	'UI:CountOfObjects' => '%1$d objekter opfylder kriteriet.',
@@ -491,6 +555,7 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:Menu:OtherActions' => 'Andre handlinger',
 	'UI:Menu:Transitions' => 'Transitions~~',
 	'UI:Menu:OtherTransitions' => 'Other Transitions~~',
+	'UI:Menu:View' => 'View this object~~',
 	'UI:Menu:New' => 'Ny...',
 	'UI:Menu:Add' => 'Tilføj...',
 	'UI:Menu:Manage' => 'Administrer...',
@@ -499,6 +564,9 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:Menu:Modify' => 'Modificer...',
 	'UI:Menu:Delete' => 'Slet...',
 	'UI:Menu:BulkDelete' => 'Slet...',
+	'UI:Menu:BulkDelete_Class' => 'Delete %1$s objects...~~',
+	'UI:Menu:BulkDelete_Link' => 'Delete %1$s...~~',
+	'UI:Menu:BulkDelete_Remote' => 'Delete %1$s...~~',
 	'UI:UndefinedObject' => 'Ikke defineret',
 	'UI:Document:OpenInNewWindow:Download' => 'Åben i nyt vindue: %1$s, Download: %2$s',
 	'UI:SplitDateTime-Date' => 'Dato',
@@ -531,7 +599,6 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:Login:ResetPassword' => 'Send now!~~',
 	'UI:Login:ResetPwdFailed' => 'Failed to send an email: %1$s~~',
 	'UI:Login:SeparatorOr' => 'Or~~',
-
 	'UI:ResetPwd-Error-WrongLogin' => '\'%1$s\' is not a valid login~~',
 	'UI:ResetPwd-Error-NotPossible' => 'external accounts do not allow password reset.~~',
 	'UI:ResetPwd-Error-FixedPwd' => 'the account does not allow password reset.~~',
@@ -542,50 +609,49 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:ResetPwd-EmailSent' => 'Please check your email box and follow the instructions. If you receive no email, please check the login you typed.~~',
 	'UI:ResetPwd-EmailSubject' => 'Reset your '.ITOP_APPLICATION_SHORT.' password~~',
 	'UI:ResetPwd-EmailBody' => '<body><p>You have requested to reset your '.ITOP_APPLICATION_SHORT.' password.</p><p>Please follow this link (single usage) to <a href="%1$s">enter a new password</a></p>.~~',
-
 	'UI:ResetPwd-Title' => 'Reset password~~',
 	'UI:ResetPwd-Error-InvalidToken' => 'Sorry, either the password has already been reset, or you have received several emails. Please make sure that you use the link provided in the very last email received.~~',
 	'UI:ResetPwd-Error-EnterPassword' => 'Enter a new password for the account \'%1$s\'.~~',
 	'UI:ResetPwd-Ready' => 'The password has been changed.~~',
 	'UI:ResetPwd-Login' => 'Click here to login...~~',
-
-	'UI:Login:About'                               => 'Om',
-	'UI:Login:ChangeYourPassword'                  => 'Skift Adgangskode',
-	'UI:Login:OldPasswordPrompt'                   => 'Gammel Adgangskode',
-	'UI:Login:NewPasswordPrompt'                   => 'Ny Adgangskode',
-	'UI:Login:RetypeNewPasswordPrompt'             => 'Gentag ny adgangskode',
-	'UI:Login:IncorrectOldPassword'                => 'Fejl: den gamle adgangskode er forkert',
-	'UI:LogOffMenu'                                => 'Log ud',
+	'UI:Login:About' => 'Om',
+	'UI:Login:ChangeYourPassword' => 'Skift Adgangskode',
+	'UI:Login:OldPasswordPrompt' => 'Gammel Adgangskode',
+	'UI:Login:NewPasswordPrompt' => 'Ny Adgangskode',
+	'UI:Login:RetypeNewPasswordPrompt' => 'Gentag ny adgangskode',
+	'UI:Login:IncorrectOldPassword' => 'Fejl: den gamle adgangskode er forkert',
+	'UI:LogOffMenu' => 'Log ud',
 	'UI:LogOff:ThankYou' => 'Tak for at du brugte '.ITOP_APPLICATION_SHORT,
-	'UI:LogOff:ClickHereToLoginAgain'              => 'Klik her for at logge ind igen...',
-	'UI:ChangePwdMenu'                             => 'Skift Adgangskode...',
-	'UI:Login:PasswordChanged'                     => 'Adgangskode oprettet med success!',
+	'UI:LogOff:ClickHereToLoginAgain' => 'Klik her for at logge ind igen...',
+	'UI:ChangePwdMenu' => 'Skift Adgangskode...',
+	'UI:Login:PasswordChanged' => 'Adgangskode oprettet med success!',
+	'UI:Login:PasswordNotChanged' => 'Error: Password is the same!~~',
 	'UI:AccessRO-All' => ITOP_APPLICATION_SHORT.' er skrivebeskyttet',
 	'UI:AccessRO-Users' => ITOP_APPLICATION_SHORT.' er skrivebeskyttet for slutbrugere',
-	'UI:ApplicationEnvironment'                    => 'Applikations miljø: %1$s',
-	'UI:Login:RetypePwdDoesNotMatch'               => 'Ny adgangskode og gentaget adgangskode passer ikke sammen!',
+	'UI:ApplicationEnvironment' => 'Applikations miljø: %1$s',
+	'UI:Login:RetypePwdDoesNotMatch' => 'Ny adgangskode og gentaget adgangskode passer ikke sammen!',
 	'UI:Button:Login' => 'Enter '.ITOP_APPLICATION_SHORT,
 	'UI:Login:Error:AccessRestricted' => ITOP_APPLICATION_SHORT.' adgang er begrænset. Venligst, kontakt en '.ITOP_APPLICATION_SHORT.' administrator.',
 	'UI:Login:Error:AccessAdmin' => 'Adgang er begrænset til administratorer. Venligst, kontakt en '.ITOP_APPLICATION_SHORT.' administrator.',
-	'UI:Login:Error:WrongOrganizationName'         => 'Unknown organization~~',
+	'UI:Login:Error:WrongOrganizationName' => 'Unknown organization~~',
 	'UI:Login:Error:MultipleContactsHaveSameEmail' => 'Multiple contacts have the same e-mail~~',
-	'UI:Login:Error:NoValidProfiles'               => 'No valid profile provided~~',
-	'UI:CSVImport:MappingSelectOne'                => '-- Vælg venligst --',
-	'UI:CSVImport:MappingNotApplicable'            => '-- ignorer dette felt --',
-	'UI:CSVImport:NoData'                          => 'Tomt data sæt..., venligst angiv nogle data!',
-	'UI:Title:DataPreview'                         => 'Data Preview',
-	'UI:CSVImport:ErrorOnlyOneColumn'              => 'Fejl: Data indeholder kun en kolonne. Har du valgt den korrekte separator?',
-	'UI:CSVImport:FieldName'                       => 'Felt %1$d',
-	'UI:CSVImport:DataLine1'                       => 'Data Linje 1',
-	'UI:CSVImport:DataLine2'                       => 'Data Linje 2',
-	'UI:CSVImport:idField'                         => 'id (Primær Nøgle)',
+	'UI:Login:Error:NoValidProfiles' => 'No valid profile provided~~',
+	'UI:CSVImport:MappingSelectOne' => '-- Vælg venligst --',
+	'UI:CSVImport:MappingNotApplicable' => '-- ignorer dette felt --',
+	'UI:CSVImport:NoData' => 'Tomt data sæt..., venligst angiv nogle data!',
+	'UI:Title:DataPreview' => 'Data Preview',
+	'UI:CSVImport:ErrorOnlyOneColumn' => 'Fejl: Data indeholder kun en kolonne. Har du valgt den korrekte separator?',
+	'UI:CSVImport:FieldName' => 'Felt %1$d',
+	'UI:CSVImport:DataLine1' => 'Data Linje 1',
+	'UI:CSVImport:DataLine2' => 'Data Linje 2',
+	'UI:CSVImport:idField' => 'id (Primær Nøgle)',
 	'UI:Title:BulkImport' => ITOP_APPLICATION_SHORT.' - Bulk import',
-	'UI:Title:BulkImport+'                         => 'CSV-Import assistent',
-	'UI:Title:BulkSynchro_nbItem_ofClass_class'    => 'Synchronisering af %1$d objekter af klasse %2$s',
-	'UI:CSVImport:ClassesSelectOne'                => '-- Vælg venligst --~~',
-	'UI:CSVImport:ErrorExtendedAttCode'            => 'Intern fejl: "%1$s" er en ukorrekt kode fordi "%2$s" er IKKE en fremmed nøgle af klassen "%3$s"',
-	'UI:CSVImport:ObjectsWillStayUnchanged'        => '%1$d objekt(er) vil forblive uændrede.',
-	'UI:CSVImport:ObjectsWillBeModified'           => '%1$d objekt(er) vil blive ændret.',
+	'UI:Title:BulkImport+' => 'CSV-Import assistent',
+	'UI:Title:BulkSynchro_nbItem_ofClass_class' => 'Synchronisering af %1$d objekter af klasse %2$s',
+	'UI:CSVImport:ClassesSelectOne' => '-- Vælg venligst --~~',
+	'UI:CSVImport:ErrorExtendedAttCode' => 'Intern fejl: "%1$s" er en ukorrekt kode fordi "%2$s" er IKKE en fremmed nøgle af klassen "%3$s"',
+	'UI:CSVImport:ObjectsWillStayUnchanged' => '%1$d objekt(er) vil forblive uændrede.',
+	'UI:CSVImport:ObjectsWillBeModified' => '%1$d objekt(er) vil blive ændret.',
 	'UI:CSVImport:ObjectsWillBeAdded' => '%1$d objekt(er) vil blive tilføjet.',
 	'UI:CSVImport:ObjectsWillHaveErrors' => '%1$d objekt(er) har fejl.',
 	'UI:CSVImport:ObjectsRemainedUnchanged' => '%1$d objekt(er) forbliver uændrede.',
@@ -631,11 +697,14 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:UniversalSearchTitle' => ITOP_APPLICATION_SHORT.' - Universal Søgning',
 	'UI:UniversalSearch:Error' => 'Fejl: %1$s',
 	'UI:UniversalSearch:LabelSelectTheClass' => 'Vælg klasse at søge efter: ',
-
 	'UI:CSVReport-Value-Modified' => 'Ændret',
 	'UI:CSVReport-Value-SetIssue' => 'invalid value for attribute~~',
 	'UI:CSVReport-Value-ChangeIssue' => '\'%1$s\' is an invalid value~~',
 	'UI:CSVReport-Value-NoMatch' => 'No match for value \'%1$s\'~~',
+	'UI:CSVReport-Value-NoMatch-PossibleValues' => 'Some possible \'%1$s\' value(s): %2$s~~',
+	'UI:CSVReport-Value-NoMatch-NoObject' => 'There are no \'%1$s\' objects~~',
+	'UI:CSVReport-Value-NoMatch-NoObject-ForCurrentUser' => 'There are no \'%1$s\' objects found with your current profile~~',
+	'UI:CSVReport-Value-NoMatch-SomeObjectNotVisibleForCurrentUser' => 'There are some \'%1$s\' objects not visible with your current profile~~',
 	'UI:CSVReport-Value-Missing' => 'Mangler obligatorisk værdi',
 	'UI:CSVReport-Value-Ambiguous' => 'Tvetydig: fandt %1$s objekter',
 	'UI:CSVReport-Row-Unchanged' => 'Uændret',
@@ -649,15 +718,16 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:CSVReport-Value-Issue-Readonly' => 'Attributten \'%1$s\' er skrivebeskyttet og kan ikke ændres (nuværende værdi: %2$s, foreslået værdi: %3$s)',
 	'UI:CSVReport-Value-Issue-Format' => 'Fejl i behandling af input: %1$s',
 	'UI:CSVReport-Value-Issue-NoMatch' => 'Uventet værdi for attribut \'%1$s\': ingen emner fundet, tjek stavningen',
+	'UI:CSVReport-Value-Issue-AllowedValues' => 'Allowed \'%1$s\' value(s): %2$s~~',
 	'UI:CSVReport-Value-Issue-Unknown' => 'Uventet værdi for attribut \'%1$s\': %2$s',
 	'UI:CSVReport-Row-Issue-Inconsistent' => 'Attributterne er ikke i overensstemmelse med hinanden: %1$s',
 	'UI:CSVReport-Row-Issue-Attribute' => 'Uventet attribut værdi(er)',
 	'UI:CSVReport-Row-Issue-MissingExtKey' => 'Kunne ikke oprettes, på grund af manglende fremmednøgle(r): %1$s',
 	'UI:CSVReport-Row-Issue-DateFormat' => 'Forkert dato format',
+	'UI:CSVReport-Row-Issue-ExpectedDateFormat' => 'Expected format: %1$s~~',
 	'UI:CSVReport-Row-Issue-Reconciliation' => 'Fejl ved forening',
 	'UI:CSVReport-Row-Issue-Ambiguous' => 'Tvetydig forening',
 	'UI:CSVReport-Row-Issue-Internal' => 'Intern fejl: %1$s, %2$s',
-
 	'UI:CSVReport-Icon-Unchanged' => 'Uændret',
 	'UI:CSVReport-Icon-Modified' => 'Ændret',
 	'UI:CSVReport-Icon-Missing' => 'Mangler',
@@ -672,14 +742,32 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:CSVReport-Stats-Errors' => '%1$.0f %% af de hentede objekter har fejl og vil blive ignoreret',
 	'UI:CSVReport-Stats-Created' => '%1$.0f %% af de hentede objekter vil blive oprettet.',
 	'UI:CSVReport-Stats-Modified' => '%1$.0f %% af de hentede objekter vil blive ændret.',
-
 	'UI:CSVExport:AdvancedMode' => 'Advanceret tilstand',
 	'UI:CSVExport:AdvancedMode+' => '',
 	'UI:CSVExport:LostChars' => 'Encoding problem',
 	'UI:CSVExport:LostChars+' => '',
-
 	'UI:Audit:Title' => ITOP_APPLICATION_SHORT.' - CMDB Audit',
 	'UI:Audit:InteractiveAudit' => 'Interaktiv Audit',
+	'UI:Audit:Interactive:All:Title' => 'Audit results~~',
+	'UI:Audit:Interactive:All:SubTitle' => 'Full audit: includes all rules, all categories, all domains~~',
+	'UI:Audit:Interactive:All:BreadCrumb' => 'Full audit~~',
+	'UI:Audit:Interactive:All:BreadCrumb+' => 'Audit results for all rules~~',
+	'UI:Audit:Interactive:Categories:Title' => 'Audit results for categories: %1$s~~',
+	'UI:Audit:Interactive:Categories:SubTitle' => 'Audit results for all the rules belonging to one of those %1$s categories~~',
+	'UI:Audit:Interactive:Categories:BreadCrumb' => 'Categories~~',
+	'UI:Audit:Interactive:Categories:BreadCrumb+' => 'Audit categories: %1$s~~',
+	'UI:Audit:Interactive:Domain:Title' => 'Audit results for Domain: %1$s~~',
+	'UI:Audit:Interactive:Domain:SubTitle' => 'Audit results for all the rules belonging to a category related to the domain: %1$s~~',
+	'UI:Audit:Interactive:Domain:BreadCrumb' => '%1$s~~',
+	'UI:Audit:Interactive:Domain:BreadCrumb+' => 'Audit for Domain: %1$s~~',
+	'UI:Audit:Interactive:Selection:Title' => 'Selection of an audit~~',
+	'UI:Audit:Interactive:Selection:SubTitle' => 'Select a domain to get the results limited to this domain or select "All categories" to get a full audit (can take time or even fail if too much data to audit)~~',
+	'UI:Audit:Interactive:Selection:BreadCrumb' => 'Selection~~',
+	'UI:Audit:Interactive:Selection:BreadCrumb+' => 'Selection of an Audit to run~~',
+	'UI:Audit:Interactive:Selection:BadgeAll' => 'All categories~~',
+	'UI:Audit:Interactive:Button:Back' => 'Back to the audit~~',
+	'UI:Audit:Interactive:Button:Configuration' => 'Audit configuration~~',
+	'UI:Audit:ViewRules' => 'Check the rules~~',
 	'UI:Audit:HeaderAuditRule' => 'Audit Regel',
 	'UI:Audit:HeaderNbObjects' => '# Objekt(er)',
 	'UI:Audit:HeaderNbErrors' => '# Fejl',
@@ -695,8 +783,6 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:Audit:Dashboard:ObjectsInError' => 'Objects in errors~~',
 	'UI:Audit:Dashboard:ObjectsValidated' => 'Objects validated~~',
 	'UI:Audit:AuditCategory:Subtitle' => '%1$s errors ouf of %2$s - %3$s%%~~',
-
-
 	'UI:RunQuery:Title' => ITOP_APPLICATION_SHORT.' - OQL Query Evaluering',
 	'UI:RunQuery:QueryExamples' => 'Query Eksempler',
 	'UI:RunQuery:QueryResults' => 'Query Results~~',
@@ -715,7 +801,7 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:RunQuery:ResultSQL' => 'Resulting SQL~~',
 	'UI:RunQuery:Error' => 'Der opstod en fejl under afviklingen af forespøgrslen',
 	'UI:Query:UrlForExcel' => 'URL til brug for MS-Excel web forespøgrsler',
-	'UI:Query:UrlV1' => 'The list of fields has been left unspecified. The page <em>export-V2.php</em> cannot be invoked without this information. Therefore, the URL suggested herebelow points to the legacy page: <em>export.php</em>. This legacy version of the export has the following limitation: the list of exported fields may vary depending on the output format and the data model of '.ITOP_APPLICATION_SHORT.'. Should you want to garantee that the list of exported columns will remain stable on the long run, then you must specify a value for the attribute "Fields" and use the page <em>export-V2.php</em>.~~',
+	'UI:Query:UrlV1' => 'The list of fields has been left unspecified. The page <em>export-V2.php</em> cannot be invoked without this information. Therefore, the URL suggested herebelow points to the legacy page: <em>export.php</em>. This legacy version of the export has the following limitation: the list of exported fields may vary depending on the output format and the data model of '.ITOP_APPLICATION_SHORT.'.Should you want to garantee that the list of exported columns will remain stable on the long run, then you must specify a value for the attribute "Fields" and use the page <em>export-V2.php</em>.~~',
 	'UI:Schema:Title' => ITOP_APPLICATION_SHORT.' objekt skema',
 	'UI:Schema:TitleForClass' => '%1$s skema~~',
 	'UI:Schema:CategoryMenuItem' => 'Kategori <b>%1$s</b>',
@@ -735,7 +821,6 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:Schema:Label' => 'Label',
 	'UI:Schema:Label+' => 'Label for attributten',
 	'UI:Schema:Type' => 'Type',
-
 	'UI:Schema:Type+' => 'Datatype for attributten',
 	'UI:Schema:Origin' => 'Oprindelse',
 	'UI:Schema:Origin+' => 'Basisklasse, hvor denne attribut er defineret',
@@ -783,6 +868,16 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:Schema:DisplaySelector/Code' => 'Code~~',
 	'UI:Schema:Attribute/Filter' => 'Filter~~',
 	'UI:Schema:DefaultNullValue' => 'Default null : "%1$s"~~',
+	'UI:Schema:Events' => 'Events~~',
+	'UI:Schema:Events:Defined' => 'Defined events~~',
+	'UI:Schema:Events:NoEvent' => 'No event defined~~',
+	'UI:Schema:Events:Listeners' => 'Event listeners~~',
+	'UI:Schema:Events:NoListener' => 'No event listener~~',
+	'UI:Schema:Events:Event' => 'Event~~',
+	'UI:Schema:Events:Description' => 'Description~~',
+	'UI:Schema:Events:Listener' => 'Listener~~',
+	'UI:Schema:Events:Rank' => 'Rank~~',
+	'UI:Schema:Events:Module' => 'Module~~',
 	'UI:LinksWidget:Autocomplete+' => '',
 	'UI:Edit:SearchQuery' => 'Select a predefined query~~',
 	'UI:Edit:TestQuery' => 'Test forespørgsel',
@@ -874,7 +969,6 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:SystemIntrusion' => 'Adgang nægtet. Du prøver at udføre en handling som du ikke har tilladelse til.',
 	'UI:FatalErrorMessage' => 'Fatal fejl, '.ITOP_APPLICATION_SHORT.' kan ikke fortsætte.',
 	'UI:Error_Details' => 'Fejl: %1$s.',
-
 	'UI:PageTitle:ProfileProjections' => ITOP_APPLICATION_SHORT.' bruger styring - profil projection',
 	'UI:UserManagement:Class' => 'Klasse',
 	'UI:UserManagement:Class+' => '',
@@ -909,66 +1003,42 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:UserManagement:NoLifeCycleApplicable' => 'N/A',
 	'UI:UserManagement:NoLifeCycleApplicable+' => '',
 	'UI:UserManagement:GrantMatrix' => 'Grant Matrix',
-
-	'Menu:AdminTools' => 'Admin værktøjer',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:AdminTools+' => 'Administration tools~~',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:AdminTools?' => 'Værktøjer kun tilgængelige for brugere med administrator profil',// Duplicated into itop-welcome-itil (will be removed from here...)
 	'Menu:SystemTools' => 'System~~',
-
 	'UI:ChangeManagementMenu' => 'Change Management',
 	'UI:ChangeManagementMenu+' => '',
 	'UI:ChangeManagementMenu:Title' => 'Changes Overblik',
 	'UI-ChangeManagementMenu-ChangesByType' => 'Changes efter type',
 	'UI-ChangeManagementMenu-ChangesByStatus' => 'Changes efter status',
 	'UI-ChangeManagementMenu-ChangesNotYetAssigned' => 'Changes endnu ikke tildelt',
-
 	'UI:ConfigurationManagementMenu' => 'Configuration Management',
 	'UI:ConfigurationManagementMenu+' => '',
 	'UI:ConfigurationManagementMenu:Title' => 'Infrastruktur Overblik',
 	'UI-ConfigurationManagementMenu-InfraByType' => 'Infrastruktur objekter efter type',
 	'UI-ConfigurationManagementMenu-InfraByStatus' => 'Infrastruktur objekter efter status',
-
 	'UI:ConfigMgmtMenuOverview:Title' => 'Dashboard for Configuration Management',
 	'UI-ConfigMgmtMenuOverview-FunctionalCIbyStatus' => 'Configuration Items efter status',
 	'UI-ConfigMgmtMenuOverview-FunctionalCIByType' => 'Configuration Items efter type',
-
 	'UI:RequestMgmtMenuOverview:Title' => 'Dashboard for Anmodnings styring',
 	'UI-RequestManagementOverview-RequestByService' => 'Bruger anmodninger efter service',
 	'UI-RequestManagementOverview-RequestByPriority' => 'Bruger anmodninger efter prioritet',
 	'UI-RequestManagementOverview-RequestUnassigned' => 'Bruger anmodninger endnu ikke tildelt',
-
 	'UI:IncidentMgmtMenuOverview:Title' => 'Dashboard for Incident Management',
 	'UI-IncidentManagementOverview-IncidentByService' => 'Incidents efter service',
 	'UI-IncidentManagementOverview-IncidentByPriority' => 'Incidents efter prioritet',
 	'UI-IncidentManagementOverview-IncidentUnassigned' => 'Incidents endnu ikke tildelt',
-
 	'UI:ChangeMgmtMenuOverview:Title' => 'Dashboard for Change Management~~',
 	'UI-ChangeManagementOverview-ChangeByType' => 'Changes efter type',
 	'UI-ChangeManagementOverview-ChangeUnassigned' => 'Changes endnu ikke tildelt',
 	'UI-ChangeManagementOverview-ChangeWithOutage' => 'Udfald på grund af changes (ændringer)',
-
 	'UI:ServiceMgmtMenuOverview:Title' => 'Dashboard for Service Management',
 	'UI-ServiceManagementOverview-CustomerContractToRenew' => 'Kunde kontrakter til fornyelse indenfor 30 dage',
 	'UI-ServiceManagementOverview-ProviderContractToRenew' => 'Leverandør kontrakter til fornyelse indenfor 30 dage',
-
 	'UI:ContactsMenu' => 'Kontakter',
 	'UI:ContactsMenu+' => '',
 	'UI:ContactsMenu:Title' => 'Kontakter Overblik',
 	'UI-ContactsMenu-ContactsByLocation' => 'Kontakter efter lokation',
 	'UI-ContactsMenu-ContactsByType' => 'Kontakter efter type',
 	'UI-ContactsMenu-ContactsByStatus' => 'Kontakter efter status',
-
-	'Menu:CSVImportMenu' => 'CSV import',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:CSVImportMenu+' => '',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:DataModelMenu' => 'Data model~~',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:DataModelMenu+' => 'Overview of the data model~~',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:ExportMenu' => 'Export~~',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:ExportMenu+' => 'Export the results of any query in HTML, CSV or XML~~',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:NotificationsMenu' => 'Notifikationer',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:NotificationsMenu+' => 'Configuration of the Notifications~~',// Duplicated into itop-welcome-itil (will be removed from here...)
 	'UI:NotificationsMenu:Title' => 'Konfiguration af Notifikationer~~',
 	'UI:NotificationsMenu:Help' => 'Hjælp',
 	'UI:NotificationsMenu:HelpContent' => '<p>I '.ITOP_APPLICATION_SHORT.' er notifikationer fuldt modificerbare. De er baseret på to sæt af objekter: <i>triggers og handlinger</i>.</p>
@@ -999,53 +1069,18 @@ Ved tilknytningen til en trigger, bliver hver handling tildelt et "rækkefølge"
 	'UI:NotificationsMenu:Actions:ActionWebhook' => 'Webhook actions (outgoing integrations)~~',
 	'UI:NotificationsMenu:Actions:Action' => 'Other actions~~',
 	'UI:NotificationsMenu:AvailableActions' => 'Tilgængelige handlinger',
-
 	'Menu:TagAdminMenu' => 'Tags configuration~~',
 	'Menu:TagAdminMenu+' => 'Tags values management~~',
 	'UI:TagAdminMenu:Title' => 'Tags configuration~~',
 	'UI:TagAdminMenu:NoTags' => 'No Tag field configured~~',
 	'UI:TagSetFieldData:Error' => 'Error: %1$s~~',
-
-	'Menu:AuditCategories' => 'Audit Kategorier',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:AuditCategories+' => 'Audit Categories~~',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:Notifications:Title' => 'Audit Kategorier',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:RunQueriesMenu' => 'Kør forespørgsler',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:RunQueriesMenu+' => 'Run any query~~',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:QueryMenu' => 'Query parlør',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:QueryMenu+' => 'Query phrasebook~~',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:DataAdministration' => 'Data administration',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:DataAdministration+' => '',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:UniversalSearchMenu' => 'Universal Søgning',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UniversalSearchMenu+' => 'Search for anything...~~',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:UserManagementMenu' => 'Bruger styring',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UserManagementMenu+' => 'User management~~',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:ProfilesMenu' => 'Profiler',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:ProfilesMenu+' => 'Profiles~~',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:ProfilesMenu:Title' => 'Profiler',
-	// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:UserAccountsMenu' => 'Bruger konti',
-	// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UserAccountsMenu+' => 'User accounts~~',
-	// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UserAccountsMenu:Title' => 'Bruger konti',
-	// Duplicated into itop-welcome-itil (will be removed from here...)
-
 	'UI:iTopVersion:Short' => '%1$s version %2$s',
 	'UI:iTopVersion:Long' => '%1$s version %2$s-%3$s built on %4$s',
 	'UI:PropertiesTab' => 'Egenskaber',
-
 	'UI:OpenDocumentInNewWindow_' => 'Åben~~',
 	'UI:DownloadDocument_' => 'Hent~~',
 	'UI:Document:NoPreview' => 'Forhåndsvisning er ikke tilgængelig for denne dokumenttype',
 	'UI:Download-CSV' => 'Download %1$s',
-
 	'UI:DeadlineMissedBy_duration' => 'Overskredet med %1$s',
 	'UI:Deadline_LessThan1Min' => '< 1 min',
 	'UI:Deadline_Minutes' => '%1$d min',
@@ -1088,7 +1123,7 @@ Ved tilknytningen til en trigger, bliver hver handling tildelt et "rækkefølge"
 	'UI:RelationTooltip:ImpactedItems_N_of_M' => '# of impacted items: %1$d / %2$d~~',
 	'UI:RelationTooltip:CriticalThreshold_N_of_M' => 'Critical threshold: %1$d / %2$d~~',
 	'Portal:Title' => ITOP_APPLICATION_SHORT.' bruger portal',
-	'Portal:NoRequestMgmt' => 'Kære %1$s, du er blevet omdirigeret til denne side, fordi din konto er konfigureret med profilen \'Portal user\'. Desværre er '.ITOP_APPLICATION_SHORT.' ikke installeret med denne funktionalitet \'Request Management\'. Venligst kontakt din administrator.',
+	'Portal:NoRequestMgmt' => 'Kære %1$s, du er blevet omdirigeret til denne side, fordi din konto er konfigureret med profilen \'Portal user\'.Desværre er '.ITOP_APPLICATION_SHORT.' ikke installeret med denne funktionalitet \'Request Management\'.Venligst kontakt din administrator.',
 	'Portal:Refresh' => 'Opdater',
 	'Portal:Back' => 'Tilbage',
 	'Portal:WelcomeUserOrg' => 'Velkommen %1$s, fra %2$s',
@@ -1124,9 +1159,13 @@ Ved tilknytningen til en trigger, bliver hver handling tildelt et "rækkefølge"
 	'Enum:Undefined' => 'Udefineret',
 	'UI:DurationForm_Days_Hours_Minutes_Seconds' => '%1$s Dage %2$s Timer %3$s Minutter %4$s Sekunder',
 	'UI:ModifyAllPageTitle' => 'Modificer Alle',
+	'UI:Modify_ObjectsOf_Class' => 'Modifying objects of class %1$s~~',
 	'UI:Modify_N_ObjectsOf_Class' => 'Ændrer %1$d objekter af klasse %2$s',
 	'UI:Modify_M_ObjectsOf_Class_OutOf_N' => 'Ændrer %1$d objekter af klasse %2$s ud af %3$d',
 	'UI:Menu:ModifyAll' => 'Modificer...',
+	'UI:Menu:ModifyAll_Class' => 'Modify %1$s objects...~~',
+	'UI:Menu:ModifyAll_Link' => 'Modify %1$s...~~',
+	'UI:Menu:ModifyAll_Remote' => 'Modify %1$s...~~',
 	'UI:Button:ModifyAll' => 'Modificer Alle',
 	'UI:Button:PreviewModifications' => 'Preview Ændringer >>',
 	'UI:ModifiedObject' => 'Objekt Ændret',
@@ -1186,7 +1225,6 @@ Ved tilknytningen til en trigger, bliver hver handling tildelt et "rækkefølge"
 	'UI:PrintResolution:LetterLandscape' => 'Letter Landscape~~',
 	'UI:Toggle:SwitchToStandardDashboard' => 'Switch to standard dashboard~~',
 	'UI:Toggle:SwitchToCustomDashboard' => 'Switch to custom dashboard~~',
-
 	'UI:ConfigureThisList' => 'Konfigurer denne liste...',
 	'UI:ListConfigurationTitle' => 'Liste Konfiguration',
 	'UI:ColumnsAndSortOrder' => 'Kolonner og sortering:',
@@ -1202,10 +1240,8 @@ Ved tilknytningen til en trigger, bliver hver handling tildelt et "rækkefølge"
 	'UI:ExtField_AsRemoteField' => '%1$s (%2$s)',
 	'UI:Button:MoveUp' => 'Ryk Op',
 	'UI:Button:MoveDown' => 'Ryk Ned',
-
 	'UI:OQL:UnknownClassAndFix' => 'Ukendt klasse "%1$s". Forsøg "%2$s" i stedet for.',
 	'UI:OQL:UnknownClassNoFix' => 'Ukendt klasse "%1$s"',
-
 	'UI:Dashboard:EditCustom' => 'Edit custom version...~~',
 	'UI:Dashboard:CreateCustom' => 'Create a custom version...~~',
 	'UI:Dashboard:DeleteCustom' => 'Delete custom version...~~',
@@ -1216,13 +1252,10 @@ Ved tilknytningen til en trigger, bliver hver handling tildelt et "rækkefølge"
 	'UI:ImportDashboardText' => 'Vælg en dashboard fil til import:',
 	'UI:Dashboard:Actions' => 'Dashboard actions~~',
 	'UI:Dashboard:NotUpToDateUntilContainerSaved' => 'This dashboard displays information that does not include the on-going changes.~~',
-
-
 	'UI:DashletCreation:Title' => 'Opret en ny Dashlet',
 	'UI:DashletCreation:Dashboard' => 'Dashboard',
 	'UI:DashletCreation:DashletType' => 'Dashlet Type',
 	'UI:DashletCreation:EditNow' => 'Rediger Dashboard',
-
 	'UI:DashboardEdit:Title' => 'Dashboard Editor',
 	'UI:DashboardEdit:DashboardTitle' => 'Titel',
 	'UI:DashboardEdit:AutoReload' => 'Automatic refresh~~',
@@ -1230,38 +1263,31 @@ Ved tilknytningen til en trigger, bliver hver handling tildelt et "rækkefølge"
 	'UI:DashboardEdit:AutoReloadSec+' => 'The minimum allowed is %1$d seconds~~',
 	'UI:DashboardEdit:Revert' => 'Revert~~',
 	'UI:DashboardEdit:Apply' => 'Apply~~',
-
 	'UI:DashboardEdit:Layout' => 'Layout',
 	'UI:DashboardEdit:Properties' => 'Dashboard Egenskaber',
 	'UI:DashboardEdit:Dashlets' => 'Tilgængelige Dashlets',
 	'UI:DashboardEdit:DashletProperties' => 'Dashlet Egenskaber',
-
 	'UI:Form:Property' => 'Egenskab',
 	'UI:Form:Value' => 'Værdi',
-
 	'UI:DashletUnknown:Label' => 'Unknown~~',
 	'UI:DashletUnknown:Description' => 'Unknown dashlet (might have been uninstalled)~~',
 	'UI:DashletUnknown:RenderText:View' => 'Unable to render this dashlet.~~',
 	'UI:DashletUnknown:RenderText:Edit' => 'Unable to render this dashlet (class "%1$s"). Check with your administrator if it is still available.~~',
 	'UI:DashletUnknown:RenderNoDataText:Edit' => 'No preview available for this dashlet (class "%1$s").~~',
 	'UI:DashletUnknown:Prop-XMLConfiguration' => 'Configuration (shown as raw XML)~~',
-
 	'UI:DashletProxy:Label' => 'Proxy~~',
 	'UI:DashletProxy:Description' => 'Proxy dashlet~~',
 	'UI:DashletProxy:RenderNoDataText:Edit' => 'No preview available for this third-party dashlet (class "%1$s").~~',
 	'UI:DashletProxy:Prop-XMLConfiguration' => 'Configuration (shown as raw XML)~~',
-
 	'UI:DashletPlainText:Label' => 'Tekst',
 	'UI:DashletPlainText:Description' => 'Plain text (ingen formatering)',
 	'UI:DashletPlainText:Prop-Text' => 'Tekst',
 	'UI:DashletPlainText:Prop-Text:Default' => 'Indtast venligst noget tekst her...',
-
 	'UI:DashletObjectList:Label' => 'Objekt liste',
 	'UI:DashletObjectList:Description' => 'Objekt liste dashlet',
 	'UI:DashletObjectList:Prop-Title' => 'Titel',
 	'UI:DashletObjectList:Prop-Query' => 'Forespørgsel',
 	'UI:DashletObjectList:Prop-Menu' => 'Menu',
-
 	'UI:DashletGroupBy:Prop-Title' => 'Titel',
 	'UI:DashletGroupBy:Prop-Query' => 'Forespørgsel',
 	'UI:DashletGroupBy:Prop-Style' => 'Style',
@@ -1275,24 +1301,20 @@ Ved tilknytningen til en trigger, bliver hver handling tildelt et "rækkefølge"
 	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfWeek' => '%1$s (ugedag)',
 	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfMonth' => '%1$s (dag i måned)',
 	'UI:DashletGroupBy:MissingGroupBy' => 'Vælg venligst det felt, somobjekterne skal grupperes efter',
-
 	'UI:DashletGroupByPie:Label' => 'Pie Chart',
 	'UI:DashletGroupByPie:Description' => 'Pie Chart',
 	'UI:DashletGroupByBars:Label' => 'Bar Chart',
 	'UI:DashletGroupByBars:Description' => 'Bar Chart',
 	'UI:DashletGroupByTable:Label' => 'Grupper Efter (tabel)',
 	'UI:DashletGroupByTable:Description' => 'Liste (Grupperet efter felt)',
-
-	// New in 2.5
+    // New in 2.5
 	'UI:DashletGroupBy:Prop-Function' => 'Aggregation function~~',
 	'UI:DashletGroupBy:Prop-FunctionAttribute' => 'Function attribute~~',
 	'UI:DashletGroupBy:Prop-OrderDirection' => 'Direction~~',
 	'UI:DashletGroupBy:Prop-OrderField' => 'Order by~~',
 	'UI:DashletGroupBy:Prop-Limit' => 'Limit~~',
-
 	'UI:DashletGroupBy:Order:asc' => 'Ascending~~',
 	'UI:DashletGroupBy:Order:desc' => 'Descending~~',
-
 	'UI:GroupBy:count' => 'Count~~',
 	'UI:GroupBy:count+' => 'Number of elements~~',
 	'UI:GroupBy:sum' => 'Sum~~',
@@ -1303,14 +1325,12 @@ Ved tilknytningen til en trigger, bliver hver handling tildelt et "rækkefølge"
 	'UI:GroupBy:min+' => 'Minimum of %1$s~~',
 	'UI:GroupBy:max' => 'Maximum~~',
 	'UI:GroupBy:max+' => 'Maximum of %1$s~~',
-	// ---
-
+    // ---
 	'UI:DashletHeaderStatic:Label' => 'Header',
 	'UI:DashletHeaderStatic:Description' => 'Vis en horisontal separator',
 	'UI:DashletHeaderStatic:Prop-Title' => 'Titel',
 	'UI:DashletHeaderStatic:Prop-Title:Default' => 'Kontakter',
 	'UI:DashletHeaderStatic:Prop-Icon' => 'Ikon',
-
 	'UI:DashletHeaderDynamic:Label' => 'Header med statistik',
 	'UI:DashletHeaderDynamic:Description' => 'Header med stats (grupperet efter...)',
 	'UI:DashletHeaderDynamic:Prop-Title' => 'Titel',
@@ -1321,11 +1341,9 @@ Ved tilknytningen til en trigger, bliver hver handling tildelt et "rækkefølge"
 	'UI:DashletHeaderDynamic:Prop-Query' => 'Forespørgsel',
 	'UI:DashletHeaderDynamic:Prop-GroupBy' => 'Gruper efter',
 	'UI:DashletHeaderDynamic:Prop-Values' => 'Værdier',
-
 	'UI:DashletBadge:Label' => 'Badge',
 	'UI:DashletBadge:Description' => 'Objekt Ikon med ny/søg',
 	'UI:DashletBadge:Prop-Class' => 'Klasse',
-
 	'DayOfWeek-Sunday' => 'Søndag',
 	'DayOfWeek-Monday' => 'Mandag',
 	'DayOfWeek-Tuesday' => 'Tirsdag',
@@ -1345,8 +1363,7 @@ Ved tilknytningen til en trigger, bliver hver handling tildelt et "rækkefølge"
 	'Month-10' => 'October~~',
 	'Month-11' => 'November~~',
 	'Month-12' => 'December~~',
-
-	// Short version for the DatePicker
+    // Short version for the DatePicker
 	'DayOfWeek-Sunday-Min' => 'Su~~',
 	'DayOfWeek-Monday-Min' => 'Mo~~',
 	'DayOfWeek-Tuesday-Min' => 'Tu~~',
@@ -1366,13 +1383,13 @@ Ved tilknytningen til en trigger, bliver hver handling tildelt et "rækkefølge"
 	'Month-10-Short' => 'Oct~~',
 	'Month-11-Short' => 'Nov~~',
 	'Month-12-Short' => 'Dec~~',
-	'Calendar-FirstDayOfWeek' => '0~~',// 0 = Sunday, 1 = Monday, etc...
-
+	'Calendar-FirstDayOfWeek' => '0~~',
+    // 0 = Sunday, 1 = Monday, etc...
 	'UI:Menu:ShortcutList' => 'Opret Genvej...',
+	'UI:Menu:FilterList' => 'Display list with search criteria~~',
 	'UI:ShortcutRenameDlg:Title' => 'Omdøb genvej',
 	'UI:ShortcutListDlg:Title' => 'Opret en genvej for denne liste',
 	'UI:ShortcutDelete:Confirm' => 'Bekræft venligst at du ønsker at slette genvej(e).',
-	'Menu:MyShortcuts' => 'Mine Genveje',// Duplicated into itop-welcome-itil (will be removed from here...)
 	'Class:Shortcut' => 'Genvej',
 	'Class:Shortcut+' => '',
 	'Class:Shortcut/Attribute:name' => 'Navn',
@@ -1386,12 +1403,10 @@ Ved tilknytningen til en trigger, bliver hver handling tildelt et "rækkefølge"
 	'Class:ShortcutOQL/Attribute:auto_reload/Value:custom' => 'Custom rate~~',
 	'Class:ShortcutOQL/Attribute:auto_reload_sec' => 'Automatic refresh interval (seconds)~~',
 	'Class:ShortcutOQL/Attribute:auto_reload_sec/tip' => 'The minimum allowed is %1$d seconds~~',
-
 	'UI:FillAllMandatoryFields' => 'Venligst udfyld alle obligatoriske felter.',
 	'UI:ValueMustBeSet' => 'Please specify a value~~',
 	'UI:ValueMustBeChanged' => 'Please change the value~~',
 	'UI:ValueInvalidFormat' => 'Invalid format~~',
-
 	'UI:CSVImportConfirmTitle' => 'Please confirm the operation~~',
 	'UI:CSVImportConfirmMessage' => 'Are you sure you want to do this?~~',
 	'UI:CSVImportError_items' => 'Errors: %1$d~~',
@@ -1417,11 +1432,9 @@ Ved tilknytningen til en trigger, bliver hver handling tildelt et "rækkefølge"
 <tr><td>i</td><td>minutes (2 digits, e.g. 00..59)</td></tr>
 <tr><td>s</td><td>seconds (2 digits, e.g. 00..59)</td></tr>
 </table>~~',
-
 	'UI:Button:Remove' => 'Remove~~',
 	'UI:AddAnExisting_Class' => 'Add objects of type %1$s...~~',
 	'UI:SelectionOf_Class' => 'Selection of objects of type %1$s~~',
-
 	'UI:AboutBox' => 'About '.ITOP_APPLICATION_SHORT.'...~~',
 	'UI:About:Title' => 'About '.ITOP_APPLICATION_SHORT.'~~',
 	'UI:About:DataModel' => 'Data model~~',
@@ -1431,12 +1444,10 @@ Ved tilknytningen til en trigger, bliver hver handling tildelt et "rækkefølge"
 	'UI:About:ManualExtensionSource' => 'Extension~~',
 	'UI:About:Extension_Version' => 'Version: %1$s~~',
 	'UI:About:RemoteExtensionSource' => 'Data~~',
-
 	'UI:DisconnectedDlgMessage' => 'You are disconnected. You must identify yourself to continue using the application.~~',
 	'UI:DisconnectedDlgTitle' => 'Warning!~~',
 	'UI:LoginAgain' => 'Login again~~',
 	'UI:StayOnThePage' => 'Stay on this page~~',
-
 	'ExcelExporter:ExportMenu' => 'Excel Export...~~',
 	'ExcelExporter:ExportDialogTitle' => 'Excel Export~~',
 	'ExcelExporter:ExportButton' => 'Export~~',
@@ -1449,7 +1460,6 @@ Ved tilknytningen til en trigger, bliver hver handling tildelt et "rækkefølge"
 	'ExcelExport:Statistics' => 'Statistics~~',
 	'portal:legacy_portal' => 'End-User Portal~~',
 	'portal:backoffice' => ITOP_APPLICATION_SHORT.' Back-Office User Interface~~',
-
 	'UI:CurrentObjectIsLockedBy_User' => 'The object is locked since it is currently being modified by %1$s.~~',
 	'UI:CurrentObjectIsLockedBy_User_Explanation' => 'The object is currently being modified by %1$s. Your modifications cannot be submitted since they would be overwritten.~~',
 	'UI:CurrentObjectIsSoftLockedBy_User' => 'The object is currently being modified by %1$s. You\'ll be able to submit your modifications once they have finished.~~',
@@ -1457,43 +1467,36 @@ Ved tilknytningen til en trigger, bliver hver handling tildelt et "rækkefølge"
 	'UI:CurrentObjectLockExpired_Explanation' => 'The lock to prevent concurrent modifications of the object has expired. You can no longer submit your modification since other users are now allowed to modify this object.~~',
 	'UI:ConcurrentLockKilled' => 'The lock preventing modifications on the current object has been deleted.~~',
 	'UI:Menu:KillConcurrentLock' => 'Kill the Concurrent Modification Lock !~~',
-
 	'UI:Menu:ExportPDF' => 'Export as PDF...~~',
 	'UI:Menu:PrintableVersion' => 'Printer friendly version~~',
-
 	'UI:BrowseInlineImages' => 'Browse images...~~',
 	'UI:UploadInlineImageLegend' => 'Upload a new image~~',
 	'UI:SelectInlineImageToUpload' => 'Select the image to upload~~',
 	'UI:AvailableInlineImagesLegend' => 'Available images~~',
 	'UI:NoInlineImage' => 'There is no image available on the server. Use the "Browse" button above to select an image from your computer and upload it to the server.~~',
-
 	'UI:ToggleFullScreen' => 'Toggle Maximize / Minimize~~',
 	'UI:Button:ResetImage' => 'Recover the previous image~~',
 	'UI:Button:RemoveImage' => 'Remove the image~~',
 	'UI:Button:UploadImage' => 'Upload an image from the disk~~',
 	'UI:UploadNotSupportedInThisMode' => 'The modification of images or files is not supported in this mode.~~',
-
 	'UI:Button:RemoveDocument' => 'Remove the document~~',
-
-	// Search form
+    // Search form
 	'UI:Search:Toggle' => 'Minimize / Expand~~',
 	'UI:Search:AutoSubmit:DisabledHint' => 'Auto submit has been disabled for this class~~',
 	'UI:Search:Obsolescence:DisabledHint' => 'Based on your preferences, obsolete data are hidden~~',
 	'UI:Search:NoAutoSubmit:ExplainText' => 'Add some criterion on the search box or click the search button to view the objects.~~',
 	'UI:Search:Criterion:MoreMenu:AddCriteria' => 'Add new criteria~~',
-	// - Add new criteria button
+    // - Add new criteria button
 	'UI:Search:AddCriteria:List:RecentlyUsed:Title' => 'Recently used~~',
 	'UI:Search:AddCriteria:List:MostPopular:Title' => 'Most popular~~',
 	'UI:Search:AddCriteria:List:Others:Title' => 'Others~~',
 	'UI:Search:AddCriteria:List:RecentlyUsed:Placeholder' => 'None yet.~~',
-
-	// - Criteria header actions
+    // - Criteria header actions
 	'UI:Search:Criteria:Toggle' => 'Minimize / Expand~~',
 	'UI:Search:Criteria:Remove' => 'Remove~~',
 	'UI:Search:Criteria:Locked' => 'Locked~~',
-
-	// - Criteria titles
-	//   - Default widget
+    // - Criteria titles
+    //   - Default widget
 	'UI:Search:Criteria:Title:Default:Any' => '%1$s: Any~~',
 	'UI:Search:Criteria:Title:Default:Empty' => '%1$s is empty~~',
 	'UI:Search:Criteria:Title:Default:NotEmpty' => '%1$s is not empty~~',
@@ -1515,53 +1518,57 @@ Ved tilknytningen til en trigger, bliver hver handling tildelt et "rækkefølge"
 	'UI:Search:Criteria:Title:Default:Between:All' => '%1$s: Any~~',
 	'UI:Search:Criteria:Title:Default:Between:From' => '%1$s from %2$s~~',
 	'UI:Search:Criteria:Title:Default:Between:Until' => '%1$s up to %2$s~~',
-	//   - Numeric widget
-	//   None yet
-	//   - DateTime widget
+    //   - Numeric widget
+    //   None yet
+    //   - DateTime widget
 	'UI:Search:Criteria:Title:DateTime:Between' => '%2$s <= 1$s <= %3$s~~',
-	//   - Enum widget
+    //   - Enum widget
 	'UI:Search:Criteria:Title:Enum:In' => '%1$s: %2$s~~',
 	'UI:Search:Criteria:Title:Enum:In:Many' => '%1$s: %2$s and %3$s others~~',
 	'UI:Search:Criteria:Title:Enum:In:All' => '%1$s: Any~~',
-	//   - TagSet widget
+    //   - TagSet widget
 	'UI:Search:Criteria:Title:TagSet:Matches' => '%1$s: %2$s~~',
-	//   - External key widget
+    //   - External key widget
 	'UI:Search:Criteria:Title:ExternalKey:Empty' => '%1$s is defined~~',
 	'UI:Search:Criteria:Title:ExternalKey:NotEmpty' => '%1$s is not defined~~',
 	'UI:Search:Criteria:Title:ExternalKey:Equals' => '%1$s %2$s~~',
 	'UI:Search:Criteria:Title:ExternalKey:In' => '%1$s: %2$s~~',
 	'UI:Search:Criteria:Title:ExternalKey:In:Many' => '%1$s: %2$s and %3$s others~~',
 	'UI:Search:Criteria:Title:ExternalKey:In:All' => '%1$s: Any~~',
-	//   - Hierarchical key widget
+    //   - Hierarchical key widget
 	'UI:Search:Criteria:Title:HierarchicalKey:Empty' => '%1$s is defined~~',
 	'UI:Search:Criteria:Title:HierarchicalKey:NotEmpty' => '%1$s is not defined~~',
 	'UI:Search:Criteria:Title:HierarchicalKey:Equals' => '%1$s %2$s~~',
 	'UI:Search:Criteria:Title:HierarchicalKey:In' => '%1$s: %2$s~~',
 	'UI:Search:Criteria:Title:HierarchicalKey:In:Many' => '%1$s: %2$s and %3$s others~~',
 	'UI:Search:Criteria:Title:HierarchicalKey:In:All' => '%1$s: Any~~',
-
-	// - Criteria operators
-	//   - Default widget
+    // - Criteria operators
+    //   - Default widget
 	'UI:Search:Criteria:Operator:Default:Empty' => 'Is empty~~',
 	'UI:Search:Criteria:Operator:Default:NotEmpty' => 'Is not empty~~',
 	'UI:Search:Criteria:Operator:Default:Equals' => 'Equals~~',
 	'UI:Search:Criteria:Operator:Default:Between' => 'Between~~',
-	//   - String widget
+    //   - String widget
 	'UI:Search:Criteria:Operator:String:Contains' => 'Contains~~',
 	'UI:Search:Criteria:Operator:String:StartsWith' => 'Starts with~~',
 	'UI:Search:Criteria:Operator:String:EndsWith' => 'Ends with~~',
 	'UI:Search:Criteria:Operator:String:RegExp' => 'Regular exp.~~',
-	//   - Numeric widget
-	'UI:Search:Criteria:Operator:Numeric:Equals' => 'Equals~~',// => '=',
-	'UI:Search:Criteria:Operator:Numeric:GreaterThan' => 'Greater~~',// => '>',
-	'UI:Search:Criteria:Operator:Numeric:GreaterThanOrEquals' => 'Greater / equals~~',// > '>=',
-	'UI:Search:Criteria:Operator:Numeric:LessThan' => 'Less~~',// => '<',
-	'UI:Search:Criteria:Operator:Numeric:LessThanOrEquals' => 'Less / equals~~',// > '<=',
-	'UI:Search:Criteria:Operator:Numeric:Different' => 'Different~~',// => '≠',
-	//   - Tag Set Widget
+    //   - Numeric widget
+	'UI:Search:Criteria:Operator:Numeric:Equals' => 'Equals~~',
+    // => '=',
+	'UI:Search:Criteria:Operator:Numeric:GreaterThan' => 'Greater~~',
+    // => '>',
+	'UI:Search:Criteria:Operator:Numeric:GreaterThanOrEquals' => 'Greater / equals~~',
+    // > '>=',
+	'UI:Search:Criteria:Operator:Numeric:LessThan' => 'Less~~',
+    // => '<',
+	'UI:Search:Criteria:Operator:Numeric:LessThanOrEquals' => 'Less / equals~~',
+    // > '<=',
+	'UI:Search:Criteria:Operator:Numeric:Different' => 'Different~~',
+    // => '≠',
+    //   - Tag Set Widget
 	'UI:Search:Criteria:Operator:TagSet:Matches' => 'Matches~~',
-
-	// - Other translations
+    // - Other translations
 	'UI:Search:Value:Filter:Placeholder' => 'Filter...~~',
 	'UI:Search:Value:Search:Placeholder' => 'Search...~~',
 	'UI:Search:Value:Autocomplete:StartTyping' => 'Start typing for possible values.~~',
@@ -1569,8 +1576,7 @@ Ved tilknytningen til en trigger, bliver hver handling tildelt et "rækkefølge"
 	'UI:Search:Value:Autocomplete:NoResult' => 'No result.~~',
 	'UI:Search:Value:Toggler:CheckAllNone' => 'Check all / none~~',
 	'UI:Search:Value:Toggler:CheckAllNoneFiltered' => 'Check all / none visibles~~',
-
-	// - Widget other translations
+    // - Widget other translations
 	'UI:Search:Criteria:Numeric:From' => 'From~~',
 	'UI:Search:Criteria:Numeric:Until' => 'To~~',
 	'UI:Search:Criteria:Numeric:PlaceholderFrom' => 'Any~~',
@@ -1584,10 +1590,8 @@ Ved tilknytningen til en trigger, bliver hver handling tildelt et "rækkefølge"
 	'UI:Search:Criteria:DateTime:PlaceholderUntil' => 'Any date~~',
 	'UI:Search:Criteria:DateTime:PlaceholderUntilTime' => 'Any date~~',
 	'UI:Search:Criteria:HierarchicalKey:ChildrenIncluded:Hint' => 'Children of the selected objects will be included.~~',
-
 	'UI:Search:Criteria:Raw:Filtered' => 'Filtered~~',
 	'UI:Search:Criteria:Raw:FilteredOn' => 'Filtered on %1$s~~',
-
 	'UI:StateChanged' => 'State changed~~',
 ));
 
@@ -1598,16 +1602,13 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Expression:Operator:AND' => ' AND ~~',
 	'Expression:Operator:OR' => ' OR ~~',
 	'Expression:Operator:=' => ': ~~',
-
 	'Expression:Unit:Short:DAY' => 'd~~',
 	'Expression:Unit:Short:WEEK' => 'w~~',
 	'Expression:Unit:Short:MONTH' => 'm~~',
 	'Expression:Unit:Short:YEAR' => 'y~~',
-
 	'Expression:Unit:Long:DAY' => 'day(s)~~',
 	'Expression:Unit:Long:HOUR' => 'hour(s)~~',
 	'Expression:Unit:Long:MINUTE' => 'minute(s)~~',
-
 	'Expression:Verb:NOW' => 'now~~',
 	'Expression:Verb:ISNULL' => ': undefined~~',
 ));
@@ -1631,46 +1632,32 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Menu:DataSources' => 'Synkroniserings Data Kilder',
 	'Menu:DataSources+' => 'All Synchronization Data Sources~~',
-	'Menu:WelcomeMenu' => 'Velkomen',
-	'Menu:WelcomeMenu+' => 'Velkommen til '.ITOP_APPLICATION_SHORT,
-	'Menu:WelcomeMenuPage' => 'Velkomen',
-	'Menu:WelcomeMenuPage+' => 'Velkommen til '.ITOP_APPLICATION_SHORT,
-	'Menu:AdminTools' => 'Admin værktøjer',
-	'Menu:AdminTools+' => 'Administration tools~~',
-	'Menu:AdminTools?' => 'Værktøjer kun tilgængelige for brugere med administrator profil',
-	'Menu:DataModelMenu' => 'Data model~~',
-	'Menu:DataModelMenu+' => 'Overview of the data model~~',
-	'Menu:ExportMenu' => 'Export~~',
-	'Menu:ExportMenu+' => 'Export the results of any query in HTML, CSV or XML~~',
-	'Menu:NotificationsMenu' => 'Notifikationer',
-	'Menu:NotificationsMenu+' => 'Configuration of the Notifications~~',
 	'Menu:AuditCategories' => 'Audit Kategorier',
 	'Menu:AuditCategories+' => 'Audit Categories~~',
 	'Menu:Notifications:Title' => 'Audit Kategorier',
-	'Menu:RunQueriesMenu'         => 'Kør forespørgsler',
-	'Menu:RunQueriesMenu+'        => 'Run any query~~',
-	'Menu:QueryMenu'              => 'Query parlør',
-	'Menu:QueryMenu+'             => 'Query phrasebook~~',
-	'Menu:UniversalSearchMenu'    => 'Universal Søgning',
-	'Menu:UniversalSearchMenu+'   => 'Search for anything...~~',
-	'Menu:UserManagementMenu'     => 'Bruger styring',
-	'Menu:UserManagementMenu+'    => 'User management~~',
-	'Menu:ProfilesMenu'           => 'Profiler',
-	'Menu:ProfilesMenu+'          => 'Profiles~~',
-	'Menu:ProfilesMenu:Title'     => 'Profiler',
-	'Menu:UserAccountsMenu'       => 'Bruger konti',
-	'Menu:UserAccountsMenu+'      => 'User accounts~~',
+	'Menu:AuditCategories:Title' => 'Audit configuration~~',
+	'Menu:RunQueriesMenu' => 'Kør forespørgsler',
+	'Menu:RunQueriesMenu+' => 'Run any query~~',
+	'Menu:QueryMenu' => 'Query parlør',
+	'Menu:QueryMenu+' => 'Query phrasebook~~',
+	'Menu:UniversalSearchMenu' => 'Universal Søgning',
+	'Menu:UniversalSearchMenu+' => 'Search for anything...~~',
+	'Menu:UserManagementMenu' => 'Bruger styring',
+	'Menu:UserManagementMenu+' => 'User management~~',
+	'Menu:ProfilesMenu' => 'Profiler',
+	'Menu:ProfilesMenu+' => 'Profiles~~',
+	'Menu:ProfilesMenu:Title' => 'Profiler',
+	'Menu:UserAccountsMenu' => 'Bruger konti',
+	'Menu:UserAccountsMenu+' => 'User accounts~~',
 	'Menu:UserAccountsMenu:Title' => 'Bruger konti',
-	'Menu:MyShortcuts'            => 'Mine Genveje',
-	'Menu:UserManagement'         => 'User management~~',
-	'Menu:Queries'                => 'Queries~~',
-	'Menu:ConfigurationTools'     => 'Configuration~~',
+	'Menu:UserManagement' => 'User management~~',
+	'Menu:Queries' => 'Queries~~',
+	'Menu:ConfigurationTools' => 'Configuration~~'
 ));
-
 // Additional language entries not present in English dict
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'UI:Toggle:StandardDashboard' => 'Standard~~',
-	'UI:Toggle:CustomDashboard'   => 'Custom~~',
-	'UI:Dashboard:Edit'           => 'Rediger denne side...',
-	'UI:Dashboard:Revert'         => 'Tilbage til original version...',
+	'UI:Toggle:CustomDashboard' => 'Custom~~',
+	'UI:Dashboard:Edit' => 'Rediger denne side...',
+	'UI:Dashboard:Revert' => 'Tilbage til original version...'
 ));
diff --git a/dictionaries/de.dictionary.itop.core.php b/dictionaries/de.dictionary.itop.core.php
index 7be532c847..0b1da549f0 100644
--- a/dictionaries/de.dictionary.itop.core.php
+++ b/dictionaries/de.dictionary.itop.core.php
@@ -22,57 +22,42 @@
  */
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Core:DeletedObjectLabel' => '%1s (gelöscht)',
-	'Core:DeletedObjectTip'   => 'Das Objekt wurde gelöscht am %1$s (%2$s)',
-
+	'Core:DeletedObjectTip' => 'Das Objekt wurde gelöscht am %1$s (%2$s)',
 	'Core:UnknownObjectLabel' => 'Objekt nicht gefunden (Klasse: %1$s, id: %2$d)',
-	'Core:UnknownObjectTip'   => 'Das Objekt konnte nicht gefunden werden. Es könnte bereits vor einiger Zeit gelöscht worden sein und das Log wurde seither bereinigt.',
-
+	'Core:UnknownObjectTip' => 'Das Objekt konnte nicht gefunden werden. Es könnte bereits vor einiger Zeit gelöscht worden sein und das Log wurde seither bereinigt.',
 	'Core:UniquenessDefaultError' => 'Eindeutigkeitsfehler: \'%1$s\'',
-	'Core:CheckConsistencyError'  => 'Consistency rules not followed: %1$s~~',
-	'Core:CheckValueError'        => 'Unexpected value for attribute \'%1$s\' (%2$s) : %3$s~~',
-
-	'Core:AttributeLinkedSet'  => 'Array von Objekten',
+	'Core:CheckConsistencyError' => 'Integritätsregeln werden nicht eingehalten: %1$s',
+	'Core:CheckValueError' => 'Ungültiger Attributwert \'%1$s\' (%2$s) : %3$s',
+	'Core:AttributeLinkedSet' => 'Array von Objekten',
 	'Core:AttributeLinkedSet+' => 'Beliebige Art von Objekten der [subclass] der selben Klasse',
-
 	'Core:AttributeLinkedSetDuplicatesFound' => 'Dubletten im \'%1$s\' Feld: %2$s',
-
-	'Core:AttributeDashboard'  => 'Dashboard',
+	'Core:AttributeDashboard' => 'Dashboard',
 	'Core:AttributeDashboard+' => '',
-
-	'Core:AttributePhoneNumber'  => 'Telefonnummer',
+	'Core:AttributePhoneNumber' => 'Telefonnummer',
 	'Core:AttributePhoneNumber+' => '',
-
 	'Core:AttributeObsolescenceDate' => 'Obsolet seit',
 	'Core:AttributeObsolescenceDate+' => 'Datum, an dem das Objekt auf "obsolet" gesetzt wurde',
-
 	'Core:AttributeTagSet' => 'Liste von Tags',
 	'Core:AttributeTagSet+' => 'List von Tags',
 	'Core:AttributeSet:placeholder' => 'Zum Hinzufügen klicken',
 	'Core:AttributeClassAttCodeSet:ItemLabel:AttributeFromClass' => '%1$s (%2$s)',
 	'Core:AttributeClassAttCodeSet:ItemLabel:AttributeFromOneChildClass' => '%1$s (%2$s von %3$s)',
 	'Core:AttributeClassAttCodeSet:ItemLabel:AttributeFromSeveralChildClasses' => '%1$s (%2$s von Kindklassen)',
-
 	'Core:AttributeCaseLog' => 'Log',
 	'Core:AttributeCaseLog+' => '',
-
 	'Core:AttributeMetaEnum' => 'Berechnetes Enum',
 	'Core:AttributeMetaEnum+' => 'Liste berechneter alphanumerischer Strings',
-
 	'Core:AttributeLinkedSetIndirect' => 'Array von Objekten (N-N)',
-	'Core:AttributeLinkedSetIndirect+' => 'Beliebige Art von Objekten der [subclass] der selben Klasse',
-
+	'Core:AttributeLinkedSetIndirect+' => 'Liste von Objekten einer Klasse, die über eine Zwischenklasse mit dem aktuellen Objekt verbunden sind.',
 	'Core:AttributeInteger' => 'Integer',
 	'Core:AttributeInteger+' => 'Numerischer Wert (kann negativ sein)',
-
 	'Core:AttributeDecimal' => 'Decimal',
 	'Core:AttributeDecimal+' => 'Dezimaler Wert (kann negativ sein)',
-
 	'Core:AttributeBoolean' => 'Boolean',
 	'Core:AttributeBoolean+' => 'Boolscher Wert',
 	'Core:AttributeBoolean/Value:null' => '',
 	'Core:AttributeBoolean/Value:yes' => 'Ja',
 	'Core:AttributeBoolean/Value:no' => 'Nein',
-
 	'Core:AttributeArchiveFlag' => 'Archiv Flag',
 	'Core:AttributeArchiveFlag/Value:yes' => 'Ja',
 	'Core:AttributeArchiveFlag/Value:yes+' => 'Dieses Objekt ist nur im Archiv Modus sichtbar',
@@ -81,7 +66,6 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Core:AttributeArchiveFlag/Label+' => '',
 	'Core:AttributeArchiveDate/Label' => 'Archivierungsdatum',
 	'Core:AttributeArchiveDate/Label+' => '',
-
 	'Core:AttributeObsolescenceFlag' => 'Obsoleszenz-Flag',
 	'Core:AttributeObsolescenceFlag/Value:yes' => 'Ja',
 	'Core:AttributeObsolescenceFlag/Value:yes+' => 'Dieses Objekt wird aus der Impact Analyse ausgeschlossen und in den Suchergebnissen versteckt',
@@ -90,54 +74,38 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Core:AttributeObsolescenceFlag/Label+' => 'Dynamisch berechnet wegen anderer Attribute',
 	'Core:AttributeObsolescenceDate/Label' => 'Obsoleszenz-Datum',
 	'Core:AttributeObsolescenceDate/Label+' => 'Ungefähres Datum, ab dem das Objekt als obsolet betrachtet wird',
-
 	'Core:AttributeString' => 'String',
 	'Core:AttributeString+' => 'Alphanumerischer String',
-
 	'Core:AttributeClass' => 'Class',
 	'Core:AttributeClass+' => '',
-
 	'Core:AttributeApplicationLanguage' => 'Benutzersprache',
 	'Core:AttributeApplicationLanguage+' => 'Sprache und Land (DE DE)',
-
 	'Core:AttributeFinalClass' => 'Class (auto)',
 	'Core:AttributeFinalClass+' => 'Echte Klasse des Objekts (automatisch erstellt durch den Core)',
-
 	'Core:AttributePassword' => 'Passwort',
 	'Core:AttributePassword+' => 'Passwort eines externen Geräts',
-
 	'Core:AttributeEncryptedString' => 'Verschlüsselter String',
 	'Core:AttributeEncryptedString+' => 'mit einem lokalen Schüssel verschlüsselter String',
 	'Core:AttributeEncryptUnknownLibrary' => 'Angegebene Library zur Verschlüsslung (%1$s) ist unbekannt',
 	'Core:AttributeEncryptFailedToDecrypt' => '** Entschlüsselungsfehler **',
-
 	'Core:AttributeText' => 'Text',
 	'Core:AttributeText+' => 'Mehrzeiliger String',
-
 	'Core:AttributeHTML' => 'HTML',
 	'Core:AttributeHTML+' => 'HTML-String',
-
 	'Core:AttributeEmailAddress' => 'E-Mail-Adresse',
 	'Core:AttributeEmailAddress+' => 'E-Mail-Adresse',
-
 	'Core:AttributeIPAddress' => 'IP-Adresse',
 	'Core:AttributeIPAddress+' => 'IP-Adresse',
-
 	'Core:AttributeOQL' => 'OQL',
 	'Core:AttributeOQL+' => 'Object-Query-Language-Ausdruck',
-
 	'Core:AttributeEnum' => 'Enum',
 	'Core:AttributeEnum+' => 'Liste vordefinierter alphanumerischer Strings',
-
 	'Core:AttributeTemplateString' => 'Vorlagen-String',
 	'Core:AttributeTemplateString+' => 'String mit Platzhaltern',
-
 	'Core:AttributeTemplateText' => 'Vorlagen-Text',
 	'Core:AttributeTemplateText+' => 'Text mit Platzhaltern',
-
 	'Core:AttributeTemplateHTML' => 'Vorlagen-HTML',
 	'Core:AttributeTemplateHTML+' => 'HTML mit Platzhaltern',
-
 	'Core:AttributeDateTime' => 'Datum/Uhrzeit',
 	'Core:AttributeDateTime+' => 'Datum und Uhrzeit (Jahr-Monat-Tag hh:mm:ss)',
 	'Core:AttributeDateTime?SmartSearch' => '
@@ -155,7 +123,6 @@ Operatoren:<br/>
 <p>
 Falls der Zeit-Wert weggelassen wird, ist der Standardwert 00:00:00
 </p>',
-
 	'Core:AttributeDate' => 'Datum',
 	'Core:AttributeDate+' => 'Datum (Jahr-Monat-Tag)',
 	'Core:AttributeDate?SmartSearch' => '
@@ -170,43 +137,30 @@ Operatoren:<br/>
 	<b>&lt;</b><em>Datum</em><br/>
 	<b>[</b><em>Datum</em>,<em>Datum</em><b>]</b>
 </p>',
-
 	'Core:AttributeDeadline' => 'Frist',
 	'Core:AttributeDeadline+' => 'relativ zur aktuellen Zeit angezeigtes Datum',
-
 	'Core:AttributeExternalKey' => 'Externer Schlüssel',
 	'Core:AttributeExternalKey+' => 'Externer (oder fremder) Schlüssel',
-
 	'Core:AttributeHierarchicalKey' => 'Hierarchischer Key',
 	'Core:AttributeHierarchicalKey+' => 'Externer Key oder Foreign Key zum Parent',
-
 	'Core:AttributeExternalField' => 'Externes Feld',
 	'Core:AttributeExternalField+' => 'durch einen externen Schlüssel abgebildetes Feld',
-
 	'Core:AttributeURL' => 'URL',
 	'Core:AttributeURL+' => 'Absolute oder relative URL als Text-String',
-
 	'Core:AttributeBlob' => 'Blob',
 	'Core:AttributeBlob+' => 'Beliebiger binärer Inhalt (Dokument)',
-
 	'Core:AttributeOneWayPassword' => 'gehashtes Passwort',
 	'Core:AttributeOneWayPassword+' => '',
-
 	'Core:AttributeTable' => 'Tabelle',
 	'Core:AttributeTable+' => 'Indiziertes Array mit zwei Dimensionen',
-
 	'Core:AttributePropertySet' => 'Eigenschaften',
 	'Core:AttributePropertySet+' => 'Liste typloser Eigenschaften (Name und Wert)',
-
 	'Core:AttributeFriendlyName' => 'Friendly name',
 	'Core:AttributeFriendlyName+' => '',
-
 	'Core:FriendlyName-Label' => 'Voller Name (Friendly Name)',
 	'Core:FriendlyName-Description' => 'Friendly name',
-
 	'Core:AttributeTag' => 'Tags',
 	'Core:AttributeTag+' => '',
-
 	'Core:Context=REST/JSON' => 'REST',
 	'Core:Context=Synchro' => 'Synchro',
 	'Core:Context=Setup' => 'Setup',
@@ -227,7 +181,7 @@ Operatoren:<br/>
 
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:CMDBChange' => 'Change',
-	'Class:CMDBChange+' => 'Protokollierung der Changes',
+	'Class:CMDBChange+' => 'Protokollierung der Änderungen',
 	'Class:CMDBChange/Attribute:date' => 'Datum',
 	'Class:CMDBChange/Attribute:date+' => 'Datum und Uhrzeit der Änderungen',
 	'Class:CMDBChange/Attribute:userinfo' => 'Sonstige Informationen',
@@ -248,7 +202,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:CMDBChangeOp' => 'Change-Operation',
-	'Class:CMDBChangeOp+' => 'Protokoll der Change-Operation',
+	'Class:CMDBChangeOp+' => 'Protokoll einer Änderung',
 	'Class:CMDBChangeOp/Attribute:change' => 'Change',
 	'Class:CMDBChangeOp/Attribute:change+' => '',
 	'Class:CMDBChangeOp/Attribute:date' => 'Datum',
@@ -375,7 +329,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:EventNotification/Attribute:action_id' => 'Aktion',
 	'Class:EventNotification/Attribute:action_id+' => '',
 	'Class:EventNotification/Attribute:object_id' => 'Objekt-ID',
-	'Class:EventNotification/Attribute:object_id+' => 'Objekt-ID (Klasse, die von Trigger definiert wurde?)',
+	'Class:EventNotification/Attribute:object_id+' => '',
 ));
 
 //
@@ -484,6 +438,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:Action' => 'Benutzerdefinierte Aktion',
 	'Class:Action+' => 'Benutzerdefinierte Aktionen',
+	'Class:Action/ComplementaryName' => '%1$s: %2$s',
 	'Class:Action/Attribute:name' => 'Name',
 	'Class:Action/Attribute:name+' => '',
 	'Class:Action/Attribute:description' => 'Beschreibung',
@@ -499,7 +454,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:Action/Attribute:trigger_list' => 'Zugehörige Trigger',
 	'Class:Action/Attribute:trigger_list+' => 'Trigger, die mit dieser Aktion verknüpft sind',
 	'Class:Action/Attribute:finalclass' => 'Typ',
-	'Class:Action/Attribute:finalclass+' => '',
+	'Class:Action/Attribute:finalclass+' => 'Name der instanziierbaren Klasse',
 	'Action:WarningNoTriggerLinked' => 'Warnung, es ist kein Trigger mit dieser Aktion verknüpft. Die Aktion ist nicht aktiv solange nicht mindestens 1 Trigger verknüpft ist.',
 ));
 
@@ -526,7 +481,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:ActionEmail/Attribute:test_recipient' => 'Testempfänger',
 	'Class:ActionEmail/Attribute:test_recipient+' => 'Empfänger im Fall eines "Test"-Status',
 	'Class:ActionEmail/Attribute:from' => 'Von (E-Mail)',
-	'Class:ActionEmail/Attribute:from+' => 'Absenderad­resse wird im E-Mail-Header mitgesendet',
+	'Class:ActionEmail/Attribute:from+' => 'Absenderadresse wird im E-Mail-Header mitgesendet',
 	'Class:ActionEmail/Attribute:from_label' => 'Von (Label)',
 	'Class:ActionEmail/Attribute:from_label+' => 'Absendername wird im E-Mail-Header mitgesendet',
 	'Class:ActionEmail/Attribute:reply_to' => 'Antworten an (E-Mail)',
@@ -541,8 +496,8 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:ActionEmail/Attribute:bcc+' => '',
 	'Class:ActionEmail/Attribute:subject' => 'Betreff',
 	'Class:ActionEmail/Attribute:subject+' => 'Betreff der E-Mail',
-	'Class:ActionEmail/Attribute:body' => 'Inhalt der Nachricht',
-	'Class:ActionEmail/Attribute:body+' => '',
+	'Class:ActionEmail/Attribute:body' => 'Nachricht',
+	'Class:ActionEmail/Attribute:body+' => 'Inhalt der Nachricht',
 	'Class:ActionEmail/Attribute:importance' => 'Priorität',
 	'Class:ActionEmail/Attribute:importance+' => 'Prioritätseinstufung',
 	'Class:ActionEmail/Attribute:importance/Value:low' => 'niedrig',
@@ -551,6 +506,22 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:ActionEmail/Attribute:importance/Value:normal+' => '',
 	'Class:ActionEmail/Attribute:importance/Value:high' => 'hoch',
 	'Class:ActionEmail/Attribute:importance/Value:high+' => '',
+	'Class:ActionEmail/Attribute:language' => 'Sprache',
+	'Class:ActionEmail/Attribute:language+' => 'Sprache, die für die Platzhalter ($xxx$) in der Nachricht verwendet wird (Status, Dringlichkeit, Priorität, etc.)',
+	'Class:ActionEmail/Attribute:html_template' => 'HTML-Template',
+	'Class:ActionEmail/Attribute:html_template+' => 'Optional: HTML-Vorlage, die den Inhalt des Feldes \'Nachricht\' einbettet, nützlich für maßgeschneiderte Layouts (in der Vorlage ersetzt der Inhalt des Feldes \'Nachricht\' das Schlüsselwort $content$).',
+	'Class:ActionEmail/Attribute:ignore_notify' => 'Ignorieren des Benachrichtigen-Flags',
+	'Class:ActionEmail/Attribute:ignore_notify+' => 'Falls dieser Wert auf "Ja" gesetzt ist, hat das Kennzeichen "Benachrichtigung" bei Kontakten keine Auswirkungen.',
+	'Class:ActionEmail/Attribute:ignore_notify/Value:no' => 'Nein',
+	'Class:ActionEmail/Attribute:ignore_notify/Value:yes' => 'Ja',
+	'ActionEmail:main' => 'Nachricht',
+	'ActionEmail:trigger' => 'Trigger',
+	'ActionEmail:recipients' => 'Kontakte',
+	'ActionEmail:preview_tab' => 'Vorschau',
+	'ActionEmail:preview_tab+' => 'Vorschau der E-Mail-Vorlage',
+	'ActionEmail:preview_warning' => 'Die tatsächliche E-Mail kann im E-Mail-Client anders aussehen als diese Vorschau in Ihrem Browser.',
+	'ActionEmail:preview_more_info' => 'Weitere Informationen zu den CSS-Funktionen, die von den verschiedenen E-Mail-Clients unterstützt werden, finden Sie unter %1$s',
+	'ActionEmail:content_placeholder_missing' => 'Der Platzhalter "%1$s" wurde in der HTML-Vorlage nicht gefunden. Der Inhalt des Feldes "%2$s" wird nicht in den generierten E-Mails enthalten sein.',
 ));
 
 //
@@ -560,6 +531,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:Trigger' => 'Trigger',
 	'Class:Trigger+' => 'Custom event handler',
+	'Class:Trigger/ComplementaryName' => '%1$s, %2$s',
 	'Class:Trigger/Attribute:description' => 'Beschreibung',
 	'Class:Trigger/Attribute:description+' => 'Kurzbeschreibung',
 	'Class:Trigger/Attribute:action_list' => 'Verbundene Trigger-Aktionen',
@@ -568,6 +540,8 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:Trigger/Attribute:finalclass+' => '',
 	'Class:Trigger/Attribute:context' => 'Kontext',
 	'Class:Trigger/Attribute:context+' => 'Kontext, der diesen Trigger auslösen lassen darf',
+	'Class:Trigger/Attribute:complement' => 'Zusätzliche Informationen',
+	'Class:Trigger/Attribute:complement+' => 'Weitere Informationen in englischer Sprache, die durch diesen Trigger bereitgestellt werden',
 ));
 
 //
@@ -663,6 +637,17 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:TriggerOnObjectMention/Attribute:mentioned_filter+' => 'Einschränkung der Objekte welche diesen Trigger aktivieren. Wenn leer, wird er von jedem Objekt (beliebige Klasse) aktiviert.',
 ));
 
+//
+// Class: TriggerOnAttributeBlobDownload
+//
+
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'Class:TriggerOnAttributeBlobDownload' => 'Trigger (beim Herunterladen einer Datei eines Objekts)',
+	'Class:TriggerOnAttributeBlobDownload+' => 'Trigger für das Herunterladen einer Datei (Blob) der angegebenen Klasse oder einer Unterklasse',
+	'Class:TriggerOnAttributeBlobDownload/Attribute:target_attcodes' => 'Ziel-Felder',
+	'Class:TriggerOnAttributeBlobDownload/Attribute:target_attcodes+' => '',
+));
+
 //
 // Class: TriggerOnThresholdReached
 //
@@ -699,11 +684,13 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 // Synchro Data Source
 //
 Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'Class:SynchroDataSource' => 'Synchronisations-Datenquelle',
 	'Class:SynchroDataSource/Attribute:name' => 'Name',
 	'Class:SynchroDataSource/Attribute:name+' => '',
 	'Class:SynchroDataSource/Attribute:description' => 'Beschreibung',
 	'Class:SynchroDataSource/Attribute:status' => 'Status',
 	'Class:SynchroDataSource/Attribute:scope_class' => 'Ziel-Klasse',
+	'Class:SynchroDataSource/Attribute:scope_class+' => 'Eine Synchro-Datenquelle kann nur eine '.ITOP_APPLICATION_SHORT.'-Klasse befüllen.',
 	'Class:SynchroDataSource/Attribute:user_id' => 'Benutzer',
 	'Class:SynchroDataSource/Attribute:notify_contact_id' => 'Zu benachrichtigender Kontakt',
 	'Class:SynchroDataSource/Attribute:notify_contact_id+' => 'Kontakt, der im Fehlerfall benachrichtigt werden muss',
@@ -712,6 +699,8 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:SynchroDataSource/Attribute:url_application' => 'Hyperlink zur Applikation',
 	'Class:SynchroDataSource/Attribute:url_application+' => 'Hyperlink zum '.ITOP_APPLICATION_SHORT.' Objekt in der externen Applikation mit der '.ITOP_APPLICATION_SHORT.' synchronisiert wird (falls anwendbar). Mögliche Platzhalter: $this->attribute$ und $replica->primary_key$',
 	'Class:SynchroDataSource/Attribute:reconciliation_policy' => 'Abgleichsvorgehen',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy+' => '"Attribute benutzen": Das '.ITOP_APPLICATION_SHORT.'-Objekt stimmt mit den Werten der Replica für jedes Synchro-Attribut überein, das für den Abgleich gekennzeichnet ist.
+"Feld primary_key benutzen": Die Spalte primary_key des Replicas soll den Bezeichner des '.ITOP_APPLICATION_SHORT.'-Objekts enthalten.',
 	'Class:SynchroDataSource/Attribute:full_load_periodicity' => 'Intervall zwischen zwei vollständigen Reloads',
 	'Class:SynchroDataSource/Attribute:full_load_periodicity+' => 'Ein vollständiger Reload des gesamten Datenbestands muss mindestens in diesem Intervall erfolgen',
 	'Class:SynchroDataSource/Attribute:action_on_zero' => 'Verhalten bei keinen Treffern',
@@ -731,6 +720,33 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:SynchroDataSource/Attribute:delete_policy_retention+' => 'Zeitraum, nach dem ein obsoletes Objekt endgültig gelöscht wird',
 	'Class:SynchroDataSource/Attribute:database_table_name' => 'Datenbanktabelle',
 	'Class:SynchroDataSource/Attribute:database_table_name+' => 'Name der Tabelle, die die Speicherung der Daten aus dieser Datenquelle enthält. Ein Default-Name wird automatisch berechnet, wenn dieses Feld leer gelassen wird.',
+	'Class:SynchroDataSource/Attribute:status/Value:implementation' => 'Implementation',
+	'Class:SynchroDataSource/Attribute:status/Value:obsolete' => 'Obsolet',
+	'Class:SynchroDataSource/Attribute:status/Value:production' => 'Produktion',
+	'Class:SynchroDataSource/Attribute:scope_restriction' => 'Anwendungsbereich',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_attributes' => 'Attribute benutzen',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_primary_key' => 'Feld primary_key benutzen',
+	'Class:SynchroDataSource/Attribute:action_on_zero/Value:create' => 'Erzeugen',
+	'Class:SynchroDataSource/Attribute:action_on_zero/Value:error' => 'Fehler',
+	'Class:SynchroDataSource/Attribute:action_on_one/Value:error' => 'Fehler',
+	'Class:SynchroDataSource/Attribute:action_on_one/Value:update' => 'Update',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:create' => 'Erzeugen',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:error' => 'Fehler',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:take_first' => 'Ersten Treffer benutzen',
+	'Class:SynchroDataSource/Attribute:delete_policy' => 'Löschrichtlinie',
+	'Class:SynchroDataSource/Attribute:delete_policy+' => 'Vorgehen wenn eine Replik obsolet ist:
+"Ignorieren": Nichts tun, das zugehörige Objekt verbleibt unverändert in '.ITOP_APPLICATION_SHORT.'.
+"Löschen": Löschen des zugehörigen Objekts in '.ITOP_APPLICATION_SHORT.' (und der Replica in der Datentabelle).
+"Update": Aktualisierung des zugehörigen Objekts gemäß den "Update-Regeln".
+"Update, danach Löschen": Die "Update-Regeln" anwenden. Wenn die Aufbewahrungsdauer abgelaufen ist, "Löschen" durchführen.',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:delete' => 'Löschen',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:ignore' => 'Ignorieren',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:update' => 'Update',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:update_then_delete' => 'Update, danach Löschen',
+	'Class:SynchroDataSource/Attribute:attribute_list' => 'Liste der Attribute',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:administrators' => 'Nur Administratoren',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:everybody' => 'Jeder darf solche Objekte löschen',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:nobody' => 'Niemand',
 	'SynchroDataSource:Description' => 'Beschreibung',
 	'SynchroDataSource:Reconciliation' => 'Suche &amp; Abgleich',
 	'SynchroDataSource:Deletion' => 'Löschregeln',
@@ -755,8 +771,10 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Core:Synchro:NeverRun' => 'Synchronisation noch nicht erfolgt. Kein Protokoll verfügbar.',
 	'Core:Synchro:SynchroEndedOn_Date' => 'Die letzte Synchronisation endete um %1$s.',
 	'Core:Synchro:SynchroRunningStartedOn_Date' => 'Die Synchronisation, die um %1$s gestartet wurde, läuft noch ...',
-	'Menu:DataSources' => 'Datenquellen für die Synchronisation', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:DataSources+' => 'Alle Datenquellen für die Synchronisation', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataSources' => 'Datenquellen für die Synchronisation',
+    // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataSources+' => 'Alle Datenquellen für die Synchronisation',
+    // Duplicated into itop-welcome-itil (will be removed from here...)
 	'Core:Synchro:label_repl_ignored' => 'Ignoriert (%1$s)',
 	'Core:Synchro:label_repl_disappeared' => 'Verschwunden (%1$s)',
 	'Core:Synchro:label_repl_existing' => 'Vorhanden (%1$s)',
@@ -820,29 +838,6 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:CMDBChangeOpSetAttributeEncrypted/Attribute:prevstring' => 'Vorheriger Wert',
 	'Class:CMDBChangeOpSetAttributeCaseLog' => 'Fall-Protokoll',
 	'Class:CMDBChangeOpSetAttributeCaseLog/Attribute:lastentry' => 'letzter Eintrag',
-	'Class:SynchroDataSource' => 'Synchronisations-Datenquelle',
-	'Class:SynchroDataSource/Attribute:status/Value:implementation' => 'Implementation',
-	'Class:SynchroDataSource/Attribute:status/Value:obsolete' => 'Obsolet',
-	'Class:SynchroDataSource/Attribute:status/Value:production' => 'Produktion',
-	'Class:SynchroDataSource/Attribute:scope_restriction' => 'Anwendungsbereich',
-	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_attributes' => 'Attribute benutzen',
-	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_primary_key' => 'Feld primary_key benutzen',
-	'Class:SynchroDataSource/Attribute:action_on_zero/Value:create' => 'Erzeugen',
-	'Class:SynchroDataSource/Attribute:action_on_zero/Value:error' => 'Fehler',
-	'Class:SynchroDataSource/Attribute:action_on_one/Value:error' => 'Fehler',
-	'Class:SynchroDataSource/Attribute:action_on_one/Value:update' => 'Update',
-	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:create' => 'Erzeugen',
-	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:error' => 'Fehler',
-	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:take_first' => 'Ersten Treffer benutzen',
-	'Class:SynchroDataSource/Attribute:delete_policy' => 'Löschrichtlinie',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:delete' => 'Löschen',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:ignore' => 'Ignorieren',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:update' => 'Update',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:update_then_delete' => 'Update, danach Löschen',
-	'Class:SynchroDataSource/Attribute:attribute_list' => 'Liste der Attribute',
-	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:administrators' => 'Nur Administratoren',
-	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:everybody' => 'Jeder darf solche Objekte löschen',
-	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:nobody' => 'Niemand',
 	'Class:SynchroAttribute' => 'Synchronisations-Attribut',
 	'Class:SynchroAttribute/Attribute:sync_source_id' => 'Synchronisations-Datenquelle',
 	'Class:SynchroAttribute/Attribute:attcode' => 'Attributs-Code',
@@ -903,19 +898,16 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:appUserPreferences/Attribute:preferences' => 'Voreinstellungen',
 	'Core:ExecProcess:Code1' => 'Falscher Befehl oder Befehl mit Fehler beendet (z.B. falscher Skriptname).',
 	'Core:ExecProcess:Code255' => 'PHP-Fehler (Parsing oder Laufzeit)',
-
-	// Attribute Duration
+    // Attribute Duration
 	'Core:Duration_Seconds' => '%1$ds',
 	'Core:Duration_Minutes_Seconds' => '%1$dmin %2$ds',
 	'Core:Duration_Hours_Minutes_Seconds' => '%1$dh %2$dmin %3$ds',
 	'Core:Duration_Days_Hours_Minutes_Seconds' => '%1$sd %2$dh %3$dmin %4$ds',
-
-	// Explain working time computing
+    // Explain working time computing
 	'Core:ExplainWTC:ElapsedTime' => 'Abgelaufene Zeit (gespeichert als \\"%1$s\\")',
 	'Core:ExplainWTC:StopWatch-TimeSpent' => 'Zeitaufwand für \\"%1$s\\"',
 	'Core:ExplainWTC:StopWatch-Deadline' => 'Deadline für \\"%1$s\\" um %2$d%%',
-
-	// Bulk export
+    // Bulk export
 	'Core:BulkExport:MissingParameter_Param' => 'Fehlender Parameter "%1$s"',
 	'Core:BulkExport:InvalidParameter_Query' => 'ungültiger Wert für den Parameter "query". Es gibt keinen Eintrag in der Query-Bibliothek, der zu der id "%1$s" korrespondiert.',
 	'Core:BulkExport:ExportFormatPrompt' => 'Exportformat:',
@@ -967,20 +959,34 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Core:BulkExport:DateTimeFormatDefault_Example' => 'Standardformat (%1$s), z.B. %2$s',
 	'Core:BulkExport:DateTimeFormatCustom_Format' => 'Angepasstes format: %1$s',
 	'Core:BulkExport:PDF:PageNumber' => 'Seite %1$s',
-	'Core:DateTime:Placeholder_d' => 'TT', // Day of the month: 2 digits (with leading zero)
-	'Core:DateTime:Placeholder_j' => 'T', // Day of the month: 1 or 2 digits (without leading zero)
-	'Core:DateTime:Placeholder_m' => 'MM', // Month on 2 digits i.e. 01-12
-	'Core:DateTime:Placeholder_n' => 'M', // Month on 1 or 2 digits 1-12
-	'Core:DateTime:Placeholder_Y' => 'JJJJ', // Year on 4 digits
-	'Core:DateTime:Placeholder_y' => 'JJ', // Year on 2 digits
-	'Core:DateTime:Placeholder_H' => 'hh', // Hour 00..23
-	'Core:DateTime:Placeholder_h' => 'h', // Hour 01..12
-	'Core:DateTime:Placeholder_G' => 'hh', // Hour 0..23
-	'Core:DateTime:Placeholder_g' => 'h', // Hour 1..12
-	'Core:DateTime:Placeholder_a' => 'am/pm', // am/pm (lowercase)
-	'Core:DateTime:Placeholder_A' => 'AM/PM', // AM/PM (uppercase)
-	'Core:DateTime:Placeholder_i' => 'mm', // minutes, 2 digits: 00..59
-	'Core:DateTime:Placeholder_s' => 'ss', // seconds, 2 digits 00..59
+	'Core:DateTime:Placeholder_d' => 'TT',
+    // Day of the month: 2 digits (with leading zero)
+	'Core:DateTime:Placeholder_j' => 'T',
+    // Day of the month: 1 or 2 digits (without leading zero)
+	'Core:DateTime:Placeholder_m' => 'MM',
+    // Month on 2 digits i.e. 01-12
+	'Core:DateTime:Placeholder_n' => 'M',
+    // Month on 1 or 2 digits 1-12
+	'Core:DateTime:Placeholder_Y' => 'JJJJ',
+    // Year on 4 digits
+	'Core:DateTime:Placeholder_y' => 'JJ',
+    // Year on 2 digits
+	'Core:DateTime:Placeholder_H' => 'hh',
+    // Hour 00..23
+	'Core:DateTime:Placeholder_h' => 'h',
+    // Hour 01..12
+	'Core:DateTime:Placeholder_G' => 'hh',
+    // Hour 0..23
+	'Core:DateTime:Placeholder_g' => 'h',
+    // Hour 1..12
+	'Core:DateTime:Placeholder_a' => 'am/pm',
+    // am/pm (lowercase)
+	'Core:DateTime:Placeholder_A' => 'AM/PM',
+    // AM/PM (uppercase)
+	'Core:DateTime:Placeholder_i' => 'mm',
+    // minutes, 2 digits: 00..59
+	'Core:DateTime:Placeholder_s' => 'ss',
+    // seconds, 2 digits 00..59
 	'Core:Validator:Default' => 'Falsches Format',
 	'Core:Validator:Mandatory' => 'Bitte dieses Feld ausfüllen',
 	'Core:Validator:MustBeInteger' => 'Muss ein Integer sein',
@@ -993,7 +999,6 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:TagSetFieldData' => '%2$s für die Klasse %1$s',
 	'Class:TagSetFieldData+' => '',
-
 	'Class:TagSetFieldData/Attribute:code' => 'Code',
 	'Class:TagSetFieldData/Attribute:code+' => 'Interner code. Muss mindestens 3 alphanumerische Zeichen enthalten',
 	'Class:TagSetFieldData/Attribute:label' => 'Label',
@@ -1003,7 +1008,6 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:TagSetFieldData/Attribute:finalclass' => 'Tag-Klasse',
 	'Class:TagSetFieldData/Attribute:obj_class' => 'Objekt-Klasse',
 	'Class:TagSetFieldData/Attribute:obj_attcode' => 'Attributscode',
-
 	'Core:TagSetFieldData:ErrorDeleteUsedTag' => 'Verwendete Tags können nicht gelöscht werden',
 	'Core:TagSetFieldData:ErrorDuplicateTagCodeOrLabel' => 'Tag-Codes oder Label müssen eindeutig sein',
 	'Core:TagSetFieldData:ErrorTagCodeSyntax' => 'Tag-Code muss zwischen 3 und %1$d alphanumerische Zeichen enthalten',
@@ -1038,7 +1042,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 // Class: BackgroundTask
 //
 Dict::Add('DE DE', 'German', 'Deutsch', array(
-	'Class:BackgroundTask' => 'Hintergrund Task',
+	'Class:BackgroundTask' => 'Hintergrund-Task',
 	'Class:BackgroundTask+' => '',
 	'Class:BackgroundTask/Attribute:class_name' => 'Klassenname',
 	'Class:BackgroundTask/Attribute:class_name+' => '',
@@ -1090,8 +1094,8 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:AsyncTask/Attribute:last_error+' => '',
 	'Class:AsyncTask/Attribute:last_attempt' => 'Letzter Versuch',
 	'Class:AsyncTask/Attribute:last_attempt+' => '',
-    'Class:AsyncTask:InvalidConfig_Class_Keys' => 'Ungültiges Format der Konfiguration für "async_task_retries[%1$s]". Erwartet wird ein Array mit den Schlüsseln: %2$s',
-    'Class:AsyncTask:InvalidConfig_Class_InvalidKey_Keys' => 'Ungültiges Format der Konfiguration für "async_task_retries[%1$s]": unerwarteter Schlüssel "%2$s". Erwartet werden nur die Schlüssel: %3$s',
+	'Class:AsyncTask:InvalidConfig_Class_Keys' => 'Ungültiges Format der Konfiguration für "async_task_retries[%1$s]". Erwartet wird ein Array mit den Schlüsseln: %2$s',
+	'Class:AsyncTask:InvalidConfig_Class_InvalidKey_Keys' => 'Ungültiges Format der Konfiguration für "async_task_retries[%1$s]": unerwarteter Schlüssel "%2$s". Erwartet werden nur die Schlüssel: %3$s',
 ));
 
 //
@@ -1129,3 +1133,6 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:ResourceSystemMenu' => 'Ressource "System Menü"',
 	'Class:ResourceSystemMenu+' => '',
 ));
+
+
+
diff --git a/dictionaries/de.dictionary.itop.ui.php b/dictionaries/de.dictionary.itop.ui.php
index 89e65b497a..3b9ed8cc9b 100644
--- a/dictionaries/de.dictionary.itop.ui.php
+++ b/dictionaries/de.dictionary.itop.ui.php
@@ -47,7 +47,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:AuditRule/Attribute:category_id' => 'Kategorie',
 	'Class:AuditRule/Attribute:category_id+' => 'Kategorie für diese Regel',
 	'Class:AuditRule/Attribute:category_name' => 'Kategorie',
-	'Class:AuditRule/Attribute:category_name+' => 'Kategoriename für diese Regel',
+	'Class:AuditRule/Attribute:category_name+' => 'Kategoriename für diese Regel'
 ));
 
 //
@@ -99,12 +99,22 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:Query/Attribute:is_template+' => 'Als Quelle für Empfänger-OQL in Benachrichtigungen nutzbar',
 	'Class:Query/Attribute:is_template/Value:yes' => 'ja',
 	'Class:Query/Attribute:is_template/Value:no' => 'nein',
+	'Class:Query/Attribute:export_count' => 'Anzahl der Exporte',
+	'Class:Query/Attribute:export_count+' => 'Zähler, der die Anzahl der Ausführungen dieser Anfrage widerspiegelt',
+	'Class:Query/Attribute:export_last_date' => 'Letzter Export',
+	'Class:Query/Attribute:export_last_date+' => 'Datum und Uhrzeit der letzten Ausführung',
+	'Class:Query/Attribute:export_last_user_id' => 'Benutzer',
+	'Class:Query/Attribute:export_last_user_id+' => 'Der Benutzer, der den letzten Export durchgeführt hat',
+	'Class:Query/Attribute:export_last_user_contact' => 'Kontakt',
+	'Class:Query/Attribute:export_last_user_contact+' => 'Der Kontakt, der den letzten Export durchgeführt hat',
+	'Query:baseinfo' => 'Allgemeine Informationen',
+	'Query:exportInfo' => 'Export-Informationen',
 	'Class:QueryOQL/Attribute:fields' => 'Felder',
-	'Class:QueryOQL/Attribute:fields+' => '',
+	'Class:QueryOQL/Attribute:fields+' => 'CSV-Liste der zu exportierenden Attribute (oder alias.attribut)',
 	'Class:QueryOQL' => 'OQL Abfrage',
-	'Class:QueryOQL+' => '',
+	'Class:QueryOQL+' => 'Eine in der "Object Query Language" geschriebene Abfrage',
 	'Class:QueryOQL/Attribute:oql' => 'Ausdruck',
-	'Class:QueryOQL/Attribute:oql+' => '',
+	'Class:QueryOQL/Attribute:oql+' => 'OQL-Abfrage',
 ));
 
 //////////////////////////////////////////////////////////////////////
@@ -120,9 +130,9 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:User' => 'Benutzer',
 	'Class:User+' => 'Benutzer-Login',
 	'Class:User/Attribute:finalclass' => 'Typ des Benutzerkontos',
-	'Class:User/Attribute:finalclass+' => '',
+	'Class:User/Attribute:finalclass+' => 'Name der instanziierbaren Klasse',
 	'Class:User/Attribute:contactid' => 'Kontakt (Person)',
-	'Class:User/Attribute:contactid+' => 'Persönliche Details der Geschäftsdaten',
+	'Class:User/Attribute:contactid+' => 'Dieses Feld ist für einen Portalbenutzer zwigend erforderlich und außerhalb von Systemkonten zu empfehlen.',
 	'Class:User/Attribute:org_id' => 'Organisation',
 	'Class:User/Attribute:org_id+' => 'Organisation der verknüpften Person',
 	'Class:User/Attribute:last_name' => 'Nachname',
@@ -132,7 +142,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:User/Attribute:email' => 'E-Mail-Adresse',
 	'Class:User/Attribute:email+' => 'E-Mail-Adresse des Kontakts',
 	'Class:User/Attribute:login' => 'Login',
-	'Class:User/Attribute:login+' => 'Benutzer-Anmeldename',
+	'Class:User/Attribute:login+' => 'Der Benutzer-Anmeldename muss innerhalb von '.ITOP_APPLICATION_SHORT.' eindeutig sein',
 	'Class:User/Attribute:language' => 'Sprache',
 	'Class:User/Attribute:language+' => 'Benutzersprache',
 	'Class:User/Attribute:language/Value:EN US' => 'English',
@@ -147,7 +157,6 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:User/Attribute:status+' => 'Ist das Benutzer aktiviert oder deaktiviert ?',
 	'Class:User/Attribute:status/Value:enabled' => 'Aktiv',
 	'Class:User/Attribute:status/Value:disabled' => 'Inaktiv',
-
 	'Class:User/Error:LoginMustBeUnique' => 'Login-Namen müssen unterschiedlich sein - "%1s" benutzt diesen Login-Name bereits.',
 	'Class:User/Error:AtLeastOneProfileIsNeeded' => 'Mindestens ein Profil muss diesem Benutzer zugewiesen sein.',
 	'Class:User/Error:ProfileNotAllowed' => 'Profil "%1$s" kann nicht hinzugefügt werde, es verhindert den Zugriff auf das Backoffice.',
@@ -159,7 +168,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:User/Error:UserOrganizationNotAllowed' => 'Das Benutzerkonto gehört nicht zu den für Sie freigegebenen Organisationen',
 	'Class:User/Error:PersonIsMandatory' => 'Der Kontakt muss angegeben werden.',
 	'Class:UserInternal' => 'Interner Benutzer',
-	'Class:UserInternal+' => 'Benutzer, der innerhalb '.ITOP_APPLICATION_SHORT.' definiert wird',
+	'Class:UserInternal+' => 'Benutzer, der innerhalb von '.ITOP_APPLICATION_SHORT.' definiert wird',
 ));
 
 //
@@ -230,7 +239,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:URP_UserOrg/Attribute:allowed_org_name' => 'Organisation',
 	'Class:URP_UserOrg/Attribute:allowed_org_name+' => '',
 	'Class:URP_UserOrg/Attribute:reason' => 'Begründung',
-	'Class:URP_UserOrg/Attribute:reason+' => '',
+	'Class:URP_UserOrg/Attribute:reason+' => 'Begründet die Berechtigung, die Daten dieser Organisation zu sehen',
 ));
 
 //
@@ -356,6 +365,29 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Expression:Unit:Short:YEAR' => 'j',
 ));
 
+//
+// Duplicated into itop-welcome-itil ( will be removed from here...)
+//
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'Menu:WelcomeMenu' => 'Willkommen',
+	'Menu:WelcomeMenu+' => 'Willkommen bei '.ITOP_APPLICATION_SHORT,
+	'Menu:WelcomeMenuPage' => 'Willkommen',
+	'Menu:WelcomeMenuPage+' => 'Willkommen bei '.ITOP_APPLICATION_SHORT,
+	'Menu:AdminTools' => 'Admin-Tools',
+	'Menu:AdminTools+' => 'Administrationswerkzeuge',
+	'Menu:AdminTools?' => 'Werkzeuge, die nur für Benutzer mit Adminstratorprofil zugänglich sind',
+	'Menu:CSVImportMenu' => 'CSV-Import',
+	'Menu:CSVImportMenu+' => 'Massenerstellung oder -aktualisierung',
+	'Menu:DataModelMenu' => 'Datenmodell',
+	'Menu:DataModelMenu+' => 'Übersicht des Datenmodells',
+	'Menu:ExportMenu' => 'Export',
+	'Menu:ExportMenu+' => 'Export einer beliebigen Abfrage in HTML, CSV oder XML',
+	'Menu:NotificationsMenu' => 'Benachrichtigungen',
+	'Menu:NotificationsMenu+' => 'Einstellungen der Benachrichtigungen',
+	'Menu:MyShortcuts' => 'Meine Shortcuts',
+	'Menu:DataAdministration' => 'Data Management',
+	'Menu:DataAdministration+' => 'Data Management',
+));
 
 //
 // String from the User Interface: menu, messages, buttons, etc...
@@ -365,12 +397,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'BooleanLabel:yes' => 'Ja',
 	'BooleanLabel:no' => 'Nein',
 	'UI:Login:Title' => ITOP_APPLICATION_SHORT.' Login',
-	'Menu:WelcomeMenu' => 'Willkommen',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:WelcomeMenu+' => 'Willkommen bei '.ITOP_APPLICATION_SHORT, // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:WelcomeMenuPage' => 'Willkommen',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:WelcomeMenuPage+' => 'Willkommen bei '.ITOP_APPLICATION_SHORT, // Duplicated into itop-welcome-itil (will be removed from here...)
 	'UI:WelcomeMenu:Title' => 'Willkommen bei '.ITOP_APPLICATION_SHORT,
-
 	'UI:WelcomeMenu:LeftBlock' => '<p>'.ITOP_APPLICATION_SHORT.' ist ein ein vollständiges, ITIL- und webbasiertes IT-Service-Management-Tool (ITSM)</p>
 <ul>Es umfasst...
 <li>eine vollständige CMDB (Configuration Management Database), um das IT-Portfolio zu dokumentieren und zu managen,</li>
@@ -381,7 +408,6 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 <li>unterschiedliche Dashboards, um sich einen schnellen Überblick über Ihre IT zu verschaffen.</li>
 </ul>
 <p>Alle Module können nacheinander und vollständig unabhängig voneinander eingerichtet werden.</p>',
-
 	'UI:WelcomeMenu:RightBlock' => '<p>'.ITOP_APPLICATION_SHORT.' ist mandantenfähig, es erlaubt IT-Technikern, auf einfache Art eine Vielzahl an Kunden und Firmen zu verwalten.
 <ul>'.ITOP_APPLICATION_SHORT.' bietet ein umfangreiches Set an Business-Prozessen, die
 <li>die Effizienz des IT-Managements steigern,</li>
@@ -397,14 +423,14 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 <li>und ein besseres Verwalten des wichtigsten Bestandteiles Ihrer IT: der Dokumentation.</li>
 </ul>
 </p>',
-	'UI:WelcomeMenu:Text'=>  '<div>Willkommen bei '.ITOP_APPLICATION.' '.ITOP_VERSION_NAME.'!</div>
+	'UI:WelcomeMenu:Text' => '<div>Willkommen bei '.ITOP_APPLICATION.' '.ITOP_VERSION_NAME.'!</div>
 
-<div>This version features a brand new modern and accessible backoffice design.</div>
+<div>Diese Version bietet ein brandneues, modernes und zugängliches Backoffice-Design.</div>
 
-<div>We kept '.ITOP_APPLICATION.' core functions that you liked and modernized them to make you love them.
-We hope you’ll enjoy this version as much as we enjoyed imagining and creating it.</div>
+<div>Wir haben die Kernfunktionen von '.ITOP_APPLICATION.' beibehalten, die Sie mögen, und sie modernisiert, damit Sie sie lieben.
+Wir hoffen, dass Ihnen diese Version genauso viel Spaß macht, wie uns die Vorstellung und die Erstellung dieser Version.</div>
 
-<div>Customize your '.ITOP_APPLICATION.' preferences for a personalized experience.</div>~~',
+<div>Passen Sie Ihre '.ITOP_APPLICATION.'-Einstellungen für ein personalisiertes Benutzererlebnis an.</div>',
 	'UI:WelcomeMenu:AllOpenRequests' => 'Offene Requests: %1$d',
 	'UI:WelcomeMenu:MyCalls' => 'An mich gestellte Benutzeranfragen',
 	'UI:WelcomeMenu:OpenIncidents' => 'Offene Incidents: %1$d',
@@ -418,6 +444,7 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:Button:GlobalSearch' => 'Suche',
 	'UI:Button:Search' => 'Suche ',
 	'UI:Button:Clear' => 'Zurücksetzen',
+	'UI:Button:Confirm' => ' Bestätigen',
 	'UI:Button:SearchInHierarchy' => 'In Hierarchie suchen',
 	'UI:Button:Query' => 'Abfrage ',
 	'UI:Button:Ok' => 'Ok',
@@ -458,7 +485,6 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:UserPref:DoNotShowAgain' => 'Nicht wieder zeigen',
 	'UI:InputFile:NoFileSelected' => 'Keine Datei gewählt',
 	'UI:InputFile:SelectFile' => 'Wählen Sie eine Datei...',
-
 	'UI:SearchToggle' => 'Suche',
 	'UI:ClickToCreateNew' => 'Klicken Sie hier, um eine neues Objekt vom Typ %1$s zu erstellen',
 	'UI:SearchFor_Class' => 'Suche nach Objekten vom Typ "%1$s"',
@@ -478,7 +504,6 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:Error:CannotWriteToTmp_Dir' => 'Nicht möglich, die temporäre Datei auf die Festplatte zu speichern: upload_tmp_dir = "%1$s".',
 	'UI:Error:UploadStoppedByExtension_FileName' => 'Der Upload wurde von der Erweiterung gestoppt. (ursprünglicher Dateiname = "%1$s").',
 	'UI:Error:UploadFailedUnknownCause_Code' => 'Dateiupload fehlgeschlagen, unbekannte Ursache (Fehlercode = "%1$s").',
-
 	'UI:Error:1ParametersMissing' => 'Fehler: der folgende Parameter muss für diese Operation spezifiziert sein: %1$s.',
 	'UI:Error:2ParametersMissing' => 'Fehler: die folgenden Parameter müssen für diese Operation spezifiziert sein: %1$s und %2$s.',
 	'UI:Error:3ParametersMissing' => 'Fehler: die folgenden Parameter müssen für diese Operation spezifiziert sein: %1$s, %2$s und %3$s.',
@@ -499,10 +524,8 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:Error:InvalidDashboard' => 'Fehler: Ungültiges Dashboard',
 	'UI:Error:MaintenanceMode' => 'Die Anwendung befindet sich derzeit im Wartungsmodus.',
 	'UI:Error:MaintenanceTitle' => 'Wartung',
-	'UI:Error:InvalidToken' => 'Error: The angeforderte Operation wurde bereits ausgeführt (CSRF-Token nicht gefunden)',
-
-	'UI:Error:SMTP:UnknownVendor' => 'OAuth SMTP provider %1$s does not exist  (email_transport_smtp.oauth.provider)~~',
-
+	'UI:Error:InvalidToken' => 'Fehler: The angeforderte Operation wurde bereits ausgeführt (CSRF-Token nicht gefunden)',
+	'UI:Error:SMTP:UnknownVendor' => 'Der oAuth-SMTP-Provider %1$s existiert nicht (email_transport_smtp.oauth.provider)',
 	'UI:GroupBy:Count' => 'Anzahl',
 	'UI:GroupBy:Count+' => 'Anzahl der Elemente',
 	'UI:CountOfObjects' => '%1$d Objekte, die das Kriterium erfüllen.',
@@ -531,6 +554,7 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:Menu:OtherActions' => 'Andere Aktionen',
 	'UI:Menu:Transitions' => 'Statusübergänge',
 	'UI:Menu:OtherTransitions' => 'Andere Statusübergänge',
+	'UI:Menu:View' => 'Dieses Objekt ansehen',
 	'UI:Menu:New' => 'Neu...',
 	'UI:Menu:Add' => 'Hinzufügen...',
 	'UI:Menu:Manage' => 'Verwalten...',
@@ -539,6 +563,9 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:Menu:Modify' => 'Modifizieren...',
 	'UI:Menu:Delete' => 'Löschen...',
 	'UI:Menu:BulkDelete' => 'Löschen...',
+	'UI:Menu:BulkDelete_Class' => 'Lösche %1$s Objekte...',
+	'UI:Menu:BulkDelete_Link' => 'Lösche %1$s...',
+	'UI:Menu:BulkDelete_Remote' => 'Lösche %1$s...',
 	'UI:UndefinedObject' => 'nicht definiert',
 	'UI:Document:OpenInNewWindow:Download' => 'In neuem Fenster öffnen: %1$s, Download: %2$s',
 	'UI:SplitDateTime-Date' => 'Datum',
@@ -571,7 +598,6 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:Login:ResetPassword' => 'Jetzt senden!',
 	'UI:Login:ResetPwdFailed' => 'Konnte keine E-Mail versenden: %1$s',
 	'UI:Login:SeparatorOr' => 'oder',
-
 	'UI:ResetPwd-Error-WrongLogin' => '\'%1$s\' ist kein gültiger Login',
 	'UI:ResetPwd-Error-NotPossible' => 'Passwort-Reset bei externem Benutzerkonto nicht möglich',
 	'UI:ResetPwd-Error-FixedPwd' => 'das Benutzerkonto erlaubt keinen Passwort-Reset. ',
@@ -582,50 +608,49 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:ResetPwd-EmailSent' => 'Bitte schauen Sie in Ihre Mailbox und folgen Sie den Anweisungen.',
 	'UI:ResetPwd-EmailSubject' => 'Zurücksetzen Ihres '.ITOP_APPLICATION_SHORT.'-Passworts',
 	'UI:ResetPwd-EmailBody' => '<body><p>Sie haben das Zurücksetzen Ihres '.ITOP_APPLICATION_SHORT.' Passworts angefordert.</p><p>Bitte folgen Sie diesem Link (funktioniert nur einmalig) : <a href="%1$s">neues Passwort eingeben</a></p>.',
-
 	'UI:ResetPwd-Title' => 'Passwort zurücksetzen',
 	'UI:ResetPwd-Error-InvalidToken' => 'Entschuldigung, aber entweder das Passwort wurde bereits zurückgesetzt, oder Sie haben mehrere E-Mails für das Zurücksetzen erhalten. Bitte nutzen Sie den link in der letzten Mail, die Sie erhalten haben.',
 	'UI:ResetPwd-Error-EnterPassword' => 'Geben Sie ein neues Passwort für das Konto \'%1$s\' ein.',
 	'UI:ResetPwd-Ready' => 'Das Passwort wurde geändert. ',
 	'UI:ResetPwd-Login' => 'Klicken Sie hier um sich einzuloggen...',
-
-	'UI:Login:About'                               => 'iTop Powered by Combodo',
-	'UI:Login:ChangeYourPassword'                  => 'Ändern Sie Ihr Passwort',
-	'UI:Login:OldPasswordPrompt'                   => 'Altes Passwort',
-	'UI:Login:NewPasswordPrompt'                   => 'Neues Passwort',
-	'UI:Login:RetypeNewPasswordPrompt'             => 'Wiederholen Sie Ihr neues Passwort',
-	'UI:Login:IncorrectOldPassword'                => 'Fehler: das alte Passwort ist ungültig',
-	'UI:LogOffMenu'                                => 'Abmelden',
+	'UI:Login:About' => 'iTop Powered by Combodo',
+	'UI:Login:ChangeYourPassword' => 'Ändern Sie Ihr Passwort',
+	'UI:Login:OldPasswordPrompt' => 'Altes Passwort',
+	'UI:Login:NewPasswordPrompt' => 'Neues Passwort',
+	'UI:Login:RetypeNewPasswordPrompt' => 'Wiederholen Sie Ihr neues Passwort',
+	'UI:Login:IncorrectOldPassword' => 'Fehler: das alte Passwort ist ungültig',
+	'UI:LogOffMenu' => 'Abmelden',
 	'UI:LogOff:ThankYou' => 'Vielen Dank dafür, dass Sie '.ITOP_APPLICATION_SHORT.' benutzen!',
-	'UI:LogOff:ClickHereToLoginAgain'              => 'Klicken Sie hier, um sich wieder anzumelden...',
-	'UI:ChangePwdMenu'                             => 'Passwort ändern...',
-	'UI:Login:PasswordChanged'                     => 'Passwort erfolgreich gesetzt!',
+	'UI:LogOff:ClickHereToLoginAgain' => 'Klicken Sie hier, um sich wieder anzumelden...',
+	'UI:ChangePwdMenu' => 'Passwort ändern...',
+	'UI:Login:PasswordChanged' => 'Passwort erfolgreich gesetzt!',
+	'UI:Login:PasswordNotChanged' => 'Fehler: Das Passwort das gleiche!',
 	'UI:AccessRO-All' => ITOP_APPLICATION_SHORT.' ist nur lesbar',
 	'UI:AccessRO-Users' => ITOP_APPLICATION_SHORT.' ist nur lesbar für Endnutzer',
-	'UI:ApplicationEnvironment'                    => 'Applikationsumgebung: %1$s',
-	'UI:Login:RetypePwdDoesNotMatch'               => 'Neues Passwort und das wiederholte Passwort stimmen nicht überein!',
+	'UI:ApplicationEnvironment' => 'Applikationsumgebung: %1$s',
+	'UI:Login:RetypePwdDoesNotMatch' => 'Neues Passwort und das wiederholte Passwort stimmen nicht überein!',
 	'UI:Button:Login' => 'in '.ITOP_APPLICATION_SHORT.' anmelden',
 	'UI:Login:Error:AccessRestricted' => 'Der '.ITOP_APPLICATION_SHORT.'-Zugang ist gesperrt. Bitte kontaktieren Sie Ihren '.ITOP_APPLICATION_SHORT.'-Administrator.',
 	'UI:Login:Error:AccessAdmin' => 'Zugang nur für Personen mit Administratorrechten. Bitte kontaktieren Sie Ihren '.ITOP_APPLICATION_SHORT.'-Administrator.',
-	'UI:Login:Error:WrongOrganizationName'         => 'Unbekannte Organisation',
+	'UI:Login:Error:WrongOrganizationName' => 'Unbekannte Organisation',
 	'UI:Login:Error:MultipleContactsHaveSameEmail' => 'Mehrere Kontakte mit gleicher E-Mail-Adresse',
-	'UI:Login:Error:NoValidProfiles'               => 'Kein gültiges Profil ausgewählt',
-	'UI:CSVImport:MappingSelectOne'                => 'Bitte wählen',
-	'UI:CSVImport:MappingNotApplicable'            => '-- Dieses Feld ignorieren --',
-	'UI:CSVImport:NoData'                          => 'Keine Daten eingegeben ... bitte geben Sie Daten ein!',
-	'UI:Title:DataPreview'                         => 'Datenvorschau',
-	'UI:CSVImport:ErrorOnlyOneColumn'              => 'Fehler: die Daten beinhalten nur eine Spalte. Haben Sie das dazugehörige Trennzeichen ausgewählt?',
-	'UI:CSVImport:FieldName'                       => 'Feld %1$d',
-	'UI:CSVImport:DataLine1'                       => 'Daten-Zeile 1',
-	'UI:CSVImport:DataLine2'                       => 'Daten-Zeile 2',
-	'UI:CSVImport:idField'                         => 'ID (Primärer Schlüssel)',
+	'UI:Login:Error:NoValidProfiles' => 'Kein gültiges Profil ausgewählt',
+	'UI:CSVImport:MappingSelectOne' => 'Bitte wählen',
+	'UI:CSVImport:MappingNotApplicable' => '-- Dieses Feld ignorieren --',
+	'UI:CSVImport:NoData' => 'Keine Daten eingegeben ... bitte geben Sie Daten ein!',
+	'UI:Title:DataPreview' => 'Datenvorschau',
+	'UI:CSVImport:ErrorOnlyOneColumn' => 'Fehler: die Daten beinhalten nur eine Spalte. Haben Sie das dazugehörige Trennzeichen ausgewählt?',
+	'UI:CSVImport:FieldName' => 'Feld %1$d',
+	'UI:CSVImport:DataLine1' => 'Daten-Zeile 1',
+	'UI:CSVImport:DataLine2' => 'Daten-Zeile 2',
+	'UI:CSVImport:idField' => 'ID (Primärer Schlüssel)',
 	'UI:Title:BulkImport' => ITOP_APPLICATION_SHORT.' - Massenimport',
-	'UI:Title:BulkImport+'                         => 'CSV-Import-Assistent',
-	'UI:Title:BulkSynchro_nbItem_ofClass_class'    => 'Synchronisation von %1$d Objekten der Klasse %2$s',
-	'UI:CSVImport:ClassesSelectOne'                => 'Bitte wählen',
-	'UI:CSVImport:ErrorExtendedAttCode'            => 'Interner Fehler: "%1$s" ist ungültiger Code. Begründung "%2$s" ist NICHT ein externer Schlüssel der Klasse "%3$s"',
-	'UI:CSVImport:ObjectsWillStayUnchanged'        => '%1$d Objekte bleiben unverändert.',
-	'UI:CSVImport:ObjectsWillBeModified'           => '%1$d Objekte werden verändert.',
+	'UI:Title:BulkImport+' => 'CSV-Import-Assistent',
+	'UI:Title:BulkSynchro_nbItem_ofClass_class' => 'Synchronisation von %1$d Objekten der Klasse %2$s',
+	'UI:CSVImport:ClassesSelectOne' => 'Bitte wählen',
+	'UI:CSVImport:ErrorExtendedAttCode' => 'Interner Fehler: "%1$s" ist ungültiger Code. Begründung "%2$s" ist NICHT ein externer Schlüssel der Klasse "%3$s"',
+	'UI:CSVImport:ObjectsWillStayUnchanged' => '%1$d Objekte bleiben unverändert.',
+	'UI:CSVImport:ObjectsWillBeModified' => '%1$d Objekte werden verändert.',
 	'UI:CSVImport:ObjectsWillBeAdded' => '%1$d Objekte werden hinzugefügt.',
 	'UI:CSVImport:ObjectsWillHaveErrors' => '%1$d Objekte werden fehlerhaft sein.',
 	'UI:CSVImport:ObjectsRemainedUnchanged' => '%1$d Objekte blieben unverändert.',
@@ -671,11 +696,14 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:UniversalSearchTitle' => ITOP_APPLICATION_SHORT.' - universelle Suche',
 	'UI:UniversalSearch:Error' => 'Fehler: %1$s',
 	'UI:UniversalSearch:LabelSelectTheClass' => 'Wählen Sie für die Suche die Klasse aus: ',
-
 	'UI:CSVReport-Value-Modified' => 'Modifiziert',
-	'UI:CSVReport-Value-SetIssue' => 'invalid value for attribute~~',
-	'UI:CSVReport-Value-ChangeIssue' => '\'%1$s\' is an invalid value~~',
-	'UI:CSVReport-Value-NoMatch' => 'No match for value \'%1$s\'~~',
+	'UI:CSVReport-Value-SetIssue' => 'Ungültiger Wert für das Attribut',
+	'UI:CSVReport-Value-ChangeIssue' => '\'%1$s\'  ist ein ungültiger Wert',
+	'UI:CSVReport-Value-NoMatch' => 'eine Übereinstimmung für  den Wert \'%1$s\'',
+	'UI:CSVReport-Value-NoMatch-PossibleValues' => 'Mögliche Werte für das Objekt \'%1$s\': %2$s',
+	'UI:CSVReport-Value-NoMatch-NoObject' => 'Es gibt keine \'%1$s\'-Objekte',
+	'UI:CSVReport-Value-NoMatch-NoObject-ForCurrentUser' => 'Es gibt kein \'%1$s\'-Objekt, das für Ihren Benutzer sichtbar ist.',
+	'UI:CSVReport-Value-NoMatch-SomeObjectNotVisibleForCurrentUser' => 'Es gibt \'%1$s\'-Objekt(e), das/die für Ihren Benutzer nicht sichtbar ist/sind.',
 	'UI:CSVReport-Value-Missing' => 'Pflichtfeld fehlt',
 	'UI:CSVReport-Value-Ambiguous' => 'Doppeldeutig: %1$s Objekte gefunden',
 	'UI:CSVReport-Row-Unchanged' => 'Unverändert',
@@ -689,15 +717,16 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:CSVReport-Value-Issue-Readonly' => 'Das Attribut \'%1$s\' ist Read-Only und kann nicht modifiziert werden (derzeitiger Wert: %2$s, vorgeschlagener Wert: %3$s)',
 	'UI:CSVReport-Value-Issue-Format' => 'Fehler beim Verarbeiten des Inputs: %1$s',
 	'UI:CSVReport-Value-Issue-NoMatch' => 'Unerwarteter Wert für Attribut \'%1$s\': kein Treffer gefunden, Rechtschreibung überprüfen',
+	'UI:CSVReport-Value-Issue-AllowedValues' => 'Erlaubte(r) \'%1$s\'-Wert(e): %2$s',
 	'UI:CSVReport-Value-Issue-Unknown' => 'Unerwarteter Wert für Attribut \'%1$s\': %2$s',
 	'UI:CSVReport-Row-Issue-Inconsistent' => 'Attribute nicht konsistent miteinander: %1$s',
 	'UI:CSVReport-Row-Issue-Attribute' => 'Unerwartete(r) Attributwert(e)',
 	'UI:CSVReport-Row-Issue-MissingExtKey' => 'Konnte nicht erzeugt werden, wegen fehlendem/n externen Key(s): %1$s',
 	'UI:CSVReport-Row-Issue-DateFormat' => 'falsches Datumsformat',
+	'UI:CSVReport-Row-Issue-ExpectedDateFormat' => 'Erwartetes Format: %1$s',
 	'UI:CSVReport-Row-Issue-Reconciliation' => 'Abgleich fehlgeschlagen',
 	'UI:CSVReport-Row-Issue-Ambiguous' => 'Doppeldeutiger Abgleich (Reconcilation)',
 	'UI:CSVReport-Row-Issue-Internal' => 'Interner Fehler: %1$s, %2$s',
-
 	'UI:CSVReport-Icon-Unchanged' => 'Unverändert',
 	'UI:CSVReport-Icon-Modified' => 'Modifiziert',
 	'UI:CSVReport-Icon-Missing' => 'Fehlend',
@@ -712,14 +741,32 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:CSVReport-Stats-Errors' => '%1$.0f %% der geladenen Objekte haben Fehler und werden ignoriert.',
 	'UI:CSVReport-Stats-Created' => '%1$.0f %% der geladenen Objekte werden erzeugt.',
 	'UI:CSVReport-Stats-Modified' => '%1$.0f %% der geladenen Objekte werden modifiziert.',
-
 	'UI:CSVExport:AdvancedMode' => 'Erweiterter Modus',
 	'UI:CSVExport:AdvancedMode+' => '',
 	'UI:CSVExport:LostChars' => 'Kodierungsproblem',
 	'UI:CSVExport:LostChars+' => '',
-
 	'UI:Audit:Title' => ITOP_APPLICATION_SHORT.' - CMDB-Audit',
 	'UI:Audit:InteractiveAudit' => 'Interaktives Audit',
+	'UI:Audit:Interactive:All:Title' => 'Audit-Ergebnisse',
+	'UI:Audit:Interactive:All:SubTitle' => 'Vollständiges Audit: umfasst alle Regeln, alle Kategorien, alle Domänen',
+	'UI:Audit:Interactive:All:BreadCrumb' => 'Vollständiges Audit',
+	'UI:Audit:Interactive:All:BreadCrumb+' => 'Audit-Ergebnisse für alle Regeln',
+	'UI:Audit:Interactive:Categories:Title' => 'Audit-Ergebnisse für die Kategorien: %1$s',
+	'UI:Audit:Interactive:Categories:SubTitle' => 'Audit-Ergebnisse für alle Regeln, die zu einer dieser %1$s Kategorien gehören',
+	'UI:Audit:Interactive:Categories:BreadCrumb' => 'Kategorien',
+	'UI:Audit:Interactive:Categories:BreadCrumb+' => 'Audit-Kategorien: %1$s',
+	'UI:Audit:Interactive:Domain:Title' => 'Audit-Ergebnisse für die Domäne: %1$s',
+	'UI:Audit:Interactive:Domain:SubTitle' => 'Audit-Ergebnisse für alle Regeln, die zu einer Kategorie dieser Domäne gehörent: %1$s',
+	'UI:Audit:Interactive:Domain:BreadCrumb' => '%1$s',
+	'UI:Audit:Interactive:Domain:BreadCrumb+' => 'Audit für Domäne: %1$s',
+	'UI:Audit:Interactive:Selection:Title' => 'Auswahl eines Audits',
+	'UI:Audit:Interactive:Selection:SubTitle' => 'Wählen Sie eine Domäne, um die Ergebnisse auf diese Domäne zu beschränken, oder wählen Sie "Alle Kategorien", um einen vollständigen Audit zu erhalten (kann einige Zeit dauern oder sogar fehlschlagen, wenn zu viele Daten zu prüfen sind)',
+	'UI:Audit:Interactive:Selection:BreadCrumb' => 'Auswahl',
+	'UI:Audit:Interactive:Selection:BreadCrumb+' => 'Auswahl eines Audits zur Durchführung',
+	'UI:Audit:Interactive:Selection:BadgeAll' => 'Alle Kategorien',
+	'UI:Audit:Interactive:Button:Back' => 'Zurück zum Audit',
+	'UI:Audit:Interactive:Button:Configuration' => 'Audit konfigurieren',
+	'UI:Audit:ViewRules' => 'Prüfen Sie die Audit-Regeln',
 	'UI:Audit:HeaderAuditRule' => 'Audit-Regel',
 	'UI:Audit:HeaderNbObjects' => '# Objekte',
 	'UI:Audit:HeaderNbErrors' => '# Fehler',
@@ -735,8 +782,6 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:Audit:Dashboard:ObjectsInError' => 'Objekte mit Fehlern',
 	'UI:Audit:Dashboard:ObjectsValidated' => 'Validierte Objekte',
 	'UI:Audit:AuditCategory:Subtitle' => '%1$s Fehler von insgesamt %2$s - %3$s%%',
-
-
 	'UI:RunQuery:Title' => ITOP_APPLICATION_SHORT.' - OQL-Abfrage-Auswertung',
 	'UI:RunQuery:QueryExamples' => 'Abfragebeispiele',
 	'UI:RunQuery:QueryResults' => 'Abfrageergebnisse',
@@ -775,7 +820,6 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:Schema:Label' => 'Label',
 	'UI:Schema:Label+' => 'Label des Attributes',
 	'UI:Schema:Type' => 'Typ',
-
 	'UI:Schema:Type+' => 'Datentyp des Attributes',
 	'UI:Schema:Origin' => 'Ursprung',
 	'UI:Schema:Origin+' => 'Die Basisklasse, in welcher dieses Attribut definiert ist.',
@@ -823,6 +867,16 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:Schema:DisplaySelector/Code' => 'Code',
 	'UI:Schema:Attribute/Filter' => 'Filter',
 	'UI:Schema:DefaultNullValue' => 'Default Null-Wert: "%1$s"',
+	'UI:Schema:Events' => 'Events',
+	'UI:Schema:Events:Defined' => 'Events',
+	'UI:Schema:Events:NoEvent' => 'Kein Event definiert',
+	'UI:Schema:Events:Listeners' => 'Event-Listener',
+	'UI:Schema:Events:NoListener' => 'Kein Event-Listener',
+	'UI:Schema:Events:Event' => 'Event',
+	'UI:Schema:Events:Description' => 'Beschreibung',
+	'UI:Schema:Events:Listener' => 'Listener',
+	'UI:Schema:Events:Rank' => 'Reihenfolge',
+	'UI:Schema:Events:Module' => 'Modul',
 	'UI:LinksWidget:Autocomplete+' => 'Geben Sie die ersten 3 Buchstaben ein...',
 	'UI:Edit:SearchQuery' => 'Wählen Sie eine bereits definierte Query',
 	'UI:Edit:TestQuery' => 'Query testen',
@@ -914,7 +968,6 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:SystemIntrusion' => 'Zugriff verweigert. Sie haben versucht, eine Aktion auszuführen, für die Sie keine ausreichende Berechtigungen besitzen.',
 	'UI:FatalErrorMessage' => 'Fataler Fehler! '.ITOP_APPLICATION_SHORT.' kann leider nicht fortfahren.',
 	'UI:Error_Details' => 'Fehler: %1$s.',
-
 	'UI:PageTitle:ProfileProjections' => ITOP_APPLICATION_SHORT.' Benutzerverwaltung - Profilabbildung',
 	'UI:UserManagement:Class' => 'Klasse',
 	'UI:UserManagement:Class+' => 'Klasse von Objekten',
@@ -949,66 +1002,42 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:UserManagement:NoLifeCycleApplicable' => 'Nicht verfügbar',
 	'UI:UserManagement:NoLifeCycleApplicable+' => 'Kein Lebenszyklus wurde für diese Klasse definiert.',
 	'UI:UserManagement:GrantMatrix' => 'Zugriffsmatrix',
-
-	'Menu:AdminTools' => 'Admin-Tools',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:AdminTools+' => 'Administrationswerkzeuge',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:AdminTools?' => 'Werkzeuge, die nur für Benutzer mit Administratorprofil zugänglich sind',// Duplicated into itop-welcome-itil (will be removed from here...)
 	'Menu:SystemTools' => 'System',
-
 	'UI:ChangeManagementMenu' => 'Change Management',
 	'UI:ChangeManagementMenu+' => 'Change Management',
 	'UI:ChangeManagementMenu:Title' => 'Übersicht an Changes',
 	'UI-ChangeManagementMenu-ChangesByType' => 'Changes ~nach Typ',
 	'UI-ChangeManagementMenu-ChangesByStatus' => 'Changes nach Status',
 	'UI-ChangeManagementMenu-ChangesNotYetAssigned' => 'Changes, die noch nicht zugeordnet wurden',
-
 	'UI:ConfigurationManagementMenu' => 'Configuration Management',
 	'UI:ConfigurationManagementMenu+' => 'Configuration Management',
 	'UI:ConfigurationManagementMenu:Title' => 'Übersicht der Infrastruktur',
 	'UI-ConfigurationManagementMenu-InfraByType' => 'Infrastrukturbestandteile nach Typ',
 	'UI-ConfigurationManagementMenu-InfraByStatus' => 'Infrastrukturbestandteile nach Status',
-
 	'UI:ConfigMgmtMenuOverview:Title' => 'Dashboard für das Configuration Management',
 	'UI-ConfigMgmtMenuOverview-FunctionalCIbyStatus' => 'Configuration Items nach Status',
 	'UI-ConfigMgmtMenuOverview-FunctionalCIByType' => 'Configuration Items nach Typ',
-
 	'UI:RequestMgmtMenuOverview:Title' => 'Dashboard für das Request Management',
 	'UI-RequestManagementOverview-RequestByService' => 'Benutzeranfragen nach Service gegliedert',
 	'UI-RequestManagementOverview-RequestByPriority' => 'Benutzeranfragen nach Priorität gegliedert',
 	'UI-RequestManagementOverview-RequestUnassigned' => 'Benutzeranfragen, die noch nicht an einen Bearbeiter zugeteilt wurden',
-
 	'UI:IncidentMgmtMenuOverview:Title' => 'Dashboard für Incident Management',
 	'UI-IncidentManagementOverview-IncidentByService' => 'Incidents nach Service',
 	'UI-IncidentManagementOverview-IncidentByPriority' => 'Incidents nach Priorität',
 	'UI-IncidentManagementOverview-IncidentUnassigned' => 'Incidents, die noch nicht an einen Bearbeiter zugeteilt wurden',
-
 	'UI:ChangeMgmtMenuOverview:Title' => 'Dashboard für das Change Management',
 	'UI-ChangeManagementOverview-ChangeByType' => 'Changes nach Typ',
 	'UI-ChangeManagementOverview-ChangeUnassigned' => 'Changes, die noch nicht an einen Bearbeiter zugeteilt wurden',
 	'UI-ChangeManagementOverview-ChangeWithOutage' => 'Ausfälle bedingt durch Changes',
-
 	'UI:ServiceMgmtMenuOverview:Title' => 'Dashboard für das Service Management',
 	'UI-ServiceManagementOverview-CustomerContractToRenew' => 'Kundenverträge, die in weniger als 30 Tagen erneuert werden müssen',
 	'UI-ServiceManagementOverview-ProviderContractToRenew' => 'Provider-Verträge, die in weniger als 30 Tagen erneuert werden müssen',
-
 	'UI:ContactsMenu' => 'Kontakte',
 	'UI:ContactsMenu+' => 'Kontakte',
 	'UI:ContactsMenu:Title' => 'Kontaktübersicht',
 	'UI-ContactsMenu-ContactsByLocation' => 'Kontakte nach Standort',
 	'UI-ContactsMenu-ContactsByType' => 'Kontakte nach Typ',
 	'UI-ContactsMenu-ContactsByStatus' => 'Kontakte nach Status',
-
-	'Menu:CSVImportMenu' => 'CSV-Import',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:CSVImportMenu+' => 'Massenerstellung oder -aktualisierung',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:DataModelMenu' => 'Datenmodell',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:DataModelMenu+' => 'Übersicht des Datenmodells',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:ExportMenu' => 'Export',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:ExportMenu+' => 'Export einer beliebigen Abfrage in HTML, CSV oder XML',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:NotificationsMenu' => 'Benachrichtigungen',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:NotificationsMenu+' => 'Einstellungen der Benachrichtigungen',// Duplicated into itop-welcome-itil (will be removed from here...)
 	'UI:NotificationsMenu:Title' => 'Einstellungen der Benachrichtigungen',
 	'UI:NotificationsMenu:Help' => 'Hilfe',
 	'UI:NotificationsMenu:HelpContent' => '<p>In '.ITOP_APPLICATION_SHORT.' sind Benachrichtigungen vollständig anpassbar. Sie basieren auf zwei Gruppen an Objekten: <i>Trigger und Aktionen</i>.</p>
@@ -1038,53 +1067,18 @@ Wenn Aktionen mit Trigger verknüpft sind, bekommt jede Aktion eine Auftragsnumm
 	'UI:NotificationsMenu:Actions:ActionWebhook' => 'Webhook Aktionen (ausgehende Integrationen)',
 	'UI:NotificationsMenu:Actions:Action' => 'Andere Aktionen',
 	'UI:NotificationsMenu:AvailableActions' => 'Verfügbare Aktionen',
-
 	'Menu:TagAdminMenu' => 'Tag-Konfiguration',
 	'Menu:TagAdminMenu+' => 'Verwaltung der Tag-Werte',
 	'UI:TagAdminMenu:Title' => 'Tag-Konfiguration',
 	'UI:TagAdminMenu:NoTags' => 'Kein tag konfiguriert',
 	'UI:TagSetFieldData:Error' => 'Fehler: %1$s',
-
-	'Menu:AuditCategories' => 'Audit-Kategorien',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:AuditCategories+' => 'Audit-Kategorien',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:Notifications:Title' => 'Audit-Kategorien',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:RunQueriesMenu' => 'Abfrage ausführen',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:RunQueriesMenu+' => 'Eine beliebige Abfrage ausführen',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:QueryMenu' => 'Query-Bibliothek',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:QueryMenu+' => '',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:DataAdministration' => 'Data Management',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:DataAdministration+' => 'Data Management',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:UniversalSearchMenu' => 'Universelle Suche',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UniversalSearchMenu+' => 'Suchen Sie nach beliebigen Inhalt...',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:UserManagementMenu' => 'Benutzerverwaltung',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UserManagementMenu+' => 'Benutzerverwaltung',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:ProfilesMenu' => 'Profile',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:ProfilesMenu+' => 'Profile',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:ProfilesMenu:Title' => 'Profile',
-	// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:UserAccountsMenu' => 'Benutzerkonten',
-	// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UserAccountsMenu+' => 'Benutzerkonten',
-	// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UserAccountsMenu:Title' => 'Benutzerkonten',
-	// Duplicated into itop-welcome-itil (will be removed from here...)
-
 	'UI:iTopVersion:Short' => '%1$s Version %2$s',
 	'UI:iTopVersion:Long' => '%1$s Version %2$s-%3$s compiliert am %4$s',
 	'UI:PropertiesTab' => 'Eigenschaften',
-
 	'UI:OpenDocumentInNewWindow_' => 'Öffnen in neuem Fenster',
 	'UI:DownloadDocument_' => 'Herunterladen',
 	'UI:Document:NoPreview' => 'Für diesen Typ Dokument ist keine Vorschau vorhanden',
 	'UI:Download-CSV' => '%1$s herunterladen',
-
 	'UI:DeadlineMissedBy_duration' => 'Verpasst um %1$s',
 	'UI:Deadline_LessThan1Min' => '< 1 Minute',
 	'UI:Deadline_Minutes' => '%1$d Minuten',
@@ -1163,9 +1157,13 @@ Wenn Aktionen mit Trigger verknüpft sind, bekommt jede Aktion eine Auftragsnumm
 	'Enum:Undefined' => 'Nicht definiert',
 	'UI:DurationForm_Days_Hours_Minutes_Seconds' => '%1$s Tage %2$s Stunden %3$s Minuten %4$s Sekunden',
 	'UI:ModifyAllPageTitle' => 'Alle modifizieren',
+	'UI:Modify_ObjectsOf_Class' => 'Bearbeiten von Objekten der Klasse %1$s',
 	'UI:Modify_N_ObjectsOf_Class' => 'Modifiziere %1$d Objekte der Klasse %2$s',
 	'UI:Modify_M_ObjectsOf_Class_OutOf_N' => 'Modifiziere %1$d Objekte der Klasse %2$s von insgesamt %3$d',
 	'UI:Menu:ModifyAll' => 'Modifizieren...',
+	'UI:Menu:ModifyAll_Class' => '%1$s Objekte bearbeiten...',
+	'UI:Menu:ModifyAll_Link' => '%1$s bearbeiten...',
+	'UI:Menu:ModifyAll_Remote' => '%1$s bearbeiten...',
 	'UI:Button:ModifyAll' => 'Alle modifizieren',
 	'UI:Button:PreviewModifications' => 'Vorschau auf Modifikationen >>',
 	'UI:ModifiedObject' => 'Objekt modifiziert',
@@ -1225,7 +1223,6 @@ Wenn Aktionen mit Trigger verknüpft sind, bekommt jede Aktion eine Auftragsnumm
 	'UI:PrintResolution:LetterLandscape' => 'Letter Querformat',
 	'UI:Toggle:SwitchToStandardDashboard' => 'Wechseln zum Standard-Dashboard',
 	'UI:Toggle:SwitchToCustomDashboard' => 'Wechseln zum Custom-Dashboard',
-
 	'UI:ConfigureThisList' => 'Liste konfigurieren...',
 	'UI:ListConfigurationTitle' => 'Listenkonfiguration',
 	'UI:ColumnsAndSortOrder' => 'Spalten und Sortierreihenfolge:',
@@ -1241,10 +1238,8 @@ Wenn Aktionen mit Trigger verknüpft sind, bekommt jede Aktion eine Auftragsnumm
 	'UI:ExtField_AsRemoteField' => '%1$s (%2$s)',
 	'UI:Button:MoveUp' => 'Nach oben',
 	'UI:Button:MoveDown' => 'Nach unten',
-
 	'UI:OQL:UnknownClassAndFix' => 'Unbekannte Klasse "%1$s". Sie könnten stattdessen "%2$s" versuchen.',
 	'UI:OQL:UnknownClassNoFix' => 'Unbekannte Klasse "%1$s"',
-
 	'UI:Dashboard:EditCustom' => 'Custom-Version anpassen',
 	'UI:Dashboard:CreateCustom' => 'Custom-Version anlegen',
 	'UI:Dashboard:DeleteCustom' => 'Custom-Version löschen',
@@ -1255,13 +1250,10 @@ Wenn Aktionen mit Trigger verknüpft sind, bekommt jede Aktion eine Auftragsnumm
 	'UI:ImportDashboardText' => 'Wählen Sie eine Dashboard-Datei zum Import:',
 	'UI:Dashboard:Actions' => 'Dashboard-Aktionen',
 	'UI:Dashboard:NotUpToDateUntilContainerSaved' => 'Dieses Dashboard zeigt Informationen an, die nicht die gerade stattfindenden Changes inkludieren.',
-
-
 	'UI:DashletCreation:Title' => 'Neues Dashlet erzeugen',
 	'UI:DashletCreation:Dashboard' => 'Dashboard',
 	'UI:DashletCreation:DashletType' => 'Dashlet-Typ',
 	'UI:DashletCreation:EditNow' => 'Dashboard bearbeiten',
-
 	'UI:DashboardEdit:Title' => 'Dashboard-Editor',
 	'UI:DashboardEdit:DashboardTitle' => 'Titel',
 	'UI:DashboardEdit:AutoReload' => 'Automatischer Reload',
@@ -1269,38 +1261,31 @@ Wenn Aktionen mit Trigger verknüpft sind, bekommt jede Aktion eine Auftragsnumm
 	'UI:DashboardEdit:AutoReloadSec+' => 'Der Mindestwert beträgt %1$d Sekunden',
 	'UI:DashboardEdit:Revert' => 'Zurücksetzen',
 	'UI:DashboardEdit:Apply' => 'Anwenden',
-
 	'UI:DashboardEdit:Layout' => 'Layout',
 	'UI:DashboardEdit:Properties' => 'Dashboard-Einstellungen',
 	'UI:DashboardEdit:Dashlets' => 'Verfügbare Dashlets',
 	'UI:DashboardEdit:DashletProperties' => 'Dashlet-Einstellungen',
-
 	'UI:Form:Property' => 'Einstellung',
 	'UI:Form:Value' => 'Wert',
-
 	'UI:DashletUnknown:Label' => 'Unbekannt',
 	'UI:DashletUnknown:Description' => 'Unbekanntes Dashlet (ggf. wurde es deinstalliert)',
 	'UI:DashletUnknown:RenderText:View' => 'Dieses Dashlet kann nicht dargestellt werden.',
 	'UI:DashletUnknown:RenderText:Edit' => 'Dieses Dashlet kann nicht dargestellt werden (Klasse "%1$s"). Bitte kontaktieren Sie Ihren Administrator, ob es noch verfügbar ist.',
 	'UI:DashletUnknown:RenderNoDataText:Edit' => 'Keine Vorschau für dieses Dashlet verfügbar (Klasse "%1$s").',
 	'UI:DashletUnknown:Prop-XMLConfiguration' => 'Konfiguration (Anzeige des XML als einfacher Text)',
-
 	'UI:DashletProxy:Label' => 'Proxy',
 	'UI:DashletProxy:Description' => 'Proxy Dashlet',
 	'UI:DashletProxy:RenderNoDataText:Edit' => 'Keine Vorschau für dieses externe Dashlet verfügbar (Klasse "%1$s").',
 	'UI:DashletProxy:Prop-XMLConfiguration' => 'Konfiguration (Anzeige des XML als einfacher Text)',
-
 	'UI:DashletPlainText:Label' => 'Text',
 	'UI:DashletPlainText:Description' => 'Reiner Text (ohne Formatierung)',
 	'UI:DashletPlainText:Prop-Text' => 'Text',
 	'UI:DashletPlainText:Prop-Text:Default' => 'Bitte Text hier eingeben...',
-
 	'UI:DashletObjectList:Label' => 'Objektliste',
 	'UI:DashletObjectList:Description' => 'Objektlisten-Dashlet',
 	'UI:DashletObjectList:Prop-Title' => 'Titel',
 	'UI:DashletObjectList:Prop-Query' => 'Query',
 	'UI:DashletObjectList:Prop-Menu' => 'Menü',
-
 	'UI:DashletGroupBy:Prop-Title' => 'Titel',
 	'UI:DashletGroupBy:Prop-Query' => 'Query',
 	'UI:DashletGroupBy:Prop-Style' => 'Stil',
@@ -1314,24 +1299,20 @@ Wenn Aktionen mit Trigger verknüpft sind, bekommt jede Aktion eine Auftragsnumm
 	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfWeek' => '%1$s (Wochentag)',
 	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfMonth' => '%1$s (Wochentag)',
 	'UI:DashletGroupBy:MissingGroupBy' => 'Bitte wählen Sie das Feld, nach dem die Objekte gruppiert werden',
-
 	'UI:DashletGroupByPie:Label' => 'Tortendiagramm',
 	'UI:DashletGroupByPie:Description' => 'Tortendiagramm',
 	'UI:DashletGroupByBars:Label' => 'Balkendiagramm',
 	'UI:DashletGroupByBars:Description' => 'Balkendiagramm',
 	'UI:DashletGroupByTable:Label' => 'Gruppieren nach (Tabelle)',
 	'UI:DashletGroupByTable:Description' => 'Liste (gruppiert nach einem Feld)',
-
-	// New in 2.5
+    // New in 2.5
 	'UI:DashletGroupBy:Prop-Function' => 'Aggregatfunktion',
 	'UI:DashletGroupBy:Prop-FunctionAttribute' => 'Funktionsattribut',
 	'UI:DashletGroupBy:Prop-OrderDirection' => 'Richtung',
 	'UI:DashletGroupBy:Prop-OrderField' => 'Sortieren nach',
 	'UI:DashletGroupBy:Prop-Limit' => 'Limit',
-
 	'UI:DashletGroupBy:Order:asc' => 'Aufsteigend',
 	'UI:DashletGroupBy:Order:desc' => 'Absteigend',
-
 	'UI:GroupBy:count' => 'Anzahl',
 	'UI:GroupBy:count+' => 'Anzahl der Elemente',
 	'UI:GroupBy:sum' => 'Summe',
@@ -1342,14 +1323,12 @@ Wenn Aktionen mit Trigger verknüpft sind, bekommt jede Aktion eine Auftragsnumm
 	'UI:GroupBy:min+' => 'Minimum von %1$s',
 	'UI:GroupBy:max' => 'Maximum',
 	'UI:GroupBy:max+' => 'Maximum von %1$s',
-	// ---
-
+    // ---
 	'UI:DashletHeaderStatic:Label' => 'Header',
 	'UI:DashletHeaderStatic:Description' => 'Zeigt einen horizontalen Trenner',
 	'UI:DashletHeaderStatic:Prop-Title' => 'Titel',
 	'UI:DashletHeaderStatic:Prop-Title:Default' => 'Kontakte',
 	'UI:DashletHeaderStatic:Prop-Icon' => 'Icon',
-
 	'UI:DashletHeaderDynamic:Label' => 'Header mit Statistiken',
 	'UI:DashletHeaderDynamic:Description' => 'Header mit Statistiken (gruppiert nach...)',
 	'UI:DashletHeaderDynamic:Prop-Title' => 'Titel',
@@ -1360,11 +1339,9 @@ Wenn Aktionen mit Trigger verknüpft sind, bekommt jede Aktion eine Auftragsnumm
 	'UI:DashletHeaderDynamic:Prop-Query' => 'Query',
 	'UI:DashletHeaderDynamic:Prop-GroupBy' => 'Gruppieren nach',
 	'UI:DashletHeaderDynamic:Prop-Values' => 'Werte',
-
 	'UI:DashletBadge:Label' => 'Badge',
 	'UI:DashletBadge:Description' => 'Objekt-Icon bei \'Neu/Suche\'',
 	'UI:DashletBadge:Prop-Class' => 'Klasse',
-
 	'DayOfWeek-Sunday' => 'Sonntag',
 	'DayOfWeek-Monday' => 'Montag',
 	'DayOfWeek-Tuesday' => 'Dienstag',
@@ -1384,8 +1361,7 @@ Wenn Aktionen mit Trigger verknüpft sind, bekommt jede Aktion eine Auftragsnumm
 	'Month-10' => 'Oktober',
 	'Month-11' => 'November',
 	'Month-12' => 'Dezember',
-
-	// Short version for the DatePicker
+    // Short version for the DatePicker
 	'DayOfWeek-Sunday-Min' => 'So',
 	'DayOfWeek-Monday-Min' => 'Mo',
 	'DayOfWeek-Tuesday-Min' => 'Di',
@@ -1405,13 +1381,13 @@ Wenn Aktionen mit Trigger verknüpft sind, bekommt jede Aktion eine Auftragsnumm
 	'Month-10-Short' => 'Okt',
 	'Month-11-Short' => 'Nov',
 	'Month-12-Short' => 'Dez',
-	'Calendar-FirstDayOfWeek' => '1',// 0 = Sunday, 1 = Monday, etc...
-
+	'Calendar-FirstDayOfWeek' => '1',
+    // 0 = Sunday, 1 = Monday, etc...
 	'UI:Menu:ShortcutList' => 'Shortcut anlegen',
+	'UI:Menu:FilterList' => 'Liste mit Suchkriterien anzeigen',
 	'UI:ShortcutRenameDlg:Title' => 'Shortcut umbenennen',
 	'UI:ShortcutListDlg:Title' => 'Shortcut für die Liste anlegen',
 	'UI:ShortcutDelete:Confirm' => 'Bitte bestätigen Sie, dass Sie den/die Shortcut(s) löschen möchten. ',
-	'Menu:MyShortcuts' => 'Meine Shortcuts',// Duplicated into itop-welcome-itil (will be removed from here...)
 	'Class:Shortcut' => 'Shortcut',
 	'Class:Shortcut+' => 'Schnellzugriff auf Objekte',
 	'Class:Shortcut/Attribute:name' => 'Name',
@@ -1425,12 +1401,10 @@ Wenn Aktionen mit Trigger verknüpft sind, bekommt jede Aktion eine Auftragsnumm
 	'Class:ShortcutOQL/Attribute:auto_reload/Value:custom' => 'Eigene Einstellung',
 	'Class:ShortcutOQL/Attribute:auto_reload_sec' => 'Intervall für automatischen Reload (Sekunden)',
 	'Class:ShortcutOQL/Attribute:auto_reload_sec/tip' => 'Der Mindestwert beträgt %1$d Sekunden',
-
 	'UI:FillAllMandatoryFields' => 'Bitte füllen Sie alle Pflichtfelder',
 	'UI:ValueMustBeSet' => 'Bitte geben Sie einen Wert an',
 	'UI:ValueMustBeChanged' => 'Bitte ändern Sie den Wert',
 	'UI:ValueInvalidFormat' => 'Ungültiges Format',
-
 	'UI:CSVImportConfirmTitle' => 'Bitte bestätigen Sie die Operation',
 	'UI:CSVImportConfirmMessage' => 'Sind Sie sicher, dass Sie dies durchführen möchten?',
 	'UI:CSVImportError_items' => 'Fehler: %1$d',
@@ -1456,11 +1430,9 @@ Wenn Aktionen mit Trigger verknüpft sind, bekommt jede Aktion eine Auftragsnumm
 <tr><td>i</td><td>Minuten (2 Ziffern, z.B. 00..59)</td></tr>
 <tr><td>s</td><td>Sekunden (2 Ziffern, z.B. 00..59)</td></tr>
 </table>',
-
 	'UI:Button:Remove' => 'Entfernen',
 	'UI:AddAnExisting_Class' => 'Objekte des Typs %1$s hinzufügen...',
 	'UI:SelectionOf_Class' => 'Selection of objects of type %1$s',
-
 	'UI:AboutBox' => 'Über '.ITOP_APPLICATION_SHORT.'...',
 	'UI:About:Title' => 'Über '.ITOP_APPLICATION_SHORT,
 	'UI:About:DataModel' => 'Datenmodell',
@@ -1470,12 +1442,10 @@ Wenn Aktionen mit Trigger verknüpft sind, bekommt jede Aktion eine Auftragsnumm
 	'UI:About:ManualExtensionSource' => 'Erweiterungen',
 	'UI:About:Extension_Version' => 'Version: %1$s',
 	'UI:About:RemoteExtensionSource' => 'Data',
-
 	'UI:DisconnectedDlgMessage' => 'Sie sind abgemeldet. Sie müssen sich identifizieren, um die Anwendung weiter zu benutzen.',
 	'UI:DisconnectedDlgTitle' => 'Warnung!',
 	'UI:LoginAgain' => 'Erneut einloggen',
 	'UI:StayOnThePage' => 'Auf dieser Seite bleiben',
-
 	'ExcelExporter:ExportMenu' => 'Excel-Export...',
 	'ExcelExporter:ExportDialogTitle' => 'Excel-Export',
 	'ExcelExporter:ExportButton' => 'Export',
@@ -1488,7 +1458,6 @@ Wenn Aktionen mit Trigger verknüpft sind, bekommt jede Aktion eine Auftragsnumm
 	'ExcelExport:Statistics' => 'Statistik',
 	'portal:legacy_portal' => 'Endbenutzer-Portal',
 	'portal:backoffice' => ITOP_APPLICATION_SHORT.' Backend',
-
 	'UI:CurrentObjectIsLockedBy_User' => 'Das Objekt ist gesperrt, da es derzeit durch %1$s bearbeitet wird.',
 	'UI:CurrentObjectIsLockedBy_User_Explanation' => 'Das Objekt wird derzeit durch %1$s bearbeitet. Ihre Änderungen können nicht gespeichert werden, da sie überschrieben würden.',
 	'UI:CurrentObjectIsSoftLockedBy_User' => 'Das Objekt wird im bearbeitet von %1$s. Sie können Ihre Änderungen speichern, wenn die andere Person mit dem Bearbeiten fertig ist.',
@@ -1496,43 +1465,36 @@ Wenn Aktionen mit Trigger verknüpft sind, bekommt jede Aktion eine Auftragsnumm
 	'UI:CurrentObjectLockExpired_Explanation' => 'Die Sperre, um simultane Änderungen am Objekt zu verhindern, ist abgelaufen. Sie können Ihre Änderungen nicht mehr speichern, da andere User jetzt das Objekt ebenfalls verändern könnten. ',
 	'UI:ConcurrentLockKilled' => 'Die Sperre, um simultane Änderungen an dem Objekt zu verhindern, wurde gelöscht.',
 	'UI:Menu:KillConcurrentLock' => 'Sperre für simultane Änderungen löschen!',
-
 	'UI:Menu:ExportPDF' => 'Als PDF exportieren... ',
 	'UI:Menu:PrintableVersion' => 'Druckversion',
-
 	'UI:BrowseInlineImages' => 'Bilder durchsuchen...',
 	'UI:UploadInlineImageLegend' => 'Neues Bild hochladen',
 	'UI:SelectInlineImageToUpload' => 'Wähle das Bild für den Upload aus',
 	'UI:AvailableInlineImagesLegend' => 'Verfügbare Bilder',
 	'UI:NoInlineImage' => 'Es sind keine Bilder auf dem Server verfügbar. Nutze den "Durchsuchen" Button oben, um ein Bild vom Computer hochzuladen.',
-
 	'UI:ToggleFullScreen' => 'Maximieren / Minimieren',
 	'UI:Button:ResetImage' => 'Vorheriges Bild wiederherstellen',
 	'UI:Button:RemoveImage' => 'Bild löschen',
 	'UI:Button:UploadImage' => 'Ein Bild von der Festplatte hochladen',
 	'UI:UploadNotSupportedInThisMode' => 'Die Modifizierung von Bildern oder Dateien wird in diesem Modus nicht unterstützt.',
-
 	'UI:Button:RemoveDocument' => 'Dokument entfernen',
-
-	// Search form
+    // Search form
 	'UI:Search:Toggle' => 'Ein-/Ausklappen',
 	'UI:Search:AutoSubmit:DisabledHint' => 'Automatische Eingabe für diese Klasse deaktiviert',
 	'UI:Search:Obsolescence:DisabledHint' => 'Obsolete Daten werden wegen ihrer Einstellung nicht angezeigt',
 	'UI:Search:NoAutoSubmit:ExplainText' => 'Fügen Sie ein Kriterium in das Suchfeld ein oder klicken Sie auf die Suchschaltfläche, um die Objekte anzuzeigen.',
 	'UI:Search:Criterion:MoreMenu:AddCriteria' => 'Kriterium hinzufügen',
-	// - Add new criteria button
+    // - Add new criteria button
 	'UI:Search:AddCriteria:List:RecentlyUsed:Title' => 'Kürzlich verwendet',
 	'UI:Search:AddCriteria:List:MostPopular:Title' => 'Am beliebtesten',
 	'UI:Search:AddCriteria:List:Others:Title' => 'Andere',
 	'UI:Search:AddCriteria:List:RecentlyUsed:Placeholder' => 'Noch keine',
-
-	// - Criteria header actions
+    // - Criteria header actions
 	'UI:Search:Criteria:Toggle' => 'Minimieren / Expandieren',
 	'UI:Search:Criteria:Remove' => 'Entfernen',
 	'UI:Search:Criteria:Locked' => 'Gesperrt',
-
-	// - Criteria titles
-	//   - Default widget
+    // - Criteria titles
+    //   - Default widget
 	'UI:Search:Criteria:Title:Default:Any' => '%1$s: Beliebig',
 	'UI:Search:Criteria:Title:Default:Empty' => '%1$s ist leer',
 	'UI:Search:Criteria:Title:Default:NotEmpty' => '%1$s ist nicht leer',
@@ -1554,53 +1516,57 @@ Wenn Aktionen mit Trigger verknüpft sind, bekommt jede Aktion eine Auftragsnumm
 	'UI:Search:Criteria:Title:Default:Between:All' => '%1$s: Beliebig',
 	'UI:Search:Criteria:Title:Default:Between:From' => '%1$s von %2$s',
 	'UI:Search:Criteria:Title:Default:Between:Until' => '%1$s bis %2$s',
-	//   - Numeric widget
-	//   None yet
-	//   - DateTime widget
+    //   - Numeric widget
+    //   None yet
+    //   - DateTime widget
 	'UI:Search:Criteria:Title:DateTime:Between' => '%2$s <= 1$s <= %3$s',
-	//   - Enum widget
+    //   - Enum widget
 	'UI:Search:Criteria:Title:Enum:In' => '%1$s: %2$s',
 	'UI:Search:Criteria:Title:Enum:In:Many' => '%1$s: %2$s und %3$s andere',
 	'UI:Search:Criteria:Title:Enum:In:All' => '%1$s: Beliebig',
-	//   - TagSet widget
+    //   - TagSet widget
 	'UI:Search:Criteria:Title:TagSet:Matches' => '%1$s: %2$s',
-	//   - External key widget
+    //   - External key widget
 	'UI:Search:Criteria:Title:ExternalKey:Empty' => '%1$s ist definiert',
 	'UI:Search:Criteria:Title:ExternalKey:NotEmpty' => '%1$s ist nicht definiert',
 	'UI:Search:Criteria:Title:ExternalKey:Equals' => '%1$s %2$s',
 	'UI:Search:Criteria:Title:ExternalKey:In' => '%1$s: %2$s',
 	'UI:Search:Criteria:Title:ExternalKey:In:Many' => '%1$s: %2$s und %3$s andere',
 	'UI:Search:Criteria:Title:ExternalKey:In:All' => '%1$s: Beliebig',
-	//   - Hierarchical key widget
+    //   - Hierarchical key widget
 	'UI:Search:Criteria:Title:HierarchicalKey:Empty' => '%1$s ist definiert',
 	'UI:Search:Criteria:Title:HierarchicalKey:NotEmpty' => '%1$s ist nicht definiert',
 	'UI:Search:Criteria:Title:HierarchicalKey:Equals' => '%1$s %2$s',
 	'UI:Search:Criteria:Title:HierarchicalKey:In' => '%1$s: %2$s',
 	'UI:Search:Criteria:Title:HierarchicalKey:In:Many' => '%1$s: %2$s und %3$s andere',
 	'UI:Search:Criteria:Title:HierarchicalKey:In:All' => '%1$s: Beliebig',
-
-	// - Criteria operators
-	//   - Default widget
+    // - Criteria operators
+    //   - Default widget
 	'UI:Search:Criteria:Operator:Default:Empty' => 'Ist leer',
 	'UI:Search:Criteria:Operator:Default:NotEmpty' => 'Ist nicht leer',
 	'UI:Search:Criteria:Operator:Default:Equals' => 'Ist gleich',
 	'UI:Search:Criteria:Operator:Default:Between' => 'Ist zwischen',
-	//   - String widget
+    //   - String widget
 	'UI:Search:Criteria:Operator:String:Contains' => 'Enthält',
 	'UI:Search:Criteria:Operator:String:StartsWith' => 'Startet mit',
 	'UI:Search:Criteria:Operator:String:EndsWith' => 'Endet mit',
 	'UI:Search:Criteria:Operator:String:RegExp' => 'Reg. Ausdruck',
-	//   - Numeric widget
-	'UI:Search:Criteria:Operator:Numeric:Equals' => 'Ist gleich',// => '=',
-	'UI:Search:Criteria:Operator:Numeric:GreaterThan' => 'Ist größer',// => '>',
-	'UI:Search:Criteria:Operator:Numeric:GreaterThanOrEquals' => 'Ist größer / gleich',// > '>=',
-	'UI:Search:Criteria:Operator:Numeric:LessThan' => 'Ist kleiner',// => '<',
-	'UI:Search:Criteria:Operator:Numeric:LessThanOrEquals' => 'Ist kleiner / gleich',// > '<=',
-	'UI:Search:Criteria:Operator:Numeric:Different' => 'Ist ungleich',// => '≠',
-	//   - Tag Set Widget
+    //   - Numeric widget
+	'UI:Search:Criteria:Operator:Numeric:Equals' => 'Ist gleich',
+    // => '=',
+	'UI:Search:Criteria:Operator:Numeric:GreaterThan' => 'Ist größer',
+    // => '>',
+	'UI:Search:Criteria:Operator:Numeric:GreaterThanOrEquals' => 'Ist größer / gleich',
+    // > '>=',
+	'UI:Search:Criteria:Operator:Numeric:LessThan' => 'Ist kleiner',
+    // => '<',
+	'UI:Search:Criteria:Operator:Numeric:LessThanOrEquals' => 'Ist kleiner / gleich',
+    // > '<=',
+	'UI:Search:Criteria:Operator:Numeric:Different' => 'Ist ungleich',
+    // => '≠',
+    //   - Tag Set Widget
 	'UI:Search:Criteria:Operator:TagSet:Matches' => 'Entspricht',
-
-	// - Other translations
+    // - Other translations
 	'UI:Search:Value:Filter:Placeholder' => 'Filter...',
 	'UI:Search:Value:Search:Placeholder' => 'Suche...',
 	'UI:Search:Value:Autocomplete:StartTyping' => 'Geben Sie mögliche Werte ein.',
@@ -1608,8 +1574,7 @@ Wenn Aktionen mit Trigger verknüpft sind, bekommt jede Aktion eine Auftragsnumm
 	'UI:Search:Value:Autocomplete:NoResult' => 'Kein Ergebnis',
 	'UI:Search:Value:Toggler:CheckAllNone' => 'Alles aus- / abwählen',
 	'UI:Search:Value:Toggler:CheckAllNoneFiltered' => 'Alle Sichtbaren aus- / abwählen',
-
-	// - Widget other translations
+    // - Widget other translations
 	'UI:Search:Criteria:Numeric:From' => 'Von',
 	'UI:Search:Criteria:Numeric:Until' => 'Bis',
 	'UI:Search:Criteria:Numeric:PlaceholderFrom' => 'Beliebig',
@@ -1623,10 +1588,8 @@ Wenn Aktionen mit Trigger verknüpft sind, bekommt jede Aktion eine Auftragsnumm
 	'UI:Search:Criteria:DateTime:PlaceholderUntil' => 'Beliebig',
 	'UI:Search:Criteria:DateTime:PlaceholderUntilTime' => 'Beliebig',
 	'UI:Search:Criteria:HierarchicalKey:ChildrenIncluded:Hint' => 'Kinderelemente ausgewählter Objekte werden berücksichtigt.',
-
 	'UI:Search:Criteria:Raw:Filtered' => 'Gefiltert',
 	'UI:Search:Criteria:Raw:FilteredOn' => 'Gefiltert über %1$s',
-
 	'UI:StateChanged' => 'Status geändert',
 ));
 
@@ -1637,16 +1600,13 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Expression:Operator:AND' => ' UND ',
 	'Expression:Operator:OR' => ' ODER ',
 	'Expression:Operator:=' => ': ',
-
 	'Expression:Unit:Short:DAY' => 't',
 	'Expression:Unit:Short:WEEK' => 'w',
 	'Expression:Unit:Short:MONTH' => 'm',
 	'Expression:Unit:Short:YEAR' => 'j',
-
 	'Expression:Unit:Long:DAY' => 'Tag(e)',
 	'Expression:Unit:Long:HOUR' => 'Stunde(n)',
 	'Expression:Unit:Long:MINUTE' => 'Minute(n)',
-
 	'Expression:Verb:NOW' => 'jetzt',
 	'Expression:Verb:ISNULL' => ': nicht definiert',
 ));
@@ -1670,22 +1630,10 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Menu:DataSources' => 'Datenquellen für die Synchronisation',
 	'Menu:DataSources+' => 'Alle Datenquellen für die Synchronisation',
-	'Menu:WelcomeMenu' => 'Willkommen',
-	'Menu:WelcomeMenu+' => 'Willkommen bei '.ITOP_APPLICATION_SHORT,
-	'Menu:WelcomeMenuPage' => 'Willkommen',
-	'Menu:WelcomeMenuPage+' => 'Willkommen bei '.ITOP_APPLICATION_SHORT,
-	'Menu:AdminTools' => 'Admin-Tools',
-	'Menu:AdminTools+' => 'Administrationswerkzeuge',
-	'Menu:AdminTools?' => 'Werkzeuge, die nur für Benutzer mit Adminstratorprofil zugänglich sind',
-	'Menu:DataModelMenu' => 'Datenmodell',
-	'Menu:DataModelMenu+' => 'Übersicht des Datenmodells',
-	'Menu:ExportMenu' => 'Export',
-	'Menu:ExportMenu+' => 'Export einer beliebigen Abfrage in HTML, CSV oder XML',
-	'Menu:NotificationsMenu' => 'Benachrichtigungen',
-	'Menu:NotificationsMenu+' => 'Einstellungen der Benachrichtigungen',
 	'Menu:AuditCategories' => 'Audit-Kategorien',
 	'Menu:AuditCategories+' => 'Audit-Kategorien',
 	'Menu:Notifications:Title' => 'Audit-Kategorien',
+	'Menu:AuditCategories:Title' => 'Audit-Konfiguration',
 	'Menu:RunQueriesMenu' => 'Abfrage ausführen',
 	'Menu:RunQueriesMenu+' => 'Eine beliebige Abfrage ausführen',
 	'Menu:QueryMenu' => 'Query-Bibliothek',
@@ -1700,17 +1648,14 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Menu:UserAccountsMenu' => 'Benutzerkonten',
 	'Menu:UserAccountsMenu+' => 'Benutzerkonten',
 	'Menu:UserAccountsMenu:Title' => 'Benutzerkonten',
-	'Menu:MyShortcuts' => 'Meine Shortcuts',
 	'Menu:UserManagement' => 'Benutzerverwaltung',
 	'Menu:Queries' => 'OQL Abfragen',
-	'Menu:ConfigurationTools' => 'Konfiguration',
+	'Menu:ConfigurationTools' => 'Konfiguration'
 ));
-
 // Additional language entries not present in English dict
 Dict::Add('DE DE', 'German', 'Deutsch', array(
- 'UI:Toggle:StandardDashboard' => 'Standard',
- 'UI:Toggle:CustomDashboard' => 'Angepasst',
- 'UI:Dashboard:Edit' => 'Diese Seite bearbeiten...',
- 'UI:Dashboard:Revert' => 'Auf Originalversion zurücksetzen...',
+	'UI:Toggle:StandardDashboard' => 'Standard',
+	'UI:Toggle:CustomDashboard' => 'Angepasst',
+	'UI:Dashboard:Edit' => 'Diese Seite bearbeiten...',
+	'UI:Dashboard:Revert' => 'Auf Originalversion zurücksetzen...'
 ));
-
diff --git a/dictionaries/en.dictionary.itop.ui.php b/dictionaries/en.dictionary.itop.ui.php
index e951728522..8e05bd5270 100644
--- a/dictionaries/en.dictionary.itop.ui.php
+++ b/dictionaries/en.dictionary.itop.ui.php
@@ -384,6 +384,29 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Expression:Unit:Short:YEAR' => 'y',
 ));
 
+//
+// Duplicated into itop-welcome-itil ( will be removed from here...)
+//
+Dict::Add('EN US', 'English', 'English', array(
+	'Menu:WelcomeMenu' => 'Welcome',
+	'Menu:WelcomeMenu+' => 'Welcome to '.ITOP_APPLICATION_SHORT,
+	'Menu:WelcomeMenuPage' => 'Welcome',
+	'Menu:WelcomeMenuPage+' => 'Welcome to '.ITOP_APPLICATION_SHORT,
+	'Menu:AdminTools' => 'Administration',
+	'Menu:AdminTools+' => 'Administration tools',
+	'Menu:AdminTools?' => 'Tools accessible only to users having the administrator profile',
+	'Menu:CSVImportMenu' => 'CSV import',
+	'Menu:CSVImportMenu+' => 'Bulk creation or update',
+	'Menu:DataModelMenu' => 'Data model',
+	'Menu:DataModelMenu+' => 'Overview of the data model',
+	'Menu:ExportMenu' => 'Export',
+	'Menu:ExportMenu+' => 'Export the results of any query in HTML, CSV or XML',
+	'Menu:NotificationsMenu' => 'Notifications',
+	'Menu:NotificationsMenu+' => 'Configuration of the Notifications',
+	'Menu:MyShortcuts' => 'My Shortcuts',
+	'Menu:DataAdministration' => 'Data administration',
+	'Menu:DataAdministration+' => '',
+));
 
 //
 // String from the User Interface: menu, messages, buttons, etc...
@@ -393,10 +416,6 @@ Dict::Add('EN US', 'English', 'English', array(
 	'BooleanLabel:yes' => 'yes',
 	'BooleanLabel:no' => 'no',
 	'UI:Login:Title' => ITOP_APPLICATION_SHORT.' login',
-	'Menu:WelcomeMenu' => 'Welcome',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:WelcomeMenu+' => 'Welcome to '.ITOP_APPLICATION_SHORT,// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:WelcomeMenuPage' => 'Welcome',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:WelcomeMenuPage+' => 'Welcome to '.ITOP_APPLICATION_SHORT,// Duplicated into itop-welcome-itil (will be removed from here...)
 	'UI:WelcomeMenu:Title' => 'Welcome to '.ITOP_APPLICATION_SHORT,
 
 	'UI:WelcomeMenu:LeftBlock' => '<p>'.ITOP_APPLICATION_SHORT.' is a complete, OpenSource, IT Operational Portal.</p>
@@ -703,6 +722,8 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:CSVImport:AlertMultipleMapping'       => 'Please make sure that a target field is mapped only once.',
 	'UI:CSVImport:AlertNoSearchCriteria'      => 'Please select at least one search criteria',
 	'UI:CSVImport:Encoding'                   => 'Character encoding',
+	'UI:CSVImport:ViewAllPossibleValues'      => 'View all possible values',
+	'UI:CSVImport:ViewAllAmbiguousValues'     => 'View all ambiguous values',
 	'UI:UniversalSearchTitle'                 => ITOP_APPLICATION_SHORT.' - Universal Search',
 	'UI:UniversalSearch:Error'                => 'Error: %1$s',
 	'UI:UniversalSearch:LabelSelectTheClass'  => 'Select the class to search: ',
@@ -1023,9 +1044,6 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:UserManagement:NoLifeCycleApplicable+' => 'No lifecycle has been defined for this class',
 	'UI:UserManagement:GrantMatrix' => 'Grant Matrix',
 
-	'Menu:AdminTools' => 'Administration',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:AdminTools+' => 'Administration tools',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:AdminTools?' => 'Tools accessible only to users having the administrator profile',// Duplicated into itop-welcome-itil (will be removed from here...)
 	'Menu:SystemTools' => 'System',
 
 	'UI:ChangeManagementMenu' => 'Change Management',
@@ -1071,17 +1089,6 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI-ContactsMenu-ContactsByType' => 'Contacts by type',
 	'UI-ContactsMenu-ContactsByStatus' => 'Contacts by status',
 
-	'Menu:CSVImportMenu' => 'CSV import',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:CSVImportMenu+' => 'Bulk creation or update',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:DataModelMenu' => 'Data model',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:DataModelMenu+' => 'Overview of the data model',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:ExportMenu' => 'Export',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:ExportMenu+' => 'Export the results of any query in HTML, CSV or XML',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:NotificationsMenu' => 'Notifications',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:NotificationsMenu+' => 'Configuration of the Notifications',// Duplicated into itop-welcome-itil (will be removed from here...)
 	'UI:NotificationsMenu:Title' => 'Configuration of the Notifications',
 	'UI:NotificationsMenu:Help' => 'Help',
 	'UI:NotificationsMenu:HelpContent' => '<p>In '.ITOP_APPLICATION_SHORT.' the notifications are fully customizable. They are based on two sets of objects: <i>triggers and actions</i>.</p>
@@ -1461,8 +1468,6 @@ When associated with a trigger, each action is given an "order" number, specifyi
 	'UI:ShortcutRenameDlg:Title'                           => 'Rename the shortcut',
 	'UI:ShortcutListDlg:Title'                             => 'Create a shortcut for the list',
 	'UI:ShortcutDelete:Confirm'                            => 'Please confirm that wou wish to delete the shortcut(s).',
-	'Menu:MyShortcuts'                                     => 'My Shortcuts',
-	// Duplicated into itop-welcome-itil (will be removed from here...)
 	'Class:Shortcut'                                       => 'Shortcut',
 	'Class:Shortcut+'                                      => '',
 	'Class:Shortcut/Attribute:name'                        => 'Name',
@@ -1720,28 +1725,14 @@ Dict::Add('EN US', 'English', 'English', array(
 
 Dict::Add('EN US', 'English', 'English', array(
 	'Menu:DataSources'            => 'Synchronization Data Sources',
-	'Menu:DataSources+'           => 'Mapping logic for batch import of external data',
-	'Menu:WelcomeMenu'            => 'Welcome',
-	'Menu:WelcomeMenu+'           => 'Welcome to '.ITOP_APPLICATION_SHORT,
-	'Menu:WelcomeMenuPage'        => 'Welcome',
-	'Menu:WelcomeMenuPage+'       => 'Welcome to '.ITOP_APPLICATION_SHORT,
-	'Menu:AdminTools'             => 'Administration',
-	'Menu:AdminTools+'            => 'Administration tools',
-	'Menu:AdminTools?'            => 'Tools accessible only to users having the administrator profile',
-	'Menu:DataModelMenu'          => 'Data model',
-	'Menu:DataModelMenu+'         => 'Overview of the data model',
-	'Menu:ExportMenu'             => 'Export',
-	'Menu:ExportMenu+'            => 'Export the results of any query in HTML, CSV or XML',
-	'Menu:NotificationsMenu'      => 'Notifications',
-	'Menu:NotificationsMenu+'     => 'Configure notifications',
-	'Menu:AuditCategories'        => 'Audit',
-	'Menu:AuditCategories+'       => 'Define new audits',
+	'Menu:DataSources+'           => 'Data synchro used for batch import of external data',
+	'Menu:AuditCategories'        => 'Audit configuration',
+	'Menu:AuditCategories+'       => 'Define rules to audit the quality of '.ITOP_APPLICATION_SHORT.' data',
 	'Menu:AuditCategories:Title'  => 'Audit configuration',
-	//	'Menu:Notifications:Title'    => 'Audit categories', // code and label aren't coherent! Is it used?
 	'Menu:RunQueriesMenu'         => 'Run queries',
 	'Menu:RunQueriesMenu+'        => 'Write and execute any OQL query',
 	'Menu:QueryMenu'              => 'Query phrasebook',
-	'Menu:QueryMenu+'             => 'Create stored queries',
+	'Menu:QueryMenu+'             => 'Reusable stored queries',
 	'Menu:UniversalSearchMenu'    => 'Universal search',
 	'Menu:UniversalSearchMenu+'   => 'Search objects of any class including abstract',
 	'Menu:UserManagementMenu'     => 'User management',
@@ -1752,7 +1743,6 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Menu:UserAccountsMenu'       => 'User accounts',
 	'Menu:UserAccountsMenu+'      => 'Handling '.ITOP_APPLICATION_SHORT.' users and their access rights',
 	'Menu:UserAccountsMenu:Title' => 'User accounts',
-	'Menu:MyShortcuts'            => 'My shortcuts',
 	'Menu:UserManagement'         => 'User management',
 	'Menu:Queries'                => 'Queries',
 	'Menu:ConfigurationTools'     => 'Configuration',
diff --git a/dictionaries/es_cr.dictionary.itop.core.php b/dictionaries/es_cr.dictionary.itop.core.php
index 75e5d3bb12..313fcf1f9c 100644
--- a/dictionaries/es_cr.dictionary.itop.core.php
+++ b/dictionaries/es_cr.dictionary.itop.core.php
@@ -24,57 +24,42 @@
  */
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Core:DeletedObjectLabel' => '%1s (eliminado)',
-	'Core:DeletedObjectTip'   => 'Elemento ha sido Eliminado en %1$s (%2$s)',
-
+	'Core:DeletedObjectTip' => 'Elemento ha sido Eliminado en %1$s (%2$s)',
 	'Core:UnknownObjectLabel' => 'Elemento No Encontrado (Clase: %1$s, Identificador: %2$d)',
-	'Core:UnknownObjectTip'   => 'El Elemento no pudo ser encontrado.  Pudo haber sido eliminado hace tiempo y purgado de la Bitácora.',
-
+	'Core:UnknownObjectTip' => 'El Elemento no pudo ser encontrado.  Pudo haber sido eliminado hace tiempo y purgado de la Bitácora.',
 	'Core:UniquenessDefaultError' => 'Regla de unicidad \'%1$s\' en error',
-	'Core:CheckConsistencyError'  => 'Consistency rules not followed: %1$s~~',
-	'Core:CheckValueError'        => 'Unexpected value for attribute \'%1$s\' (%2$s) : %3$s~~',
-
-	'Core:AttributeLinkedSet'  => 'Arreglo de objetos',
+	'Core:CheckConsistencyError' => 'Consistency rules not followed: %1$s~~',
+	'Core:CheckValueError' => 'Unexpected value for attribute \'%1$s\' (%2$s) : %3$s~~',
+	'Core:AttributeLinkedSet' => 'Arreglo de objetos',
 	'Core:AttributeLinkedSet+' => 'Cualquier tipo de objetos [subclass] de la misma clase',
-
 	'Core:AttributeLinkedSetDuplicatesFound' => 'Duplicados en el campo \'%1$s\': %2$s',
-
-	'Core:AttributeDashboard'  => 'Panel de Control',
+	'Core:AttributeDashboard' => 'Panel de Control',
 	'Core:AttributeDashboard+' => 'Panel de control y supervisión',
-
-	'Core:AttributePhoneNumber'  => 'Número telefónico',
+	'Core:AttributePhoneNumber' => 'Número telefónico',
 	'Core:AttributePhoneNumber+' => '',
-
 	'Core:AttributeObsolescenceDate' => 'Fecha de Obsolescencia',
 	'Core:AttributeObsolescenceDate+' => '',
-
 	'Core:AttributeTagSet' => 'Lista de etiquetas',
 	'Core:AttributeTagSet+' => '',
 	'Core:AttributeSet:placeholder' => 'Click to agregar',
 	'Core:AttributeClassAttCodeSet:ItemLabel:AttributeFromClass' => '%1$s (%2$s)',
 	'Core:AttributeClassAttCodeSet:ItemLabel:AttributeFromOneChildClass' => '%1$s (%2$s de %3$s)',
 	'Core:AttributeClassAttCodeSet:ItemLabel:AttributeFromSeveralChildClasses' => '%1$s (%2$s de clases hijas)',
-
 	'Core:AttributeCaseLog' => 'Bitácora',
 	'Core:AttributeCaseLog+' => '',
-
 	'Core:AttributeMetaEnum' => 'Enumeración Calculada',
 	'Core:AttributeMetaEnum+' => '',
-
 	'Core:AttributeLinkedSetIndirect' => 'Arreglo de objetos (N-N)',
 	'Core:AttributeLinkedSetIndirect+' => 'Cualquier tipo de objetos [subclass] de la misma clase',
-
 	'Core:AttributeInteger' => 'Entero',
 	'Core:AttributeInteger+' => 'Valor numérico (puede ser negativo)',
-
 	'Core:AttributeDecimal' => 'Decimal',
 	'Core:AttributeDecimal+' => 'Valor decimal (puede ser negativo)',
-
 	'Core:AttributeBoolean' => 'Booleano',
 	'Core:AttributeBoolean+' => 'Booleano',
 	'Core:AttributeBoolean/Value:null' => 'Nulo',
 	'Core:AttributeBoolean/Value:yes' => 'Si',
 	'Core:AttributeBoolean/Value:no' => 'No',
-
 	'Core:AttributeArchiveFlag' => 'Bandera de Archivado',
 	'Core:AttributeArchiveFlag/Value:yes' => 'Si',
 	'Core:AttributeArchiveFlag/Value:yes+' => 'Este objeto es solo visible en modo Archivado',
@@ -83,7 +68,6 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Core:AttributeArchiveFlag/Label+' => '',
 	'Core:AttributeArchiveDate/Label' => 'Fecha de Archivado',
 	'Core:AttributeArchiveDate/Label+' => '',
-
 	'Core:AttributeObsolescenceFlag' => 'Bandera de Obsolescencia',
 	'Core:AttributeObsolescenceFlag/Value:yes' => 'Si',
 	'Core:AttributeObsolescenceFlag/Value:yes+' => 'Este objeto está excluido del análisis de impacto, y oculto de los resultados de búsqueda',
@@ -92,54 +76,38 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Core:AttributeObsolescenceFlag/Label+' => 'Calculado dinamicamente en otros atributos',
 	'Core:AttributeObsolescenceDate/Label' => 'Fecha de Obsolescencia',
 	'Core:AttributeObsolescenceDate/Label+' => 'Fecha aproximada cuando el objeto fue considerado obsoleto',
-
 	'Core:AttributeString' => 'Cadena de caracteres',
 	'Core:AttributeString+' => 'Cadena de caracteres alfanumerico',
-
 	'Core:AttributeClass' => 'Clase',
 	'Core:AttributeClass+' => 'Clase',
-
 	'Core:AttributeApplicationLanguage' => 'Lenguaje del usuario',
 	'Core:AttributeApplicationLanguage+' => 'Lenguaje y país (EN US)',
-
 	'Core:AttributeFinalClass' => 'Clase (auto)',
 	'Core:AttributeFinalClass+' => 'Clase real del objeto (automaticamente creada por el core)',
-
 	'Core:AttributePassword' => 'Contraseña',
 	'Core:AttributePassword+' => 'Contraseña para dispositivo externo',
-
 	'Core:AttributeEncryptedString' => 'Cadena encriptada',
 	'Core:AttributeEncryptedString+' => 'Cadena encriptada con llave local',
 	'Core:AttributeEncryptUnknownLibrary' => 'Librería de Encriptación especificada (%1$s) es desconocida',
 	'Core:AttributeEncryptFailedToDecrypt' => '** Error de Desencripción **',
-
 	'Core:AttributeText' => 'Texto',
 	'Core:AttributeText+' => 'Cadena de Múltiples Líneas de Caracteres',
-
 	'Core:AttributeHTML' => 'HTML',
 	'Core:AttributeHTML+' => 'Cadena HTML',
-
 	'Core:AttributeEmailAddress' => 'Correo Electrónico',
 	'Core:AttributeEmailAddress+' => 'Correo Electrónico',
-
 	'Core:AttributeIPAddress' => 'Dirección IP',
 	'Core:AttributeIPAddress+' => 'Dirección IP',
-
 	'Core:AttributeOQL' => 'OQL',
 	'Core:AttributeOQL+' => 'Object Query Language expresion',
-
 	'Core:AttributeEnum' => 'Enum',
 	'Core:AttributeEnum+' => 'Lista de cadenas alfanumericas predefinidas',
-
 	'Core:AttributeTemplateString' => 'Cadena de plantilla',
 	'Core:AttributeTemplateString+' => 'Cadena conteniendo lugares',
-
 	'Core:AttributeTemplateText' => 'Texto de plantilla',
 	'Core:AttributeTemplateText+' => 'Texto conteniendo lugares',
-
 	'Core:AttributeTemplateHTML' => 'Plantilla HTML',
 	'Core:AttributeTemplateHTML+' => 'HTML conteniendo lugares',
-
 	'Core:AttributeDateTime' => 'Fecha/hora',
 	'Core:AttributeDateTime+' => 'Fecha y horae (año-mes-dia hh:mm:ss)',
 	'Core:AttributeDateTime?SmartSearch' => '
@@ -157,7 +125,6 @@ Operadores:<br/>
 <p>
 Si se omite el tiempo, por omisión es 00:00:00
 </p>',
-
 	'Core:AttributeDate' => 'Fecha',
 	'Core:AttributeDate+' => 'Fecha (año-mes-dia)',
 	'Core:AttributeDate?SmartSearch' => '
@@ -172,43 +139,30 @@ Operadores:<br/>
 	<b>&lt;</b><em>fecha</em><br/>
 	<b>[</b><em>fecha</em>,<em>fecha</em><b>]</b>
 </p>',
-
 	'Core:AttributeDeadline' => 'Fecha límite',
 	'Core:AttributeDeadline+' => 'Fecha, desplegada relativamente al tiempo actual',
-
 	'Core:AttributeExternalKey' => 'Llave externa',
 	'Core:AttributeExternalKey+' => 'Llave external o foránea',
-
 	'Core:AttributeHierarchicalKey' => 'Llave jerárquica',
 	'Core:AttributeHierarchicalKey+' => 'Llave externa o foránea al padre',
-
 	'Core:AttributeExternalField' => 'Campo externo',
 	'Core:AttributeExternalField+' => 'Campo mapeado de una llave externa',
-
 	'Core:AttributeURL' => 'URL',
 	'Core:AttributeURL+' => 'URL absoluto o relativo',
-
 	'Core:AttributeBlob' => 'Blob',
 	'Core:AttributeBlob+' => 'Cualquier contenido binario (documento)',
-
 	'Core:AttributeOneWayPassword' => 'Contraseña de una sola vía',
 	'Core:AttributeOneWayPassword+' => 'Contraseña encriptada de una sola vía (hashed)',
-
 	'Core:AttributeTable' => 'Tabla',
 	'Core:AttributeTable+' => 'Arreglo indexado con dos dimensiones',
-
 	'Core:AttributePropertySet' => 'Propiedades',
 	'Core:AttributePropertySet+' => 'Lista de propiedades sin tipo (nombre y valor)',
-
 	'Core:AttributeFriendlyName' => 'Nombre común',
 	'Core:AttributeFriendlyName+' => 'Atributo creado automáticamente; el nombre común es obtenido de varios atributos',
-
 	'Core:FriendlyName-Label' => 'Nombre común',
 	'Core:FriendlyName-Description' => 'Nombre común',
-
 	'Core:AttributeTag' => 'Etiquetas',
 	'Core:AttributeTag+' => '',
-
 	'Core:Context=REST/JSON' => 'REST',
 	'Core:Context=Synchro' => 'Synchro',
 	'Core:Context=Setup' => 'Configuración',
@@ -486,6 +440,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Action' => 'Acción Personalizada',
 	'Class:Action+' => 'Acción definida por el usuario',
+	'Class:Action/ComplementaryName' => '%1$s: %2$s~~',
 	'Class:Action/Attribute:name' => 'Nombre',
 	'Class:Action/Attribute:name+' => 'Nombre de la Acción',
 	'Class:Action/Attribute:description' => 'Descripción',
@@ -553,6 +508,22 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:ActionEmail/Attribute:importance/Value:normal+' => 'Normal',
 	'Class:ActionEmail/Attribute:importance/Value:high' => 'Alta',
 	'Class:ActionEmail/Attribute:importance/Value:high+' => 'Alta',
+	'Class:ActionEmail/Attribute:language' => 'Language~~',
+	'Class:ActionEmail/Attribute:language+' => 'Language to use for placeholders ($xxx$) inside the message (state, importance, priority, etc)~~',
+	'Class:ActionEmail/Attribute:html_template' => 'HTML template~~',
+	'Class:ActionEmail/Attribute:html_template+' => 'Optional HTML template wrapping around the content of the \'Body\' attribute below, useful for tailored email layouts (in the template, content of the \'Body\' attribute will replace the $content$ placeholder)~~',
+	'Class:ActionEmail/Attribute:ignore_notify' => 'Ignore the Notify flag~~',
+	'Class:ActionEmail/Attribute:ignore_notify+' => 'If set to \'Yes\' the \'Notify\' flag on Contacts has no effect.~~',
+	'Class:ActionEmail/Attribute:ignore_notify/Value:no' => 'No~~',
+	'Class:ActionEmail/Attribute:ignore_notify/Value:yes' => 'Yes~~',
+	'ActionEmail:main' => 'Message~~',
+	'ActionEmail:trigger' => 'Triggers~~',
+	'ActionEmail:recipients' => 'Contacts~~',
+	'ActionEmail:preview_tab' => 'Preview~~',
+	'ActionEmail:preview_tab+' => 'Preview of the eMail template~~',
+	'ActionEmail:preview_warning' => 'The actual eMail may look different in the eMail client than this preview in your browser.~~',
+	'ActionEmail:preview_more_info' => 'For more information about the CSS features supported by the different eMail clients, refer to %1$s~~',
+	'ActionEmail:content_placeholder_missing' => 'The placeholder "%1$s" was not found in the HTML template. The content of the field "%2$s" will not be included in the generated emails.~~',
 ));
 
 //
@@ -562,6 +533,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Trigger' => 'Disparador',
 	'Class:Trigger+' => 'Disparador',
+	'Class:Trigger/ComplementaryName' => '%1$s, %2$s~~',
 	'Class:Trigger/Attribute:description' => 'Descripción',
 	'Class:Trigger/Attribute:description+' => 'Descripción',
 	'Class:Trigger/Attribute:action_list' => 'Acciones',
@@ -570,6 +542,8 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Trigger/Attribute:finalclass+' => 'Clase',
 	'Class:Trigger/Attribute:context' => 'Contexto',
 	'Class:Trigger/Attribute:context+' => 'Contexto para permitir el inicio del disparador',
+	'Class:Trigger/Attribute:complement' => 'Additional information~~',
+	'Class:Trigger/Attribute:complement+' => 'Further information as provided in english, by this trigger~~',
 ));
 
 //
@@ -665,6 +639,17 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:TriggerOnObjectMention/Attribute:mentioned_filter+' => 'Limite la lista de objetos mencionados que activarán el disparador. Si está vacío, cualquier objeto mencionado (de cualquier clase) lo activará.',
 ));
 
+//
+// Class: TriggerOnAttributeBlobDownload
+//
+
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
+	'Class:TriggerOnAttributeBlobDownload' => 'Trigger (on object\'s document download)~~',
+	'Class:TriggerOnAttributeBlobDownload+' => 'Trigger on object\'s document field download of [a child class of] the given class~~',
+	'Class:TriggerOnAttributeBlobDownload/Attribute:target_attcodes' => 'Target fields~~',
+	'Class:TriggerOnAttributeBlobDownload/Attribute:target_attcodes+' => '~~',
+));
+
 //
 // Class: TriggerOnThresholdReached
 //
@@ -701,11 +686,13 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 // Synchro Data Source
 //
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
+	'Class:SynchroDataSource' => 'Fuente de Datos Sincronizable',
 	'Class:SynchroDataSource/Attribute:name' => 'Nombre',
 	'Class:SynchroDataSource/Attribute:name+' => 'Nombre de la Fuente de Datos',
 	'Class:SynchroDataSource/Attribute:description' => 'Descripción',
 	'Class:SynchroDataSource/Attribute:status' => 'Estatus',
 	'Class:SynchroDataSource/Attribute:scope_class' => 'Clase',
+	'Class:SynchroDataSource/Attribute:scope_class+' => 'A Synchro Data Source can only populate a single '.ITOP_APPLICATION_SHORT.' class~~',
 	'Class:SynchroDataSource/Attribute:user_id' => 'Usuario',
 	'Class:SynchroDataSource/Attribute:notify_contact_id' => 'Contacto a Notificar',
 	'Class:SynchroDataSource/Attribute:notify_contact_id+' => 'Contact a Notificar en Caso de Error',
@@ -714,6 +701,8 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:SynchroDataSource/Attribute:url_application' => 'URL a la Aplicación',
 	'Class:SynchroDataSource/Attribute:url_application+' => 'URL a la Aplicación (Si aplica). Posibles lugares: $this->attribute$ y $replica->primary_key$',
 	'Class:SynchroDataSource/Attribute:reconciliation_policy' => 'Política de Reconciliación',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy+' => '"Use the attributes": '.ITOP_APPLICATION_SHORT.' object matches replica values for each Synchro attributes flagged for Reconciliation.
+"Use primary_key": the column primary_key of the replica is expected to contain the identifier of the '.ITOP_APPLICATION_SHORT.' object~~',
 	'Class:SynchroDataSource/Attribute:full_load_periodicity' => 'Interválo de Carga',
 	'Class:SynchroDataSource/Attribute:full_load_periodicity+' => 'Una recarga completa de datos debe ocurrir en el intervalo especificado aquí',
 	'Class:SynchroDataSource/Attribute:action_on_zero' => 'Accíón con NADA',
@@ -733,6 +722,33 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:SynchroDataSource/Attribute:delete_policy_retention+' => 'Cuanto tiempo un objeto obsoleto es conservado antes de borrarse',
 	'Class:SynchroDataSource/Attribute:database_table_name' => 'Tabla de Datos',
 	'Class:SynchroDataSource/Attribute:database_table_name+' => 'Dónde se guardan los datos sincronizados. Si se deja vacía, un nombre será asignado automáticamente.',
+	'Class:SynchroDataSource/Attribute:status/Value:implementation' => 'No Productivo',
+	'Class:SynchroDataSource/Attribute:status/Value:obsolete' => 'Obsoleto',
+	'Class:SynchroDataSource/Attribute:status/Value:production' => 'Productivo',
+	'Class:SynchroDataSource/Attribute:scope_restriction' => 'Alcance de la restricción',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_attributes' => 'Usar los Atributos',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_primary_key' => 'Usar el Campo Primary_Key',
+	'Class:SynchroDataSource/Attribute:action_on_zero/Value:create' => 'Crear',
+	'Class:SynchroDataSource/Attribute:action_on_zero/Value:error' => 'Error',
+	'Class:SynchroDataSource/Attribute:action_on_one/Value:error' => 'Error',
+	'Class:SynchroDataSource/Attribute:action_on_one/Value:update' => 'Actualizar',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:create' => 'Crear',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:error' => 'Error',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:take_first' => 'Tomar el primero(¿random?)',
+	'Class:SynchroDataSource/Attribute:delete_policy' => 'Política de Borrado',
+	'Class:SynchroDataSource/Attribute:delete_policy+' => 'What to do when a replica becomes obsolete:
+"Ignore": do nothing, the associated object remains as is in iTop.
+"Delete": Delete the associated object in iTop (and the replica in the data table).
+"Update": Update the associated object as specified by the Update rules (see below).
+"Update then Delete": apply the "Update rules". When Retention Duration expires, execute a "Delete" ~~',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:delete' => 'Borrar',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:ignore' => 'Ignorar',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:update' => 'Actualizar',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:update_then_delete' => 'Actualizar y después Borrar',
+	'Class:SynchroDataSource/Attribute:attribute_list' => 'Lista de Atributos',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:administrators' => 'Sólo Administradores',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:everybody' => 'Todos tienen permitido borrar esos objetos',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:nobody' => 'Ninguno',
 	'SynchroDataSource:Description' => 'Descripción',
 	'SynchroDataSource:Reconciliation' => 'Búsqueda y Reconciliación',
 	'SynchroDataSource:Deletion' => 'Reglas de Borrado',
@@ -757,8 +773,10 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Core:Synchro:NeverRun' => 'Esta Sincronización no ha sido ejecutada. No hay bitácora todavía.',
 	'Core:Synchro:SynchroEndedOn_Date' => 'La última Sincronización terminó en %1$s.',
 	'Core:Synchro:SynchroRunningStartedOn_Date' => 'La Sincronización iniciada en %1$s está todavía en ejecución.',
-	'Menu:DataSources' => 'Fuentes de Datos Sincronizables', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:DataSources+' => 'Fuentes de Datos Sincronizables', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataSources' => 'Fuentes de Datos Sincronizables',
+    // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataSources+' => 'Fuentes de Datos Sincronizables',
+    // Duplicated into itop-welcome-itil (will be removed from here...)
 	'Core:Synchro:label_repl_ignored' => 'Ignorados (%1$s)',
 	'Core:Synchro:label_repl_disappeared' => 'Desaparecieron (%1$s)',
 	'Core:Synchro:label_repl_existing' => 'Existen (%1$s)',
@@ -822,29 +840,6 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:CMDBChangeOpSetAttributeEncrypted/Attribute:prevstring' => 'Valor Anterior',
 	'Class:CMDBChangeOpSetAttributeCaseLog' => 'Bitácora de Caso',
 	'Class:CMDBChangeOpSetAttributeCaseLog/Attribute:lastentry' => 'Última Entrada',
-	'Class:SynchroDataSource' => 'Fuente de Datos Sincronizable',
-	'Class:SynchroDataSource/Attribute:status/Value:implementation' => 'No Productivo',
-	'Class:SynchroDataSource/Attribute:status/Value:obsolete' => 'Obsoleto',
-	'Class:SynchroDataSource/Attribute:status/Value:production' => 'Productivo',
-	'Class:SynchroDataSource/Attribute:scope_restriction' => 'Alcance de la restricción',
-	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_attributes' => 'Usar los Atributos',
-	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_primary_key' => 'Usar el Campo Primary_Key',
-	'Class:SynchroDataSource/Attribute:action_on_zero/Value:create' => 'Crear',
-	'Class:SynchroDataSource/Attribute:action_on_zero/Value:error' => 'Error',
-	'Class:SynchroDataSource/Attribute:action_on_one/Value:error' => 'Error',
-	'Class:SynchroDataSource/Attribute:action_on_one/Value:update' => 'Actualizar',
-	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:create' => 'Crear',
-	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:error' => 'Error',
-	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:take_first' => 'Tomar el primero(¿random?)',
-	'Class:SynchroDataSource/Attribute:delete_policy' => 'Política de Borrado',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:delete' => 'Borrar',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:ignore' => 'Ignorar',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:update' => 'Actualizar',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:update_then_delete' => 'Actualizar y después Borrar',
-	'Class:SynchroDataSource/Attribute:attribute_list' => 'Lista de Atributos',
-	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:administrators' => 'Sólo Administradores',
-	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:everybody' => 'Todos tienen permitido borrar esos objetos',
-	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:nobody' => 'Ninguno',
 	'Class:SynchroAttribute' => 'Atributos de Sincronización',
 	'Class:SynchroAttribute/Attribute:sync_source_id' => 'Fuente de Datos Sincronizable',
 	'Class:SynchroAttribute/Attribute:attcode' => 'Código de Atributo',
@@ -905,19 +900,16 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:appUserPreferences/Attribute:preferences' => 'Preferencias',
 	'Core:ExecProcess:Code1' => 'Comando equivocado o comando terminó con errores (ejem. nombre incorrecto de script)',
 	'Core:ExecProcess:Code255' => 'PHP Error (parsing, or runtime)',
-
-	// Attribute Duration
+    // Attribute Duration
 	'Core:Duration_Seconds' => '%1$ds',
 	'Core:Duration_Minutes_Seconds' => '%1$dmin %2$ds',
 	'Core:Duration_Hours_Minutes_Seconds' => '%1$dh %2$dmin %3$ds',
 	'Core:Duration_Days_Hours_Minutes_Seconds' => '%1$sd %2$dh %3$dmin %4$ds',
-
-	// Explain working time computing
+    // Explain working time computing
 	'Core:ExplainWTC:ElapsedTime' => 'Tiempo transcurrido (almacenado como \\"%1$s\\")',
 	'Core:ExplainWTC:StopWatch-TimeSpent' => 'Tiempo invertido para \\"%1$s\\"',
 	'Core:ExplainWTC:StopWatch-Deadline' => 'Límite para \\"%1$s\\" at %2$d%%',
-
-	// Bulk export
+    // Bulk export
 	'Core:BulkExport:MissingParameter_Param' => 'Parámetro faltante \\"%1$s\\"',
 	'Core:BulkExport:InvalidParameter_Query' => 'Valor inválido para parámetro \\"query\\". No existe en la libreta de consulta el Id: \\"%1$s\\".',
 	'Core:BulkExport:ExportFormatPrompt' => 'Formato de Exportación:',
@@ -969,20 +961,34 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Core:BulkExport:DateTimeFormatDefault_Example' => 'Formato por omisión (%1$s), ej. %2$s',
 	'Core:BulkExport:DateTimeFormatCustom_Format' => 'Formato personalizado: %1$s',
 	'Core:BulkExport:PDF:PageNumber' => 'Página %1$s',
-	'Core:DateTime:Placeholder_d' => 'DD', // Day of the month: 2 digits (with leading zero)
-	'Core:DateTime:Placeholder_j' => 'D', // Day of the month: 1 or 2 digits (without leading zero)
-	'Core:DateTime:Placeholder_m' => 'MM', // Month on 2 digits i.e. 01-12
-	'Core:DateTime:Placeholder_n' => 'M', // Month on 1 or 2 digits 1-12
-	'Core:DateTime:Placeholder_Y' => 'AAAA', // Year on 4 digits
-	'Core:DateTime:Placeholder_y' => 'AA', // Year on 2 digits
-	'Core:DateTime:Placeholder_H' => 'hh', // Hour 00..23
-	'Core:DateTime:Placeholder_h' => 'h', // Hour 01..12
-	'Core:DateTime:Placeholder_G' => 'hh', // Hour 0..23
-	'Core:DateTime:Placeholder_g' => 'h', // Hour 1..12
-	'Core:DateTime:Placeholder_a' => 'am/pm', // am/pm (lowercase)
-	'Core:DateTime:Placeholder_A' => 'AM/PM', // AM/PM (uppercase)
-	'Core:DateTime:Placeholder_i' => 'mm', // minutes, 2 digits: 00..59
-	'Core:DateTime:Placeholder_s' => 'ss', // seconds, 2 digits 00..59
+	'Core:DateTime:Placeholder_d' => 'DD',
+    // Day of the month: 2 digits (with leading zero)
+	'Core:DateTime:Placeholder_j' => 'D',
+    // Day of the month: 1 or 2 digits (without leading zero)
+	'Core:DateTime:Placeholder_m' => 'MM',
+    // Month on 2 digits i.e. 01-12
+	'Core:DateTime:Placeholder_n' => 'M',
+    // Month on 1 or 2 digits 1-12
+	'Core:DateTime:Placeholder_Y' => 'AAAA',
+    // Year on 4 digits
+	'Core:DateTime:Placeholder_y' => 'AA',
+    // Year on 2 digits
+	'Core:DateTime:Placeholder_H' => 'hh',
+    // Hour 00..23
+	'Core:DateTime:Placeholder_h' => 'h',
+    // Hour 01..12
+	'Core:DateTime:Placeholder_G' => 'hh',
+    // Hour 0..23
+	'Core:DateTime:Placeholder_g' => 'h',
+    // Hour 1..12
+	'Core:DateTime:Placeholder_a' => 'am/pm',
+    // am/pm (lowercase)
+	'Core:DateTime:Placeholder_A' => 'AM/PM',
+    // AM/PM (uppercase)
+	'Core:DateTime:Placeholder_i' => 'mm',
+    // minutes, 2 digits: 00..59
+	'Core:DateTime:Placeholder_s' => 'ss',
+    // seconds, 2 digits 00..59
 	'Core:Validator:Default' => 'Formato incorrecto',
 	'Core:Validator:Mandatory' => 'Por favor, ingrese este campo',
 	'Core:Validator:MustBeInteger' => 'Debe ser un entero',
@@ -995,7 +1001,6 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:TagSetFieldData' => '%2$s para la clase %1$s',
 	'Class:TagSetFieldData+' => 'Datos de campo',
-
 	'Class:TagSetFieldData/Attribute:code' => 'Código',
 	'Class:TagSetFieldData/Attribute:code+' => 'Código interno. Debe contener al menos tres caracteres alfanuméricos',
 	'Class:TagSetFieldData/Attribute:label' => 'Etiqueta',
@@ -1005,7 +1010,6 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:TagSetFieldData/Attribute:finalclass' => 'Clase',
 	'Class:TagSetFieldData/Attribute:obj_class' => 'Clase de objeto',
 	'Class:TagSetFieldData/Attribute:obj_attcode' => 'Código de campo',
-
 	'Core:TagSetFieldData:ErrorDeleteUsedTag' => 'Etiquetas es uso no pueden ser borradas',
 	'Core:TagSetFieldData:ErrorDuplicateTagCodeOrLabel' => 'Los códigos o las etiquetas deben ser únicos',
 	'Core:TagSetFieldData:ErrorTagCodeSyntax' => 'El código de la etiqueta debe contener entre 3 y %1$d caracteres alfanuméricos',
diff --git a/dictionaries/es_cr.dictionary.itop.ui.php b/dictionaries/es_cr.dictionary.itop.ui.php
index e5828e7b73..aa444e89ae 100644
--- a/dictionaries/es_cr.dictionary.itop.ui.php
+++ b/dictionaries/es_cr.dictionary.itop.ui.php
@@ -26,6 +26,12 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:AuditCategory/Attribute:definition_set+' => 'Expresión OQL que define el conjunto de objetos a auditar',
 	'Class:AuditCategory/Attribute:rules_list' => 'Reglas de Auditoría',
 	'Class:AuditCategory/Attribute:rules_list+' => 'Reglas de Auditoría para esta Categoría',
+	'Class:AuditCategory/Attribute:ok_error_tolerance' => 'Warning threshold~~',
+	'Class:AuditCategory/Attribute:ok_error_tolerance+' => 'Percentage of invalid objects below which the result is a warning (orange)~~',
+	'Class:AuditCategory/Attribute:warning_error_tolerance' => 'Error threshold~~',
+	'Class:AuditCategory/Attribute:warning_error_tolerance+' => 'Percentage of invalid objects below which the result is in error (red)~~',
+	'Class:AuditCategory/Attribute:domains_list' => 'Domains~~',
+	'Class:AuditCategory/Attribute:domains_list+' => 'Domains which includes this category~~',
 ));
 
 //
@@ -53,7 +59,42 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:AuditRule/Attribute:category_id' => 'Categoría',
 	'Class:AuditRule/Attribute:category_id+' => 'La categoría para esta regla',
 	'Class:AuditRule/Attribute:category_name' => 'Categoría',
-	'Class:AuditRule/Attribute:category_name+' => 'Nombre de la categoría para esta regla',
+	'Class:AuditRule/Attribute:category_name+' => 'Nombre de la categoría para esta regla'
+));
+
+//
+// Class: AuditDomain
+//
+
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
+	'Class:AuditDomain' => 'Audit Domain~~',
+	'Class:AuditDomain+' => 'Audit domains allow to group the audit categories.
+Domain usually correspond to who is responsible for checking and fixing errors~~',
+	'Class:AuditDomain/Attribute:name' => 'Name~~',
+	'Class:AuditDomain/Attribute:name+' => 'Its a segmentation of the Audit by who is in charge of fixing it or just interested~~',
+	'Class:AuditDomain/Attribute:description' => 'Description~~',
+	'Class:AuditDomain/Attribute:description+' => '~~',
+	'Class:AuditDomain/Attribute:icon' => 'Icon~~',
+	'Class:AuditDomain/Attribute:icon+' => '~~',
+	'Class:AuditDomain/Attribute:categories_list' => 'Categories~~',
+	'Class:AuditDomain/Attribute:categories_list+' => 'Related audit categories. When running the audit on a domain, all related audit categories are checked and only those.~~',
+));
+
+//
+// Class: lnkAuditCategoryToAuditDomain
+//
+
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
+	'Class:lnkAuditCategoryToAuditDomain' => 'Link AuditCategory / AuditDomain~~',
+	'Class:lnkAuditCategoryToAuditDomain+' => '~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:category_id' => 'Category~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:category_id+' => 'Audit Category~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:category_name' => 'Category name~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:category_name+' => 'Audit category name~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:domain_id' => 'Domain~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:domain_id+' => 'Audit domain~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:domain_name' => 'Domain name~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:domain_name+' => 'Audit domain name~~',
 ));
 
 //
@@ -71,6 +112,16 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Query/Attribute:is_template+' => 'Utilizable como fuente de destinatarios OQL en Notificaciones',
 	'Class:Query/Attribute:is_template/Value:yes' => 'Si',
 	'Class:Query/Attribute:is_template/Value:no' => 'No',
+	'Class:Query/Attribute:export_count' => 'Export counter~~',
+	'Class:Query/Attribute:export_count+' => 'Counter reflecting the number of time this query has been executed~~',
+	'Class:Query/Attribute:export_last_date' => 'Last export~~',
+	'Class:Query/Attribute:export_last_date+' => 'Date and time of the last export execution~~',
+	'Class:Query/Attribute:export_last_user_id' => 'User~~',
+	'Class:Query/Attribute:export_last_user_id+' => 'The user who executed the last export~~',
+	'Class:Query/Attribute:export_last_user_contact' => 'Contact~~',
+	'Class:Query/Attribute:export_last_user_contact+' => 'The contact who executed the last export~~',
+	'Query:baseinfo' => 'General information~~',
+	'Query:exportInfo' => 'Export information~~',
 	'Class:QueryOQL/Attribute:fields' => 'Campos',
 	'Class:QueryOQL/Attribute:fields+' => 'Lista de atributos separados por coma (o alias.attribute) para exportación',
 	'Class:QueryOQL' => 'Consulta OQL',
@@ -119,7 +170,6 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:User/Attribute:status+' => 'Cuando el usuario se encuentra habilitado o deshabilitado.',
 	'Class:User/Attribute:status/Value:enabled' => 'Habilitado',
 	'Class:User/Attribute:status/Value:disabled' => 'Deshabilitado',
-
 	'Class:User/Error:LoginMustBeUnique' => 'Usuario debe ser único - "%1s" ya se encuentra en uso.',
 	'Class:User/Error:AtLeastOneProfileIsNeeded' => 'Al menos un Perfil debe ser asignado a este usuario.',
 	'Class:User/Error:ProfileNotAllowed' => 'No se puede agregar el perfil "%1$s"; denegará el acceso al backoffice',
@@ -328,6 +378,29 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Expression:Unit:Short:YEAR' => 'a',
 ));
 
+//
+// Duplicated into itop-welcome-itil ( will be removed from here...)
+//
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
+	'Menu:WelcomeMenu' => 'Bienvenido',
+	'Menu:WelcomeMenu+' => 'Bienvenido a '.ITOP_APPLICATION_SHORT,
+	'Menu:WelcomeMenuPage' => 'Bienvenido',
+	'Menu:WelcomeMenuPage+' => 'Bienvenido a '.ITOP_APPLICATION_SHORT,
+	'Menu:AdminTools' => 'Herramientas Administrativas',
+	'Menu:AdminTools+' => 'Herramientas Administrativas',
+	'Menu:AdminTools?' => 'Herramientas accesibles sólo a usuarios con Perfil de administrador',
+	'Menu:CSVImportMenu' => 'Importar CSV',
+	'Menu:CSVImportMenu+' => 'Creación o Actualización Másiva',
+	'Menu:DataModelMenu' => 'Modelo de datos',
+	'Menu:DataModelMenu+' => 'Resumen del modelo de datos',
+	'Menu:ExportMenu' => 'Exportar',
+	'Menu:ExportMenu+' => 'Exportar los resultados de cualquier consulta en HTML, CSV o XML',
+	'Menu:NotificationsMenu' => 'Notificaciones',
+	'Menu:NotificationsMenu+' => 'Configuración de las notificaciones',
+	'Menu:MyShortcuts' => 'Mis Accesos Rápidos',
+	'Menu:DataAdministration' => 'Administración de Datos',
+	'Menu:DataAdministration+' => 'Administración de Datos',
+));
 
 //
 // String from the User Interface: menu, messages, buttons, etc...
@@ -337,12 +410,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'BooleanLabel:yes' => 'Si',
 	'BooleanLabel:no' => 'No',
 	'UI:Login:Title' => 'Inicio de Sesión',
-	'Menu:WelcomeMenu' => 'Bienvenido',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:WelcomeMenu+' => 'Bienvenido a '.ITOP_APPLICATION_SHORT, // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:WelcomeMenuPage' => 'Bienvenido',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:WelcomeMenuPage+' => 'Bienvenido a '.ITOP_APPLICATION_SHORT, // Duplicated into itop-welcome-itil (will be removed from here...)
 	'UI:WelcomeMenu:Title' => 'Bienvenido a '.ITOP_APPLICATION_SHORT,
-
 	'UI:WelcomeMenu:LeftBlock' => '<p>'.ITOP_APPLICATION_SHORT.' es un completo portal de administración de servicios de TI basado en código abierto.</p>
 <p>Incluye:</p>
 <ul><li>Una CMDB completa (Base de datos de Configuraciones) para documentar y manejar el inventario de TI.</li>
@@ -353,7 +421,6 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 <li>Tableros de Control para rápidamente tener visión general del ambiente de TI.</li>
 </ul>
 <p>Todos los módulos pueden ser configurados, paso a paso, individual e independientemente de los otros.</p>',
-
 	'UI:WelcomeMenu:RightBlock' => '<p>'.ITOP_APPLICATION_SHORT.' está orientado a los proveedores de servicios, le permite al personal de TI administrar fácilmente múltiples Organizaciones.
 <p>'.ITOP_APPLICATION_SHORT.', provee un conjunto de funciones de procesos de negocio que: </p>
 <ul><li>Mejora la efectividad de la adminitración de TI</li> 
@@ -369,7 +436,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 <li>Administrar el bien más importante de su infraestructura de TI: La Documentación.</li>
 </ul>
 </p>',
-	'UI:WelcomeMenu:Text'=> '<div>Felicidades, se encuentra en '.ITOP_APPLICATION.' '.ITOP_VERSION_NAME.'!</div>
+	'UI:WelcomeMenu:Text' => '<div>Felicidades, se encuentra en '.ITOP_APPLICATION.' '.ITOP_VERSION_NAME.'!</div>
 
 <div>Esta versión cuenta con un moderno diseño accesible y receptivo.</div>
 
@@ -390,6 +457,7 @@ Esperamos distrute de esta versión tanto como nosotros la imaginamos y creamos.
 	'UI:Button:GlobalSearch' => 'Buscar',
 	'UI:Button:Search' => 'Buscar',
 	'UI:Button:Clear' => ' Limpiar',
+	'UI:Button:Confirm' => ' Confirm ~~',
 	'UI:Button:SearchInHierarchy' => 'Buscar en Jerarquía',
 	'UI:Button:Query' => 'Consultar',
 	'UI:Button:Ok' => 'Aceptar',
@@ -430,7 +498,6 @@ Esperamos distrute de esta versión tanto como nosotros la imaginamos y creamos.
 	'UI:UserPref:DoNotShowAgain' => 'No mostrar otra vez',
 	'UI:InputFile:NoFileSelected' => 'Ningún Archivo seleccionado',
 	'UI:InputFile:SelectFile' => 'Seleccionar un archivo',
-
 	'UI:SearchToggle' => 'Buscar',
 	'UI:ClickToCreateNew' => 'Crear %1$s',
 	'UI:SearchFor_Class' => 'Buscar %1$s',
@@ -450,7 +517,6 @@ Esperamos distrute de esta versión tanto como nosotros la imaginamos y creamos.
 	'UI:Error:CannotWriteToTmp_Dir' => 'No fue posible escribir el archivo temporal al disco. upload_tmp_dir = "%1$s".',
 	'UI:Error:UploadStoppedByExtension_FileName' => 'Carga de archivo interrumpida por la extension. (Nombre de archivo original = "%1$s").',
 	'UI:Error:UploadFailedUnknownCause_Code' => 'Carga de archivo fallida, causa desconocida. (Codigo de error = "%1$s").',
-
 	'UI:Error:1ParametersMissing' => 'Error: El siguiente parámetro debe ser especificado para esta operacion: %1$s.',
 	'UI:Error:2ParametersMissing' => 'Error: Los siguientes parámetros deben ser especificados para esta operacion: %1$s y %2$s.',
 	'UI:Error:3ParametersMissing' => 'Error: Los siguientes parámetros deben ser especificados para esta operacion: %1$s, %2$s y %3$s.',
@@ -473,7 +539,6 @@ Esperamos distrute de esta versión tanto como nosotros la imaginamos y creamos.
 	'UI:Error:MaintenanceTitle' => 'Mantenimiento',
 	'UI:Error:InvalidToken' => 'Error: La operación solicitada ya se habia realizado (CSRF token not found)',
 	'UI:Error:SMTP:UnknownVendor' => 'OAuth SMTP provider %1$s does not exist  (email_transport_smtp.oauth.provider)~~',
-
 	'UI:GroupBy:Count' => 'Cuenta',
 	'UI:GroupBy:Count+' => 'Número de Elementos',
 	'UI:CountOfObjects' => '%1$d Elementos cumplen Criterio.',
@@ -502,6 +567,7 @@ Esperamos distrute de esta versión tanto como nosotros la imaginamos y creamos.
 	'UI:Menu:OtherActions' => 'Otras Acciones',
 	'UI:Menu:Transitions' => 'Transiciones',
 	'UI:Menu:OtherTransitions' => 'Otras Transiciones',
+	'UI:Menu:View' => 'View this object~~',
 	'UI:Menu:New' => 'Nuevo',
 	'UI:Menu:Add' => 'Agregar',
 	'UI:Menu:Manage' => 'Administrar',
@@ -510,6 +576,9 @@ Esperamos distrute de esta versión tanto como nosotros la imaginamos y creamos.
 	'UI:Menu:Modify' => 'Modificar',
 	'UI:Menu:Delete' => 'Borrar',
 	'UI:Menu:BulkDelete' => 'Borrar',
+	'UI:Menu:BulkDelete_Class' => 'Delete %1$s objects...~~',
+	'UI:Menu:BulkDelete_Link' => 'Delete %1$s...~~',
+	'UI:Menu:BulkDelete_Remote' => 'Delete %1$s...~~',
 	'UI:UndefinedObject' => 'No Definido',
 	'UI:Document:OpenInNewWindow:Download' => 'abrir en nueva ventana: %1$s, Descargar: %2$s',
 	'UI:SplitDateTime-Date' => 'fecha',
@@ -542,7 +611,6 @@ Esperamos distrute de esta versión tanto como nosotros la imaginamos y creamos.
 	'UI:Login:ResetPassword' => 'Enviar Ahora',
 	'UI:Login:ResetPwdFailed' => 'Error al enviar correo-e: %1$s',
 	'UI:Login:SeparatorOr' => 'O',
-
 	'UI:ResetPwd-Error-WrongLogin' => '\'%1$s\' no es un usuario válido',
 	'UI:ResetPwd-Error-NotPossible' => 'Cuentas externas no permiten restablecimiento de contraseña.',
 	'UI:ResetPwd-Error-FixedPwd' => 'La cuenta no permite restablecimiento de contraseña.',
@@ -553,50 +621,49 @@ Esperamos distrute de esta versión tanto como nosotros la imaginamos y creamos.
 	'UI:ResetPwd-EmailSent' => 'Por favor verifique su buzón de correo y siga las instrucciones. Si no recibe el mensaje, por favor verifique la cuenta proporcionada.',
 	'UI:ResetPwd-EmailSubject' => 'Restablecer contraseña de '.ITOP_APPLICATION_SHORT,
 	'UI:ResetPwd-EmailBody' => '<body><p>Ha solicitado restablecer su contraseña en '.ITOP_APPLICATION_SHORT.'.</p><p>Por favor de click en la siguiente liga: <a href="%1$s">proporcione una nueva contraseña</a></p>.',
-
 	'UI:ResetPwd-Title' => 'Restablecer Contraseña',
 	'UI:ResetPwd-Error-InvalidToken' => 'Lo siento, tal vez su contraseña ya ha sido cambiada, o ha recibido varios correos electrónicos. Por favor asegurese de haber dado click a la liga del último correo recibido.',
 	'UI:ResetPwd-Error-EnterPassword' => 'Contraseña Nueva para \'%1$s\'.',
 	'UI:ResetPwd-Ready' => 'La contraseña ha sido cambiada.',
 	'UI:ResetPwd-Login' => 'Click aquí para conectarse ',
-
-	'UI:Login:About'                               => 'Acerca de',
-	'UI:Login:ChangeYourPassword'                  => 'Cambie su Contraseña',
-	'UI:Login:OldPasswordPrompt'                   => 'Contraseña Actual',
-	'UI:Login:NewPasswordPrompt'                   => 'Contraseña Nueva',
-	'UI:Login:RetypeNewPasswordPrompt'             => 'Confirme Contraseña Nueva',
-	'UI:Login:IncorrectOldPassword'                => 'Error: la Contraseña Anterior es Incorrecta',
-	'UI:LogOffMenu'                                => 'Cerrar Sesión',
+	'UI:Login:About' => 'Acerca de',
+	'UI:Login:ChangeYourPassword' => 'Cambie su Contraseña',
+	'UI:Login:OldPasswordPrompt' => 'Contraseña Actual',
+	'UI:Login:NewPasswordPrompt' => 'Contraseña Nueva',
+	'UI:Login:RetypeNewPasswordPrompt' => 'Confirme Contraseña Nueva',
+	'UI:Login:IncorrectOldPassword' => 'Error: la Contraseña Anterior es Incorrecta',
+	'UI:LogOffMenu' => 'Cerrar Sesión',
 	'UI:LogOff:ThankYou' => 'Gracias por usar '.ITOP_APPLICATION_SHORT,
-	'UI:LogOff:ClickHereToLoginAgain'              => 'Click aquí para conectarse nuevamente',
-	'UI:ChangePwdMenu'                             => 'Cambiar Contraseña',
-	'UI:Login:PasswordChanged'                     => '¡Contraseña Exitosamente Cambiada!',
+	'UI:LogOff:ClickHereToLoginAgain' => 'Click aquí para conectarse nuevamente',
+	'UI:ChangePwdMenu' => 'Cambiar Contraseña',
+	'UI:Login:PasswordChanged' => '¡Contraseña Exitosamente Cambiada!',
+	'UI:Login:PasswordNotChanged' => 'Error: Password is the same!~~',
 	'UI:AccessRO-All' => ITOP_APPLICATION_SHORT.' está en modo de sólo lectura',
 	'UI:AccessRO-Users' => ITOP_APPLICATION_SHORT.' está en modo de sólo lectura para usuarios',
-	'UI:ApplicationEnvironment'                    => 'Ambiente: %1$s',
-	'UI:Login:RetypePwdDoesNotMatch'               => '¡La Nueva Contraseña y su Confirmación No Coinciden!',
-	'UI:Button:Login'                              => 'Entrar',
+	'UI:ApplicationEnvironment' => 'Ambiente: %1$s',
+	'UI:Login:RetypePwdDoesNotMatch' => '¡La Nueva Contraseña y su Confirmación No Coinciden!',
+	'UI:Button:Login' => 'Entrar',
 	'UI:Login:Error:AccessRestricted' => 'El acceso a '.ITOP_APPLICATION_SHORT.' está restringido. Por favor contacte al Administrador de '.ITOP_APPLICATION_SHORT.'.',
 	'UI:Login:Error:AccessAdmin' => 'Acceso restringido a usuarios con privilegio de administrador. Por favor contacte al Administrador de '.ITOP_APPLICATION_SHORT.'.',
-	'UI:Login:Error:WrongOrganizationName'         => 'Organización desconocida',
+	'UI:Login:Error:WrongOrganizationName' => 'Organización desconocida',
 	'UI:Login:Error:MultipleContactsHaveSameEmail' => 'Varios contactos tienen la misma dirección de correo electrónico',
-	'UI:Login:Error:NoValidProfiles'               => 'Perfil inválido',
-	'UI:CSVImport:MappingSelectOne'                => '-- seleccione uno --',
-	'UI:CSVImport:MappingNotApplicable'            => '-- ignore este campo --',
-	'UI:CSVImport:NoData'                          => 'Conjunto de datos vacío..., por favor provea algun dato.',
-	'UI:Title:DataPreview'                         => 'Vista previa de datos',
-	'UI:CSVImport:ErrorOnlyOneColumn'              => 'Error: Los datos sólo contienen una columna. ¿Seleccionó el separador de campos adecuado?',
-	'UI:CSVImport:FieldName'                       => 'Campo %1$d',
-	'UI:CSVImport:DataLine1'                       => 'Linea de datos 1',
-	'UI:CSVImport:DataLine2'                       => 'Linea de datos 2',
-	'UI:CSVImport:idField'                         => 'Id (Clave Primaria)',
+	'UI:Login:Error:NoValidProfiles' => 'Perfil inválido',
+	'UI:CSVImport:MappingSelectOne' => '-- seleccione uno --',
+	'UI:CSVImport:MappingNotApplicable' => '-- ignore este campo --',
+	'UI:CSVImport:NoData' => 'Conjunto de datos vacío..., por favor provea algun dato.',
+	'UI:Title:DataPreview' => 'Vista previa de datos',
+	'UI:CSVImport:ErrorOnlyOneColumn' => 'Error: Los datos sólo contienen una columna. ¿Seleccionó el separador de campos adecuado?',
+	'UI:CSVImport:FieldName' => 'Campo %1$d',
+	'UI:CSVImport:DataLine1' => 'Linea de datos 1',
+	'UI:CSVImport:DataLine2' => 'Linea de datos 2',
+	'UI:CSVImport:idField' => 'Id (Clave Primaria)',
 	'UI:Title:BulkImport' => ITOP_APPLICATION_SHORT.' - Importación por Lotes',
-	'UI:Title:BulkImport+'                         => 'Asistente de Importación Archivos CSV',
-	'UI:Title:BulkSynchro_nbItem_ofClass_class'    => 'Sincronización de %1$d objetos de la clase %2$s',
-	'UI:CSVImport:ClassesSelectOne'                => '-- Seleccione uno --',
-	'UI:CSVImport:ErrorExtendedAttCode'            => 'Error Interno: "%1$s" es un código incorrecto debido a que "%2$s" NO es una clave externa de la clase "%3$s"',
-	'UI:CSVImport:ObjectsWillStayUnchanged'        => '%1$d objeto(s) permanecerá sin cambio.',
-	'UI:CSVImport:ObjectsWillBeModified'           => '%1$d objeto(s) será modificado.',
+	'UI:Title:BulkImport+' => 'Asistente de Importación Archivos CSV',
+	'UI:Title:BulkSynchro_nbItem_ofClass_class' => 'Sincronización de %1$d objetos de la clase %2$s',
+	'UI:CSVImport:ClassesSelectOne' => '-- Seleccione uno --',
+	'UI:CSVImport:ErrorExtendedAttCode' => 'Error Interno: "%1$s" es un código incorrecto debido a que "%2$s" NO es una clave externa de la clase "%3$s"',
+	'UI:CSVImport:ObjectsWillStayUnchanged' => '%1$d objeto(s) permanecerá sin cambio.',
+	'UI:CSVImport:ObjectsWillBeModified' => '%1$d objeto(s) será modificado.',
 	'UI:CSVImport:ObjectsWillBeAdded' => '%1$d objeto(s) será agregado.',
 	'UI:CSVImport:ObjectsWillHaveErrors' => '%1$d objeto(s) tendrá error.',
 	'UI:CSVImport:ObjectsRemainedUnchanged' => '%1$d objeto(s) permanencen sin cambio.',
@@ -642,11 +709,14 @@ Esperamos distrute de esta versión tanto como nosotros la imaginamos y creamos.
 	'UI:UniversalSearchTitle' => ITOP_APPLICATION_SHORT.' - Busqueda Universal',
 	'UI:UniversalSearch:Error' => 'Error: %1$s',
 	'UI:UniversalSearch:LabelSelectTheClass' => 'Seleccione la clase a buscar: ',
-
 	'UI:CSVReport-Value-Modified' => 'Modificado',
 	'UI:CSVReport-Value-SetIssue' => 'invalid value for attribute~~',
 	'UI:CSVReport-Value-ChangeIssue' => '\'%1$s\' is an invalid value~~',
 	'UI:CSVReport-Value-NoMatch' => 'No match for value \'%1$s\'~~',
+	'UI:CSVReport-Value-NoMatch-PossibleValues' => 'Some possible \'%1$s\' value(s): %2$s~~',
+	'UI:CSVReport-Value-NoMatch-NoObject' => 'There are no \'%1$s\' objects~~',
+	'UI:CSVReport-Value-NoMatch-NoObject-ForCurrentUser' => 'There are no \'%1$s\' objects found with your current profile~~',
+	'UI:CSVReport-Value-NoMatch-SomeObjectNotVisibleForCurrentUser' => 'There are some \'%1$s\' objects not visible with your current profile~~',
 	'UI:CSVReport-Value-Missing' => 'Falta valor obligatorio',
 	'UI:CSVReport-Value-Ambiguous' => 'Ambigüedad: encontrados %1$s objetos',
 	'UI:CSVReport-Row-Unchanged' => 'Sin Cambios',
@@ -660,15 +730,16 @@ Esperamos distrute de esta versión tanto como nosotros la imaginamos y creamos.
 	'UI:CSVReport-Value-Issue-Readonly' => 'El atributo \'%1$s\' es de solo lectura y nno puede ser modificado (valor actual: %2$s, valor propuesto: %3$s)',
 	'UI:CSVReport-Value-Issue-Format' => 'Falla al procesar entrada: %1$s',
 	'UI:CSVReport-Value-Issue-NoMatch' => 'Valor no esperado para el atributo \'%1$s\': no hay coincidencias, verifique ortografía',
+	'UI:CSVReport-Value-Issue-AllowedValues' => 'Allowed \'%1$s\' value(s): %2$s~~',
 	'UI:CSVReport-Value-Issue-Unknown' => 'Valor inesperado para el atributo \'%1$s\': %2$s',
 	'UI:CSVReport-Row-Issue-Inconsistent' => 'Atributos no consistentes entre ellos: %1$s',
 	'UI:CSVReport-Row-Issue-Attribute' => 'Valor(es) inesperado(s) para el atributo',
 	'UI:CSVReport-Row-Issue-MissingExtKey' => 'No puede ser creado, debido a llaves externas faltantes: %1$s',
 	'UI:CSVReport-Row-Issue-DateFormat' => 'Formato de fecha incorrecto',
+	'UI:CSVReport-Row-Issue-ExpectedDateFormat' => 'Expected format: %1$s~~',
 	'UI:CSVReport-Row-Issue-Reconciliation' => 'Falla al reconciliar',
 	'UI:CSVReport-Row-Issue-Ambiguous' => 'Reconciliación Ambigua',
 	'UI:CSVReport-Row-Issue-Internal' => 'Error Interno: %1$s, %2$s',
-
 	'UI:CSVReport-Icon-Unchanged' => 'Sin Cambio',
 	'UI:CSVReport-Icon-Modified' => 'Modificado',
 	'UI:CSVReport-Icon-Missing' => 'Faltante',
@@ -683,14 +754,32 @@ Esperamos distrute de esta versión tanto como nosotros la imaginamos y creamos.
 	'UI:CSVReport-Stats-Errors' => '%1$.0f %% de los objetos cargados tienen errores y serán ignorados.',
 	'UI:CSVReport-Stats-Created' => '%1$.0f %% de los objetos cargados serán creados.',
 	'UI:CSVReport-Stats-Modified' => '%1$.0f %% de los objetos cargados serán moficados.',
-
 	'UI:CSVExport:AdvancedMode' => 'Modo Avanzado',
 	'UI:CSVExport:AdvancedMode+' => 'En el modo avanzado, varias columnas son agregadas a la exportación: ID del objeto, ID de las llaves externas y los atributos de reconciliación.',
 	'UI:CSVExport:LostChars' => 'Errores de Código de Caracteres',
 	'UI:CSVExport:LostChars+' => 'El archivo descargado será codificado a %1$s. '.ITOP_APPLICATION_SHORT.' detectó alguos caracteres que no son compatibles con este formato. Esos caracteres serán reemplazados por un sustituto (ejem.: caracteres sin acento), o serán descartados. Puede copiar/pegar datos desde su navegador de internet.  Alternativamente, puede contactar al administrador para cambiar el código de caracteres (Ver parámetro \'csv_file_default_charset\').',
-
 	'UI:Audit:Title' => ITOP_APPLICATION_SHORT.' - Auditoría a CMDB',
 	'UI:Audit:InteractiveAudit' => 'Auditoría Interactiva',
+	'UI:Audit:Interactive:All:Title' => 'Audit results~~',
+	'UI:Audit:Interactive:All:SubTitle' => 'Full audit: includes all rules, all categories, all domains~~',
+	'UI:Audit:Interactive:All:BreadCrumb' => 'Full audit~~',
+	'UI:Audit:Interactive:All:BreadCrumb+' => 'Audit results for all rules~~',
+	'UI:Audit:Interactive:Categories:Title' => 'Audit results for categories: %1$s~~',
+	'UI:Audit:Interactive:Categories:SubTitle' => 'Audit results for all the rules belonging to one of those %1$s categories~~',
+	'UI:Audit:Interactive:Categories:BreadCrumb' => 'Categories~~',
+	'UI:Audit:Interactive:Categories:BreadCrumb+' => 'Audit categories: %1$s~~',
+	'UI:Audit:Interactive:Domain:Title' => 'Audit results for Domain: %1$s~~',
+	'UI:Audit:Interactive:Domain:SubTitle' => 'Audit results for all the rules belonging to a category related to the domain: %1$s~~',
+	'UI:Audit:Interactive:Domain:BreadCrumb' => '%1$s~~',
+	'UI:Audit:Interactive:Domain:BreadCrumb+' => 'Audit for Domain: %1$s~~',
+	'UI:Audit:Interactive:Selection:Title' => 'Selection of an audit~~',
+	'UI:Audit:Interactive:Selection:SubTitle' => 'Select a domain to get the results limited to this domain or select "All categories" to get a full audit (can take time or even fail if too much data to audit)~~',
+	'UI:Audit:Interactive:Selection:BreadCrumb' => 'Selection~~',
+	'UI:Audit:Interactive:Selection:BreadCrumb+' => 'Selection of an Audit to run~~',
+	'UI:Audit:Interactive:Selection:BadgeAll' => 'All categories~~',
+	'UI:Audit:Interactive:Button:Back' => 'Back to the audit~~',
+	'UI:Audit:Interactive:Button:Configuration' => 'Audit configuration~~',
+	'UI:Audit:ViewRules' => 'Check the rules~~',
 	'UI:Audit:HeaderAuditRule' => 'Reglas de Auditoría',
 	'UI:Audit:HeaderNbObjects' => '# Objetos',
 	'UI:Audit:HeaderNbErrors' => '# Errores',
@@ -706,8 +795,6 @@ Esperamos distrute de esta versión tanto como nosotros la imaginamos y creamos.
 	'UI:Audit:Dashboard:ObjectsInError' => 'Objetos con Error',
 	'UI:Audit:Dashboard:ObjectsValidated' => 'Objetos Válidos',
 	'UI:Audit:AuditCategory:Subtitle' => '%1$s errores de %2$s - %3$s%%',
-
-
 	'UI:RunQuery:Title' => ITOP_APPLICATION_SHORT.' - Evaluación de consultas OQL',
 	'UI:RunQuery:QueryExamples' => 'Explorador de Consultas',
 	'UI:RunQuery:QueryResults' => 'Resultados de Consulta',
@@ -726,7 +813,7 @@ Esperamos distrute de esta versión tanto como nosotros la imaginamos y creamos.
 	'UI:RunQuery:ResultSQL' => 'SQL Resultante',
 	'UI:RunQuery:Error' => 'Ha ocurrido un error al ejecutar la consulta: %1$s',
 	'UI:Query:UrlForExcel' => 'URL para usarse en consultas web de MS-Excel',
-	'UI:Query:UrlV1' => 'La lista de campos se ha dejado sin especificación. La página <em>export-V2.php</em> no puede ser invocada sin está información. Por lo tanto, el URL sugerido abajo apunta a la página legada: <em>export.php</em>. Esta versión legada de exportación tiene la siguiente limitación: la lista de campos exportados puede variar, dependiendo del formato de salida y el modelo de datos de '.ITOP_APPLICATION_SHORT.'. Desea garantizar que la lista de columnas exportadas permanenzcan estables durante la ejecución, entonces debe especificar un valor para el atributo "Campos" y utilice la página <em>export-V2.php</em>.',
+	'UI:Query:UrlV1' => 'La lista de campos se ha dejado sin especificación. La página <em>export-V2.php</em> no puede ser invocada sin está información. Por lo tanto, el URL sugerido abajo apunta a la página legada: <em>export.php</em>. Esta versión legada de exportación tiene la siguiente limitación: la lista de campos exportados puede variar, dependiendo del formato de salida y el modelo de datos de '.ITOP_APPLICATION_SHORT.'.Desea garantizar que la lista de columnas exportadas permanenzcan estables durante la ejecución, entonces debe especificar un valor para el atributo "Campos" y utilice la página <em>export-V2.php</em>.',
 	'UI:Schema:Title' => 'Esquema de Objetos en '.ITOP_APPLICATION_SHORT,
 	'UI:Schema:TitleForClass' => 'Esquema de %1$s',
 	'UI:Schema:CategoryMenuItem' => 'Categoria <b>%1$s</b>',
@@ -746,7 +833,6 @@ Esperamos distrute de esta versión tanto como nosotros la imaginamos y creamos.
 	'UI:Schema:Label' => 'Etiqueta',
 	'UI:Schema:Label+' => 'Etiqueta del Atributo',
 	'UI:Schema:Type' => 'Tipo',
-
 	'UI:Schema:Type+' => 'Tipo de dato del Atributo',
 	'UI:Schema:Origin' => 'Origen',
 	'UI:Schema:Origin+' => 'La clase base en dónde está definido este atributo',
@@ -794,6 +880,16 @@ Esperamos distrute de esta versión tanto como nosotros la imaginamos y creamos.
 	'UI:Schema:DisplaySelector/Code' => 'Código',
 	'UI:Schema:Attribute/Filter' => 'Filtro',
 	'UI:Schema:DefaultNullValue' => 'Nulo por Omisión : "%1$s"',
+	'UI:Schema:Events' => 'Events~~',
+	'UI:Schema:Events:Defined' => 'Defined events~~',
+	'UI:Schema:Events:NoEvent' => 'No event defined~~',
+	'UI:Schema:Events:Listeners' => 'Event listeners~~',
+	'UI:Schema:Events:NoListener' => 'No event listener~~',
+	'UI:Schema:Events:Event' => 'Event~~',
+	'UI:Schema:Events:Description' => 'Description~~',
+	'UI:Schema:Events:Listener' => 'Listener~~',
+	'UI:Schema:Events:Rank' => 'Rank~~',
+	'UI:Schema:Events:Module' => 'Module~~',
 	'UI:LinksWidget:Autocomplete+' => 'Escriba los primeros 3 caracteres...',
 	'UI:Edit:SearchQuery' => 'Selecciona una consulta predefinida',
 	'UI:Edit:TestQuery' => 'Consulta de Prueba',
@@ -885,7 +981,6 @@ Esperamos distrute de esta versión tanto como nosotros la imaginamos y creamos.
 	'UI:SystemIntrusion' => 'Acceso denegado. Esta tratando de ejecutar una operación no permitida para usted.',
 	'UI:FatalErrorMessage' => 'Error fatal, '.ITOP_APPLICATION_SHORT.' no puede continuar.',
 	'UI:Error_Details' => 'Error: %1$s.',
-
 	'UI:PageTitle:ProfileProjections' => 'Administración de usuarios '.ITOP_APPLICATION_SHORT.' - proyecciones de Perfil',
 	'UI:UserManagement:Class' => 'Clase',
 	'UI:UserManagement:Class+' => 'Clase de objetos',
@@ -922,12 +1017,7 @@ Esperamos distrute de esta versión tanto como nosotros la imaginamos y creamos.
 	'UI:UserManagement:GrantMatrix' => 'Matriz de Acceso',
 	'UI:UserManagement:LinkBetween_User_And_Profile' => 'Vinculo entre %1$s y %2$s',
 	'UI:UserManagement:LinkBetween_User_And_Org' => 'Vínculo entre %1$s y %2$s',
-
-	'Menu:AdminTools' => 'Herramientas Administrativas',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:AdminTools+' => 'Herramientas Administrativas',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:AdminTools?' => 'Herramientas accesibles sólo a usuarios con Perfil de administrador',// Duplicated into itop-welcome-itil (will be removed from here...)
 	'Menu:SystemTools' => 'Sistema',
-
 	'UI:ChangeManagementMenu' => 'Control de Cambios',
 	'UI:ChangeManagementMenu+' => '',
 	'UI:ChangeManagementMenu:Title' => 'Resumen de Cambios',
@@ -935,54 +1025,35 @@ Esperamos distrute de esta versión tanto como nosotros la imaginamos y creamos.
 	'UI-ChangeManagementMenu-ChangesByStatus' => 'Cambios por Estatus',
 	'UI-ChangeManagementMenu-ChangesByWorkgroup' => 'Cambios por Grupo de Trabajo',
 	'UI-ChangeManagementMenu-ChangesNotYetAssigned' => 'Cambios No Asignados Aún',
-
 	'UI:ConfigurationManagementMenu' => 'Administración de la Configuración',
 	'UI:ConfigurationManagementMenu+' => 'Administración de la Configuración',
 	'UI:ConfigurationManagementMenu:Title' => 'Resumen de Infrastructura',
 	'UI-ConfigurationManagementMenu-InfraByType' => 'Objetos de Infraestructura por Tipo',
 	'UI-ConfigurationManagementMenu-InfraByStatus' => 'Objetos de Infraestructura por Estatus',
-
 	'UI:ConfigMgmtMenuOverview:Title' => 'Panel de Control para Administración de la Configuración',
 	'UI-ConfigMgmtMenuOverview-FunctionalCIbyStatus' => 'Elementos de Configuración por Estatus',
 	'UI-ConfigMgmtMenuOverview-FunctionalCIByType' => 'Elementos de Configuración por Tipo',
-
 	'UI:RequestMgmtMenuOverview:Title' => 'Panel de Control para Administración de Requerimientos',
 	'UI-RequestManagementOverview-RequestByService' => 'Requerimientos de Usuario por Servicio',
 	'UI-RequestManagementOverview-RequestByPriority' => 'Requerimientos de Usuario por Prioridad',
 	'UI-RequestManagementOverview-RequestUnassigned' => 'Requerimientos de Usuario Sin Asignar a un Analista',
-
 	'UI:IncidentMgmtMenuOverview:Title' => 'Panel de Control para Administración de Incidentes',
 	'UI-IncidentManagementOverview-IncidentByService' => 'Incidentes por Servicio',
 	'UI-IncidentManagementOverview-IncidentByPriority' => 'Incidentes por Prioridad',
 	'UI-IncidentManagementOverview-IncidentUnassigned' => 'Incidentes No Asignados a un Analista',
-
 	'UI:ChangeMgmtMenuOverview:Title' => 'Panel de Control para Control de Cambios',
 	'UI-ChangeManagementOverview-ChangeByType' => 'Cambios por Tipo',
 	'UI-ChangeManagementOverview-ChangeUnassigned' => 'Cambios No Asignados a un Analista',
 	'UI-ChangeManagementOverview-ChangeWithOutage' => 'Interrupciones de Servicios debida a Cambios',
-
 	'UI:ServiceMgmtMenuOverview:Title' => 'Panel de Control para Administración de Servicios',
 	'UI-ServiceManagementOverview-CustomerContractToRenew' => 'Acuerdos con Clientes a ser Renovados en 30 días',
 	'UI-ServiceManagementOverview-ProviderContractToRenew' => 'Contratos de Proveedores a ser Renovados en 30 días',
-
 	'UI:ContactsMenu' => 'Contactos',
 	'UI:ContactsMenu+' => 'Contactos',
 	'UI:ContactsMenu:Title' => 'Resumen de Contactos',
 	'UI-ContactsMenu-ContactsByLocation' => 'Contactos por Localidad',
 	'UI-ContactsMenu-ContactsByType' => 'Contactos por Tipo',
 	'UI-ContactsMenu-ContactsByStatus' => 'Contactos por Estatus',
-
-	'Menu:CSVImportMenu' => 'Importar CSV', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:CSVImportMenu+' => 'Creación o Actualización Másiva', // Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:DataModelMenu' => 'Modelo de datos', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:DataModelMenu+' => 'Resumen del modelo de datos', // Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:ExportMenu' => 'Exportar', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:ExportMenu+' => 'Exportar los Resultados de Cualquier Consulta en HTML, CSV o XML', // Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:NotificationsMenu' => 'Notificaciones', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:NotificationsMenu+' => 'Configuración de las Notificaciones', // Duplicated into itop-welcome-itil (will be removed from here...)
 	'UI:NotificationsMenu:Title' => 'Configuración de las Notificaciones',
 	'UI:NotificationsMenu:Help' => 'Ayuda',
 	'UI:NotificationsMenu:HelpContent' => '<p>En '.ITOP_APPLICATION_SHORT.' las notificaciones son completamente personalizables. Están basadas en dos conjuntos de objetos: <i>Disparadores y Acciones</i>.</p>
@@ -1015,49 +1086,18 @@ Cuando se asocien con un disparador, cada acción recibe un número de "orden",
 	'UI:NotificationsMenu:Actions:ActionWebhook' => 'Acciones Webhook (Integraciones salientes)',
 	'UI:NotificationsMenu:Actions:Action' => 'Otras acciones',
 	'UI:NotificationsMenu:AvailableActions' => 'Acciones Disponibles',
-
 	'Menu:TagAdminMenu' => 'Configuración de Etiquetas',
 	'Menu:TagAdminMenu+' => 'Administración de valores de Etiquetas',
 	'UI:TagAdminMenu:Title' => 'Configuración de Etiquetas',
 	'UI:TagAdminMenu:NoTags' => 'No hay campos Etiquetas configurados',
 	'UI:TagSetFieldData:Error' => 'Error: %1$s',
-
-	'Menu:AuditCategories' => 'Auditar Categorías', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:AuditCategories+' => 'Auditar Categorías', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:Notifications:Title' => 'Auditar Categorías', // Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:RunQueriesMenu' => 'Ejecutar Consultas', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:RunQueriesMenu+' => 'Ejecutar Cualquier Consulta', // Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:QueryMenu' => 'Libreta de Consultas', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:QueryMenu+' => 'Libreta de Consultas', // Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:DataAdministration' => 'Administración de Datos', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:DataAdministration+' => 'Administración de Datos', // Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:UniversalSearchMenu' => 'Búsqueda Universal', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UniversalSearchMenu+' => 'Buscar cualquier cosa', // Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:UserManagementMenu' => 'Administración de Usuarios', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UserManagementMenu+' => 'Administración de Usuarios', // Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:ProfilesMenu' => 'Perfiles', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:ProfilesMenu+' => 'Perfiles', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:ProfilesMenu:Title' => 'Perfiles', // Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:UserAccountsMenu' => 'Cuentas de Usuario', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UserAccountsMenu+' => 'Cuentas de Usuario', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UserAccountsMenu:Title' => 'Cuentas de Usuario', // Duplicated into itop-welcome-itil (will be removed from here...)
-
 	'UI:iTopVersion:Short' => '%1$s versión %2$s',
 	'UI:iTopVersion:Long' => '%1$s versión %2$s-%3$s compilada en %4$s',
 	'UI:PropertiesTab' => 'Propiedades',
-
 	'UI:OpenDocumentInNewWindow_' => 'Abrir~~',
 	'UI:DownloadDocument_' => 'Descargar~~',
 	'UI:Document:NoPreview' => 'No hay prevista disponible para este tipo de archivo',
 	'UI:Download-CSV' => 'Descargar %1$s',
-
 	'UI:DeadlineMissedBy_duration' => 'No se cumplió por %1$s',
 	'UI:Deadline_LessThan1Min' => '< 1 min',
 	'UI:Deadline_Minutes' => '%1$d min',
@@ -1100,7 +1140,7 @@ Cuando se asocien con un disparador, cada acción recibe un número de "orden",
 	'UI:RelationTooltip:ImpactedItems_N_of_M' => '# de elementos impactados: %1$d / %2$d',
 	'UI:RelationTooltip:CriticalThreshold_N_of_M' => 'Umbral Crítico: %1$d / %2$d',
 	'Portal:Title' => 'Portal de Usuario',
-	'Portal:NoRequestMgmt' => 'Estimado(a) %1$s, ha sido redirigido a esta página porque su cuenta está configurada con el Perfil \'Portal user\'. Desafortunadamente, '.ITOP_APPLICATION_SHORT.' no fue instalado con el módulo \'Request Management\'. Por favor contacte a su Administrador.',
+	'Portal:NoRequestMgmt' => 'Estimado(a) %1$s, ha sido redirigido a esta página porque su cuenta está configurada con el Perfil \'Portal user\'.Desafortunadamente, '.ITOP_APPLICATION_SHORT.' no fue instalado con el módulo \'Request Management\'.Por favor contacte a su Administrador.',
 	'Portal:Refresh' => 'Actualizar',
 	'Portal:Back' => 'Atrás',
 	'Portal:WelcomeUserOrg' => 'Bienvenido %1$s, de %2$s',
@@ -1136,9 +1176,13 @@ Cuando se asocien con un disparador, cada acción recibe un número de "orden",
 	'Enum:Undefined' => 'No Definido',
 	'UI:DurationForm_Days_Hours_Minutes_Seconds' => '%1$s Días %2$s Hrs. %3$s Mins. %4$s Segs.',
 	'UI:ModifyAllPageTitle' => 'Modificar Todos',
+	'UI:Modify_ObjectsOf_Class' => 'Modifying objects of class %1$s~~',
 	'UI:Modify_N_ObjectsOf_Class' => 'Modificando %1$d objetos de la clase %2$s',
 	'UI:Modify_M_ObjectsOf_Class_OutOf_N' => 'Modificando %1$d objetos de la clase %2$s de un total de %3$d',
 	'UI:Menu:ModifyAll' => 'Modificar',
+	'UI:Menu:ModifyAll_Class' => 'Modify %1$s objects...~~',
+	'UI:Menu:ModifyAll_Link' => 'Modify %1$s...~~',
+	'UI:Menu:ModifyAll_Remote' => 'Modify %1$s...~~',
 	'UI:Button:ModifyAll' => 'Modificar Todos',
 	'UI:Button:PreviewModifications' => 'Previsualizar Modificaciones >>',
 	'UI:ModifiedObject' => 'Objecto Modificado',
@@ -1198,7 +1242,6 @@ Cuando se asocien con un disparador, cada acción recibe un número de "orden",
 	'UI:PrintResolution:LetterLandscape' => 'Carta Horizontal',
 	'UI:Toggle:SwitchToStandardDashboard' => 'Estandar',
 	'UI:Toggle:SwitchToCustomDashboard' => 'Personalizado',
-
 	'UI:ConfigureThisList' => 'Configurar Lista',
 	'UI:ListConfigurationTitle' => 'Configuración de Lista',
 	'UI:ColumnsAndSortOrder' => 'Columnas y Ordenamiento:',
@@ -1214,10 +1257,8 @@ Cuando se asocien con un disparador, cada acción recibe un número de "orden",
 	'UI:ExtField_AsRemoteField' => '%1$s (%2$s)',
 	'UI:Button:MoveUp' => 'Mover Arriba',
 	'UI:Button:MoveDown' => 'Mover Abajo',
-
 	'UI:OQL:UnknownClassAndFix' => 'Clase Desconocida "%1$s". Puede usar "%2$s" en su lugar.',
 	'UI:OQL:UnknownClassNoFix' => 'Clase Desconocida "%1$s"',
-
 	'UI:Dashboard:EditCustom' => 'Editar versión personalizada...',
 	'UI:Dashboard:CreateCustom' => 'Crear versión personalizada...',
 	'UI:Dashboard:DeleteCustom' => 'Borrar versión personalizada...',
@@ -1228,13 +1269,10 @@ Cuando se asocien con un disparador, cada acción recibe un número de "orden",
 	'UI:ImportDashboardText' => 'Seleccione el archivo de Panel de Control a importar:',
 	'UI:Dashboard:Actions' => 'Acciones en Panel de Control',
 	'UI:Dashboard:NotUpToDateUntilContainerSaved' => 'Este panel de control muestra información que no incluye los cambios en curso',
-
-
 	'UI:DashletCreation:Title' => 'Crear Dashlet',
 	'UI:DashletCreation:Dashboard' => 'Panel de Control',
 	'UI:DashletCreation:DashletType' => 'Tipo de Dashlet',
 	'UI:DashletCreation:EditNow' => 'Editar el Panel de Control',
-
 	'UI:DashboardEdit:Title' => 'Editor de Panel del Control',
 	'UI:DashboardEdit:DashboardTitle' => 'Título',
 	'UI:DashboardEdit:AutoReload' => 'Actualización Automática',
@@ -1242,38 +1280,31 @@ Cuando se asocien con un disparador, cada acción recibe un número de "orden",
 	'UI:DashboardEdit:AutoReloadSec+' => 'El interválo mínimo es de %1$d segundos',
 	'UI:DashboardEdit:Revert' => 'Revertir',
 	'UI:DashboardEdit:Apply' => 'Aplicar',
-
 	'UI:DashboardEdit:Layout' => 'Distribución',
 	'UI:DashboardEdit:Properties' => 'Propiedades',
 	'UI:DashboardEdit:Dashlets' => 'Dashlets disponibles',
 	'UI:DashboardEdit:DashletProperties' => 'Propiedades de Dashlet',
-
 	'UI:Form:Property' => 'Propiedad',
 	'UI:Form:Value' => 'Valor',
-
 	'UI:DashletUnknown:Label' => 'Desconocido',
 	'UI:DashletUnknown:Description' => 'Dashlet desconocido (puede haber sido desinstalado)',
 	'UI:DashletUnknown:RenderText:View' => 'No es posible desplegar este dashlet.',
 	'UI:DashletUnknown:RenderText:Edit' => 'No es posible desplegar este dashlet (clase "%1$s"). Verifique con su administrador si está todavia disponible.',
 	'UI:DashletUnknown:RenderNoDataText:Edit' => 'No hay vista previa para este dashlet (clase "%1$s").',
 	'UI:DashletUnknown:Prop-XMLConfiguration' => 'Configuración (mostrado como código XML)',
-
 	'UI:DashletProxy:Label' => 'Proxy',
 	'UI:DashletProxy:Description' => 'Dashlet Proxy',
 	'UI:DashletProxy:RenderNoDataText:Edit' => 'No hay vista previa para este dashlet de terceros (clase "%1$s").',
 	'UI:DashletProxy:Prop-XMLConfiguration' => 'Configuración (mostrado como XML sin formato)',
-
 	'UI:DashletPlainText:Label' => 'Texto',
 	'UI:DashletPlainText:Description' => 'Texto Plano (sin formato)',
 	'UI:DashletPlainText:Prop-Text' => 'Texto',
 	'UI:DashletPlainText:Prop-Text:Default' => 'Escriba texto aquí...',
-
 	'UI:DashletObjectList:Label' => 'Lista de Objetos',
 	'UI:DashletObjectList:Description' => 'Lista de Objetos en dashlet',
 	'UI:DashletObjectList:Prop-Title' => 'Título',
 	'UI:DashletObjectList:Prop-Query' => 'Consulta',
 	'UI:DashletObjectList:Prop-Menu' => 'Menú',
-
 	'UI:DashletGroupBy:Prop-Title' => 'Título',
 	'UI:DashletGroupBy:Prop-Query' => 'Consulta',
 	'UI:DashletGroupBy:Prop-Style' => 'Estilo',
@@ -1287,24 +1318,20 @@ Cuando se asocien con un disparador, cada acción recibe un número de "orden",
 	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfWeek' => '%1$s (día de la semana)',
 	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfMonth' => '%1$s (día del mes)',
 	'UI:DashletGroupBy:MissingGroupBy' => 'Por favor seleccione los campos por los cuales los objetos serán agrupados',
-
 	'UI:DashletGroupByPie:Label' => 'Gráfica de Pastel',
 	'UI:DashletGroupByPie:Description' => 'Gráfica de Pastel',
 	'UI:DashletGroupByBars:Label' => 'Gráfica de Barras',
 	'UI:DashletGroupByBars:Description' => 'Gráfica de Barras',
 	'UI:DashletGroupByTable:Label' => 'Agrupado por (tabla)',
 	'UI:DashletGroupByTable:Description' => 'Lista (Campos de agrupación)',
-
-	// New in 2.5
+    // New in 2.5
 	'UI:DashletGroupBy:Prop-Function' => 'Función de Agrupación',
 	'UI:DashletGroupBy:Prop-FunctionAttribute' => 'Atributo de Función',
 	'UI:DashletGroupBy:Prop-OrderDirection' => 'Dirección',
 	'UI:DashletGroupBy:Prop-OrderField' => 'Ordenar por',
 	'UI:DashletGroupBy:Prop-Limit' => 'Límite',
-
 	'UI:DashletGroupBy:Order:asc' => 'Ascendente',
 	'UI:DashletGroupBy:Order:desc' => 'Descendente',
-
 	'UI:GroupBy:count' => 'Cuenta',
 	'UI:GroupBy:count+' => 'Número de elementos',
 	'UI:GroupBy:sum' => 'Suma',
@@ -1315,14 +1342,12 @@ Cuando se asocien con un disparador, cada acción recibe un número de "orden",
 	'UI:GroupBy:min+' => 'Mínimo de %1$s',
 	'UI:GroupBy:max' => 'Máximo',
 	'UI:GroupBy:max+' => 'Máximo de %1$s',
-	// ---
-
+    // ---
 	'UI:DashletHeaderStatic:Label' => 'Encabezado',
 	'UI:DashletHeaderStatic:Description' => 'Desplegar un separador horizontal',
 	'UI:DashletHeaderStatic:Prop-Title' => 'Título',
 	'UI:DashletHeaderStatic:Prop-Title:Default' => 'Contactos',
 	'UI:DashletHeaderStatic:Prop-Icon' => 'Icono',
-
 	'UI:DashletHeaderDynamic:Label' => 'Encabezado con Estadísticas',
 	'UI:DashletHeaderDynamic:Description' => 'Encabezado con estadísticas (agrupado por)',
 	'UI:DashletHeaderDynamic:Prop-Title' => 'Título',
@@ -1333,11 +1358,9 @@ Cuando se asocien con un disparador, cada acción recibe un número de "orden",
 	'UI:DashletHeaderDynamic:Prop-Query' => 'Query',
 	'UI:DashletHeaderDynamic:Prop-GroupBy' => 'Agrupar por',
 	'UI:DashletHeaderDynamic:Prop-Values' => 'Valores',
-
 	'UI:DashletBadge:Label' => 'Etiqueta',
 	'UI:DashletBadge:Description' => 'Icono con nuevo/buscar',
 	'UI:DashletBadge:Prop-Class' => 'Clase',
-
 	'DayOfWeek-Sunday' => 'Domingo',
 	'DayOfWeek-Monday' => 'Lunes',
 	'DayOfWeek-Tuesday' => 'Martes',
@@ -1357,8 +1380,7 @@ Cuando se asocien con un disparador, cada acción recibe un número de "orden",
 	'Month-10' => 'Octubre',
 	'Month-11' => 'Noviembre',
 	'Month-12' => 'Diciembre',
-
-	// Short version for the DatePicker
+    // Short version for the DatePicker
 	'DayOfWeek-Sunday-Min' => 'Do',
 	'DayOfWeek-Monday-Min' => 'Lu',
 	'DayOfWeek-Tuesday-Min' => 'Ma',
@@ -1378,13 +1400,13 @@ Cuando se asocien con un disparador, cada acción recibe un número de "orden",
 	'Month-10-Short' => 'Oct',
 	'Month-11-Short' => 'Nov',
 	'Month-12-Short' => 'Dic',
-	'Calendar-FirstDayOfWeek' => '0', // 0 = Sunday, 1 = Monday, etc...
-
+	'Calendar-FirstDayOfWeek' => '0',
+    // 0 = Sunday, 1 = Monday, etc...
 	'UI:Menu:ShortcutList' => 'Crear Acceso Rápido',
+	'UI:Menu:FilterList' => 'Display list with search criteria~~',
 	'UI:ShortcutRenameDlg:Title' => 'Renombrar Acceso Rápido',
 	'UI:ShortcutListDlg:Title' => 'Crear Acceso Rápido para la Lista',
 	'UI:ShortcutDelete:Confirm' => 'Por favor conforme que desea Eliminar el/los Acceso(s) Rápido(s)',
-	'Menu:MyShortcuts' => 'Mis Accesos Rápidos', // Duplicated into itop-welcome-itil (will be removed from here...)
 	'Class:Shortcut' => 'Acceso Rápido',
 	'Class:Shortcut+' => 'Acceso Rápido',
 	'Class:Shortcut/Attribute:name' => 'Nombre',
@@ -1398,12 +1420,10 @@ Cuando se asocien con un disparador, cada acción recibe un número de "orden",
 	'Class:ShortcutOQL/Attribute:auto_reload/Value:custom' => 'Frecuencia configurable',
 	'Class:ShortcutOQL/Attribute:auto_reload_sec' => 'Interválo de Actualización Automática (segundos)',
 	'Class:ShortcutOQL/Attribute:auto_reload_sec/tip' => 'El interválo mínimo es de %1$d segundos',
-
 	'UI:FillAllMandatoryFields' => 'Por favor llenar los campos obligatorios.',
 	'UI:ValueMustBeSet' => 'Por favor, ingrese un valor',
 	'UI:ValueMustBeChanged' => 'Por favor cambie el valor',
 	'UI:ValueInvalidFormat' => 'Formato inválido',
-
 	'UI:CSVImportConfirmTitle' => 'Por favor confirme la operación',
 	'UI:CSVImportConfirmMessage' => '¿Está seguro?',
 	'UI:CSVImportError_items' => 'Errores: %1$d',
@@ -1429,12 +1449,9 @@ Cuando se asocien con un disparador, cada acción recibe un número de "orden",
 <tr><td>i</td><td>minutos (2 digitos, ejem. 00..59)</td></tr>
 <tr><td>s</td><td>segundos (2 digitos, ejem. 00..59)</td></tr>
 </table>',
-
 	'UI:Button:Remove' => 'Remover',
 	'UI:AddAnExisting_Class' => 'Agregar objetos del tipo %1$s...',
 	'UI:SelectionOf_Class' => 'Selección de objetos del tipo %1$s',
-
-
 	'UI:AboutBox' => 'Acerca de '.ITOP_APPLICATION_SHORT.'...',
 	'UI:About:Title' => 'Acerca de '.ITOP_APPLICATION_SHORT,
 	'UI:About:DataModel' => 'Modelo de Datos',
@@ -1444,12 +1461,10 @@ Cuando se asocien con un disparador, cada acción recibe un número de "orden",
 	'UI:About:ManualExtensionSource' => 'Extensión',
 	'UI:About:Extension_Version' => 'Versión: %1$s',
 	'UI:About:RemoteExtensionSource' => 'Fuente',
-
 	'UI:DisconnectedDlgMessage' => 'Está desconectado. Debe identificarse para continuar usando la aplicación.',
 	'UI:DisconnectedDlgTitle' => 'Advertencia',
 	'UI:LoginAgain' => 'Conectarse nuevamente',
 	'UI:StayOnThePage' => 'Mantenerse en esta página',
-
 	'ExcelExporter:ExportMenu' => 'Exportar a Excel...',
 	'ExcelExporter:ExportDialogTitle' => 'Exportar a Excel',
 	'ExcelExporter:ExportButton' => 'Exportar',
@@ -1462,7 +1477,6 @@ Cuando se asocien con un disparador, cada acción recibe un número de "orden",
 	'ExcelExport:Statistics' => 'Estadísticas',
 	'portal:legacy_portal' => 'Portal de Clientes',
 	'portal:backoffice' => 'Portal de Soporte',
-
 	'UI:CurrentObjectIsLockedBy_User' => 'El objeto está bloqueado debido a que está siendo modificado por %1$s.',
 	'UI:CurrentObjectIsLockedBy_User_Explanation' => 'El objeto está siendo modificado por %1$s. Sus modificaciones no pueden ser guardadas debeido a que serán re-escritas.',
 	'UI:CurrentObjectIsSoftLockedBy_User' => 'El objeto se encuentra modificado por %1$s. Podrá guardar sus modificaciones cuando el otro usuario termine.',
@@ -1470,43 +1484,36 @@ Cuando se asocien con un disparador, cada acción recibe un número de "orden",
 	'UI:CurrentObjectLockExpired_Explanation' => 'TEl bloqueo que prevenia modificaciones concurrentes ha expirado. Sus modificaiones no pueden ser guardadas debido a que otros usuario tiene el permiso para modificar este objeto.',
 	'UI:ConcurrentLockKilled' => 'El bloqueo que prevenia modificaciones concurrentes ha sido eliminado.',
 	'UI:Menu:KillConcurrentLock' => 'Detener el bloque por modificaciones concurrentes!',
-
 	'UI:Menu:ExportPDF' => 'Exportar como PDF...',
 	'UI:Menu:PrintableVersion' => 'Versión imprimible',
-
 	'UI:BrowseInlineImages' => 'Ver imágenes...',
 	'UI:UploadInlineImageLegend' => 'Subir nueva imágen',
 	'UI:SelectInlineImageToUpload' => 'Seleccione la imágen a subir',
 	'UI:AvailableInlineImagesLegend' => 'Imágenes disponibles',
 	'UI:NoInlineImage' => 'No hay imágenes disponibles en el servidor. Use el botón "Seleccionar archivo" para seleccionar una imágen de su equipo local y subirla al servidor.',
-
 	'UI:ToggleFullScreen' => 'Cambiar Maximizar / Minimizar',
 	'UI:Button:ResetImage' => 'Recuperar imágen previa',
 	'UI:Button:RemoveImage' => 'Remover imágen',
 	'UI:Button:UploadImage' => 'Cargar una imagen del disco',
 	'UI:UploadNotSupportedInThisMode' => 'La modificación de imágenes o archivos no está soportado en este modo.',
-
 	'UI:Button:RemoveDocument' => 'Remover documento',
-
-	// Search form
+    // Search form
 	'UI:Search:Toggle' => 'Minimizar/ Expandir',
 	'UI:Search:AutoSubmit:DisabledHint' => 'Auto enviar ha sido deshabilitado para esta clase',
 	'UI:Search:Obsolescence:DisabledHint' => 'Basado en sus preferencias, datos obsoletos están ocultos',
 	'UI:Search:NoAutoSubmit:ExplainText' => 'Agregue algún criterio en el cuadro de búsqueda o haga click en el botón de búsqueda para ver los objetos.',
 	'UI:Search:Criterion:MoreMenu:AddCriteria' => 'Agregar nuevo criterio',
-	// - Add new criteria button
+    // - Add new criteria button
 	'UI:Search:AddCriteria:List:RecentlyUsed:Title' => 'Recientemente usado',
 	'UI:Search:AddCriteria:List:MostPopular:Title' => 'Más popular',
 	'UI:Search:AddCriteria:List:Others:Title' => 'Otros',
 	'UI:Search:AddCriteria:List:RecentlyUsed:Placeholder' => 'Ninguno todavía',
-
-	// - Criteria header actions
+    // - Criteria header actions
 	'UI:Search:Criteria:Toggle' => 'Minimizar / Expandir',
 	'UI:Search:Criteria:Remove' => 'Remover',
 	'UI:Search:Criteria:Locked' => 'Bloquear',
-
-	// - Criteria titles
-	//   - Default widget
+    // - Criteria titles
+    //   - Default widget
 	'UI:Search:Criteria:Title:Default:Any' => '%1$s: Cualquier',
 	'UI:Search:Criteria:Title:Default:Empty' => '%1$s está vacío',
 	'UI:Search:Criteria:Title:Default:NotEmpty' => '%1$s no está vacío',
@@ -1528,53 +1535,57 @@ Cuando se asocien con un disparador, cada acción recibe un número de "orden",
 	'UI:Search:Criteria:Title:Default:Between:All' => '%1$s: Cualquier',
 	'UI:Search:Criteria:Title:Default:Between:From' => '%1$s desde %2$s',
 	'UI:Search:Criteria:Title:Default:Between:Until' => '%1$s hasta %2$s',
-	//   - Numeric widget
-	//   None yet
-	//   - DateTime widget
+    //   - Numeric widget
+    //   None yet
+    //   - DateTime widget
 	'UI:Search:Criteria:Title:DateTime:Between' => '%2$s <= 1$s <= %3$s',
-	//   - Enum widget
+    //   - Enum widget
 	'UI:Search:Criteria:Title:Enum:In' => '%1$s: %2$s',
 	'UI:Search:Criteria:Title:Enum:In:Many' => '%1$s: %2$s y %3$s otros',
 	'UI:Search:Criteria:Title:Enum:In:All' => '%1$s: Cualquier',
-	//   - TagSet widget
+    //   - TagSet widget
 	'UI:Search:Criteria:Title:TagSet:Matches' => '%1$s: %2$s',
-	//   - External key widget
+    //   - External key widget
 	'UI:Search:Criteria:Title:ExternalKey:Empty' => '%1$s está definido',
 	'UI:Search:Criteria:Title:ExternalKey:NotEmpty' => '%1$s no está definido',
 	'UI:Search:Criteria:Title:ExternalKey:Equals' => '%1$s %2$s',
 	'UI:Search:Criteria:Title:ExternalKey:In' => '%1$s: %2$s',
 	'UI:Search:Criteria:Title:ExternalKey:In:Many' => '%1$s: %2$s y %3$s otros',
 	'UI:Search:Criteria:Title:ExternalKey:In:All' => '%1$s: Cualquier',
-	//   - Hierarchical key widget
+    //   - Hierarchical key widget
 	'UI:Search:Criteria:Title:HierarchicalKey:Empty' => '%1$s está definido',
 	'UI:Search:Criteria:Title:HierarchicalKey:NotEmpty' => '%1$s no está definido',
 	'UI:Search:Criteria:Title:HierarchicalKey:Equals' => '%1$s %2$s',
 	'UI:Search:Criteria:Title:HierarchicalKey:In' => '%1$s: %2$s',
 	'UI:Search:Criteria:Title:HierarchicalKey:In:Many' => '%1$s: %2$s y %3$s otros',
 	'UI:Search:Criteria:Title:HierarchicalKey:In:All' => '%1$s: Cualquier',
-
-	// - Criteria operators
-	//   - Default widget
+    // - Criteria operators
+    //   - Default widget
 	'UI:Search:Criteria:Operator:Default:Empty' => 'Está vacío',
 	'UI:Search:Criteria:Operator:Default:NotEmpty' => 'No está vacío',
 	'UI:Search:Criteria:Operator:Default:Equals' => 'Igual',
 	'UI:Search:Criteria:Operator:Default:Between' => 'Entre',
-	//   - String widget
+    //   - String widget
 	'UI:Search:Criteria:Operator:String:Contains' => 'Contiene',
 	'UI:Search:Criteria:Operator:String:StartsWith' => 'Comienza con',
 	'UI:Search:Criteria:Operator:String:EndsWith' => 'Termina con',
 	'UI:Search:Criteria:Operator:String:RegExp' => 'Exp. Regular',
-	//   - Numeric widget
-	'UI:Search:Criteria:Operator:Numeric:Equals' => 'Igual', // => '=',
-	'UI:Search:Criteria:Operator:Numeric:GreaterThan' => 'Mayor', // => '>',
-	'UI:Search:Criteria:Operator:Numeric:GreaterThanOrEquals' => 'Mayor / igual', // > '>=',
-	'UI:Search:Criteria:Operator:Numeric:LessThan' => 'Menor', // => '<',
-	'UI:Search:Criteria:Operator:Numeric:LessThanOrEquals' => 'Menor / igual', // > '<=',
-	'UI:Search:Criteria:Operator:Numeric:Different' => 'Diferente', // => '≠',
-	//   - Tag Set Widget
+    //   - Numeric widget
+	'UI:Search:Criteria:Operator:Numeric:Equals' => 'Igual',
+    // => '=',
+	'UI:Search:Criteria:Operator:Numeric:GreaterThan' => 'Mayor',
+    // => '>',
+	'UI:Search:Criteria:Operator:Numeric:GreaterThanOrEquals' => 'Mayor / igual',
+    // > '>=',
+	'UI:Search:Criteria:Operator:Numeric:LessThan' => 'Menor',
+    // => '<',
+	'UI:Search:Criteria:Operator:Numeric:LessThanOrEquals' => 'Menor / igual',
+    // > '<=',
+	'UI:Search:Criteria:Operator:Numeric:Different' => 'Diferente',
+    // => '≠',
+    //   - Tag Set Widget
 	'UI:Search:Criteria:Operator:TagSet:Matches' => 'Coincidencias',
-
-	// - Other translations
+    // - Other translations
 	'UI:Search:Value:Filter:Placeholder' => 'Filtro...',
 	'UI:Search:Value:Search:Placeholder' => 'Búsqueda...',
 	'UI:Search:Value:Autocomplete:StartTyping' => 'Inicie escribiento posibles valores.',
@@ -1582,8 +1593,7 @@ Cuando se asocien con un disparador, cada acción recibe un número de "orden",
 	'UI:Search:Value:Autocomplete:NoResult' => 'Sin Resultados.',
 	'UI:Search:Value:Toggler:CheckAllNone' => 'Marcar todos / ninguno',
 	'UI:Search:Value:Toggler:CheckAllNoneFiltered' => 'Marcar todos / ninguno visible',
-
-	// - Widget other translations
+    // - Widget other translations
 	'UI:Search:Criteria:Numeric:From' => 'De',
 	'UI:Search:Criteria:Numeric:Until' => 'Para',
 	'UI:Search:Criteria:Numeric:PlaceholderFrom' => 'Cualquier',
@@ -1597,10 +1607,8 @@ Cuando se asocien con un disparador, cada acción recibe un número de "orden",
 	'UI:Search:Criteria:DateTime:PlaceholderUntil' => 'Cualquier fecha',
 	'UI:Search:Criteria:DateTime:PlaceholderUntilTime' => 'Cualquier fecha',
 	'UI:Search:Criteria:HierarchicalKey:ChildrenIncluded:Hint' => 'Hijos de los objetos seleccionados serán incluídos.',
-
 	'UI:Search:Criteria:Raw:Filtered' => 'Filtrado',
 	'UI:Search:Criteria:Raw:FilteredOn' => 'Filtrado en %1$s',
-
 	'UI:StateChanged' => 'Estado cambiado',
 ));
 
@@ -1611,16 +1619,13 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Expression:Operator:AND' => ' Y ',
 	'Expression:Operator:OR' => ' O ',
 	'Expression:Operator:=' => ': ',
-
 	'Expression:Unit:Short:DAY' => 'd',
 	'Expression:Unit:Short:WEEK' => 's',
 	'Expression:Unit:Short:MONTH' => 'm',
 	'Expression:Unit:Short:YEAR' => 'a',
-
 	'Expression:Unit:Long:DAY' => 'día(s)',
 	'Expression:Unit:Long:HOUR' => 'hora(s)',
 	'Expression:Unit:Long:MINUTE' => 'minuto(s)',
-
 	'Expression:Verb:NOW' => 'Ahora',
 	'Expression:Verb:ISNULL' => ': Nulo',
 ));
@@ -1644,46 +1649,32 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Menu:DataSources' => 'Fuentes de Datos Sincronizables',
 	'Menu:DataSources+' => 'Fuentes de Datos Sincronizables',
-	'Menu:WelcomeMenu' => 'Bienvenido',
-	'Menu:WelcomeMenu+' => 'Bienvenido a '.ITOP_APPLICATION_SHORT,
-	'Menu:WelcomeMenuPage' => 'Bienvenido',
-	'Menu:WelcomeMenuPage+' => 'Bienvenido a '.ITOP_APPLICATION_SHORT,
-	'Menu:AdminTools' => 'Herramientas Administrativas',
-	'Menu:AdminTools+' => 'Herramientas Administrativas',
-	'Menu:AdminTools?' => 'Herramientas accesibles sólo a usuarios con Perfil de administrador',
-	'Menu:DataModelMenu' => 'Modelo de datos',
-	'Menu:DataModelMenu+' => 'Resumen del modelo de datos',
-	'Menu:ExportMenu' => 'Exportar',
-	'Menu:ExportMenu+' => 'Exportar los resultados de cualquier consulta en HTML, CSV o XML',
-	'Menu:NotificationsMenu' => 'Notificaciones',
-	'Menu:NotificationsMenu+' => 'Configuración de las notificaciones',
 	'Menu:AuditCategories' => 'Auditar categorías',
 	'Menu:AuditCategories+' => 'Auditar categorías',
 	'Menu:Notifications:Title' => 'Auditar categorías',
-	'Menu:RunQueriesMenu'         => 'Ejecutar consultas',
-	'Menu:RunQueriesMenu+'        => 'Ejecutar cualquier consulta',
-	'Menu:QueryMenu'              => 'Libreta de consultas',
-	'Menu:QueryMenu+'             => 'Libreta de consultas',
-	'Menu:UniversalSearchMenu'    => 'Búsqueda universal',
-	'Menu:UniversalSearchMenu+'   => 'Buscar cualquier cosa',
-	'Menu:UserManagementMenu'     => 'Administración de usuarios',
-	'Menu:UserManagementMenu+'    => 'Administración de usuarios',
-	'Menu:ProfilesMenu'           => 'Perfiles',
-	'Menu:ProfilesMenu+'          => 'Perfiles',
-	'Menu:ProfilesMenu:Title'     => 'Perfiles',
-	'Menu:UserAccountsMenu'       => 'Cuentas de Usuario',
-	'Menu:UserAccountsMenu+'      => 'Cuentas de Usuario',
+	'Menu:AuditCategories:Title' => 'Audit configuration~~',
+	'Menu:RunQueriesMenu' => 'Ejecutar consultas',
+	'Menu:RunQueriesMenu+' => 'Ejecutar cualquier consulta',
+	'Menu:QueryMenu' => 'Libreta de consultas',
+	'Menu:QueryMenu+' => 'Libreta de consultas',
+	'Menu:UniversalSearchMenu' => 'Búsqueda universal',
+	'Menu:UniversalSearchMenu+' => 'Buscar cualquier cosa',
+	'Menu:UserManagementMenu' => 'Administración de usuarios',
+	'Menu:UserManagementMenu+' => 'Administración de usuarios',
+	'Menu:ProfilesMenu' => 'Perfiles',
+	'Menu:ProfilesMenu+' => 'Perfiles',
+	'Menu:ProfilesMenu:Title' => 'Perfiles',
+	'Menu:UserAccountsMenu' => 'Cuentas de Usuario',
+	'Menu:UserAccountsMenu+' => 'Cuentas de Usuario',
 	'Menu:UserAccountsMenu:Title' => 'Cuentas de Usuario',
-	'Menu:MyShortcuts' => 'Mis Accesos Rápidos',
 	'Menu:UserManagement' => 'Administración de usuarios',
 	'Menu:Queries' => 'Consultas',
-	'Menu:ConfigurationTools' => 'Configuración',
+	'Menu:ConfigurationTools' => 'Configuración'
 ));
-
 // Additional language entries not present in English dict
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'UI:Toggle:StandardDashboard' => 'Estándar',
 	'UI:Toggle:CustomDashboard' => 'Personalizado',
 	'UI:Dashboard:Edit' => 'Editar esta Página',
-	'UI:Dashboard:Revert' => 'Regresar a Versión Original',
+	'UI:Dashboard:Revert' => 'Regresar a Versión Original'
 ));
diff --git a/dictionaries/fr.dictionary.itop.core.php b/dictionaries/fr.dictionary.itop.core.php
index 605852be0b..7e145cb036 100644
--- a/dictionaries/fr.dictionary.itop.core.php
+++ b/dictionaries/fr.dictionary.itop.core.php
@@ -21,57 +21,42 @@
  */
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Core:DeletedObjectLabel' => '%1s (effacé)',
-	'Core:DeletedObjectTip'   => 'L\'objet a été effacé le %1$s (%2$s)',
-
+	'Core:DeletedObjectTip' => 'L\'objet a été effacé le %1$s (%2$s)',
 	'Core:UnknownObjectLabel' => 'Classe: %1$s, Identifiant: %2$d',
-	'Core:UnknownObjectTip'   => 'L\'objet n\'a pu être trouvé. Il se peut que les archives aient été purgées après son effacement.',
-
+	'Core:UnknownObjectTip' => 'L\'objet n\'a pu être trouvé. Il se peut que les archives aient été purgées après son effacement.',
 	'Core:UniquenessDefaultError' => 'La règle d\'unicité \'%1$s\' renvoie une erreur',
-	'Core:CheckConsistencyError'  => 'La règle d\'intégrité %1$s n\'est pas respectée',
-	'Core:CheckValueError'        => 'Valeur de l\'attribut incorrecte \'%1$s\' (%2$s) : %3$s',
-
-	'Core:AttributeLinkedSet'  => 'Objets liés (1-n)',
+	'Core:CheckConsistencyError' => 'La règle d\'intégrité %1$s n\'est pas respectée',
+	'Core:CheckValueError' => 'Valeur de l\'attribut incorrecte \'%1$s\' (%2$s) : %3$s',
+	'Core:AttributeLinkedSet' => 'Objets liés (1-n)',
 	'Core:AttributeLinkedSet+' => 'Liste d\'objets d\'une classe donnée et pointant sur l\'objet courant',
-
 	'Core:AttributeLinkedSetDuplicatesFound' => 'Des doublons sont présents dans le champ \'%1$s\' : %2$s',
-
-	'Core:AttributeDashboard'  => 'Tableau de bord',
+	'Core:AttributeDashboard' => 'Tableau de bord',
 	'Core:AttributeDashboard+' => '',
-
-	'Core:AttributePhoneNumber'  => 'Numéro de téléphone',
+	'Core:AttributePhoneNumber' => 'Numéro de téléphone',
 	'Core:AttributePhoneNumber+' => '',
-
 	'Core:AttributeObsolescenceDate' => 'Date d\'obsolescence',
 	'Core:AttributeObsolescenceDate+' => '',
-
 	'Core:AttributeTagSet' => 'Liste d\'étiquettes',
 	'Core:AttributeTagSet+' => '',
 	'Core:AttributeSet:placeholder' => 'cliquer pour ajouter',
 	'Core:AttributeClassAttCodeSet:ItemLabel:AttributeFromClass' => '%1$s (%2$s)',
 	'Core:AttributeClassAttCodeSet:ItemLabel:AttributeFromOneChildClass' => '%1$s (%2$s de la classe %3$s)',
 	'Core:AttributeClassAttCodeSet:ItemLabel:AttributeFromSeveralChildClasses' => '%1$s (%2$s d\'une sous-classe)',
-
 	'Core:AttributeCaseLog' => 'Journal',
 	'Core:AttributeCaseLog+' => '',
-
 	'Core:AttributeMetaEnum' => 'Liste enumérée consolidée',
 	'Core:AttributeMetaEnum+' => '',
-
 	'Core:AttributeLinkedSetIndirect' => 'Objets liés (1-n)',
 	'Core:AttributeLinkedSetIndirect+' => 'Liste d\'objets d\'une classe donnée et liés à l\'objet courant via une classe intermédiaire',
-
 	'Core:AttributeInteger' => 'Nombre entier',
 	'Core:AttributeInteger+' => 'Valeur numérique entière',
-
 	'Core:AttributeDecimal' => 'Nombre décimal',
 	'Core:AttributeDecimal+' => 'Valeur numérique décimale',
-
 	'Core:AttributeBoolean' => 'Booléen',
 	'Core:AttributeBoolean+' => '',
 	'Core:AttributeBoolean/Value:null' => '',
 	'Core:AttributeBoolean/Value:yes' => 'Oui',
 	'Core:AttributeBoolean/Value:no' => 'Non',
-
 	'Core:AttributeArchiveFlag' => 'Drapeau Archive',
 	'Core:AttributeArchiveFlag/Value:yes' => 'Oui',
 	'Core:AttributeArchiveFlag/Value:yes+' => 'Cet object n\'est visible que dans le mode Archive',
@@ -80,7 +65,6 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Core:AttributeArchiveFlag/Label+' => '',
 	'Core:AttributeArchiveDate/Label' => 'Date archivage',
 	'Core:AttributeArchiveDate/Label+' => '',
-
 	'Core:AttributeObsolescenceFlag' => 'Drapeau obsolète',
 	'Core:AttributeObsolescenceFlag/Value:yes' => 'Oui',
 	'Core:AttributeObsolescenceFlag/Value:yes+' => 'Cet objet est exclus de l\'analyse d\'impact, et n\'est pas affiché dans les résultats de recherche',
@@ -89,54 +73,38 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Core:AttributeObsolescenceFlag/Label+' => 'Calculé dynamiquement en fonction d\'autres attributs de l\'objet',
 	'Core:AttributeObsolescenceDate/Label' => 'Date d\'obsolescence',
 	'Core:AttributeObsolescenceDate/Label+' => 'Date approximative du jour où l\'objet est devenu obsolète',
-
 	'Core:AttributeString' => 'Chaîne de caractères',
 	'Core:AttributeString+' => 'Chaîne de caractères (limitée à une ligne)',
-
 	'Core:AttributeClass' => 'Classe',
 	'Core:AttributeClass+' => 'Classe d\'objets',
-
 	'Core:AttributeApplicationLanguage' => 'Langue',
 	'Core:AttributeApplicationLanguage+' => 'Codes langue et pays (EN US)',
-
 	'Core:AttributeFinalClass' => 'Classe',
 	'Core:AttributeFinalClass+' => 'Classe réelle de l\'objet (attribut créé automatiquement)',
-
 	'Core:AttributePassword' => 'Mot de passe',
 	'Core:AttributePassword+' => 'Mot de passe qui peut être lu en clair',
-
 	'Core:AttributeEncryptedString' => 'Chaîne encryptée',
 	'Core:AttributeEncryptedString+' => 'Chaîne encryptée avec une clé locale',
 	'Core:AttributeEncryptUnknownLibrary' => 'La bibliothèque de chiffrement specifée (%1$s) est inconnue',
 	'Core:AttributeEncryptFailedToDecrypt' => '** erreur de déchiffrage **',
-
 	'Core:AttributeText' => 'Texte',
 	'Core:AttributeText+' => 'Chaîne de caractères de plusieurs lignes',
-
 	'Core:AttributeHTML' => 'HTML',
 	'Core:AttributeHTML+' => 'Texte formaté en HTML',
-
 	'Core:AttributeEmailAddress' => 'Adresse électronique',
 	'Core:AttributeEmailAddress+' => 'Adresse électronique (xxxx@yyy.zzz)',
-
 	'Core:AttributeIPAddress' => 'Adresse IP',
 	'Core:AttributeIPAddress+' => '',
-
 	'Core:AttributeOQL' => 'Expression OQL',
 	'Core:AttributeOQL+' => 'Expression formattée en "Object Query Language"',
-
 	'Core:AttributeEnum' => 'Enumération',
 	'Core:AttributeEnum+' => 'Valeur choisie parmi un liste de chaîne de caractères',
-
 	'Core:AttributeTemplateString' => 'Modèle de chaîne de caractères',
 	'Core:AttributeTemplateString+' => 'Chaîne de caractères d\'une ligne, contenant des espaces réservés pour des données '.ITOP_APPLICATION_SHORT,
-
 	'Core:AttributeTemplateText' => 'Modèle de texte',
 	'Core:AttributeTemplateText+' => 'Texte contenant des espaces réservés pour des données '.ITOP_APPLICATION_SHORT,
-
 	'Core:AttributeTemplateHTML' => 'Modèle HTML',
 	'Core:AttributeTemplateHTML+' => 'HTML contenant des espaces réservés pour des données '.ITOP_APPLICATION_SHORT,
-
 	'Core:AttributeDateTime' => 'Date/heure',
 	'Core:AttributeDateTime+' => 'Date et heure (année-mois-jour hh:mm:ss)',
 	'Core:AttributeDateTime?SmartSearch' => '
@@ -154,7 +122,6 @@ Opérateurs :<br/>
 <p>
 Si l\'heure n\'est pas spécifiée, cela revient à 00:00:00 (minuit)
 </p>',
-
 	'Core:AttributeDate' => 'Date',
 	'Core:AttributeDate+' => 'Date (année-mois-jour)',
 	'Core:AttributeDate?SmartSearch' => '
@@ -169,43 +136,30 @@ Opérateurs :<br/>
 	<b>&lt;</b><em>date</em><br/>
 	<b>[</b><em>date</em>,<em>date</em><b>]</b>
 </p>',
-
 	'Core:AttributeDeadline' => 'Délai',
 	'Core:AttributeDeadline+' => 'Date/heure exprimée relativement à l\'heure courante',
-
 	'Core:AttributeExternalKey' => 'Clé externe',
 	'Core:AttributeExternalKey+' => '',
-
 	'Core:AttributeHierarchicalKey' => 'Clé externe (hiérarchie)',
 	'Core:AttributeHierarchicalKey+' => 'Clé externe vers le parent',
-
 	'Core:AttributeExternalField' => 'Attribut externe',
 	'Core:AttributeExternalField+' => 'Copie de la valeur d\'un attribut de l\'objet lié par une clé externe',
-
 	'Core:AttributeURL' => 'URL',
 	'Core:AttributeURL+' => 'URL absolue ou relative',
-
 	'Core:AttributeBlob' => 'Blob',
 	'Core:AttributeBlob+' => 'Contenu binaire (document)',
-
 	'Core:AttributeOneWayPassword' => 'Mot de passe "one way"',
 	'Core:AttributeOneWayPassword+' => 'Mot de passe qui peut être vérifié mais jamais lu en clair',
-
 	'Core:AttributeTable' => 'Table',
 	'Core:AttributeTable+' => 'Tableau à deux dimensions',
-
 	'Core:AttributePropertySet' => 'Propriétés',
 	'Core:AttributePropertySet+' => 'Liste de propriétés (nom et valeur) non typées',
-
 	'Core:AttributeFriendlyName' => 'Nom usuel (convivial)',
 	'Core:AttributeFriendlyName+' => 'Attribut créé automatiquement ; sa valeur est calculée d\'après d\'autres attributs',
-
 	'Core:FriendlyName-Label' => 'Nom complet',
 	'Core:FriendlyName-Description' => 'Nom complet',
-
 	'Core:AttributeTag' => 'Taxon',
 	'Core:AttributeTag+' => '',
-	
 	'Core:Context=REST/JSON' => 'REST',
 	'Core:Context=Synchro' => 'Synchro',
 	'Core:Context=Setup' => 'Setup',
@@ -481,25 +435,26 @@ Dict::Add('FR FR', 'French', 'Français', array(
 //
 
 Dict::Add('FR FR', 'French', 'Français', array(
-	'Class:Action'                                  => 'Action',
-	'Class:Action+'                                 => 'Action spécifique',
-	'Class:Action/Attribute:name'                   => 'Nom',
-	'Class:Action/Attribute:name+'                  => 'Label',
-	'Class:Action/Attribute:description'            => 'Description',
-	'Class:Action/Attribute:description+'           => '',
-	'Class:Action/Attribute:status'                 => 'Etat',
-	'Class:Action/Attribute:status+'                => '',
-	'Class:Action/Attribute:status/Value:test'      => 'En test',
-	'Class:Action/Attribute:status/Value:test+'     => '',
-	'Class:Action/Attribute:status/Value:enabled'   => 'En production',
-	'Class:Action/Attribute:status/Value:enabled+'  => '',
-	'Class:Action/Attribute:status/Value:disabled'  => 'Inactive',
+	'Class:Action' => 'Action',
+	'Class:Action+' => 'Action spécifique',
+	'Class:Action/ComplementaryName' => '%1$s: %2$s~~',
+	'Class:Action/Attribute:name' => 'Nom',
+	'Class:Action/Attribute:name+' => 'Label',
+	'Class:Action/Attribute:description' => 'Description',
+	'Class:Action/Attribute:description+' => '',
+	'Class:Action/Attribute:status' => 'Etat',
+	'Class:Action/Attribute:status+' => '',
+	'Class:Action/Attribute:status/Value:test' => 'En test',
+	'Class:Action/Attribute:status/Value:test+' => '',
+	'Class:Action/Attribute:status/Value:enabled' => 'En production',
+	'Class:Action/Attribute:status/Value:enabled+' => '',
+	'Class:Action/Attribute:status/Value:disabled' => 'Inactive',
 	'Class:Action/Attribute:status/Value:disabled+' => '',
-	'Class:Action/Attribute:trigger_list'           => 'Déclencheurs liés',
-	'Class:Action/Attribute:trigger_list+'          => 'Déclencheurs à l\'origine de cette action',
-	'Class:Action/Attribute:finalclass'             => 'Sous-classe d\'Action',
-	'Class:Action/Attribute:finalclass+'            => 'Nom de la classe instanciable',
-	'Action:WarningNoTriggerLinked'                 => 'Attention, aucun déclencheur n\'est associé à l\'action. Elle ne sera pas active tant qu\'elle n\'en aura pas au moins 1.',
+	'Class:Action/Attribute:trigger_list' => 'Déclencheurs liés',
+	'Class:Action/Attribute:trigger_list+' => 'Déclencheurs à l\'origine de cette action',
+	'Class:Action/Attribute:finalclass' => 'Sous-classe d\'Action',
+	'Class:Action/Attribute:finalclass+' => 'Nom de la classe instanciable',
+	'Action:WarningNoTriggerLinked' => 'Attention, aucun déclencheur n\'est associé à l\'action. Elle ne sera pas active tant qu\'elle n\'en aura pas au moins 1.',
 ));
 
 //
@@ -516,44 +471,44 @@ Dict::Add('FR FR', 'French', 'Français', array(
 //
 
 Dict::Add('FR FR', 'French', 'Français', array(
-	'Class:ActionEmail'                                  => 'Notification par mél',
-	'Class:ActionEmail+'                                 => '',
-	'Class:ActionEmail/Attribute:status+'                => 'Cet état définit qui va être notifié: 
+	'Class:ActionEmail' => 'Notification par mél',
+	'Class:ActionEmail+' => '',
+	'Class:ActionEmail/Attribute:status+' => 'Cet état définit qui va être notifié: 
 - En test : le Destinataire de test uniquement,
 - En production : tous les destinataires (A, Copie and Copie Cachée),
 - Inactive : personne.',
-	'Class:ActionEmail/Attribute:status/Value:test+'     => 'Seul le destinataire de test est notifié ',
-	'Class:ActionEmail/Attribute:status/Value:enabled+'  => 'Tous les destinataires (A, Copie and Copie Cachée) sont notifiés',
+	'Class:ActionEmail/Attribute:status/Value:test+' => 'Seul le destinataire de test est notifié ',
+	'Class:ActionEmail/Attribute:status/Value:enabled+' => 'Tous les destinataires (A, Copie and Copie Cachée) sont notifiés',
 	'Class:ActionEmail/Attribute:status/Value:disabled+' => 'La notification n\'est pas envoyée',
-	'Class:ActionEmail/Attribute:test_recipient'         => 'Destinataire de test',
-	'Class:ActionEmail/Attribute:test_recipient+'        => 'Adresse mél utilisée en remplacement des A, Copie et Copie Cachée, lorsque la notification est \'En test\'',
-	'Class:ActionEmail/Attribute:from'                   => 'De (mél)',
-	'Class:ActionEmail/Attribute:from+'                  => 'Soit une adresse mél en clair, soit un mot clé comme $this->agent_id->email$.
+	'Class:ActionEmail/Attribute:test_recipient' => 'Destinataire de test',
+	'Class:ActionEmail/Attribute:test_recipient+' => 'Adresse mél utilisée en remplacement des A, Copie et Copie Cachée, lorsque la notification est \'En test\'',
+	'Class:ActionEmail/Attribute:from' => 'De (mél)',
+	'Class:ActionEmail/Attribute:from+' => 'Soit une adresse mél en clair, soit un mot clé comme $this->agent_id->email$.
 Ce dernier pourrait ne pas être accepté par certains serveurs de mél.',
-	'Class:ActionEmail/Attribute:from_label'             => 'De (libellé)',
-	'Class:ActionEmail/Attribute:from_label+'            => 'Le nom de l\'expéditeur en dur ou un mot clé comme $this->agent_id->friendlyname$. 
+	'Class:ActionEmail/Attribute:from_label' => 'De (libellé)',
+	'Class:ActionEmail/Attribute:from_label+' => 'Le nom de l\'expéditeur en dur ou un mot clé comme $this->agent_id->friendlyname$. 
 Il sera inclus dans l\'entête du mél',
-	'Class:ActionEmail/Attribute:reply_to'               => 'Répondre à (mél)',
-	'Class:ActionEmail/Attribute:reply_to+'              => 'Adresse mèl en clair ou un mot clé comme $this->team_id->email$.
+	'Class:ActionEmail/Attribute:reply_to' => 'Répondre à (mél)',
+	'Class:ActionEmail/Attribute:reply_to+' => 'Adresse mèl en clair ou un mot clé comme $this->team_id->email$.
 Il sera affichée dans le \'répondre à\' de la notification.
 Si ce champ n\'est pas rempli, la valeur de \'De (mél)\' sera utilisée',
-	'Class:ActionEmail/Attribute:reply_to_label'         => 'Répondre à (libellé)',
-	'Class:ActionEmail/Attribute:reply_to_label+'        => 'Le nom du destinataire en dur ou un mot clé comme $this->agent_id->friendlyname$.
+	'Class:ActionEmail/Attribute:reply_to_label' => 'Répondre à (libellé)',
+	'Class:ActionEmail/Attribute:reply_to_label+' => 'Le nom du destinataire en dur ou un mot clé comme $this->agent_id->friendlyname$.
 En cas de réponse, il sera inclus dans l\'entête du mél.
 Si ce champ n\'est pas rempli, la valeur de \'De (libellé)\' sera utilisée',
-	'Class:ActionEmail/Attribute:to'                     => 'A',
-	'Class:ActionEmail/Attribute:to+'                    => 'A : une requête OQL retournant des objets ayant un attribut mél.
+	'Class:ActionEmail/Attribute:to' => 'A',
+	'Class:ActionEmail/Attribute:to+' => 'A : une requête OQL retournant des objets ayant un attribut mél.
 En édition, cliquez sur la loupe pour obtenir des exemples pertinents.',
-	'Class:ActionEmail/Attribute:cc'                     => 'Copie',
-	'Class:ActionEmail/Attribute:cc+'                    => 'Copie : une requête OQL retournant des objets ayant un attribut mél.
+	'Class:ActionEmail/Attribute:cc' => 'Copie',
+	'Class:ActionEmail/Attribute:cc+' => 'Copie : une requête OQL retournant des objets ayant un attribut mél.
 En édition, cliquez sur la loupe pour obtenir des exemples pertinents.',
-	'Class:ActionEmail/Attribute:bcc'                      => 'Copie Cachée',
-	'Class:ActionEmail/Attribute:bcc+'                   => 'Copie Cachée : une requête OQL retournant des objets ayant un attribut mél.
+	'Class:ActionEmail/Attribute:bcc' => 'Copie Cachée',
+	'Class:ActionEmail/Attribute:bcc+' => 'Copie Cachée : une requête OQL retournant des objets ayant un attribut mél.
 En édition, cliquez sur la loupe pour obtenir des exemples pertinents.',
-	'Class:ActionEmail/Attribute:subject'                  => 'Sujet',
-	'Class:ActionEmail/Attribute:subject+'                 => 'Sujet du mél. Peut contenir des mots-clés comme $this->attribute_code$',
-	'Class:ActionEmail/Attribute:body'                     => 'Message',
-	'Class:ActionEmail/Attribute:body+'                    => 'Contenu du mél. Peut contenir des mots-clés:
+	'Class:ActionEmail/Attribute:subject' => 'Sujet',
+	'Class:ActionEmail/Attribute:subject+' => 'Sujet du mél. Peut contenir des mots-clés comme $this->attribute_code$',
+	'Class:ActionEmail/Attribute:body' => 'Message',
+	'Class:ActionEmail/Attribute:body+' => 'Contenu du mél. Peut contenir des mots-clés:
 - $this->attribute_code$ un attribut de l\'objet qui a déclenché la notification,
 - $this->html(attribute_code)$ idem mais affiché en html au lieu de texte simple,
 - $this->hyperlink()$ hyperlien vers l\'objet déclencheur dans la console,
@@ -561,30 +516,30 @@ En édition, cliquez sur la loupe pour obtenir des exemples pertinents.',
 - $this->head_html(case_log_attribute)$ dernière réponse en format html d\'un journal,
 - $this->attribute_external_key->attribute$ syntaxe récursive pour afficher un attribut distant,
 - $current_contact->attribute$ attribut de la Personne qui a déclenché la notification',
-	'Class:ActionEmail/Attribute:importance'               => 'Importance',
-	'Class:ActionEmail/Attribute:importance+'              => 'Sera mis en propriété du mél envoyé',
-	'Class:ActionEmail/Attribute:importance/Value:low'     => 'Basse',
-	'Class:ActionEmail/Attribute:importance/Value:low+'    => '',
-	'Class:ActionEmail/Attribute:importance/Value:normal'  => 'Normale',
+	'Class:ActionEmail/Attribute:importance' => 'Importance',
+	'Class:ActionEmail/Attribute:importance+' => 'Sera mis en propriété du mél envoyé',
+	'Class:ActionEmail/Attribute:importance/Value:low' => 'Basse',
+	'Class:ActionEmail/Attribute:importance/Value:low+' => '',
+	'Class:ActionEmail/Attribute:importance/Value:normal' => 'Normale',
 	'Class:ActionEmail/Attribute:importance/Value:normal+' => '',
-	'Class:ActionEmail/Attribute:importance/Value:high'    => 'Haute',
-	'Class:ActionEmail/Attribute:importance/Value:high+'   => '',
-	'Class:ActionEmail/Attribute:language'                 => 'Langue',
-	'Class:ActionEmail/Attribute:language+'                => 'Langue utilisée pour les placeholders ($xxx$) dans le message (statut, importance, priorité, etc)',
-	'Class:ActionEmail/Attribute:html_template'            => 'Modèle HTML',
-	'Class:ActionEmail/Attribute:html_template+'           => 'Optionnel, modèle HTML encapsulant le contenu du champ \'Message\' ci-dessous, utile pour des mises en page sur mesure (dans le modèle, le contenu du champ \'Message\' remplacera le mot-clé $content$)',
-	'Class:ActionEmail/Attribute:ignore_notify'            => 'Ignorer la préférence \'Notification\'',
-	'Class:ActionEmail/Attribute:ignore_notify+'           => 'Si \'Oui\', le champ \'Notification\' des Contacts est ignoré.',
-	'Class:ActionEmail/Attribute:ignore_notify/Value:no'   => 'Non',
-	'Class:ActionEmail/Attribute:ignore_notify/Value:yes'  => 'Oui',
-	'ActionEmail:main'                                     => 'Message',
-	'ActionEmail:trigger'                                  => 'Conditions de déclenchement',
-	'ActionEmail:recipients'                               => 'Contacts',
-	'ActionEmail:preview_tab'                              => 'Aperçu',
-	'ActionEmail:preview_tab+'                             => 'Aperçu du modèle de mèl',
-	'ActionEmail:preview_warning'                          => 'Le mèl peut s\'afficher différement dans les clients mèl par rapport à cet aperçu dans votre navigateur.',
-	'ActionEmail:preview_more_info'                        => 'Pour plus d\'informations sur les fonctionnalités CSS supportées par les différents client mèl, consultez %1$s.',
-	'ActionEmail:content_placeholder_missing'              => 'The mot-clé "%1$s" ne figure pas dans le modèle HTML. Le contenu du champ "%2$s" ne sera pas intégré dans les mèls générés.',
+	'Class:ActionEmail/Attribute:importance/Value:high' => 'Haute',
+	'Class:ActionEmail/Attribute:importance/Value:high+' => '',
+	'Class:ActionEmail/Attribute:language' => 'Langue',
+	'Class:ActionEmail/Attribute:language+' => 'Langue utilisée pour les placeholders ($xxx$) dans le message (statut, importance, priorité, etc)',
+	'Class:ActionEmail/Attribute:html_template' => 'Modèle HTML',
+	'Class:ActionEmail/Attribute:html_template+' => 'Optionnel, modèle HTML encapsulant le contenu du champ \'Message\' ci-dessous, utile pour des mises en page sur mesure (dans le modèle, le contenu du champ \'Message\' remplacera le mot-clé $content$)',
+	'Class:ActionEmail/Attribute:ignore_notify' => 'Ignorer la préférence \'Notification\'',
+	'Class:ActionEmail/Attribute:ignore_notify+' => 'Si \'Oui\', le champ \'Notification\' des Contacts est ignoré.',
+	'Class:ActionEmail/Attribute:ignore_notify/Value:no' => 'Non',
+	'Class:ActionEmail/Attribute:ignore_notify/Value:yes' => 'Oui',
+	'ActionEmail:main' => 'Message',
+	'ActionEmail:trigger' => 'Conditions de déclenchement',
+	'ActionEmail:recipients' => 'Contacts',
+	'ActionEmail:preview_tab' => 'Aperçu',
+	'ActionEmail:preview_tab+' => 'Aperçu du modèle de mèl',
+	'ActionEmail:preview_warning' => 'Le mèl peut s\'afficher différement dans les clients mèl par rapport à cet aperçu dans votre navigateur.',
+	'ActionEmail:preview_more_info' => 'Pour plus d\'informations sur les fonctionnalités CSS supportées par les différents client mèl, consultez %1$s.',
+	'ActionEmail:content_placeholder_missing' => 'The mot-clé "%1$s" ne figure pas dans le modèle HTML. Le contenu du champ "%2$s" ne sera pas intégré dans les mèls générés.',
 ));
 
 //
@@ -592,19 +547,19 @@ En édition, cliquez sur la loupe pour obtenir des exemples pertinents.',
 //
 
 Dict::Add('FR FR', 'French', 'Français', array(
-	'Class:Trigger'                        => 'Déclencheur',
-	'Class:Trigger+'                       => '',
-	'Class:Trigger/ComplementaryName'      => '%1$s, %2$s',
-	'Class:Trigger/Attribute:description'  => 'Description',
+	'Class:Trigger' => 'Déclencheur',
+	'Class:Trigger+' => '',
+	'Class:Trigger/ComplementaryName' => '%1$s, %2$s',
+	'Class:Trigger/Attribute:description' => 'Description',
 	'Class:Trigger/Attribute:description+' => '',
-	'Class:Trigger/Attribute:action_list'  => 'Actions déclenchées',
+	'Class:Trigger/Attribute:action_list' => 'Actions déclenchées',
 	'Class:Trigger/Attribute:action_list+' => 'Actions effectuées quand le déclencheur est activé',
-	'Class:Trigger/Attribute:finalclass'   => 'Sous-classe de Déclencheur',
-	'Class:Trigger/Attribute:finalclass+'  => 'Nom de la classe instanciable',
-	'Class:Trigger/Attribute:context'      => 'Contexte',
-	'Class:Trigger/Attribute:context+'     => 'Contexte de déclenchement',
-	'Class:Trigger/Attribute:complement'   => 'Information complémentaire',
-	'Class:Trigger/Attribute:complement+'  => 'Détails en anglais, fourni par ce type de déclencheur',
+	'Class:Trigger/Attribute:finalclass' => 'Sous-classe de Déclencheur',
+	'Class:Trigger/Attribute:finalclass+' => 'Nom de la classe instanciable',
+	'Class:Trigger/Attribute:context' => 'Contexte',
+	'Class:Trigger/Attribute:context+' => 'Contexte de déclenchement',
+	'Class:Trigger/Attribute:complement' => 'Information complémentaire',
+	'Class:Trigger/Attribute:complement+' => 'Détails en anglais, fourni par ce type de déclencheur',
 ));
 
 //
@@ -612,14 +567,14 @@ Dict::Add('FR FR', 'French', 'Français', array(
 //
 
 Dict::Add('FR FR', 'French', 'Français', array(
-	'Class:TriggerOnObject'                         => 'Déclencheur sur modification de données',
-	'Class:TriggerOnObject+'                        => '',
-	'Class:TriggerOnObject/Attribute:target_class'  => 'Classe cible',
+	'Class:TriggerOnObject' => 'Déclencheur sur modification de données',
+	'Class:TriggerOnObject+' => '',
+	'Class:TriggerOnObject/Attribute:target_class' => 'Classe cible',
 	'Class:TriggerOnObject/Attribute:target_class+' => 'Classe d\'objets allant activer ce déclencheur',
-	'Class:TriggerOnObject/Attribute:filter'        => 'Filtre',
-	'Class:TriggerOnObject/Attribute:filter+'       => 'Permet de limiter la liste des objets (de la classe cible) activant le déclencheur',
-	'TriggerOnObject:WrongFilterQuery'              => 'Requête de filtrage incorrecte: %1$s',
-	'TriggerOnObject:WrongFilterClass'              => 'La requête de filtrage doit retourner des objets de la classe "%1$s"',
+	'Class:TriggerOnObject/Attribute:filter' => 'Filtre',
+	'Class:TriggerOnObject/Attribute:filter+' => 'Permet de limiter la liste des objets (de la classe cible) activant le déclencheur',
+	'TriggerOnObject:WrongFilterQuery' => 'Requête de filtrage incorrecte: %1$s',
+	'TriggerOnObject:WrongFilterClass' => 'La requête de filtrage doit retourner des objets de la classe "%1$s"',
 ));
 
 //
@@ -747,156 +702,155 @@ Dict::Add('FR FR', 'French', 'Français', array(
 // Synchro Data Source
 //
 Dict::Add('FR FR', 'French', 'Français', array(
-	'Class:SynchroDataSource'                                                       => 'Source de données',
-	'Class:SynchroDataSource/Attribute:name'                                        => 'Nom',
-	'Class:SynchroDataSource/Attribute:name+'                                       => '',
-	'Class:SynchroDataSource/Attribute:description'                                 => 'Description',
-	'Class:SynchroDataSource/Attribute:status'                                      => 'Etat',
-	'Class:SynchroDataSource/Attribute:scope_class'                                 => 'Type cible',
-	'Class:SynchroDataSource/Attribute:scope_class+'                                => 'Une Source de données ne peut alimenter qu\'une seule classe '.ITOP_APPLICATION_SHORT,
-	'Class:SynchroDataSource/Attribute:user_id'                                     => 'Utilisateur',
-	'Class:SynchroDataSource/Attribute:notify_contact_id'                           => 'Contact à notifier',
-	'Class:SynchroDataSource/Attribute:notify_contact_id+'                          => 'Contact à notifier en cas d\'erreur',
-	'Class:SynchroDataSource/Attribute:url_icon'                                    => 'Icône (hyperlien)',
-	'Class:SynchroDataSource/Attribute:url_icon+'                                   => 'Hyperlien vers une icône représentant l\'application source des données.
+	'Class:SynchroDataSource' => 'Source de données',
+	'Class:SynchroDataSource/Attribute:name' => 'Nom',
+	'Class:SynchroDataSource/Attribute:name+' => '',
+	'Class:SynchroDataSource/Attribute:description' => 'Description',
+	'Class:SynchroDataSource/Attribute:status' => 'Etat',
+	'Class:SynchroDataSource/Attribute:scope_class' => 'Type cible',
+	'Class:SynchroDataSource/Attribute:scope_class+' => 'Une Source de données ne peut alimenter qu\'une seule classe '.ITOP_APPLICATION_SHORT,
+	'Class:SynchroDataSource/Attribute:user_id' => 'Utilisateur',
+	'Class:SynchroDataSource/Attribute:notify_contact_id' => 'Contact à notifier',
+	'Class:SynchroDataSource/Attribute:notify_contact_id+' => 'Contact à notifier en cas d\'erreur',
+	'Class:SynchroDataSource/Attribute:url_icon' => 'Icône (hyperlien)',
+	'Class:SynchroDataSource/Attribute:url_icon+' => 'Hyperlien vers une icône représentant l\'application source des données.
 Ce lien est affiché dans le tootip du cadenas, visible sur les objets '.ITOP_APPLICATION_SHORT.' synchronisés',
-	'Class:SynchroDataSource/Attribute:url_application'                             => 'Application (hyperlien)',
-	'Class:SynchroDataSource/Attribute:url_application+'                            => 'Un hyperlien vers l\'object source dans l\'application d\'origine. 
+	'Class:SynchroDataSource/Attribute:url_application' => 'Application (hyperlien)',
+	'Class:SynchroDataSource/Attribute:url_application+' => 'Un hyperlien vers l\'object source dans l\'application d\'origine. 
 Paramètres possibles: $this->nom_de_champ$ et $replica->primary_key$.
 L\'hyperlien est affiché dans le tootip du cadenas, visible sur les objets '.ITOP_APPLICATION_SHORT.' synchronisés',
-	'Class:SynchroDataSource/Attribute:reconciliation_policy'                       => 'Politique de recherche',
-	'Class:SynchroDataSource/Attribute:reconciliation_policy+'                      => 'Pour retrouver le(s) objet(s) '.ITOP_APPLICATION_SHORT.' correspondant à l\'objet source :
+	'Class:SynchroDataSource/Attribute:reconciliation_policy' => 'Politique de recherche',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy+' => 'Pour retrouver le(s) objet(s) '.ITOP_APPLICATION_SHORT.' correspondant à l\'objet source :
 Soit on recherche ceux qui ont les mêmes valeurs sur tous les champs de synchronisation marqués comme critère de recherche,
 Soit on recherche directement l\'objet sur son id qui doit être égal au "primary_key" de la source',
-	'Class:SynchroDataSource/Attribute:full_load_periodicity'                       => 'Obsolescence après',
-	'Class:SynchroDataSource/Attribute:full_load_periodicity+'                      => 'Un objet est considéré comme obsolète s\'il n\'apparaît pas dans les données au delà de cette durée',
-	'Class:SynchroDataSource/Attribute:action_on_zero'                              => 'Action si zéro',
-	'Class:SynchroDataSource/Attribute:action_on_zero+'                             => 'Que fait-on si aucun objet '.ITOP_APPLICATION_SHORT.' ne correspond à l\'objet source',
-	'Class:SynchroDataSource/Attribute:action_on_one'                               => 'Action si un',
-	'Class:SynchroDataSource/Attribute:action_on_one+'                              => 'Que fait-on lorsqu\'un seul objet '.ITOP_APPLICATION_SHORT.' correspond à l\'objet source',
-	'Class:SynchroDataSource/Attribute:action_on_multiple'                          => 'Action si plusieurs',
-	'Class:SynchroDataSource/Attribute:action_on_multiple+'                         => 'Que fait-on lorsque plus d\'un objet '.ITOP_APPLICATION_SHORT.' correspond à l\'objet source',
-	'Class:SynchroDataSource/Attribute:user_delete_policy'                          => 'Utilisateurs autorisés',
-	'Class:SynchroDataSource/Attribute:user_delete_policy+'                         => 'Quels utilisateurs sont autorisés à effacer des objets synchronisés',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:never'                   => 'Personne',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:depends'                 => 'Uniquement les administrateurs',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:always'                  => 'Tous les utilisateurs autorisés',
-	'Class:SynchroDataSource/Attribute:delete_policy_update'                        => 'Mise à jour',
-	'Class:SynchroDataSource/Attribute:delete_policy_update+'                       => 'Liste au format: nom_de_champ:valeur; 
+	'Class:SynchroDataSource/Attribute:full_load_periodicity' => 'Obsolescence après',
+	'Class:SynchroDataSource/Attribute:full_load_periodicity+' => 'Un objet est considéré comme obsolète s\'il n\'apparaît pas dans les données au delà de cette durée',
+	'Class:SynchroDataSource/Attribute:action_on_zero' => 'Action si zéro',
+	'Class:SynchroDataSource/Attribute:action_on_zero+' => 'Que fait-on si aucun objet '.ITOP_APPLICATION_SHORT.' ne correspond à l\'objet source',
+	'Class:SynchroDataSource/Attribute:action_on_one' => 'Action si un',
+	'Class:SynchroDataSource/Attribute:action_on_one+' => 'Que fait-on lorsqu\'un seul objet '.ITOP_APPLICATION_SHORT.' correspond à l\'objet source',
+	'Class:SynchroDataSource/Attribute:action_on_multiple' => 'Action si plusieurs',
+	'Class:SynchroDataSource/Attribute:action_on_multiple+' => 'Que fait-on lorsque plus d\'un objet '.ITOP_APPLICATION_SHORT.' correspond à l\'objet source',
+	'Class:SynchroDataSource/Attribute:user_delete_policy' => 'Utilisateurs autorisés',
+	'Class:SynchroDataSource/Attribute:user_delete_policy+' => 'Quels utilisateurs sont autorisés à effacer des objets synchronisés',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:never' => 'Personne',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:depends' => 'Uniquement les administrateurs',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:always' => 'Tous les utilisateurs autorisés',
+	'Class:SynchroDataSource/Attribute:delete_policy_update' => 'Mise à jour',
+	'Class:SynchroDataSource/Attribute:delete_policy_update+' => 'Liste au format: nom_de_champ:valeur; 
 "nom_de_champ" doit être un code de champ existant dans la classe synchronisée,
 "valeur" doit être une valeur autorisée pour ce champ,
 Plusieurs champs peuvent ainsi être modifiés lors d\'une "mise à jour" en application de la politique d\'effacement',
-	'Class:SynchroDataSource/Attribute:delete_policy_retention'                     => 'Durée de rétention',
-	'Class:SynchroDataSource/Attribute:delete_policy_retention+'                    => 'Si la politique est \'Mettre à jour puis effacer\', les objets obsolètes sont encore conservés pendant cette durée avant d\'être effacés',
-	'Class:SynchroDataSource/Attribute:database_table_name'                         => 'Table de données',
-	'Class:SynchroDataSource/Attribute:database_table_name+'                        => 'Nom de la table stockant les données de cette source. Un nom par défaut est calculé automatiquement si ce champ est laissé vide.',
-	'Class:SynchroDataSource/Attribute:status/Value:implementation'                 => 'Implémentation',
-	'Class:SynchroDataSource/Attribute:status/Value:obsolete'                       => 'Obsolete',
-	'Class:SynchroDataSource/Attribute:status/Value:production'                     => 'Production',
-	'Class:SynchroDataSource/Attribute:scope_restriction'                           => 'Restriction',
-	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_attributes'  => 'Utiliser les champs',
+	'Class:SynchroDataSource/Attribute:delete_policy_retention' => 'Durée de rétention',
+	'Class:SynchroDataSource/Attribute:delete_policy_retention+' => 'Si la politique est \'Mettre à jour puis effacer\', les objets obsolètes sont encore conservés pendant cette durée avant d\'être effacés',
+	'Class:SynchroDataSource/Attribute:database_table_name' => 'Table de données',
+	'Class:SynchroDataSource/Attribute:database_table_name+' => 'Nom de la table stockant les données de cette source. Un nom par défaut est calculé automatiquement si ce champ est laissé vide.',
+	'Class:SynchroDataSource/Attribute:status/Value:implementation' => 'Implémentation',
+	'Class:SynchroDataSource/Attribute:status/Value:obsolete' => 'Obsolete',
+	'Class:SynchroDataSource/Attribute:status/Value:production' => 'Production',
+	'Class:SynchroDataSource/Attribute:scope_restriction' => 'Restriction',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_attributes' => 'Utiliser les champs',
 	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_primary_key' => 'Utiliser la clé primaire',
-	'Class:SynchroDataSource/Attribute:action_on_zero/Value:create'                 => 'Créer',
-	'Class:SynchroDataSource/Attribute:action_on_zero/Value:error'                  => 'Erreur',
-	'Class:SynchroDataSource/Attribute:action_on_one/Value:error'                   => 'Erreur',
-	'Class:SynchroDataSource/Attribute:action_on_one/Value:update'                  => 'Mettre à jour',
-	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:create'             => 'Créer',
-	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:error'              => 'Erreur',
-	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:take_first'         => 'Prendre le premier',
-	'Class:SynchroDataSource/Attribute:delete_policy'                               => 'Politique d\'effacement',
-	'Class:SynchroDataSource/Attribute:delete_policy+'                              => 'Que fait-on avec l\'objet '.ITOP_APPLICATION_SHORT.' synchronisé lorsque objet source n\'est plus présent ?
+	'Class:SynchroDataSource/Attribute:action_on_zero/Value:create' => 'Créer',
+	'Class:SynchroDataSource/Attribute:action_on_zero/Value:error' => 'Erreur',
+	'Class:SynchroDataSource/Attribute:action_on_one/Value:error' => 'Erreur',
+	'Class:SynchroDataSource/Attribute:action_on_one/Value:update' => 'Mettre à jour',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:create' => 'Créer',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:error' => 'Erreur',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:take_first' => 'Prendre le premier',
+	'Class:SynchroDataSource/Attribute:delete_policy' => 'Politique d\'effacement',
+	'Class:SynchroDataSource/Attribute:delete_policy+' => 'Que fait-on avec l\'objet '.ITOP_APPLICATION_SHORT.' synchronisé lorsque objet source n\'est plus présent ?
 "Ignorer" : on ne fait rien, l\'objet demeure dans '.ITOP_APPLICATION_SHORT.' inchangé,
 "Effacer" : l\'objet '.ITOP_APPLICATION_SHORT.' est supprimé ainsi que son replica,
 "Mettre à jour" : les régles décrites dans le champ "mise à jour" sont appliquées à l\'objet '.ITOP_APPLICATION_SHORT.' qui est donc modifié,
 "Mettre à jour puis effacer" : on effectue immédiatement une mise à jour, et lorsque la durée de rétention est atteinte, on supprime l\'objet '.ITOP_APPLICATION_SHORT,
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:delete'                  => 'Effacer',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:ignore'                  => 'Ignorer',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:update'                  => 'Mettre à jour',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:update_then_delete'      => 'Mettre à jour puis effacer',
-	'Class:SynchroDataSource/Attribute:attribute_list'                              => 'Liste des champs',
-	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:administrators'     => 'Seulement les administrateurs',
-	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:everybody'          => 'Tous les utilisateurs autorisés',
-	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:nobody'             => 'Personne',
-
-	'SynchroDataSource:Description'                                            => 'Description',
-	'SynchroDataSource:Reconciliation'                                         => 'Recherche et réconciliation',
-	'SynchroDataSource:Deletion'                                               => 'Règles d\'effacement',
-	'SynchroDataSource:Status'                                                 => 'Etat',
-	'SynchroDataSource:Information'                                            => 'Information',
-	'SynchroDataSource:Definition'                                             => 'Définition',
-	'Core:SynchroAttributes'                                                   => 'Champs',
-	'Core:SynchroStatus'                                                       => 'Etat',
-	'Core:Synchro:ErrorsLabel'                                                 => 'Erreurs',
-	'Core:Synchro:CreatedLabel'                                                => 'Créations',
-	'Core:Synchro:ModifiedLabel'                                               => 'Modifications',
-	'Core:Synchro:UnchangedLabel'                                              => 'Sans changement',
-	'Core:Synchro:ReconciledErrorsLabel'                                       => 'Erreurs',
-	'Core:Synchro:ReconciledLabel'                                             => 'Trouvés',
-	'Core:Synchro:ReconciledNewLabel'                                          => 'Créations',
-	'Core:SynchroReconcile:Yes'                                                => 'Oui',
-	'Core:SynchroReconcile:No'                                                 => 'Non',
-	'Core:SynchroUpdate:Yes'                                                   => 'Oui',
-	'Core:SynchroUpdate:No'                                                    => 'Non',
-	'Core:Synchro:LastestStatus'                                               => 'Dernier état',
-	'Core:Synchro:History'                                                     => 'Historique de synchronisation',
-	'Core:Synchro:NeverRun'                                                    => 'Aucun historique, la synchronisation n\'a pas encore fonctionné',
-	'Core:Synchro:SynchroEndedOn_Date'                                         => 'La dernière synchronisation s\'est terminée à: %1$s.',
-	'Core:Synchro:SynchroRunningStartedOn_Date'                                => 'Synchronisation en cours (début à %1$s)',
-	'Core:Synchro:label_repl_ignored'                                          => 'Ignorés (%1$s)',
-	'Core:Synchro:label_repl_disappeared'                                      => 'Disparus (%1$s)',
-	'Core:Synchro:label_repl_existing'                                         => 'Existants (%1$s)',
-	'Core:Synchro:label_repl_new'                                              => 'Nouveau (%1$s)',
-	'Core:Synchro:label_obj_deleted'                                           => 'Effacés (%1$s)',
-	'Core:Synchro:label_obj_obsoleted'                                         => 'Obsoletés (%1$s)',
-	'Core:Synchro:label_obj_disappeared_errors'                                => 'Erreurs (%1$s)',
-	'Core:Synchro:label_obj_disappeared_no_action'                             => 'Aucune action (%1$s)',
-	'Core:Synchro:label_obj_unchanged'                                         => 'Sans changement (%1$s)',
-	'Core:Synchro:label_obj_updated'                                           => 'Mis à jour (%1$s)',
-	'Core:Synchro:label_obj_updated_errors'                                    => 'Erreurs (%1$s)',
-	'Core:Synchro:label_obj_new_unchanged'                                     => 'Sans changement (%1$s)',
-	'Core:Synchro:label_obj_new_updated'                                       => 'Mis à jour (%1$s)',
-	'Core:Synchro:label_obj_created'                                           => 'Créations (%1$s)',
-	'Core:Synchro:label_obj_new_errors'                                        => 'Erreurs (%1$s)',
-	'Core:SynchroLogTitle'                                                     => '%1$s - %2$s',
-	'Core:Synchro:Nb_Replica'                                                  => 'Replica traités: %1$s',
-	'Core:Synchro:Nb_Class:Objects'                                            => '%1$s: %2$s',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:delete' => 'Effacer',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:ignore' => 'Ignorer',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:update' => 'Mettre à jour',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:update_then_delete' => 'Mettre à jour puis effacer',
+	'Class:SynchroDataSource/Attribute:attribute_list' => 'Liste des champs',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:administrators' => 'Seulement les administrateurs',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:everybody' => 'Tous les utilisateurs autorisés',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:nobody' => 'Personne',
+	'SynchroDataSource:Description' => 'Description',
+	'SynchroDataSource:Reconciliation' => 'Recherche et réconciliation',
+	'SynchroDataSource:Deletion' => 'Règles d\'effacement',
+	'SynchroDataSource:Status' => 'Etat',
+	'SynchroDataSource:Information' => 'Information',
+	'SynchroDataSource:Definition' => 'Définition',
+	'Core:SynchroAttributes' => 'Champs',
+	'Core:SynchroStatus' => 'Etat',
+	'Core:Synchro:ErrorsLabel' => 'Erreurs',
+	'Core:Synchro:CreatedLabel' => 'Créations',
+	'Core:Synchro:ModifiedLabel' => 'Modifications',
+	'Core:Synchro:UnchangedLabel' => 'Sans changement',
+	'Core:Synchro:ReconciledErrorsLabel' => 'Erreurs',
+	'Core:Synchro:ReconciledLabel' => 'Trouvés',
+	'Core:Synchro:ReconciledNewLabel' => 'Créations',
+	'Core:SynchroReconcile:Yes' => 'Oui',
+	'Core:SynchroReconcile:No' => 'Non',
+	'Core:SynchroUpdate:Yes' => 'Oui',
+	'Core:SynchroUpdate:No' => 'Non',
+	'Core:Synchro:LastestStatus' => 'Dernier état',
+	'Core:Synchro:History' => 'Historique de synchronisation',
+	'Core:Synchro:NeverRun' => 'Aucun historique, la synchronisation n\'a pas encore fonctionné',
+	'Core:Synchro:SynchroEndedOn_Date' => 'La dernière synchronisation s\'est terminée à: %1$s.',
+	'Core:Synchro:SynchroRunningStartedOn_Date' => 'Synchronisation en cours (début à %1$s)',
+	'Core:Synchro:label_repl_ignored' => 'Ignorés (%1$s)',
+	'Core:Synchro:label_repl_disappeared' => 'Disparus (%1$s)',
+	'Core:Synchro:label_repl_existing' => 'Existants (%1$s)',
+	'Core:Synchro:label_repl_new' => 'Nouveau (%1$s)',
+	'Core:Synchro:label_obj_deleted' => 'Effacés (%1$s)',
+	'Core:Synchro:label_obj_obsoleted' => 'Obsoletés (%1$s)',
+	'Core:Synchro:label_obj_disappeared_errors' => 'Erreurs (%1$s)',
+	'Core:Synchro:label_obj_disappeared_no_action' => 'Aucune action (%1$s)',
+	'Core:Synchro:label_obj_unchanged' => 'Sans changement (%1$s)',
+	'Core:Synchro:label_obj_updated' => 'Mis à jour (%1$s)',
+	'Core:Synchro:label_obj_updated_errors' => 'Erreurs (%1$s)',
+	'Core:Synchro:label_obj_new_unchanged' => 'Sans changement (%1$s)',
+	'Core:Synchro:label_obj_new_updated' => 'Mis à jour (%1$s)',
+	'Core:Synchro:label_obj_created' => 'Créations (%1$s)',
+	'Core:Synchro:label_obj_new_errors' => 'Erreurs (%1$s)',
+	'Core:SynchroLogTitle' => '%1$s - %2$s',
+	'Core:Synchro:Nb_Replica' => 'Replica traités: %1$s',
+	'Core:Synchro:Nb_Class:Objects' => '%1$s: %2$s',
 	'Class:SynchroDataSource/Error:AtLeastOneReconciliationKeyMustBeSpecified' => 'Si la politique de réconciliation n\'est pas la clé primaire, au moins une clé de recherche doit être spécifiée',
-	'Class:SynchroDataSource/Error:DeleteRetentionDurationMustBeSpecified'     => 'Pour que les objets soient effacés après avoir été obsoletés, il faut spécifier une durée de rétention',
-	'Class:SynchroDataSource/Error:DeletePolicyUpdateMustBeSpecified'          => 'Les objets obsolètes doivent être mis à jour, mais aucune information de mise à jour n\'est spécifiée',
-	'Class:SynchroDataSource/Error:DataTableAlreadyExists'                     => 'La table %1$s existe déjà dans la base de données. Veuillez utiliser un autre nom pour la table des données de cette source.',
-	'Core:SynchroReplica:PublicData'                                           => 'Données synchronisées',
-	'Core:SynchroReplica:PrivateDetails'                                       => 'Informations internes',
-	'Core:SynchroReplica:BackToDataSource'                                     => 'Retourner aux détails de la source de données: %1$s',
-	'Core:SynchroReplica:ListOfReplicas'                                       => 'Liste des réplica',
-	'Core:SynchroAttExtKey:ReconciliationById'                                 => 'id (clé primaire)',
-	'Core:SynchroAtt:attcode'                                                  => 'Champ',
-	'Core:SynchroAtt:attcode+'                                                 => '',
-	'Core:SynchroAtt:reconciliation'                                           => 'Réconciliation ?',
-	'Core:SynchroAtt:reconciliation+'                                          => '',
-	'Core:SynchroAtt:update'                                                   => 'Mise  jour ?',
-	'Core:SynchroAtt:update+'                                                  => '',
-	'Core:SynchroAtt:update_policy'                                            => 'Politique de mise à jour',
-	'Core:SynchroAtt:update_policy+'                                           => '',
-	'Core:SynchroAtt:reconciliation_attcode'                                   => 'Clé de recherche',
-	'Core:SynchroAtt:reconciliation_attcode+'                                  => '',
-	'Core:SyncDataExchangeComment'                                             => '(Synchronisation)',
-	'Core:Synchro:ListOfDataSources'                                           => 'Sources de données:',
-	'Core:Synchro:LastSynchro'                                                 => 'Dernière synchronisation:',
-	'Core:Synchro:ThisObjectIsSynchronized'                                    => 'Cet objet est synchronisé avec une source de données',
-	'Core:Synchro:TheObjectWasCreatedBy_Source'                                => 'Cet objet a été <b>créé</b> par la source de données %1$s',
-	'Core:Synchro:TheObjectCanBeDeletedBy_Source'                              => 'Cet objet <b>peut être effacé/b> par la source de données %1$s',
-	'Core:Synchro:TheObjectCannotBeDeletedByUser_Source'                       => 'Vous <b>ne pouvez pas effacer</b> cet objet car il est géré par le source de données %1$s',
-	'TitleSynchroExecution'                                                    => 'Exécution de la synchronisation',
-	'Class:SynchroDataSource:DataTable'                                        => 'Table contenant les données: %1$s',
-	'Core:SyncDataSourceObsolete'                                              => 'Cette source de données est obsolète. Opération annulée.',
-	'Core:SyncDataSourceAccessRestriction'                                     => 'Seuls les administrateurs et l\'utilisateur spécifié dans la source de données peuvent exécuter cette synchronisation. Opération annulée.',
-	'Core:SyncTooManyMissingReplicas'                                          => 'Tous les réplicas sont absents de l\'import. L\'import a-t-il réellement tourné. Opération annulée.',
-	'Core:SyncSplitModeCLIOnly'                                                => 'La synchronization ne peut être exécutée partiellement qu\'en mode ligne de commande',
-	'Core:Synchro:ListReplicas_AllReplicas_Errors_Warnings'                    => '%1$s replicas, %2$s erreur(s), %3$s avertissement(s).',
-	'Core:SynchroReplica:TargetObject'                                         => 'Objet Synchronisé : %1$s',
-	'Class:AsyncSendEmail'                                                     => 'Envoi d\'Email Asynchrone',
-	'Class:AsyncSendEmail/Attribute:to'                                        => 'A',
-	'Class:AsyncSendEmail/Attribute:subject'                                   => 'Sujet',
+	'Class:SynchroDataSource/Error:DeleteRetentionDurationMustBeSpecified' => 'Pour que les objets soient effacés après avoir été obsoletés, il faut spécifier une durée de rétention',
+	'Class:SynchroDataSource/Error:DeletePolicyUpdateMustBeSpecified' => 'Les objets obsolètes doivent être mis à jour, mais aucune information de mise à jour n\'est spécifiée',
+	'Class:SynchroDataSource/Error:DataTableAlreadyExists' => 'La table %1$s existe déjà dans la base de données. Veuillez utiliser un autre nom pour la table des données de cette source.',
+	'Core:SynchroReplica:PublicData' => 'Données synchronisées',
+	'Core:SynchroReplica:PrivateDetails' => 'Informations internes',
+	'Core:SynchroReplica:BackToDataSource' => 'Retourner aux détails de la source de données: %1$s',
+	'Core:SynchroReplica:ListOfReplicas' => 'Liste des réplica',
+	'Core:SynchroAttExtKey:ReconciliationById' => 'id (clé primaire)',
+	'Core:SynchroAtt:attcode' => 'Champ',
+	'Core:SynchroAtt:attcode+' => '',
+	'Core:SynchroAtt:reconciliation' => 'Réconciliation ?',
+	'Core:SynchroAtt:reconciliation+' => '',
+	'Core:SynchroAtt:update' => 'Mise  jour ?',
+	'Core:SynchroAtt:update+' => '',
+	'Core:SynchroAtt:update_policy' => 'Politique de mise à jour',
+	'Core:SynchroAtt:update_policy+' => '',
+	'Core:SynchroAtt:reconciliation_attcode' => 'Clé de recherche',
+	'Core:SynchroAtt:reconciliation_attcode+' => '',
+	'Core:SyncDataExchangeComment' => '(Synchronisation)',
+	'Core:Synchro:ListOfDataSources' => 'Sources de données:',
+	'Core:Synchro:LastSynchro' => 'Dernière synchronisation:',
+	'Core:Synchro:ThisObjectIsSynchronized' => 'Cet objet est synchronisé avec une source de données',
+	'Core:Synchro:TheObjectWasCreatedBy_Source' => 'Cet objet a été <b>créé</b> par la source de données %1$s',
+	'Core:Synchro:TheObjectCanBeDeletedBy_Source' => 'Cet objet <b>peut être effacé/b> par la source de données %1$s',
+	'Core:Synchro:TheObjectCannotBeDeletedByUser_Source' => 'Vous <b>ne pouvez pas effacer</b> cet objet car il est géré par le source de données %1$s',
+	'TitleSynchroExecution' => 'Exécution de la synchronisation',
+	'Class:SynchroDataSource:DataTable' => 'Table contenant les données: %1$s',
+	'Core:SyncDataSourceObsolete' => 'Cette source de données est obsolète. Opération annulée.',
+	'Core:SyncDataSourceAccessRestriction' => 'Seuls les administrateurs et l\'utilisateur spécifié dans la source de données peuvent exécuter cette synchronisation. Opération annulée.',
+	'Core:SyncTooManyMissingReplicas' => 'Tous les réplicas sont absents de l\'import. L\'import a-t-il réellement tourné. Opération annulée.',
+	'Core:SyncSplitModeCLIOnly' => 'La synchronization ne peut être exécutée partiellement qu\'en mode ligne de commande',
+	'Core:Synchro:ListReplicas_AllReplicas_Errors_Warnings' => '%1$s replicas, %2$s erreur(s), %3$s avertissement(s).',
+	'Core:SynchroReplica:TargetObject' => 'Objet Synchronisé : %1$s',
+	'Class:AsyncSendEmail' => 'Envoi d\'Email Asynchrone',
+	'Class:AsyncSendEmail/Attribute:to' => 'A',
+	'Class:AsyncSendEmail/Attribute:subject' => 'Sujet',
 	'Class:AsyncSendEmail/Attribute:body' => 'Message',
 	'Class:AsyncSendEmail/Attribute:header' => 'En-tête',
 	'Class:CMDBChangeOpSetAttributeOneWayPassword' => 'Mot de passe chiffré',
@@ -1055,7 +1009,6 @@ Plusieurs champs peuvent ainsi être modifiés lors d\'une "mise à jour" en app
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:TagSetFieldData' => '%2$s pour la classe %1$s',
 	'Class:TagSetFieldData+' => '',
-
 	'Class:TagSetFieldData/Attribute:code' => 'Code',
 	'Class:TagSetFieldData/Attribute:code+' => 'Code interne. Doit contenir au moins 3 caractères alphanumériques',
 	'Class:TagSetFieldData/Attribute:label' => 'Label',
@@ -1065,7 +1018,6 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:TagSetFieldData/Attribute:finalclass' => 'Type d\'étiquette',
 	'Class:TagSetFieldData/Attribute:obj_class' => 'Type d\'objet',
 	'Class:TagSetFieldData/Attribute:obj_attcode' => 'Code du champ',
-
 	'Core:TagSetFieldData:ErrorDeleteUsedTag' => 'Impossible de supprimer une étiquette utilisée',
 	'Core:TagSetFieldData:ErrorDuplicateTagCodeOrLabel' => 'Les codes et noms des étiquettes doivent être unique',
 	'Core:TagSetFieldData:ErrorTagCodeSyntax' => 'Le code de l\'étiquette doit contenir entre 3 et %1$d caractères alphanumériques, et commencer par une lettre.',
@@ -1152,8 +1104,8 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:AsyncTask/Attribute:last_error+' => '',
 	'Class:AsyncTask/Attribute:last_attempt' => 'Dernière tentative',
 	'Class:AsyncTask/Attribute:last_attempt+' => '',
-    'Class:AsyncTask:InvalidConfig_Class_Keys' => 'Format incorrect pour la configuration de "async_task_retries[%1$s]". La bonne syntaxe est un tableau avec comme clés: %2$s',
-    'Class:AsyncTask:InvalidConfig_Class_InvalidKey_Keys' => 'Format incorrect pour la configuration de "async_task_retries[%1$s]": clé "%2$s" invalide. Les clés attendues sont: %3$s',
+	'Class:AsyncTask:InvalidConfig_Class_Keys' => 'Format incorrect pour la configuration de "async_task_retries[%1$s]". La bonne syntaxe est un tableau avec comme clés: %2$s',
+	'Class:AsyncTask:InvalidConfig_Class_InvalidKey_Keys' => 'Format incorrect pour la configuration de "async_task_retries[%1$s]": clé "%2$s" invalide. Les clés attendues sont: %3$s',
 ));
 
 //
@@ -1191,16 +1143,15 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:ResourceSystemMenu' => 'Menu System',
 	'Class:ResourceSystemMenu+' => '',
 ));
-
-
-
-
 // Additional language entries not present in English dict
 Dict::Add('FR FR', 'French', 'Français', array(
- 'Core:Context=REST/JSON+' => 'REST/JSON',
- 'Core:Context=Synchro+' => 'Synchro',
- 'Core:Context=Setup+' => 'Setup',
- 'Core:Context=GUI:Console+' => 'GUI:Console',
- 'Core:Context=CRON+' => 'cron',
- 'Core:Context=GUI:Portal+' => 'GUI:Portal',
+	'Core:Context=REST/JSON+' => 'REST/JSON',
+	'Core:Context=Synchro+' => 'Synchro',
+	'Core:Context=Setup+' => 'Setup',
+	'Core:Context=GUI:Console+' => 'GUI:Console',
+	'Core:Context=CRON+' => 'cron',
+	'Core:Context=GUI:Portal+' => 'GUI:Portal'
 ));
+
+
+
diff --git a/dictionaries/fr.dictionary.itop.ui.php b/dictionaries/fr.dictionary.itop.ui.php
index 7ba682c822..664deeb078 100644
--- a/dictionaries/fr.dictionary.itop.ui.php
+++ b/dictionaries/fr.dictionary.itop.ui.php
@@ -4,24 +4,23 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 Dict::Add('FR FR', 'French', 'Français', array(
-	'Class:AuditCategory'                                    => 'Catégorie d\'audit',
-	'Class:AuditCategory+'                                   => 'La catégorie d\'audit définit un ensemble d\'objets qui doivent être audité.
+	'Class:AuditCategory' => 'Catégorie d\'audit',
+	'Class:AuditCategory+' => 'La catégorie d\'audit définit un ensemble d\'objets qui doivent être audité.
 Elle regroupe toutes les régles qui s\'appliquent au même périmètre d\'objets',
-	'Class:AuditCategory/Attribute:name'                     => 'Nom',
-	'Class:AuditCategory/Attribute:name+'                    => 'Identifie un ensemble d\'objets à auditer',
-	'Class:AuditCategory/Attribute:description'              => 'Description',
-	'Class:AuditCategory/Attribute:description+'             => '',
-	'Class:AuditCategory/Attribute:definition_set'           => 'Périmètre',
-	'Class:AuditCategory/Attribute:definition_set+'          => 'Requête OQL retournant les objets qui sont dans le périmètre d\'application de cet audit',
-	'Class:AuditCategory/Attribute:rules_list'               => 'Règles d\'audit',
-	'Class:AuditCategory/Attribute:rules_list+'              => 'Les règles d\'audit qui utilisent le périmètre de cette catégorie',
-	'Class:AuditCategory/Attribute:ok_error_tolerance'       => 'Seuil d\'alerte',
-	'Class:AuditCategory/Attribute:ok_error_tolerance+'      => 'Pourcentage d\'objets en erreur au dela duquel le résultat est à surveiller (orange)',
-	'Class:AuditCategory/Attribute:warning_error_tolerance'  => 'Seuil d\'erreur',
+	'Class:AuditCategory/Attribute:name' => 'Nom',
+	'Class:AuditCategory/Attribute:name+' => 'Identifie un ensemble d\'objets à auditer',
+	'Class:AuditCategory/Attribute:description' => 'Description',
+	'Class:AuditCategory/Attribute:description+' => '',
+	'Class:AuditCategory/Attribute:definition_set' => 'Périmètre',
+	'Class:AuditCategory/Attribute:definition_set+' => 'Requête OQL retournant les objets qui sont dans le périmètre d\'application de cet audit',
+	'Class:AuditCategory/Attribute:rules_list' => 'Règles d\'audit',
+	'Class:AuditCategory/Attribute:rules_list+' => 'Les règles d\'audit qui utilisent le périmètre de cette catégorie',
+	'Class:AuditCategory/Attribute:ok_error_tolerance' => 'Seuil d\'alerte',
+	'Class:AuditCategory/Attribute:ok_error_tolerance+' => 'Pourcentage d\'objets en erreur au dela duquel le résultat est à surveiller (orange)',
+	'Class:AuditCategory/Attribute:warning_error_tolerance' => 'Seuil d\'erreur',
 	'Class:AuditCategory/Attribute:warning_error_tolerance+' => 'Pourcentage d\'objets en erreur au dela duquel le résultat est en erreur (rouge)',
-	'Class:AuditCategory/Attribute:domains_list'             => 'Domaines',
-	'Class:AuditCategory/Attribute:domains_list+'            => 'Domaines incluant cette catégorie d\'audit',
-
+	'Class:AuditCategory/Attribute:domains_list' => 'Domaines',
+	'Class:AuditCategory/Attribute:domains_list+' => 'Domaines incluant cette catégorie d\'audit',
 ));
 
 //
@@ -29,27 +28,27 @@ Elle regroupe toutes les régles qui s\'appliquent au même périmètre d\'objet
 //
 
 Dict::Add('FR FR', 'French', 'Français', array(
-	'Class:AuditRule'                                   => 'Règle d\'audit',
-	'Class:AuditRule+'                                  => 'Une règle d\'audit correspond à une vérification particulière.
+	'Class:AuditRule' => 'Règle d\'audit',
+	'Class:AuditRule+' => 'Une règle d\'audit correspond à une vérification particulière.
 Elle s\'applique à tous les objets dans le périmètre de sa catégorie d\'audit',
-	'Class:AuditRule/Attribute:name'                    => 'Nom',
-	'Class:AuditRule/Attribute:name+'                   => 'Une vérification particulière',
-	'Class:AuditRule/Attribute:description'             => 'Description',
-	'Class:AuditRule/Attribute:description+'            => 'Qu\'est ce qu\'on vérifie ? Comment le corriger ? Qui doit le faire ? ...',
-	'Class:AuditRule/Attribute:query'                   => 'Requête',
-	'Class:AuditRule/Attribute:query+'                  => 'Requête OQL à executer. Les classes retournées doivent être cohérentes avec celles définies dans le périmètre de la catégorie',
-	'Class:AuditRule/Attribute:valid_flag'              => 'Objets retournés :',
-	'Class:AuditRule/Attribute:valid_flag+'             => 'Que retourne la requête ci-dessus ?
+	'Class:AuditRule/Attribute:name' => 'Nom',
+	'Class:AuditRule/Attribute:name+' => 'Une vérification particulière',
+	'Class:AuditRule/Attribute:description' => 'Description',
+	'Class:AuditRule/Attribute:description+' => 'Qu\'est ce qu\'on vérifie ? Comment le corriger ? Qui doit le faire ? ...',
+	'Class:AuditRule/Attribute:query' => 'Requête',
+	'Class:AuditRule/Attribute:query+' => 'Requête OQL à executer. Les classes retournées doivent être cohérentes avec celles définies dans le périmètre de la catégorie',
+	'Class:AuditRule/Attribute:valid_flag' => 'Objets retournés :',
+	'Class:AuditRule/Attribute:valid_flag+' => 'Que retourne la requête ci-dessus ?
 "les objets valides" : alors les objets en erreur sont tout ceux du périmètre qui ne sont pas dans la liste des valides.
 "les objets invalides" : alors les objets en erreur sont les invalides qui font partie du périmètre.',
-	'Class:AuditRule/Attribute:valid_flag/Value:true'   => 'les objets valides',
-	'Class:AuditRule/Attribute:valid_flag/Value:true+'  => 'Alors les objets en erreur sont tout ceux du périmètre qui ne sont pas dans la liste des objets valides',
-	'Class:AuditRule/Attribute:valid_flag/Value:false'  => 'les objets invalides',
+	'Class:AuditRule/Attribute:valid_flag/Value:true' => 'les objets valides',
+	'Class:AuditRule/Attribute:valid_flag/Value:true+' => 'Alors les objets en erreur sont tout ceux du périmètre qui ne sont pas dans la liste des objets valides',
+	'Class:AuditRule/Attribute:valid_flag/Value:false' => 'les objets invalides',
 	'Class:AuditRule/Attribute:valid_flag/Value:false+' => 'Alors les objets en erreur sont les invalides qui font partie du périmètre',
-	'Class:AuditRule/Attribute:category_id'             => 'Catégorie',
-	'Class:AuditRule/Attribute:category_id+'            => '',
-	'Class:AuditRule/Attribute:category_name'           => 'Nom de la catégorie',
-	'Class:AuditRule/Attribute:category_name+'          => '',
+	'Class:AuditRule/Attribute:category_id' => 'Catégorie',
+	'Class:AuditRule/Attribute:category_id+' => '',
+	'Class:AuditRule/Attribute:category_name' => 'Nom de la catégorie',
+	'Class:AuditRule/Attribute:category_name+' => '',
 ));
 
 //
@@ -57,16 +56,16 @@ Elle s\'applique à tous les objets dans le périmètre de sa catégorie d\'audi
 //
 
 Dict::Add('FR FR', 'French', 'Français', array(
-	'Class:AuditDomain'                            => 'Domaine d\'audit',
-	'Class:AuditDomain+'                           => 'Un domaine permet de regrouper ensemble des catégories d\'audit.
+	'Class:AuditDomain' => 'Domaine d\'audit',
+	'Class:AuditDomain+' => 'Un domaine permet de regrouper ensemble des catégories d\'audit.
 Cela recouvre en général, un domaine d\'intérêt ou de responsabilité',
-	'Class:AuditDomain/Attribute:name'             => 'Nom',
-	'Class:AuditDomain/Attribute:name+'            => 'C\'est un filtre sur les catégories d\'audit pour une population en charge de contrôler ou de fixer les erreurs',
-	'Class:AuditDomain/Attribute:description'      => 'Description',
-	'Class:AuditDomain/Attribute:description+'     => '',
-	'Class:AuditDomain/Attribute:icon'             => 'Icône',
-	'Class:AuditDomain/Attribute:icon+'            => '',
-	'Class:AuditDomain/Attribute:categories_list'  => 'Catégories',
+	'Class:AuditDomain/Attribute:name' => 'Nom',
+	'Class:AuditDomain/Attribute:name+' => 'C\'est un filtre sur les catégories d\'audit pour une population en charge de contrôler ou de fixer les erreurs',
+	'Class:AuditDomain/Attribute:description' => 'Description',
+	'Class:AuditDomain/Attribute:description+' => '',
+	'Class:AuditDomain/Attribute:icon' => 'Icône',
+	'Class:AuditDomain/Attribute:icon+' => '',
+	'Class:AuditDomain/Attribute:categories_list' => 'Catégories',
 	'Class:AuditDomain/Attribute:categories_list+' => 'Catégories d\'audit incluses dans ce domaine. Cette inclusion n\'est pas exclusive.
 Lorsqu\'on execute l\'audit sur un domaine, toutes les catégories d\'audit incluses sont vérifiées en même temps et seulement celles là',
 ));
@@ -76,50 +75,49 @@ Lorsqu\'on execute l\'audit sur un domaine, toutes les catégories d\'audit incl
 //
 
 Dict::Add('FR FR', 'French', 'Français', array(
-	'Class:lnkAuditCategoryToAuditDomain'                          => 'Link AuditCategory / AuditDomain',
-	'Class:lnkAuditCategoryToAuditDomain+'                         => '',
-	'Class:lnkAuditCategoryToAuditDomain/Attribute:category_id'    => 'Catégorie',
-	'Class:lnkAuditCategoryToAuditDomain/Attribute:category_id+'   => 'Catégorie d\'audit',
-	'Class:lnkAuditCategoryToAuditDomain/Attribute:category_name'  => 'Nom de la catégorie',
+	'Class:lnkAuditCategoryToAuditDomain' => 'Link AuditCategory / AuditDomain',
+	'Class:lnkAuditCategoryToAuditDomain+' => '',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:category_id' => 'Catégorie',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:category_id+' => 'Catégorie d\'audit',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:category_name' => 'Nom de la catégorie',
 	'Class:lnkAuditCategoryToAuditDomain/Attribute:category_name+' => 'Nom de la catégorie d\'audit',
-	'Class:lnkAuditCategoryToAuditDomain/Attribute:domain_id'      => 'Domaine',
-	'Class:lnkAuditCategoryToAuditDomain/Attribute:domain_id+'     => 'Domaine d\'audit',
-	'Class:lnkAuditCategoryToAuditDomain/Attribute:domain_name'    => 'Nom du domain',
-	'Class:lnkAuditCategoryToAuditDomain/Attribute:domain_name+'   => 'Nom du domain d\'audit',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:domain_id' => 'Domaine',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:domain_id+' => 'Domaine d\'audit',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:domain_name' => 'Nom du domain',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:domain_name+' => 'Nom du domain d\'audit',
 ));
 
-
 //
 // Class: QueryOQL
 //
 
 Dict::Add('FR FR', 'French', 'Français', array(
-	'Class:Query'                                     => 'Requête',
-	'Class:Query+'                                    => 'Une requête définit un ensemble d\'information de manière dynamique',
-	'Class:Query/Attribute:name'                      => 'Nom',
-	'Class:Query/Attribute:name+'                     => 'Identification de la requête',
-	'Class:Query/Attribute:description'               => 'Description',
-	'Class:Query/Attribute:description+'              => 'Description complète (finalité, utilisations, public)',
-	'Class:Query/Attribute:is_template'               => 'Base pour champ OQL',
-	'Class:Query/Attribute:is_template+'              => 'Utilisable comme base pour les destinataires des Notifications',
-	'Class:Query/Attribute:is_template/Value:yes'     => 'Oui',
-	'Class:Query/Attribute:is_template/Value:no'      => 'Non',
-	'Class:Query/Attribute:export_count'              => 'Nombre d\'exports',
-	'Class:Query/Attribute:export_count+'             => 'Compteur reflétant le nombre d\'éxécutions de cette requête',
-	'Class:Query/Attribute:export_last_date'          => 'Dernier export',
-	'Class:Query/Attribute:export_last_date+'         => 'Date et heure de la dernière éxécution',
-	'Class:Query/Attribute:export_last_user_id'       => 'Utilisateur',
-	'Class:Query/Attribute:export_last_user_id+'      => 'Dernier utilisateur ayant exécuté cette requête',
-	'Class:Query/Attribute:export_last_user_contact'  => 'Contact',
+	'Class:Query' => 'Requête',
+	'Class:Query+' => 'Une requête définit un ensemble d\'information de manière dynamique',
+	'Class:Query/Attribute:name' => 'Nom',
+	'Class:Query/Attribute:name+' => 'Identification de la requête',
+	'Class:Query/Attribute:description' => 'Description',
+	'Class:Query/Attribute:description+' => 'Description complète (finalité, utilisations, public)',
+	'Class:Query/Attribute:is_template' => 'Base pour champ OQL',
+	'Class:Query/Attribute:is_template+' => 'Utilisable comme base pour les destinataires des Notifications',
+	'Class:Query/Attribute:is_template/Value:yes' => 'Oui',
+	'Class:Query/Attribute:is_template/Value:no' => 'Non',
+	'Class:Query/Attribute:export_count' => 'Nombre d\'exports',
+	'Class:Query/Attribute:export_count+' => 'Compteur reflétant le nombre d\'éxécutions de cette requête',
+	'Class:Query/Attribute:export_last_date' => 'Dernier export',
+	'Class:Query/Attribute:export_last_date+' => 'Date et heure de la dernière éxécution',
+	'Class:Query/Attribute:export_last_user_id' => 'Utilisateur',
+	'Class:Query/Attribute:export_last_user_id+' => 'Dernier utilisateur ayant exécuté cette requête',
+	'Class:Query/Attribute:export_last_user_contact' => 'Contact',
 	'Class:Query/Attribute:export_last_user_contact+' => 'Dernier contact ayant exécuté cette requête',
-	'Query:baseinfo'                                  => 'Informations générales',
-	'Query:exportInfo'                                => 'Informations sur les exports',
-	'Class:QueryOQL/Attribute:fields'                 => 'Champs',
-	'Class:QueryOQL/Attribute:fields+'                => 'Liste CSV des attributs (ou alias.attribut) à exporter',
-	'Class:QueryOQL'                                  => 'Requête OQL',
-	'Class:QueryOQL+'                                 => 'Une requête écrite dans le langage "Object Query Language"',
-	'Class:QueryOQL/Attribute:oql'                    => 'Expression',
-	'Class:QueryOQL/Attribute:oql+'                   => 'Expression OQL',
+	'Query:baseinfo' => 'Informations générales',
+	'Query:exportInfo' => 'Informations sur les exports',
+	'Class:QueryOQL/Attribute:fields' => 'Champs',
+	'Class:QueryOQL/Attribute:fields+' => 'Liste CSV des attributs (ou alias.attribut) à exporter',
+	'Class:QueryOQL' => 'Requête OQL',
+	'Class:QueryOQL+' => 'Une requête écrite dans le langage "Object Query Language"',
+	'Class:QueryOQL/Attribute:oql' => 'Expression',
+	'Class:QueryOQL/Attribute:oql+' => 'Expression OQL',
 ));
 
 //////////////////////////////////////////////////////////////////////
@@ -132,37 +130,36 @@ Dict::Add('FR FR', 'French', 'Français', array(
 //
 
 Dict::Add('FR FR', 'French', 'Français', array(
-	'Class:User'                                 => 'Utilisateur',
-	'Class:User+'                                => 'Compte utilisateur',
-	'Class:User/Attribute:finalclass'            => 'Type de compte',
-	'Class:User/Attribute:finalclass+'           => 'Nom de la classe instanciable',
-	'Class:User/Attribute:contactid'             => 'Personne',
-	'Class:User/Attribute:contactid+'            => 'Ce champ est obligatoire pour un utilisateur portail et très souhaitable hors comptes systèmes',
-	'Class:User/Attribute:org_id'                => 'Organisation',
-	'Class:User/Attribute:org_id+'               => 'Organisation de la personne associée',
-	'Class:User/Attribute:last_name'             => 'Nom',
-	'Class:User/Attribute:last_name+'            => 'Nom de la personne associée',
-	'Class:User/Attribute:first_name'            => 'Prénom',
-	'Class:User/Attribute:first_name+'           => 'Prénom de la personne associée',
-	'Class:User/Attribute:email'                 => 'Adresse mél',
-	'Class:User/Attribute:email+'                => 'Adresse mél de la personne associée',
-	'Class:User/Attribute:login'                 => 'Login',
-	'Class:User/Attribute:login+'                => 'Indentifiant de ce compte, doit être unique au sein d\''.ITOP_APPLICATION_SHORT,
-	'Class:User/Attribute:language'              => 'Langue',
-	'Class:User/Attribute:language+'             => 'Langue de défaut d\''.ITOP_APPLICATION_SHORT.' pour cet utilisateur, à choisir parmi les langues dans lequelles '.ITOP_APPLICATION_SHORT.' a été traduit.',
-	'Class:User/Attribute:language/Value:EN US'  => 'Anglais',
+	'Class:User' => 'Utilisateur',
+	'Class:User+' => 'Compte utilisateur',
+	'Class:User/Attribute:finalclass' => 'Type de compte',
+	'Class:User/Attribute:finalclass+' => 'Nom de la classe instanciable',
+	'Class:User/Attribute:contactid' => 'Personne',
+	'Class:User/Attribute:contactid+' => 'Ce champ est obligatoire pour un utilisateur portail et très souhaitable hors comptes systèmes',
+	'Class:User/Attribute:org_id' => 'Organisation',
+	'Class:User/Attribute:org_id+' => 'Organisation de la personne associée',
+	'Class:User/Attribute:last_name' => 'Nom',
+	'Class:User/Attribute:last_name+' => 'Nom de la personne associée',
+	'Class:User/Attribute:first_name' => 'Prénom',
+	'Class:User/Attribute:first_name+' => 'Prénom de la personne associée',
+	'Class:User/Attribute:email' => 'Adresse mél',
+	'Class:User/Attribute:email+' => 'Adresse mél de la personne associée',
+	'Class:User/Attribute:login' => 'Login',
+	'Class:User/Attribute:login+' => 'Indentifiant de ce compte, doit être unique au sein d\''.ITOP_APPLICATION_SHORT,
+	'Class:User/Attribute:language' => 'Langue',
+	'Class:User/Attribute:language+' => 'Langue de défaut d\''.ITOP_APPLICATION_SHORT.' pour cet utilisateur, à choisir parmi les langues dans lequelles '.ITOP_APPLICATION_SHORT.' a été traduit.',
+	'Class:User/Attribute:language/Value:EN US' => 'Anglais',
 	'Class:User/Attribute:language/Value:EN US+' => 'Anglais (Etats-unis)',
-	'Class:User/Attribute:language/Value:FR FR'  => 'Français',
+	'Class:User/Attribute:language/Value:FR FR' => 'Français',
 	'Class:User/Attribute:language/Value:FR FR+' => 'Français (France)',
-	'Class:User/Attribute:profile_list'          => 'Profils',
-	'Class:User/Attribute:profile_list+'         => 'Rôles, ouvrants les droits d\'accès',
-	'Class:User/Attribute:allowed_org_list'      => 'Organisations permises',
-	'Class:User/Attribute:allowed_org_list+'     => 'L\'utilisateur a le droit de voir les données des organisations listées ici. Si aucune organisation n\'est spécifiée, alors aucune restriction ne s\'applique.',
-	'Class:User/Attribute:status'                => 'Etat',
-	'Class:User/Attribute:status+'               => 'Est-ce que ce compte utilisateur est actif, ou non?',
+	'Class:User/Attribute:profile_list' => 'Profils',
+	'Class:User/Attribute:profile_list+' => 'Rôles, ouvrants les droits d\'accès',
+	'Class:User/Attribute:allowed_org_list' => 'Organisations permises',
+	'Class:User/Attribute:allowed_org_list+' => 'L\'utilisateur a le droit de voir les données des organisations listées ici. Si aucune organisation n\'est spécifiée, alors aucune restriction ne s\'applique.',
+	'Class:User/Attribute:status' => 'Etat',
+	'Class:User/Attribute:status+' => 'Est-ce que ce compte utilisateur est actif, ou non?',
 	'Class:User/Attribute:status/Value:enabled' => 'Actif',
 	'Class:User/Attribute:status/Value:disabled' => 'Désactivé',
-
 	'Class:User/Error:LoginMustBeUnique' => 'Le login doit être unique - "%1s" est déjà utilisé.',
 	'Class:User/Error:AtLeastOneProfileIsNeeded' => 'L\'utilisateur doit avoir au moins un profil.',
 	'Class:User/Error:ProfileNotAllowed' => 'Le profil "%1$s" ne peux pas être ajouté à son propre utilisateur, il interdit l\'accès à la console',
@@ -371,6 +368,28 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Expression:Unit:Short:YEAR' => 'a',
 ));
 
+//
+// Duplicated into itop-welcome-itil ( will be removed from here...)
+//
+Dict::Add('FR FR', 'French', 'Français', array(
+	'Menu:WelcomeMenu' => 'Bienvenue',
+	'Menu:WelcomeMenu+' => 'Bienvenue dans '.ITOP_APPLICATION_SHORT, 'Menu:WelcomeMenuPage' => 'Bienvenue',
+	'Menu:WelcomeMenuPage+' => 'Bienvenue dans '.ITOP_APPLICATION_SHORT, 'Menu:AdminTools' => 'Administration',
+	'Menu:AdminTools+' => 'Outils d\'administration',
+	'Menu:AdminTools?' => 'Ces outils sont accessibles uniquement aux utilisateurs possédant le profil Administrateur.',
+	'Menu:CSVImportMenu' => 'Import CSV',
+	'Menu:CSVImportMenu+' => 'Import ou mise à jour en masse',
+	'Menu:DataModelMenu' => 'Modèle de données',
+	'Menu:DataModelMenu+' => 'Résumé du modèle de données',
+	'Menu:ExportMenu' => 'Export',
+	'Menu:ExportMenu+' => 'Export des résultats d\'une requête en HTML, CSV ou XML',
+	'Menu:NotificationsMenu' => 'Notifications',
+	'Menu:NotificationsMenu+' => 'Configurer les Notifications',
+	'Menu:MyShortcuts' => 'Mes raccourcis',
+	'Menu:DataAdministration' => 'Administration des données',
+	'Menu:DataAdministration+' => 'Administration des données',
+	'Menu:Notifications:Title' => 'Catégories d\'audit'
+));
 
 //
 // String from the User Interface: menu, messages, buttons, etc...
@@ -380,12 +399,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'BooleanLabel:yes' => 'oui',
 	'BooleanLabel:no' => 'non',
 	'UI:Login:Title' => ITOP_APPLICATION_SHORT.' login',
-	'Menu:WelcomeMenu' => 'Bienvenue',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:WelcomeMenu+' => 'Bienvenue dans '.ITOP_APPLICATION_SHORT,// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:WelcomeMenuPage' => 'Bienvenue',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:WelcomeMenuPage+' => 'Bienvenue dans '.ITOP_APPLICATION_SHORT,// Duplicated into itop-welcome-itil (will be removed from here...)
 	'UI:WelcomeMenu:Title' => 'Bienvenue dans '.ITOP_APPLICATION_SHORT,
-
 	'UI:WelcomeMenu:LeftBlock' => '<p>'.ITOP_APPLICATION_SHORT.' est un portail opérationnel complet et libre pour gérer votre SI.</p>
 <ul>il contient:
 <li>Une base de gestion des configurations (CMDB - Configuration management database) pour documenter et gérer votre parc informatique.</li>
@@ -396,7 +410,6 @@ Dict::Add('FR FR', 'French', 'Français', array(
 <li>Des tableaux de bord pour avoir rapidement une vue synthétique de votre SI.</li>
 </ul>
 <p>Tous ces modules peuvent être installés séparément, à votre rythme.</p>',
-
 	'UI:WelcomeMenu:RightBlock' => '<p>'.ITOP_APPLICATION_SHORT.' a été conçu pour les fournisseurs de service, il permet à vos équipes IT de gérer facilement de multiples clients et organisations.
 <ul>iTop fournit un riche ensemble de processus métier&nbsp;pour:
 <li>Augmenter l\'efficacité de la gestion de votre SI</li> 
@@ -455,97 +468,93 @@ Nous espérons que vous aimerez cette version autant que nous avons eu du plaisi
 	'UI:Button:Evaluate' => ' Exécuter ',
 	'UI:Button:Evaluate:Title' => ' Exécuter (Ctrl+Entrée)',
 	'UI:Button:AddObject' => ' Ajouter... ',
-	'UI:Button:BrowseObjects'     => ' Naviguer... ',
-	'UI:Button:Add'               => ' Ajouter ',
-	'UI:Button:AddToList'         => ' << Ajouter ',
-	'UI:Button:RemoveFromList'    => ' Enlever >> ',
-	'UI:Button:FilterList'        => ' Filtrer... ',
-	'UI:Button:Create'            => ' Créer ',
-	'UI:Button:Delete'            => ' Supprimer ',
-	'UI:Button:Rename'            => ' Renommer... ',
-	'UI:Button:ChangePassword'    => ' Changer ! ',
-	'UI:Button:ResetPassword'     => ' Ràz du mot de passe ',
-	'UI:Button:Insert'            => 'Insérer',
-	'UI:Button:More'              => 'Plus',
-	'UI:Button:Less'              => 'Moins',
-	'UI:Button:Wait'              => 'Patientez pendant la mise à jour des champs',
-	'UI:Treeview:CollapseAll'     => 'Tout replier',
-	'UI:Treeview:ExpandAll'       => 'Tout déplier',
-	'UI:UserPref:DoNotShowAgain'  => 'Ne plus afficher ce message',
+	'UI:Button:BrowseObjects' => ' Naviguer... ',
+	'UI:Button:Add' => ' Ajouter ',
+	'UI:Button:AddToList' => ' << Ajouter ',
+	'UI:Button:RemoveFromList' => ' Enlever >> ',
+	'UI:Button:FilterList' => ' Filtrer... ',
+	'UI:Button:Create' => ' Créer ',
+	'UI:Button:Delete' => ' Supprimer ',
+	'UI:Button:Rename' => ' Renommer... ',
+	'UI:Button:ChangePassword' => ' Changer ! ',
+	'UI:Button:ResetPassword' => ' Ràz du mot de passe ',
+	'UI:Button:Insert' => 'Insérer',
+	'UI:Button:More' => 'Plus',
+	'UI:Button:Less' => 'Moins',
+	'UI:Button:Wait' => 'Patientez pendant la mise à jour des champs',
+	'UI:Treeview:CollapseAll' => 'Tout replier',
+	'UI:Treeview:ExpandAll' => 'Tout déplier',
+	'UI:UserPref:DoNotShowAgain' => 'Ne plus afficher ce message',
 	'UI:InputFile:NoFileSelected' => 'Aucun fichier sélectionné',
-	'UI:InputFile:SelectFile'     => 'Sélectionner un fichier',
-
-	'UI:SearchToggle'                                    => 'Recherche',
-	'UI:ClickToCreateNew'                                => 'Créer un(e) %1$s',
-	'UI:SearchFor_Class'                                 => 'Rechercher des objets de type %1$s',
-	'UI:NoObjectToDisplay'                               => 'Aucun objet à afficher.',
-	'UI:Error:SaveFailed'                                => 'L\'objet ne peut pas être sauvé : ',
-	'UI:Error:MandatoryTemplateParameter_object_id'      => 'Le paramètre object_id est obligatoire quand link_attr est spécifié. Vérifiez la définition du modèle.',
-	'UI:Error:MandatoryTemplateParameter_target_attr'    => 'Le paramètre taarget_attr est obligatoire quand link_attr est spécifié. Vérifiez la définition du modèle.',
-	'UI:Error:MandatoryTemplateParameter_group_by'       => 'Le paramètre group_by est obligatoire. Vérifiez la définition du modèle.',
-	'UI:Error:InvalidGroupByFields'                      => 'Liste des champs "group by" incorrecte: "%1$s".',
-	'UI:Error:UnsupportedStyleOfBlock'                   => 'Erreur: style de bloc("%1$s") inconnu.',
+	'UI:InputFile:SelectFile' => 'Sélectionner un fichier',
+	'UI:SearchToggle' => 'Recherche',
+	'UI:ClickToCreateNew' => 'Créer un(e) %1$s',
+	'UI:SearchFor_Class' => 'Rechercher des objets de type %1$s',
+	'UI:NoObjectToDisplay' => 'Aucun objet à afficher.',
+	'UI:Error:SaveFailed' => 'L\'objet ne peut pas être sauvé : ',
+	'UI:Error:MandatoryTemplateParameter_object_id' => 'Le paramètre object_id est obligatoire quand link_attr est spécifié. Vérifiez la définition du modèle.',
+	'UI:Error:MandatoryTemplateParameter_target_attr' => 'Le paramètre taarget_attr est obligatoire quand link_attr est spécifié. Vérifiez la définition du modèle.',
+	'UI:Error:MandatoryTemplateParameter_group_by' => 'Le paramètre group_by est obligatoire. Vérifiez la définition du modèle.',
+	'UI:Error:InvalidGroupByFields' => 'Liste des champs "group by" incorrecte: "%1$s".',
+	'UI:Error:UnsupportedStyleOfBlock' => 'Erreur: style de bloc("%1$s") inconnu.',
 	'UI:Error:IncorrectLinkDefinition_LinkedClass_Class' => 'la définition du lien est incorrecte: la classe d\'objets à gérer: %1$s n\'est référencée par aucune clef externe de la classe %2$s',
-	'UI:Error:Object_Class_Id_NotFound'                  => 'L\'objet: %1$s:%2$d est introuvable.',
-	'UI:Error:WizardCircularReferenceInDependencies'     => 'Erreur: Référence circulaire entre les dépendences entre champs, vérifiez le modèle de données.',
-	'UI:Error:UploadedFileTooBig'                        => 'Le fichier téléchargé est trop gros. (La taille maximale autorisée est %1$s). Pour modifier cette limite contactez votre administrateur '.ITOP_APPLICATION_SHORT.'. (Réglages upload_max_filesize et post_max_size dans la configuration PHP sur le serveur)',
-	'UI:Error:UploadedFileTruncated.'                    => 'Le fichier téléchargé a été tronqué !',
-	'UI:Error:NoTmpDir'                                  => 'Il n\'y a aucun répertoire temporaire de défini.',
-	'UI:Error:CannotWriteToTmp_Dir'                      => 'Impossible d\'écrire le fichier temporaire sur disque. upload_tmp_dir = "%1$s".',
-	'UI:Error:UploadStoppedByExtension_FileName'         => 'Téléchargement arrêté à cause de l\'extension. (Nom du fichier original = "%1$s").',
-	'UI:Error:UploadFailedUnknownCause_Code'             => 'Le téléchargement a échoué pour une raison inconnue. (Code d\'erreur = "%1$s").',
-
-	'UI:Error:1ParametersMissing'                         => 'Erreur: Pour effectuer cette opération il manque le paramètre suivant: %1$s.',
-	'UI:Error:2ParametersMissing'                         => 'Erreur: Pour effectuer cette opération il manque les paramètres suivants: %1$s and %2$s.',
-	'UI:Error:3ParametersMissing'                         => 'Erreur: Pour effectuer cette opération il manque les paramètres suivants: %1$s, %2$s and %3$s.',
-	'UI:Error:4ParametersMissing'                         => 'Erreur: Pour effectuer cette opération il manque les paramètres suivants: %1$s, %2$s, %3$s and %4$s.',
-	'UI:Error:IncorrectOQLQuery_Message'                  => 'Erreur: requête OQL incorrecte: %1$s',
+	'UI:Error:Object_Class_Id_NotFound' => 'L\'objet: %1$s:%2$d est introuvable.',
+	'UI:Error:WizardCircularReferenceInDependencies' => 'Erreur: Référence circulaire entre les dépendences entre champs, vérifiez le modèle de données.',
+	'UI:Error:UploadedFileTooBig' => 'Le fichier téléchargé est trop gros. (La taille maximale autorisée est %1$s). Pour modifier cette limite contactez votre administrateur '.ITOP_APPLICATION_SHORT.'. (Réglages upload_max_filesize et post_max_size dans la configuration PHP sur le serveur)',
+	'UI:Error:UploadedFileTruncated.' => 'Le fichier téléchargé a été tronqué !',
+	'UI:Error:NoTmpDir' => 'Il n\'y a aucun répertoire temporaire de défini.',
+	'UI:Error:CannotWriteToTmp_Dir' => 'Impossible d\'écrire le fichier temporaire sur disque. upload_tmp_dir = "%1$s".',
+	'UI:Error:UploadStoppedByExtension_FileName' => 'Téléchargement arrêté à cause de l\'extension. (Nom du fichier original = "%1$s").',
+	'UI:Error:UploadFailedUnknownCause_Code' => 'Le téléchargement a échoué pour une raison inconnue. (Code d\'erreur = "%1$s").',
+	'UI:Error:1ParametersMissing' => 'Erreur: Pour effectuer cette opération il manque le paramètre suivant: %1$s.',
+	'UI:Error:2ParametersMissing' => 'Erreur: Pour effectuer cette opération il manque les paramètres suivants: %1$s and %2$s.',
+	'UI:Error:3ParametersMissing' => 'Erreur: Pour effectuer cette opération il manque les paramètres suivants: %1$s, %2$s and %3$s.',
+	'UI:Error:4ParametersMissing' => 'Erreur: Pour effectuer cette opération il manque les paramètres suivants: %1$s, %2$s, %3$s and %4$s.',
+	'UI:Error:IncorrectOQLQuery_Message' => 'Erreur: requête OQL incorrecte: %1$s',
 	'UI:Error:AnErrorOccuredWhileRunningTheQuery_Message' => 'Une erreur s\'est produite en exécutant la requête: %1$s',
-	'UI:Error:ObjectAlreadyUpdated'                       => 'Erreur: l\'objet a déjà été mis à jour.',
-	'UI:Error:ObjectCannotBeUpdated'                      => 'Erreur: l\'objet ne peut pas être mis à jour.',
-	'UI:Error:ObjectsAlreadyDeleted'                      => 'Erreur: les objets ont déjà été supprimés !',
-	'UI:Error:BulkDeleteNotAllowedOn_Class'               => 'Vous n\'êtes pas autorisé à faire une suppression massive sur les objets de type %1$s',
-	'UI:Error:DeleteNotAllowedOn_Class'                   => 'Vous n\'êtes pas autorisé à supprimer des objets de type %1$s',
-	'UI:Error:ReadNotAllowedOn_Class'                     => 'Vous n\'êtes pas autorisé à voir des objets de type %1$s',
-	'UI:Error:BulkModifyNotAllowedOn_Class'               => 'Vous n\'êtes pas autorisé à faire une modification massive sur les objets de type %1$s',
-	'UI:Error:ObjectAlreadyCloned'                        => 'Erreur: l\'objet a déjà été dupliqué !',
-	'UI:Error:ObjectAlreadyCreated'                       => 'Erreur: l\'objet a déjà été créé !',
-	'UI:Error:Invalid_Stimulus_On_Object_In_State'        => '%2$s est actuellement dans l\'état "%3$s", l\'opération "%1$s" que vous avez demandée ne peut être appliquée.',
-	'UI:Error:InvalidDashboardFile'                       => 'Erreur: Le fichier tableau de bord est invalide',
-	'UI:Error:InvalidDashboard'                           => 'Erreur: Le tableau de bord est invalide',
-	'UI:Error:MaintenanceMode'                            => 'L\'application est en maintenance',
-	'UI:Error:MaintenanceTitle'                           => 'Maintenance',
-	'UI:Error:InvalidToken'                               => 'Erreur: l\'opération a déjà été effectuée (CSRF token not found)',
-
+	'UI:Error:ObjectAlreadyUpdated' => 'Erreur: l\'objet a déjà été mis à jour.',
+	'UI:Error:ObjectCannotBeUpdated' => 'Erreur: l\'objet ne peut pas être mis à jour.',
+	'UI:Error:ObjectsAlreadyDeleted' => 'Erreur: les objets ont déjà été supprimés !',
+	'UI:Error:BulkDeleteNotAllowedOn_Class' => 'Vous n\'êtes pas autorisé à faire une suppression massive sur les objets de type %1$s',
+	'UI:Error:DeleteNotAllowedOn_Class' => 'Vous n\'êtes pas autorisé à supprimer des objets de type %1$s',
+	'UI:Error:ReadNotAllowedOn_Class' => 'Vous n\'êtes pas autorisé à voir des objets de type %1$s',
+	'UI:Error:BulkModifyNotAllowedOn_Class' => 'Vous n\'êtes pas autorisé à faire une modification massive sur les objets de type %1$s',
+	'UI:Error:ObjectAlreadyCloned' => 'Erreur: l\'objet a déjà été dupliqué !',
+	'UI:Error:ObjectAlreadyCreated' => 'Erreur: l\'objet a déjà été créé !',
+	'UI:Error:Invalid_Stimulus_On_Object_In_State' => '%2$s est actuellement dans l\'état "%3$s", l\'opération "%1$s" que vous avez demandée ne peut être appliquée.',
+	'UI:Error:InvalidDashboardFile' => 'Erreur: Le fichier tableau de bord est invalide',
+	'UI:Error:InvalidDashboard' => 'Erreur: Le tableau de bord est invalide',
+	'UI:Error:MaintenanceMode' => 'L\'application est en maintenance',
+	'UI:Error:MaintenanceTitle' => 'Maintenance',
+	'UI:Error:InvalidToken' => 'Erreur: l\'opération a déjà été effectuée (CSRF token not found)',
 	'UI:Error:SMTP:UnknownVendor' => 'Le provider SMTP OAuth 2.0 %1$s n\'existe pas',
-
-	'UI:GroupBy:Count'                 => 'Nombre',
-	'UI:GroupBy:Count+'                => 'Nombre d\'éléments',
-	'UI:CountOfObjects'                => '%1$d objets correspondants aux critères.',
-	'UI_CountOfObjectsShort'           => '%1$d objets.',
-	'UI:NoObject_Class_ToDisplay'      => 'Aucun objet %1$s à afficher',
-	'UI:History:LastModified_On_By'    => 'Dernière modification par %2$s le %1$s.',
-	'UI:HistoryTab'                    => 'Historique',
-	'UI:NotificationsTab'              => 'Notifications',
-	'UI:History:BulkImports'           => 'Historique',
-	'UI:History:BulkImports+'          => 'Liste des imports CSV (le dernier est en haut de la liste)',
-	'UI:History:BulkImportDetails'     => 'Changements résultant de l\'import CSV du %1$s (auteur: %2$s)',
-	'UI:History:Date'                  => 'Date',
-	'UI:History:Date+'                 => 'Date de modification',
-	'UI:History:User'                  => 'Utilisateur',
-	'UI:History:User+'                 => 'Utilisateur qui a fait la modification',
-	'UI:History:Changes'               => 'Changements',
-	'UI:History:Changes+'              => 'Changements sur cet objet',
-	'UI:History:StatsCreations'        => 'Créés',
-	'UI:History:StatsCreations+'       => 'Nombre d\'objets créés',
-	'UI:History:StatsModifs'           => 'Modifiés',
-	'UI:History:StatsModifs+'          => 'Nombre d\'objets modifiés',
-	'UI:History:StatsDeletes'          => 'Effacés',
-	'UI:History:StatsDeletes+'         => 'Nombre d\'objets effacés',
-	'UI:Loading'                       => 'Chargement...',
-	'UI:Menu:Actions'                  => 'Actions',
-	'UI:Menu:OtherActions'             => 'Autres actions',
-	'UI:Menu:Transitions'              => 'Transitions',
+	'UI:GroupBy:Count' => 'Nombre',
+	'UI:GroupBy:Count+' => 'Nombre d\'éléments',
+	'UI:CountOfObjects' => '%1$d objets correspondants aux critères.',
+	'UI_CountOfObjectsShort' => '%1$d objets.',
+	'UI:NoObject_Class_ToDisplay' => 'Aucun objet %1$s à afficher',
+	'UI:History:LastModified_On_By' => 'Dernière modification par %2$s le %1$s.',
+	'UI:HistoryTab' => 'Historique',
+	'UI:NotificationsTab' => 'Notifications',
+	'UI:History:BulkImports' => 'Historique',
+	'UI:History:BulkImports+' => 'Liste des imports CSV (le dernier est en haut de la liste)',
+	'UI:History:BulkImportDetails' => 'Changements résultant de l\'import CSV du %1$s (auteur: %2$s)',
+	'UI:History:Date' => 'Date',
+	'UI:History:Date+' => 'Date de modification',
+	'UI:History:User' => 'Utilisateur',
+	'UI:History:User+' => 'Utilisateur qui a fait la modification',
+	'UI:History:Changes' => 'Changements',
+	'UI:History:Changes+' => 'Changements sur cet objet',
+	'UI:History:StatsCreations' => 'Créés',
+	'UI:History:StatsCreations+' => 'Nombre d\'objets créés',
+	'UI:History:StatsModifs' => 'Modifiés',
+	'UI:History:StatsModifs+' => 'Nombre d\'objets modifiés',
+	'UI:History:StatsDeletes' => 'Effacés',
+	'UI:History:StatsDeletes+' => 'Nombre d\'objets effacés',
+	'UI:Loading' => 'Chargement...',
+	'UI:Menu:Actions' => 'Actions',
+	'UI:Menu:OtherActions' => 'Autres actions',
+	'UI:Menu:Transitions' => 'Transitions',
 	'UI:Menu:OtherTransitions' => 'Autres transitions',
 	'UI:Menu:View' => 'Voir cet objet',
 	'UI:Menu:New' => 'Créer...',
@@ -591,7 +600,6 @@ Nous espérons que vous aimerez cette version autant que nous avons eu du plaisi
 	'UI:Login:ResetPassword' => 'Envoyer le message',
 	'UI:Login:ResetPwdFailed' => 'Impossible de vous faire parvenir le message: %1$s',
 	'UI:Login:SeparatorOr' => 'Ou',
-
 	'UI:ResetPwd-Error-WrongLogin' => 'le compte \'%1$s\' est inconnu.',
 	'UI:ResetPwd-Error-NotPossible' => 'les comptes "externes" ne permettent pas la saisie d\'un mot de passe dans '.ITOP_APPLICATION_SHORT.'.',
 	'UI:ResetPwd-Error-FixedPwd' => 'ce mode de saisie du mot de passe n\'est pas autorisé pour ce compte.',
@@ -602,319 +610,312 @@ Nous espérons que vous aimerez cette version autant que nous avons eu du plaisi
 	'UI:ResetPwd-EmailSent' => 'Veuillez vérifier votre boîte de réception. Ensuite, suivez les instructions données dans l\'email. Si vous ne recevez pas d\'email, merci de vérifier le login saisi',
 	'UI:ResetPwd-EmailSubject' => 'Changer votre mot de passe '.ITOP_APPLICATION_SHORT,
 	'UI:ResetPwd-EmailBody' => '<body><p>Vous avez demandé à changer votre mot de passe '.ITOP_APPLICATION_SHORT.' sans connaître le mot de passe précédent.</p><p>Veuillez suivre le lien suivant (usage unique) afin de pouvoir <a href="%1$s">saisir un nouveau mot de passe</a></p>.',
-
 	'UI:ResetPwd-Title' => 'Nouveau mot de passe',
 	'UI:ResetPwd-Error-InvalidToken' => 'Désolé, le mot de passe a déjà été modifié avec le lien que vous avez suivi, ou bien vous avez reçu plusieurs emails. Dans ce cas, veillez à utiliser le tout dernier lien reçu.',
 	'UI:ResetPwd-Error-EnterPassword' => 'Veuillez saisir le nouveau mot de passe pour \'%1$s\'.',
 	'UI:ResetPwd-Ready' => 'Le mot de passe a bien été changé.',
 	'UI:ResetPwd-Login' => 'Cliquez ici pour vous connecter...',
-
-	'UI:Login:About'                               => '~~',
-	'UI:Login:ChangeYourPassword'                  => 'Changer de mot de passe',
-	'UI:Login:OldPasswordPrompt'                   => 'Ancien mot de passe',
-	'UI:Login:NewPasswordPrompt'                   => 'Nouveau mot de passe',
-	'UI:Login:RetypeNewPasswordPrompt'             => 'Resaisir le nouveau mot de passe',
-	'UI:Login:IncorrectOldPassword'                => 'Erreur: l\'ancien mot de passe est incorrect',
-	'UI:LogOffMenu'                                => 'Déconnexion',
-	'UI:LogOff:ThankYou'                           => 'Merci d\'avoir utilisé '.ITOP_APPLICATION_SHORT,
-	'UI:LogOff:ClickHereToLoginAgain'              => 'Cliquez ici pour vous reconnecter...',
-	'UI:ChangePwdMenu'                             => 'Changer de mot de passe...',
-	'UI:Login:PasswordChanged'                     => 'Mot de passe mis à jour !',
-	'UI:Login:PasswordNotChanged'                  => 'Erreur : le mot de passe est identique !',
-	'UI:AccessRO-All'                              => ITOP_APPLICATION_SHORT.' est en lecture seule',
-	'UI:AccessRO-Users'                            => ITOP_APPLICATION_SHORT.' est en lecture seule pour les utilisateurs finaux',
-	'UI:ApplicationEnvironment'                    => 'Environnement applicatif: %1$s',
-	'UI:Login:RetypePwdDoesNotMatch'               => 'Les deux saisies du nouveau mot de passe ne sont pas identiques !',
-	'UI:Button:Login'                              => 'Entrer dans '.ITOP_APPLICATION_SHORT,
-	'UI:Login:Error:AccessRestricted'              => 'L\'accès à cette page '.ITOP_APPLICATION_SHORT.' est soumis à autorisation. Merci de contacter votre administrateur '.ITOP_APPLICATION_SHORT.'.',
-	'UI:Login:Error:AccessAdmin'                   => 'Accès restreint aux utilisateurs possédant le profil Administrateur.',
-	'UI:Login:Error:WrongOrganizationName'         => 'Organisation inconnue',
+	'UI:Login:About' => '~~',
+	'UI:Login:ChangeYourPassword' => 'Changer de mot de passe',
+	'UI:Login:OldPasswordPrompt' => 'Ancien mot de passe',
+	'UI:Login:NewPasswordPrompt' => 'Nouveau mot de passe',
+	'UI:Login:RetypeNewPasswordPrompt' => 'Resaisir le nouveau mot de passe',
+	'UI:Login:IncorrectOldPassword' => 'Erreur: l\'ancien mot de passe est incorrect',
+	'UI:LogOffMenu' => 'Déconnexion',
+	'UI:LogOff:ThankYou' => 'Merci d\'avoir utilisé '.ITOP_APPLICATION_SHORT,
+	'UI:LogOff:ClickHereToLoginAgain' => 'Cliquez ici pour vous reconnecter...',
+	'UI:ChangePwdMenu' => 'Changer de mot de passe...',
+	'UI:Login:PasswordChanged' => 'Mot de passe mis à jour !',
+	'UI:Login:PasswordNotChanged' => 'Erreur : le mot de passe est identique !',
+	'UI:AccessRO-All' => ITOP_APPLICATION_SHORT.' est en lecture seule',
+	'UI:AccessRO-Users' => ITOP_APPLICATION_SHORT.' est en lecture seule pour les utilisateurs finaux',
+	'UI:ApplicationEnvironment' => 'Environnement applicatif: %1$s',
+	'UI:Login:RetypePwdDoesNotMatch' => 'Les deux saisies du nouveau mot de passe ne sont pas identiques !',
+	'UI:Button:Login' => 'Entrer dans '.ITOP_APPLICATION_SHORT,
+	'UI:Login:Error:AccessRestricted' => 'L\'accès à cette page '.ITOP_APPLICATION_SHORT.' est soumis à autorisation. Merci de contacter votre administrateur '.ITOP_APPLICATION_SHORT.'.',
+	'UI:Login:Error:AccessAdmin' => 'Accès restreint aux utilisateurs possédant le profil Administrateur.',
+	'UI:Login:Error:WrongOrganizationName' => 'Organisation inconnue',
 	'UI:Login:Error:MultipleContactsHaveSameEmail' => 'Email partagé par plusieurs contacts',
-	'UI:Login:Error:NoValidProfiles'               => 'Pas de profil valide',
-	'UI:CSVImport:MappingSelectOne'                => '-- choisir une valeur --',
-	'UI:CSVImport:MappingNotApplicable'            => '-- ignorer ce champ --',
-	'UI:CSVImport:NoData'                          => 'Aucune donnée... merci de fournir des données !',
-	'UI:Title:DataPreview'                         => 'Aperçu des données',
-	'UI:CSVImport:ErrorOnlyOneColumn'              => 'Erreur: Les données semblent ne contenir qu\'une seule colonne. Avez-vous choisi le bon séparateur ?',
-	'UI:CSVImport:FieldName'                       => 'Champ n°%1$d',
-	'UI:CSVImport:DataLine1'                       => 'Données Ligne 1',
-	'UI:CSVImport:DataLine2'                       => 'Données Ligne  2',
-	'UI:CSVImport:idField'                         => 'id (Clef primaire)',
-	'UI:Title:BulkImport'                          => ITOP_APPLICATION_SHORT.' - Import massif',
-	'UI:Title:BulkImport+'                         => 'Assistant d\'import CSV',
-	'UI:Title:BulkSynchro_nbItem_ofClass_class'    => 'Synchronisation de %1$d éléments de type %2$s',
-	'UI:CSVImport:ClassesSelectOne'                => '-- choisir une valeur --',
-	'UI:CSVImport:ErrorExtendedAttCode'            => 'Erreur interne: "%1$s" n\'est pas une code correct car "%2$s" n\'est pas une clef externe de la classe "%3$s"',
-	'UI:CSVImport:ObjectsWillStayUnchanged'        => '%1$d objets(s) resteront inchangés.',
-	'UI:CSVImport:ObjectsWillBeModified'           => '%1$d objets(s) seront modifiés.',
-	'UI:CSVImport:ObjectsWillBeAdded'              => '%1$d objets(s) seront créés.',
-	'UI:CSVImport:ObjectsWillHaveErrors'           => '%1$d objets(s) seront en erreur.',
-	'UI:CSVImport:ObjectsRemainedUnchanged'        => '%1$d objets(s) n\'ont pas changé.',
-	'UI:CSVImport:ObjectsWereModified'             => '%1$d objets(s)ont été modifiés.',
-	'UI:CSVImport:ObjectsWereAdded'                => '%1$d objets(s) ont été créés.',
-	'UI:CSVImport:ObjectsHadErrors'                => '%1$d ligne(s) contenaient des erreurs.',
-	'UI:Title:CSVImportStep2'                      => 'Etape 2 sur 5: Options du format CSV',
-	'UI:Title:CSVImportStep3'                      => 'Etape 3 sur 5: Correspondance des données',
-	'UI:Title:CSVImportStep4'                      => 'Etape 4 sur 5: Simulation de l\'import',
-	'UI:Title:CSVImportStep5'                      => 'Etape 5 sur 5: Import terminé',
-	'UI:CSVImport:LinesNotImported'                => 'Des lignes n\'ont pas été importées:',
-	'UI:CSVImport:LinesNotImported+'               => 'Les lignes suivantes n\'ont pas été importées car elles contenaient des erreurs.',
-	'UI:CSVImport:SeparatorComma+'                 => ', (virgule)',
-	'UI:CSVImport:SeparatorSemicolon+'             => '; (point-virgule)',
-	'UI:CSVImport:SeparatorTab+'                   => 'tab',
-	'UI:CSVImport:SeparatorOther'                  => 'autre :',
-	'UI:CSVImport:QualifierDoubleQuote+'           => '" (guillemet double)',
-	'UI:CSVImport:QualifierSimpleQuote+'           => '\' (guillemet simple / apostrophe)',
-	'UI:CSVImport:QualifierOther'                  => 'autre :',
-	'UI:CSVImport:TreatFirstLineAsHeader'          => 'La première ligne est l\'en-tête (noms des colonnes)',
-	'UI:CSVImport:Skip_N_LinesAtTheBeginning'      => 'Ignorer les %1$s premières lignes du fichier',
-	'UI:CSVImport:CSVDataPreview'                  => 'Aperçu des données CSV',
-	'UI:CSVImport:SelectFile'                      => 'Sélectionnez le fichier à importer:',
-	'UI:CSVImport:Tab:LoadFromFile'                => 'Import depuis un fichier',
-	'UI:CSVImport:Tab:CopyPaste'                   => 'Copier/Coller de données',
-	'UI:CSVImport:Tab:Templates'                   => 'Modèles',
-	'UI:CSVImport:PasteData'                       => 'Collez ici les données à importer:',
-	'UI:CSVImport:PickClassForTemplate'            => 'Choisissez un modèle à télécharger: ',
-	'UI:CSVImport:SeparatorCharacter'              => 'Séparateur:',
-	'UI:CSVImport:TextQualifierCharacter'          => 'Délimiteur de texte',
-	'UI:CSVImport:CommentsAndHeader'               => 'Commentaires et en-tête',
-	'UI:CSVImport:SelectClass'                     => 'Sélectionner le type d\'objets à importer:',
-	'UI:CSVImport:AdvancedMode'                    => 'Mode expert',
-	'UI:CSVImport:AdvancedMode+'                   => 'En mode expert, l\'"id" (clef primaire) des objets peut être utilisé pour renommer des objets.Cependant la colonne "id" (si elle est présente) ne peut être utilisée que comme clef de recherche et ne peut pas être combinée avec une autre clef de recherche.',
-	'UI:CSVImport:SelectAClassFirst'               => 'Pour configurer la correspondance, choississez d\'abord un type ci-dessus.',
-	'UI:CSVImport:HeaderFields'                    => 'Champs',
-	'UI:CSVImport:HeaderMappings'                  => 'Correspondance',
-	'UI:CSVImport:HeaderSearch'                    => 'Recherche ?',
-	'UI:CSVImport:AlertIncompleteMapping'          => 'Veuillez choisir la correspondance pour chacun des champs.',
-	'UI:CSVImport:AlertMultipleMapping'            => 'Veuillez vous assurer que chaque champ cible est sélectionné une seule fois.',
-	'UI:CSVImport:AlertNoSearchCriteria'           => 'Veuillez choisir au moins une clef de recherche.',
-	'UI:CSVImport:Encoding'                        => 'Encodage des caractères',
-	'UI:UniversalSearchTitle'                      => ITOP_APPLICATION_SHORT.' - Recherche universelle',
-	'UI:UniversalSearch:Error'                     => 'Erreur : %1$s',
-	'UI:UniversalSearch:LabelSelectTheClass'       => 'Sélectionnez le type d\'objets à rechercher : ',
-
-	'UI:CSVReport-Value-Modified'                                   => 'Modifié',
-	'UI:CSVReport-Value-SetIssue'                                   => 'Valeur invalide',
-	'UI:CSVReport-Value-ChangeIssue'                                => 'Ne peut pas prendre la valeur \'%1$s\'',
-	'UI:CSVReport-Value-NoMatch'                                    => 'Pas de correspondance avec \'%1$s\'',
-	'UI:CSVReport-Value-NoMatch-PossibleValues'                     => 'Valeur(s) possible(s) pour l\'objet \'%1$s\' : %2$s',
-	'UI:CSVReport-Value-NoMatch-NoObject'                           => 'Il n\'y a aucun objet \'%1$s\'',
-	'UI:CSVReport-Value-NoMatch-NoObject-ForCurrentUser'            => 'Il n\'y a aucun objet \'%1$s\' visible par votre utilisateur',
+	'UI:Login:Error:NoValidProfiles' => 'Pas de profil valide',
+	'UI:CSVImport:MappingSelectOne' => '-- choisir une valeur --',
+	'UI:CSVImport:MappingNotApplicable' => '-- ignorer ce champ --',
+	'UI:CSVImport:NoData' => 'Aucune donnée... merci de fournir des données !',
+	'UI:Title:DataPreview' => 'Aperçu des données',
+	'UI:CSVImport:ErrorOnlyOneColumn' => 'Erreur: Les données semblent ne contenir qu\'une seule colonne. Avez-vous choisi le bon séparateur ?',
+	'UI:CSVImport:FieldName' => 'Champ n°%1$d',
+	'UI:CSVImport:DataLine1' => 'Données Ligne 1',
+	'UI:CSVImport:DataLine2' => 'Données Ligne  2',
+	'UI:CSVImport:idField' => 'id (Clef primaire)',
+	'UI:Title:BulkImport' => ITOP_APPLICATION_SHORT.' - Import massif',
+	'UI:Title:BulkImport+' => 'Assistant d\'import CSV',
+	'UI:Title:BulkSynchro_nbItem_ofClass_class' => 'Synchronisation de %1$d éléments de type %2$s',
+	'UI:CSVImport:ClassesSelectOne' => '-- choisir une valeur --',
+	'UI:CSVImport:ErrorExtendedAttCode' => 'Erreur interne: "%1$s" n\'est pas une code correct car "%2$s" n\'est pas une clef externe de la classe "%3$s"',
+	'UI:CSVImport:ObjectsWillStayUnchanged' => '%1$d objets(s) resteront inchangés.',
+	'UI:CSVImport:ObjectsWillBeModified' => '%1$d objets(s) seront modifiés.',
+	'UI:CSVImport:ObjectsWillBeAdded' => '%1$d objets(s) seront créés.',
+	'UI:CSVImport:ObjectsWillHaveErrors' => '%1$d objets(s) seront en erreur.',
+	'UI:CSVImport:ObjectsRemainedUnchanged' => '%1$d objets(s) n\'ont pas changé.',
+	'UI:CSVImport:ObjectsWereModified' => '%1$d objets(s)ont été modifiés.',
+	'UI:CSVImport:ObjectsWereAdded' => '%1$d objets(s) ont été créés.',
+	'UI:CSVImport:ObjectsHadErrors' => '%1$d ligne(s) contenaient des erreurs.',
+	'UI:Title:CSVImportStep2' => 'Etape 2 sur 5: Options du format CSV',
+	'UI:Title:CSVImportStep3' => 'Etape 3 sur 5: Correspondance des données',
+	'UI:Title:CSVImportStep4' => 'Etape 4 sur 5: Simulation de l\'import',
+	'UI:Title:CSVImportStep5' => 'Etape 5 sur 5: Import terminé',
+	'UI:CSVImport:LinesNotImported' => 'Des lignes n\'ont pas été importées:',
+	'UI:CSVImport:LinesNotImported+' => 'Les lignes suivantes n\'ont pas été importées car elles contenaient des erreurs.',
+	'UI:CSVImport:SeparatorComma+' => ', (virgule)',
+	'UI:CSVImport:SeparatorSemicolon+' => '; (point-virgule)',
+	'UI:CSVImport:SeparatorTab+' => 'tab',
+	'UI:CSVImport:SeparatorOther' => 'autre :',
+	'UI:CSVImport:QualifierDoubleQuote+' => '" (guillemet double)',
+	'UI:CSVImport:QualifierSimpleQuote+' => '\' (guillemet simple / apostrophe)',
+	'UI:CSVImport:QualifierOther' => 'autre :',
+	'UI:CSVImport:TreatFirstLineAsHeader' => 'La première ligne est l\'en-tête (noms des colonnes)',
+	'UI:CSVImport:Skip_N_LinesAtTheBeginning' => 'Ignorer les %1$s premières lignes du fichier',
+	'UI:CSVImport:CSVDataPreview' => 'Aperçu des données CSV',
+	'UI:CSVImport:SelectFile' => 'Sélectionnez le fichier à importer:',
+	'UI:CSVImport:Tab:LoadFromFile' => 'Import depuis un fichier',
+	'UI:CSVImport:Tab:CopyPaste' => 'Copier/Coller de données',
+	'UI:CSVImport:Tab:Templates' => 'Modèles',
+	'UI:CSVImport:PasteData' => 'Collez ici les données à importer:',
+	'UI:CSVImport:PickClassForTemplate' => 'Choisissez un modèle à télécharger: ',
+	'UI:CSVImport:SeparatorCharacter' => 'Séparateur:',
+	'UI:CSVImport:TextQualifierCharacter' => 'Délimiteur de texte',
+	'UI:CSVImport:CommentsAndHeader' => 'Commentaires et en-tête',
+	'UI:CSVImport:SelectClass' => 'Sélectionner le type d\'objets à importer:',
+	'UI:CSVImport:AdvancedMode' => 'Mode expert',
+	'UI:CSVImport:AdvancedMode+' => 'En mode expert, l\'"id" (clef primaire) des objets peut être utilisé pour renommer des objets.Cependant la colonne "id" (si elle est présente) ne peut être utilisée que comme clef de recherche et ne peut pas être combinée avec une autre clef de recherche.',
+	'UI:CSVImport:SelectAClassFirst' => 'Pour configurer la correspondance, choississez d\'abord un type ci-dessus.',
+	'UI:CSVImport:HeaderFields' => 'Champs',
+	'UI:CSVImport:HeaderMappings' => 'Correspondance',
+	'UI:CSVImport:HeaderSearch' => 'Recherche ?',
+	'UI:CSVImport:AlertIncompleteMapping' => 'Veuillez choisir la correspondance pour chacun des champs.',
+	'UI:CSVImport:AlertMultipleMapping' => 'Veuillez vous assurer que chaque champ cible est sélectionné une seule fois.',
+	'UI:CSVImport:AlertNoSearchCriteria' => 'Veuillez choisir au moins une clef de recherche.',
+	'UI:CSVImport:Encoding' => 'Encodage des caractères',
+	'UI:CSVImport:ViewAllPossibleValues'      => 'Voir toutes les valeurs possibles',
+	'UI:CSVImport:ViewAllAmbiguousValues'     => 'Voir toutes les valeurs ambigues',
+	'UI:UniversalSearchTitle' => ITOP_APPLICATION_SHORT.' - Recherche universelle',
+	'UI:UniversalSearch:Error' => 'Erreur : %1$s',
+	'UI:UniversalSearch:LabelSelectTheClass' => 'Sélectionnez le type d\'objets à rechercher : ',
+	'UI:CSVReport-Value-Modified' => 'Modifié',
+	'UI:CSVReport-Value-SetIssue' => 'Valeur invalide',
+	'UI:CSVReport-Value-ChangeIssue' => 'Ne peut pas prendre la valeur \'%1$s\'',
+	'UI:CSVReport-Value-NoMatch' => 'Pas de correspondance avec \'%1$s\'',
+	'UI:CSVReport-Value-NoMatch-PossibleValues' => 'Valeur(s) possible(s) pour l\'objet \'%1$s\' : %2$s',
+	'UI:CSVReport-Value-NoMatch-NoObject' => 'Il n\'y a aucun objet \'%1$s\'',
+	'UI:CSVReport-Value-NoMatch-NoObject-ForCurrentUser' => 'Il n\'y a aucun objet \'%1$s\' visible par votre utilisateur',
 	'UI:CSVReport-Value-NoMatch-SomeObjectNotVisibleForCurrentUser' => 'Il existe des objet(s) \'%1$s\' non visible(s) par votre utilisateur',
-
-	'UI:CSVReport-Value-Missing'            => 'Absence de valeur obligatoire',
-	'UI:CSVReport-Value-Ambiguous'          => 'Ambigüité: %1$d objets trouvés',
-	'UI:CSVReport-Row-Unchanged'            => 'inchangé',
-	'UI:CSVReport-Row-Created'              => 'créé',
-	'UI:CSVReport-Row-Updated'              => '%1$d colonnes modifiées',
-	'UI:CSVReport-Row-Disappeared'          => 'disparu, %1$d colonnes modifiées',
-	'UI:CSVReport-Row-Issue'                => 'Erreur: %1$s',
-	'UI:CSVReport-Value-Issue-Null'         => 'Valeur obligatoire',
-	'UI:CSVReport-Value-Issue-NotFound'     => 'Objet non trouvé',
-	'UI:CSVReport-Value-Issue-FoundMany'    => 'Plusieurs objets trouvés (%1$d)',
-	'UI:CSVReport-Value-Issue-Readonly'     => 'L\'attribut \'%1$s\' est en lecture seule (valeur courante: %2$s, valeur proposée: %3$s)',
-	'UI:CSVReport-Value-Issue-Format'       => 'Echec de traitement de la valeur: %1$s',
-	'UI:CSVReport-Value-Issue-NoMatch'      => 'Valeur incorrecte pour \'%1$s\': pas de correspondance, veuillez vérifier la syntaxe',
-	'UI:CSVReport-Value-Issue-Unknown'      => 'Valeur incorrecte pour \'%1$s\': %2$s',
-	'UI:CSVReport-Row-Issue-Inconsistent'   => 'Incohérence entre attributs: %1$s',
-	'UI:CSVReport-Row-Issue-Attribute'      => 'Des attributs ont des valeurs incorrectes',
-	'UI:CSVReport-Row-Issue-MissingExtKey'  => 'Ne peut pas être créé car il manque des clés externes : %1$s',
-	'UI:CSVReport-Row-Issue-DateFormat'     => 'Format de date incorrect',
+	'UI:CSVReport-Value-Missing' => 'Absence de valeur obligatoire',
+	'UI:CSVReport-Value-Ambiguous' => 'Ambigüité: %1$d objets trouvés',
+	'UI:CSVReport-Row-Unchanged' => 'inchangé',
+	'UI:CSVReport-Row-Created' => 'créé',
+	'UI:CSVReport-Row-Updated' => '%1$d colonnes modifiées',
+	'UI:CSVReport-Row-Disappeared' => 'disparu, %1$d colonnes modifiées',
+	'UI:CSVReport-Row-Issue' => 'Erreur: %1$s',
+	'UI:CSVReport-Value-Issue-Null' => 'Valeur obligatoire',
+	'UI:CSVReport-Value-Issue-NotFound' => 'Objet non trouvé',
+	'UI:CSVReport-Value-Issue-FoundMany' => 'Plusieurs objets trouvés (%1$d)',
+	'UI:CSVReport-Value-Issue-Readonly' => 'L\'attribut \'%1$s\' est en lecture seule (valeur courante: %2$s, valeur proposée: %3$s)',
+	'UI:CSVReport-Value-Issue-Format' => 'Echec de traitement de la valeur: %1$s',
+	'UI:CSVReport-Value-Issue-NoMatch' => 'Valeur incorrecte pour \'%1$s\': pas de correspondance, veuillez vérifier la syntaxe',
+	'UI:CSVReport-Value-Issue-AllowedValues' => 'Allowed \'%1$s\' value(s): %2$s~~',
+	'UI:CSVReport-Value-Issue-Unknown' => 'Valeur incorrecte pour \'%1$s\': %2$s',
+	'UI:CSVReport-Row-Issue-Inconsistent' => 'Incohérence entre attributs: %1$s',
+	'UI:CSVReport-Row-Issue-Attribute' => 'Des attributs ont des valeurs incorrectes',
+	'UI:CSVReport-Row-Issue-MissingExtKey' => 'Ne peut pas être créé car il manque des clés externes : %1$s',
+	'UI:CSVReport-Row-Issue-DateFormat' => 'Format de date incorrect',
+	'UI:CSVReport-Row-Issue-ExpectedDateFormat' => 'Expected format: %1$s~~',
 	'UI:CSVReport-Row-Issue-Reconciliation' => 'Echec de réconciliation',
-	'UI:CSVReport-Row-Issue-Ambiguous'      => 'Réconciliation ambigüe',
-	'UI:CSVReport-Row-Issue-Internal'       => 'Erreur interne: %1$s, %2$s',
-
-	'UI:CSVReport-Icon-Unchanged'         => 'Non modifié',
-	'UI:CSVReport-Icon-Modified'          => 'Modifié',
-	'UI:CSVReport-Icon-Missing'           => 'A disparu',
+	'UI:CSVReport-Row-Issue-Ambiguous' => 'Réconciliation ambigüe',
+	'UI:CSVReport-Row-Issue-Internal' => 'Erreur interne: %1$s, %2$s',
+	'UI:CSVReport-Icon-Unchanged' => 'Non modifié',
+	'UI:CSVReport-Icon-Modified' => 'Modifié',
+	'UI:CSVReport-Icon-Missing' => 'A disparu',
 	'UI:CSVReport-Object-MissingToUpdate' => 'Objet disparu: sera modifié',
-	'UI:CSVReport-Object-MissingUpdated'  => 'Objet disparu: modifié',
-	'UI:CSVReport-Icon-Created'           => 'Créé',
-	'UI:CSVReport-Object-ToCreate'        => 'L\'objet sera créé',
-	'UI:CSVReport-Object-Created'         => 'Objet créé',
-	'UI:CSVReport-Icon-Error'             => 'Erreur',
-	'UI:CSVReport-Object-Error'           => 'Erreur: %1$s',
-	'UI:CSVReport-Object-Ambiguous'       => 'Ambigüité: %1$s',
-	'UI:CSVReport-Stats-Errors'           => '%1$.0f %% des lignes chargées sont en erreur et seront ignorées.',
-	'UI:CSVReport-Stats-Created'          => '%1$.0f %% des lignes chargées vont engendrer un nouvel objet.',
-	'UI:CSVReport-Stats-Modified'         => '%1$.0f %% des lignes chargées vont modifier un objet.',
-
-	'UI:CSVExport:AdvancedMode'  => 'Mode expert',
+	'UI:CSVReport-Object-MissingUpdated' => 'Objet disparu: modifié',
+	'UI:CSVReport-Icon-Created' => 'Créé',
+	'UI:CSVReport-Object-ToCreate' => 'L\'objet sera créé',
+	'UI:CSVReport-Object-Created' => 'Objet créé',
+	'UI:CSVReport-Icon-Error' => 'Erreur',
+	'UI:CSVReport-Object-Error' => 'Erreur: %1$s',
+	'UI:CSVReport-Object-Ambiguous' => 'Ambigüité: %1$s',
+	'UI:CSVReport-Stats-Errors' => '%1$.0f %% des lignes chargées sont en erreur et seront ignorées.',
+	'UI:CSVReport-Stats-Created' => '%1$.0f %% des lignes chargées vont engendrer un nouvel objet.',
+	'UI:CSVReport-Stats-Modified' => '%1$.0f %% des lignes chargées vont modifier un objet.',
+	'UI:CSVExport:AdvancedMode' => 'Mode expert',
 	'UI:CSVExport:AdvancedMode+' => 'Dans le mode expert, des colonnes supplémentaires apparaissent: l\'identifiant de l\'objet, la valeur des clés externes et leurs attributs de reconciliation.',
-	'UI:CSVExport:LostChars'     => 'Problème d\'encodage',
-	'UI:CSVExport:LostChars+'    => 'Le fichier téléchargé sera encodé en %1$s. iTop a détecté des caractères incompatible avec ce format. Ces caractères seront soit remplacés par des caractères de substitution (par exemple: \'é\' transformé en \'e\'), soit perdus. Vous pouvez utiliser le copier/coller depuis votre navigateur web, ou bien contacter votre administrateur pour que l\'encodage corresponde mieux à votre besoin (Cf. paramètre \'csv_file_default_charset\').',
-
-	'UI:Audit:Title'                              => ITOP_APPLICATION_SHORT.' - Audit de la CMDB',
-	'UI:Audit:Interactive:All:Title'              => 'Résultats de tous les audits',
-	'UI:Audit:Interactive:All:SubTitle'           => 'Audit complet, incluant toutes les régles, sans limitation de domaine ni de catégorie',
-	'UI:Audit:Interactive:All:BreadCrumb'         => 'Audit complet',
-	'UI:Audit:Interactive:All:BreadCrumb+'        => 'Audit de toutes les régles',
-	'UI:Audit:Interactive:Categories:Title'       => 'Résultats d\'audit des catégories : %1$s',
-	'UI:Audit:Interactive:Categories:SubTitle'    => 'Audit de toutes les régles appartenant à ces %1$s catégories',
-	'UI:Audit:Interactive:Categories:BreadCrumb'  => 'Catégories',
+	'UI:CSVExport:LostChars' => 'Problème d\'encodage',
+	'UI:CSVExport:LostChars+' => 'Le fichier téléchargé sera encodé en %1$s. iTop a détecté des caractères incompatible avec ce format. Ces caractères seront soit remplacés par des caractères de substitution (par exemple: \'é\' transformé en \'e\'), soit perdus. Vous pouvez utiliser le copier/coller depuis votre navigateur web, ou bien contacter votre administrateur pour que l\'encodage corresponde mieux à votre besoin (Cf. paramètre \'csv_file_default_charset\').',
+	'UI:Audit:Title' => ITOP_APPLICATION_SHORT.' - Audit de la CMDB',
+	'UI:Audit:Interactive:All:Title' => 'Résultats de tous les audits',
+	'UI:Audit:Interactive:All:SubTitle' => 'Audit complet, incluant toutes les régles, sans limitation de domaine ni de catégorie',
+	'UI:Audit:Interactive:All:BreadCrumb' => 'Audit complet',
+	'UI:Audit:Interactive:All:BreadCrumb+' => 'Audit de toutes les régles',
+	'UI:Audit:Interactive:Categories:Title' => 'Résultats d\'audit des catégories : %1$s',
+	'UI:Audit:Interactive:Categories:SubTitle' => 'Audit de toutes les régles appartenant à ces %1$s catégories',
+	'UI:Audit:Interactive:Categories:BreadCrumb' => 'Catégories',
 	'UI:Audit:Interactive:Categories:BreadCrumb+' => 'Audit des catégories : %1$s',
-	'UI:Audit:Interactive:Domain:Title'           => 'Résultats d\'audit du domaine : %1$s',
-	'UI:Audit:Interactive:Domain:SubTitle'        => 'Audit de toutes les régles dont la catégorie est reliée au domaine : %1$s',
-	'UI:Audit:Interactive:Domain:BreadCrumb'      => '%1$s',
-	'UI:Audit:Interactive:Domain:BreadCrumb+'     => 'Audit du domaine : %1$s',
-	'UI:Audit:Interactive:Selection:Title'        => 'Sélection d\'un audit',
-	'UI:Audit:Interactive:Selection:SubTitle'     => 'Choisir un domaine pour obtenir les résultats d\'audit limités à ce domaine ou "Toutes les catégories" (Peut prendre du temps, voir échouer s\'il y a trop d\'objets à auditer)',
-	'UI:Audit:Interactive:Selection:BreadCrumb'   => 'Sélection',
-	'UI:Audit:Interactive:Selection:BreadCrumb+'  => 'Choix d\'un Audit à exécuter',
-	'UI:Audit:Interactive:Selection:BadgeAll'     => 'Toutes les catégories',
-	'UI:Audit:Interactive:Button:Back'            => 'Retour à l\'audit',
-	'UI:Audit:Interactive:Button:Configuration'   => 'Configurer l\'audit',
-
+	'UI:Audit:Interactive:Domain:Title' => 'Résultats d\'audit du domaine : %1$s',
+	'UI:Audit:Interactive:Domain:SubTitle' => 'Audit de toutes les régles dont la catégorie est reliée au domaine : %1$s',
+	'UI:Audit:Interactive:Domain:BreadCrumb' => '%1$s',
+	'UI:Audit:Interactive:Domain:BreadCrumb+' => 'Audit du domaine : %1$s',
+	'UI:Audit:Interactive:Selection:Title' => 'Sélection d\'un audit',
+	'UI:Audit:Interactive:Selection:SubTitle' => 'Choisir un domaine pour obtenir les résultats d\'audit limités à ce domaine ou "Toutes les catégories" (Peut prendre du temps, voir échouer s\'il y a trop d\'objets à auditer)',
+	'UI:Audit:Interactive:Selection:BreadCrumb' => 'Sélection',
+	'UI:Audit:Interactive:Selection:BreadCrumb+' => 'Choix d\'un Audit à exécuter',
+	'UI:Audit:Interactive:Selection:BadgeAll' => 'Toutes les catégories',
+	'UI:Audit:Interactive:Button:Back' => 'Retour à l\'audit',
+	'UI:Audit:Interactive:Button:Configuration' => 'Configurer l\'audit',
 	'UI:Audit:ViewRules' => 'Vérifier les régles d\'audit',
-
-	'UI:Audit:HeaderAuditRule'                     => 'Règle d\'audit',
-	'UI:Audit:HeaderNbObjects'                     => 'Nb d\'Objets',
-	'UI:Audit:HeaderNbErrors'                      => 'Nb d\'Erreurs',
-	'UI:Audit:PercentageOk'                        => '% Ok',
-	'UI:Audit:OqlError'                            => 'Erreur OQL',
-	'UI:Audit:Error:ValueNA'                       => 'n/a',
-	'UI:Audit:ErrorIn_Rule'                        => 'Erreur dans le régle',
-	'UI:Audit:ErrorIn_Rule_Reason'                 => 'Erreur OQL dans la règle %1$s: %2$s.',
-	'UI:Audit:ErrorIn_Category'                    => 'Erreur dans la catégorie',
-	'UI:Audit:ErrorIn_Category_Reason'             => 'Erreur OQL dans la catégorie %1$s: %2$s.',
-	'UI:Audit:AuditErrors'                         => 'Audit Errors~~',
-	'UI:Audit:Dashboard:ObjectsAudited'            => 'Objets audités',
-	'UI:Audit:Dashboard:ObjectsInError'            => 'Objets en erreur',
-	'UI:Audit:Dashboard:ObjectsValidated'          => 'Objets valides',
-	'UI:Audit:AuditCategory:Subtitle'              => '%1$s en erreur sur %2$s - %3$s%% des objets sont valides',
-
-	'UI:RunQuery:Title'                => ITOP_APPLICATION_SHORT.' - Evaluation de requêtes OQL',
-	'UI:RunQuery:QueryExamples'        => 'Exemples de requêtes',
-	'UI:RunQuery:QueryResults'         => 'Résultats de la requête',
-	'UI:RunQuery:HeaderPurpose'        => 'Objectif',
-	'UI:RunQuery:HeaderPurpose+'       => 'But de la requête',
-	'UI:RunQuery:HeaderOQLExpression'  => 'Requête OQL',
+	'UI:Audit:HeaderAuditRule' => 'Règle d\'audit',
+	'UI:Audit:HeaderNbObjects' => 'Nb d\'Objets',
+	'UI:Audit:HeaderNbErrors' => 'Nb d\'Erreurs',
+	'UI:Audit:PercentageOk' => '% Ok',
+	'UI:Audit:OqlError' => 'Erreur OQL',
+	'UI:Audit:Error:ValueNA' => 'n/a',
+	'UI:Audit:ErrorIn_Rule' => 'Erreur dans le régle',
+	'UI:Audit:ErrorIn_Rule_Reason' => 'Erreur OQL dans la règle %1$s: %2$s.',
+	'UI:Audit:ErrorIn_Category' => 'Erreur dans la catégorie',
+	'UI:Audit:ErrorIn_Category_Reason' => 'Erreur OQL dans la catégorie %1$s: %2$s.',
+	'UI:Audit:AuditErrors' => 'Audit Errors~~',
+	'UI:Audit:Dashboard:ObjectsAudited' => 'Objets audités',
+	'UI:Audit:Dashboard:ObjectsInError' => 'Objets en erreur',
+	'UI:Audit:Dashboard:ObjectsValidated' => 'Objets valides',
+	'UI:Audit:AuditCategory:Subtitle' => '%1$s en erreur sur %2$s - %3$s%% des objets sont valides',
+	'UI:RunQuery:Title' => ITOP_APPLICATION_SHORT.' - Evaluation de requêtes OQL',
+	'UI:RunQuery:QueryExamples' => 'Exemples de requêtes',
+	'UI:RunQuery:QueryResults' => 'Résultats de la requête',
+	'UI:RunQuery:HeaderPurpose' => 'Objectif',
+	'UI:RunQuery:HeaderPurpose+' => 'But de la requête',
+	'UI:RunQuery:HeaderOQLExpression' => 'Requête OQL',
 	'UI:RunQuery:HeaderOQLExpression+' => 'La requête en OQL',
 	'UI:RunQuery:ExpressionToEvaluate' => 'Requête à exécuter : ',
-	'UI:RunQuery:QueryArguments'       => 'Arguments de la requête',
-	'UI:RunQuery:MoreInfo'             => 'Plus d\'information sur la requête : ',
-	'UI:RunQuery:DevelopedQuery'       => 'Requête OQL décompilée : ',
-	'UI:RunQuery:SerializedFilter'     => 'Version sérialisée : ',
-	'UI:RunQuery:DevelopedOQL'         => 'OQL développé',
-	'UI:RunQuery:DevelopedOQLCount'    => 'OQL développé pour le compte',
-	'UI:RunQuery:ResultSQLCount'       => 'SQL généré pour le compte',
-	'UI:RunQuery:ResultSQL'            => 'SQL généré',
-	'UI:RunQuery:Error'                => 'Une erreur s\'est produite durant l\'exécution de la requête',
-	'UI:Query:UrlForExcel'             => 'Lien à copier-coller dans Excel, pour déclarer une source de données à partir du web',
-	'UI:Query:UrlV1'                   => 'La liste des champs à exporter n\'a pas été spécifiée. La page <em>export-V2.php</em> ne peut pas fonctionner sans cette information. Par conséquent, le lien fourni ci-dessous pointe sur l\'ancienne page: <em>export.php</em>. Cette ancienne version de l\'export présente la limitation suivante : la liste des champs exportés varie en fonction du format de l\'export et du modèle de données. <br/>Si vous devez garantir la stabilité du format de l\'export (liste des colonnes) sur le long terme, alors vous devrez renseigner l\'attribut "Champs" et utiliser la page <em>export-V2.php</em>.',
-	'UI:Schema:Title'                  => 'Modèle de données '.ITOP_APPLICATION_SHORT,
-	'UI:Schema:TitleForClass'          => 'Modèle de données de %1$s~~',
-	'UI:Schema:CategoryMenuItem'       => 'Catégorie <b>%1$s</b>',
-	'UI:Schema:Relationships'          => 'Relations',
-	'UI:Schema:AbstractClass'          => 'Classe abstraite : les objets de cette classe ne peuvent pas être instanciés.',
-	'UI:Schema:NonAbstractClass'       => 'Classe concrète : les objets de cette classe peuvent être instanciés.',
-	'UI:Schema:ClassHierarchyTitle'    => 'Hiérachie des classes',
-	'UI:Schema:AllClasses'             => 'Toutes les classes',
-	'UI:Schema:ExternalKey_To'         => 'Clef externe vers %1$s',
-	'UI:Schema:Columns_Description'    => 'Colonnes : <em>%1$s</em>',
-	'UI:Schema:Default_Description'    => 'Valeur par défaut: "%1$s"',
-	'UI:Schema:NullAllowed'            => 'Null autorisé',
-	'UI:Schema:NullNotAllowed'         => 'Null interdit',
-	'UI:Schema:Attributes'             => 'Attributs',
-	'UI:Schema:AttributeCode'          => 'Code',
-	'UI:Schema:AttributeCode+'         => 'Code interne de l\'attribut',
-	'UI:Schema:Label'                  => 'Label',
-	'UI:Schema:Label+'                 => 'Label de l\'attribut',
-	'UI:Schema:Type'                   => 'Type',
-
-	'UI:Schema:Type+'                                        => 'Type de données de l\'attribut',
-	'UI:Schema:Origin'                                       => 'Origine',
-	'UI:Schema:Origin+'                                      => 'La classe de base dans laquelle l\'attribut est défini',
-	'UI:Schema:Description'                                  => 'Description',
-	'UI:Schema:Description+'                                 => 'Description de l\'attribut',
-	'UI:Schema:AllowedValues'                                => 'Valeurs possibles',
-	'UI:Schema:AllowedValues+'                               => 'Restrictions des valeurs possibles pour cet attribut',
-	'UI:Schema:MoreInfo'                                     => 'Plus info',
-	'UI:Schema:MoreInfo+'                                    => 'Plus d\'information à propos de la définition de ce champ dans la base de données',
-	'UI:Schema:SearchCriteria'                               => 'Critères de recherche',
-	'UI:Schema:FilterCode'                                   => 'Code',
-	'UI:Schema:FilterCode+'                                  => 'Code de ce critère de recherche',
-	'UI:Schema:FilterDescription'                            => 'Description',
-	'UI:Schema:FilterDescription+'                           => 'Description de ce critère de recherche',
-	'UI:Schema:AvailOperators'                               => 'Opérateurs',
-	'UI:Schema:AvailOperators+'                              => 'Opérateurs possibles pour ce critère de recherche',
-	'UI:Schema:ChildClasses'                                 => 'Classes dérivées',
-	'UI:Schema:ReferencingClasses'                           => 'Classes faisant référence',
-	'UI:Schema:RelatedClasses'                               => 'Classes reliées',
-	'UI:Schema:LifeCycle'                                    => 'Cycle de vie',
-	'UI:Schema:Triggers'                                     => 'Déclencheurs',
-	'UI:Schema:Relation_Code_Description'                    => 'Relation <em>%1$s</em> (%2$s)',
-	'UI:Schema:RelationDown_Description'                     => 'Sens descendant: %1$s',
-	'UI:Schema:RelationUp_Description'                       => 'Sens montant: %1$s',
-	'UI:Schema:RelationPropagates'                           => '%1$s: se propage sur %2$d niveau(x), requête: %3$s',
-	'UI:Schema:RelationDoesNotPropagate'                     => '%1$s: ne se propage pas (%2$d niveaux), requête: %3$s',
-	'UI:Schema:Class_ReferencingClasses_From_By'             => '%1$s est référencé par la classe %2$s via le champ %3$s',
+	'UI:RunQuery:QueryArguments' => 'Arguments de la requête',
+	'UI:RunQuery:MoreInfo' => 'Plus d\'information sur la requête : ',
+	'UI:RunQuery:DevelopedQuery' => 'Requête OQL décompilée : ',
+	'UI:RunQuery:SerializedFilter' => 'Version sérialisée : ',
+	'UI:RunQuery:DevelopedOQL' => 'OQL développé',
+	'UI:RunQuery:DevelopedOQLCount' => 'OQL développé pour le compte',
+	'UI:RunQuery:ResultSQLCount' => 'SQL généré pour le compte',
+	'UI:RunQuery:ResultSQL' => 'SQL généré',
+	'UI:RunQuery:Error' => 'Une erreur s\'est produite durant l\'exécution de la requête',
+	'UI:Query:UrlForExcel' => 'Lien à copier-coller dans Excel, pour déclarer une source de données à partir du web',
+	'UI:Query:UrlV1' => 'La liste des champs à exporter n\'a pas été spécifiée. La page <em>export-V2.php</em> ne peut pas fonctionner sans cette information. Par conséquent, le lien fourni ci-dessous pointe sur l\'ancienne page: <em>export.php</em>. Cette ancienne version de l\'export présente la limitation suivante : la liste des champs exportés varie en fonction du format de l\'export et du modèle de données. <br/>Si vous devez garantir la stabilité du format de l\'export (liste des colonnes) sur le long terme, alors vous devrez renseigner l\'attribut "Champs" et utiliser la page <em>export-V2.php</em>.',
+	'UI:Schema:Title' => 'Modèle de données '.ITOP_APPLICATION_SHORT,
+	'UI:Schema:TitleForClass' => 'Modèle de données de %1$s~~',
+	'UI:Schema:CategoryMenuItem' => 'Catégorie <b>%1$s</b>',
+	'UI:Schema:Relationships' => 'Relations',
+	'UI:Schema:AbstractClass' => 'Classe abstraite : les objets de cette classe ne peuvent pas être instanciés.',
+	'UI:Schema:NonAbstractClass' => 'Classe concrète : les objets de cette classe peuvent être instanciés.',
+	'UI:Schema:ClassHierarchyTitle' => 'Hiérachie des classes',
+	'UI:Schema:AllClasses' => 'Toutes les classes',
+	'UI:Schema:ExternalKey_To' => 'Clef externe vers %1$s',
+	'UI:Schema:Columns_Description' => 'Colonnes : <em>%1$s</em>',
+	'UI:Schema:Default_Description' => 'Valeur par défaut: "%1$s"',
+	'UI:Schema:NullAllowed' => 'Null autorisé',
+	'UI:Schema:NullNotAllowed' => 'Null interdit',
+	'UI:Schema:Attributes' => 'Attributs',
+	'UI:Schema:AttributeCode' => 'Code',
+	'UI:Schema:AttributeCode+' => 'Code interne de l\'attribut',
+	'UI:Schema:Label' => 'Label',
+	'UI:Schema:Label+' => 'Label de l\'attribut',
+	'UI:Schema:Type' => 'Type',
+	'UI:Schema:Type+' => 'Type de données de l\'attribut',
+	'UI:Schema:Origin' => 'Origine',
+	'UI:Schema:Origin+' => 'La classe de base dans laquelle l\'attribut est défini',
+	'UI:Schema:Description' => 'Description',
+	'UI:Schema:Description+' => 'Description de l\'attribut',
+	'UI:Schema:AllowedValues' => 'Valeurs possibles',
+	'UI:Schema:AllowedValues+' => 'Restrictions des valeurs possibles pour cet attribut',
+	'UI:Schema:MoreInfo' => 'Plus info',
+	'UI:Schema:MoreInfo+' => 'Plus d\'information à propos de la définition de ce champ dans la base de données',
+	'UI:Schema:SearchCriteria' => 'Critères de recherche',
+	'UI:Schema:FilterCode' => 'Code',
+	'UI:Schema:FilterCode+' => 'Code de ce critère de recherche',
+	'UI:Schema:FilterDescription' => 'Description',
+	'UI:Schema:FilterDescription+' => 'Description de ce critère de recherche',
+	'UI:Schema:AvailOperators' => 'Opérateurs',
+	'UI:Schema:AvailOperators+' => 'Opérateurs possibles pour ce critère de recherche',
+	'UI:Schema:ChildClasses' => 'Classes dérivées',
+	'UI:Schema:ReferencingClasses' => 'Classes faisant référence',
+	'UI:Schema:RelatedClasses' => 'Classes reliées',
+	'UI:Schema:LifeCycle' => 'Cycle de vie',
+	'UI:Schema:Triggers' => 'Déclencheurs',
+	'UI:Schema:Relation_Code_Description' => 'Relation <em>%1$s</em> (%2$s)',
+	'UI:Schema:RelationDown_Description' => 'Sens descendant: %1$s',
+	'UI:Schema:RelationUp_Description' => 'Sens montant: %1$s',
+	'UI:Schema:RelationPropagates' => '%1$s: se propage sur %2$d niveau(x), requête: %3$s',
+	'UI:Schema:RelationDoesNotPropagate' => '%1$s: ne se propage pas (%2$d niveaux), requête: %3$s',
+	'UI:Schema:Class_ReferencingClasses_From_By' => '%1$s est référencé par la classe %2$s via le champ %3$s',
 	'UI:Schema:Class_IsLinkedTo_Class_Via_ClassAndAttribute' => '%1$s est lié à la classe %2$s via %3$s::<em>%4$s</em>',
-	'UI:Schema:Links:1-n'                                    => 'Classes pointant sur %1$s (liens 1:n) :',
-	'UI:Schema:Links:n-n'                                    => 'Classes liées à %1$s (liens n:n) :',
-	'UI:Schema:Links:All'                                    => 'Graphe de toutes les classes liées',
-	'UI:Schema:NoLifeCyle'                                   => 'Aucun cycle de vie n\'est défini pour cette classe.',
-	'UI:Schema:LifeCycleTransitions'                         => 'États et Transitions',
-	'UI:Schema:LifeCyleAttributeOptions'                     => 'Options des attributs',
-	'UI:Schema:LifeCycleHiddenAttribute'                     => 'Caché',
-	'UI:Schema:LifeCycleReadOnlyAttribute'                   => 'Lecture seule',
-	'UI:Schema:LifeCycleMandatoryAttribute'                  => 'Obligatoire',
-	'UI:Schema:LifeCycleAttributeMustChange'                 => 'Doit changer',
-	'UI:Schema:LifeCycleAttributeMustPrompt'                 => 'L\'utilisateur se verra proposer de changer la valeur',
-	'UI:Schema:LifeCycleEmptyList'                           => 'liste vide',
-	'UI:Schema:ClassFilter'                                  => 'Classe :',
-	'UI:Schema:DisplayLabel'                                 => 'Affichage :',
-	'UI:Schema:DisplaySelector/LabelAndCode'                 => 'Label et code',
-	'UI:Schema:DisplaySelector/Label'                        => 'Label',
-	'UI:Schema:DisplaySelector/Code'                         => 'Code',
-	'UI:Schema:Attribute/Filter'                             => 'Filtre',
-	'UI:Schema:DefaultNullValue'                             => 'Valeur null par défaut : "%1$s"',
-	'UI:Schema:Events'                                       => 'Événements',
-	'UI:Schema:Events:Defined'                               => 'Événements',
-	'UI:Schema:Events:NoEvent'                               => 'Aucun événement défini',
-	'UI:Schema:Events:Listeners'                             => 'Récepteurs d\'événements',
-	'UI:Schema:Events:NoListener'                            => 'Aucun récepteur d\'événements',
-	'UI:Schema:Events:Event'                                 => 'Événement',
-	'UI:Schema:Events:Description'                           => 'Description',
-	'UI:Schema:Events:Listener'                              => 'Récepteur',
-	'UI:Schema:Events:Rank'                                  => 'Rang',
-	'UI:Schema:Events:Module'                                => 'Module',
-	'UI:LinksWidget:Autocomplete+'                           => 'Tapez les 3 premiers caractères...',
-	'UI:Edit:SearchQuery'                                    => 'Sélectionner une requête prédéfinie',
-	'UI:Edit:TestQuery'                                      => 'Tester la requête',
-	'UI:Combo:SelectValue'                                   => '--- choisissez une valeur ---',
-	'UI:Label:SelectedObjects'                               => 'Objets sélectionnés: ',
-	'UI:Label:AvailableObjects'                              => 'Objets disponibles: ',
-	'UI:Link_Class_Attributes'                               => 'Attributs du type %1$s',
-	'UI:SelectAllToggle+'                                    => 'Tout sélectionner / Tout déselectionner',
-	'UI:AddObjectsOf_Class_LinkedWith_Class_Instance'        => 'Ajouter des objets de type %1$s liés à %3$s (%2$s)',
-	'UI:AddObjectsOf_Class_LinkedWith_Class'                 => 'Ajouter des objets de type %1$s à lier à cet objet de type %2$s',
-	'UI:ManageObjectsOf_Class_LinkedWith_Class_Instance'     => 'Gérer les objets de type %1$s liés à %3$s (%2$s)',
-	'UI:AddLinkedObjectsOf_Class'                            => 'Ajouter des %1$s',
-	'UI:RemoveLinkedObjectsOf_Class'                         => 'Enlever les objets sélectionnés',
-	'UI:Message:EmptyList:UseAdd'                            => 'La liste est vide, utilisez le bouton "Ajouter..." pour ajouter des objets.',
-	'UI:Message:EmptyList:UseSearchForm'                     => 'Utilisez le formulaire de recherche ci-dessus pour trouver les objets à ajouter.',
-	'UI:Wizard:FinalStepTitle'                               => 'Dernière étape: confirmation',
-	'UI:Title:DeletionOf_Object'                             => 'Suppression de %1$s',
-	'UI:Title:BulkDeletionOf_Count_ObjectsOf_Class'          => 'Suppression massive de %1$d objets de type %2$s',
-	'UI:Delete:NotAllowedToDelete'                           => 'Vous n\'êtes pas autorisé à supprimer cet objet',
-	'UI:Delete:NotAllowedToUpdate_Fields'                    => 'Vous n\'êtes pas autorisé à mettre à jour les champs suivants : %1$s',
-	'UI:Error:ActionNotAllowed'                              => 'Vous n\'êtes pas autorisé à effectuer cette action',
-	'UI:Error:NotEnoughRightsToDelete'                       => 'Cet objet ne peut pas être supprimé car l\'utilisateur courant n\'a pas les droits nécessaires.',
-	'UI:Error:CannotDeleteBecause'                           => 'Cet objet ne peut pas être effacé. Raison: %1$s',
-	'UI:Error:CannotDeleteBecauseOfDepencies'                => 'Cet objet ne peut pas être supprimé, des opérations manuelles sont nécessaire avant sa suppression.',
-	'UI:Error:CannotDeleteBecauseManualOpNeeded'             => 'Des opération manuelles sont nécessaires avant de pouvoir effacer cet objet',
-	'UI:Archive_User_OnBehalfOf_User'                        => '%1$s pour %2$s',
-	'UI:Delete:Deleted'                                      => 'supprimé',
-	'UI:Delete:AutomaticallyDeleted'                         => 'supprimé automatiquement',
-	'UI:Delete:AutomaticResetOf_Fields'                      => 'mise à jour automatique des champ(s): %1$s',
-	'UI:Delete:CleaningUpRefencesTo_Object'                  => 'Suppression de toutes les références vers %1$s...',
+	'UI:Schema:Links:1-n' => 'Classes pointant sur %1$s (liens 1:n) :',
+	'UI:Schema:Links:n-n' => 'Classes liées à %1$s (liens n:n) :',
+	'UI:Schema:Links:All' => 'Graphe de toutes les classes liées',
+	'UI:Schema:NoLifeCyle' => 'Aucun cycle de vie n\'est défini pour cette classe.',
+	'UI:Schema:LifeCycleTransitions' => 'États et Transitions',
+	'UI:Schema:LifeCyleAttributeOptions' => 'Options des attributs',
+	'UI:Schema:LifeCycleHiddenAttribute' => 'Caché',
+	'UI:Schema:LifeCycleReadOnlyAttribute' => 'Lecture seule',
+	'UI:Schema:LifeCycleMandatoryAttribute' => 'Obligatoire',
+	'UI:Schema:LifeCycleAttributeMustChange' => 'Doit changer',
+	'UI:Schema:LifeCycleAttributeMustPrompt' => 'L\'utilisateur se verra proposer de changer la valeur',
+	'UI:Schema:LifeCycleEmptyList' => 'liste vide',
+	'UI:Schema:ClassFilter' => 'Classe :',
+	'UI:Schema:DisplayLabel' => 'Affichage :',
+	'UI:Schema:DisplaySelector/LabelAndCode' => 'Label et code',
+	'UI:Schema:DisplaySelector/Label' => 'Label',
+	'UI:Schema:DisplaySelector/Code' => 'Code',
+	'UI:Schema:Attribute/Filter' => 'Filtre',
+	'UI:Schema:DefaultNullValue' => 'Valeur null par défaut : "%1$s"',
+	'UI:Schema:Events' => 'Événements',
+	'UI:Schema:Events:Defined' => 'Événements',
+	'UI:Schema:Events:NoEvent' => 'Aucun événement défini',
+	'UI:Schema:Events:Listeners' => 'Récepteurs d\'événements',
+	'UI:Schema:Events:NoListener' => 'Aucun récepteur d\'événements',
+	'UI:Schema:Events:Event' => 'Événement',
+	'UI:Schema:Events:Description' => 'Description',
+	'UI:Schema:Events:Listener' => 'Récepteur',
+	'UI:Schema:Events:Rank' => 'Rang',
+	'UI:Schema:Events:Module' => 'Module',
+	'UI:LinksWidget:Autocomplete+' => 'Tapez les 3 premiers caractères...',
+	'UI:Edit:SearchQuery' => 'Sélectionner une requête prédéfinie',
+	'UI:Edit:TestQuery' => 'Tester la requête',
+	'UI:Combo:SelectValue' => '--- choisissez une valeur ---',
+	'UI:Label:SelectedObjects' => 'Objets sélectionnés: ',
+	'UI:Label:AvailableObjects' => 'Objets disponibles: ',
+	'UI:Link_Class_Attributes' => 'Attributs du type %1$s',
+	'UI:SelectAllToggle+' => 'Tout sélectionner / Tout déselectionner',
+	'UI:AddObjectsOf_Class_LinkedWith_Class_Instance' => 'Ajouter des objets de type %1$s liés à %3$s (%2$s)',
+	'UI:AddObjectsOf_Class_LinkedWith_Class' => 'Ajouter des objets de type %1$s à lier à cet objet de type %2$s',
+	'UI:ManageObjectsOf_Class_LinkedWith_Class_Instance' => 'Gérer les objets de type %1$s liés à %3$s (%2$s)',
+	'UI:AddLinkedObjectsOf_Class' => 'Ajouter des %1$s',
+	'UI:RemoveLinkedObjectsOf_Class' => 'Enlever les objets sélectionnés',
+	'UI:Message:EmptyList:UseAdd' => 'La liste est vide, utilisez le bouton "Ajouter..." pour ajouter des objets.',
+	'UI:Message:EmptyList:UseSearchForm' => 'Utilisez le formulaire de recherche ci-dessus pour trouver les objets à ajouter.',
+	'UI:Wizard:FinalStepTitle' => 'Dernière étape: confirmation',
+	'UI:Title:DeletionOf_Object' => 'Suppression de %1$s',
+	'UI:Title:BulkDeletionOf_Count_ObjectsOf_Class' => 'Suppression massive de %1$d objets de type %2$s',
+	'UI:Delete:NotAllowedToDelete' => 'Vous n\'êtes pas autorisé à supprimer cet objet',
+	'UI:Delete:NotAllowedToUpdate_Fields' => 'Vous n\'êtes pas autorisé à mettre à jour les champs suivants : %1$s',
+	'UI:Error:ActionNotAllowed' => 'Vous n\'êtes pas autorisé à effectuer cette action',
+	'UI:Error:NotEnoughRightsToDelete' => 'Cet objet ne peut pas être supprimé car l\'utilisateur courant n\'a pas les droits nécessaires.',
+	'UI:Error:CannotDeleteBecause' => 'Cet objet ne peut pas être effacé. Raison: %1$s',
+	'UI:Error:CannotDeleteBecauseOfDepencies' => 'Cet objet ne peut pas être supprimé, des opérations manuelles sont nécessaire avant sa suppression.',
+	'UI:Error:CannotDeleteBecauseManualOpNeeded' => 'Des opération manuelles sont nécessaires avant de pouvoir effacer cet objet',
+	'UI:Archive_User_OnBehalfOf_User' => '%1$s pour %2$s',
+	'UI:Delete:Deleted' => 'supprimé',
+	'UI:Delete:AutomaticallyDeleted' => 'supprimé automatiquement',
+	'UI:Delete:AutomaticResetOf_Fields' => 'mise à jour automatique des champ(s): %1$s',
+	'UI:Delete:CleaningUpRefencesTo_Object' => 'Suppression de toutes les références vers %1$s...',
 	'UI:Delete:CleaningUpRefencesTo_Several_ObjectsOf_Class' => 'Suppression de toutes les références vers les %1$d objets de type %2$s...',
-	'UI:Delete:Done+'                                        => 'Ce qui a été effectué...',
-	'UI:Delete:_Name_Class_Deleted'                          => ' %2$s %1$s supprimé.',
-	'UI:Delete:ConfirmDeletionOf_Name'                       => 'Suppression de %1$s',
-	'UI:Delete:ConfirmDeletionOf_Count_ObjectsOf_Class'      => 'Suppression de %1$d objets de type %2$s',
-	'UI:Delete:CannotDeleteBecause'                          => 'Ne peut pas être supprimé: %1$s',
+	'UI:Delete:Done+' => 'Ce qui a été effectué...',
+	'UI:Delete:_Name_Class_Deleted' => ' %2$s %1$s supprimé.',
+	'UI:Delete:ConfirmDeletionOf_Name' => 'Suppression de %1$s',
+	'UI:Delete:ConfirmDeletionOf_Count_ObjectsOf_Class' => 'Suppression de %1$d objets de type %2$s',
+	'UI:Delete:CannotDeleteBecause' => 'Ne peut pas être supprimé: %1$s',
 	'UI:Delete:ShouldBeDeletedAtomaticallyButNotPossible' => 'Devrait être supprimé automatiquement, mais cela n\'est pas possible: %1$s',
 	'UI:Delete:MustBeDeletedManuallyButNotPossible' => 'Doit être supprimé manuellement, mais cela n\'est pas possible: %1$s',
 	'UI:Delete:WillBeDeletedAutomatically' => 'Sera supprimé automatiquement',
@@ -970,7 +971,6 @@ Nous espérons que vous aimerez cette version autant que nous avons eu du plaisi
 	'UI:SystemIntrusion' => 'Accès non autorisé. Vous êtes en train de d\'effectuer une opération qui ne vous est pas permise.',
 	'UI:FatalErrorMessage' => 'Erreur fatale, iTop ne peut pas continuer.',
 	'UI:Error_Details' => 'Erreur: %1$s.',
-
 	'UI:PageTitle:ProfileProjections' => ITOP_APPLICATION_SHORT.' gestion des utilisateurs - projections des profils',
 	'UI:UserManagement:Class' => 'Type',
 	'UI:UserManagement:Class+' => 'Type des objets',
@@ -1005,66 +1005,42 @@ Nous espérons que vous aimerez cette version autant que nous avons eu du plaisi
 	'UI:UserManagement:NoLifeCycleApplicable' => 'N/A',
 	'UI:UserManagement:NoLifeCycleApplicable+' => 'Aucun cycle de vie n\'est défini pour ce type d\'objets.',
 	'UI:UserManagement:GrantMatrix' => 'Matrice des droits',
-
-	'Menu:AdminTools' => 'Administration',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:AdminTools+' => 'Outils d\'administration',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:AdminTools?' => 'Ces outils sont accessibles uniquement aux utilisateurs possédant le profil Administrateur.',// Duplicated into itop-welcome-itil (will be removed from here...)
 	'Menu:SystemTools' => 'Système',
-
 	'UI:ChangeManagementMenu' => 'Gestion du Changement',
 	'UI:ChangeManagementMenu+' => 'Gestion du Changement',
 	'UI:ChangeManagementMenu:Title' => 'Résumé des changements',
 	'UI-ChangeManagementMenu-ChangesByType' => 'Changements par type',
 	'UI-ChangeManagementMenu-ChangesByStatus' => 'Changements par état',
 	'UI-ChangeManagementMenu-ChangesNotYetAssigned' => 'Changements en attente d\'assignation',
-
 	'UI:ConfigurationManagementMenu' => 'Gestion de Configuration',
 	'UI:ConfigurationManagementMenu+' => 'Gestion de Configuration',
 	'UI:ConfigurationManagementMenu:Title' => 'Résumé de l\'Infrastructure',
 	'UI-ConfigurationManagementMenu-InfraByType' => 'Nombre d\'éléments par type',
 	'UI-ConfigurationManagementMenu-InfraByStatus' => 'Nombre d\'éléments par état',
-
 	'UI:ConfigMgmtMenuOverview:Title' => 'Tableau de bord de la Gestion de Configuration',
 	'UI-ConfigMgmtMenuOverview-FunctionalCIbyStatus' => 'Actifs par état',
 	'UI-ConfigMgmtMenuOverview-FunctionalCIByType' => 'Actifs par type',
-
 	'UI:RequestMgmtMenuOverview:Title' => 'Tableau de bord de la Gestion des Demandes Utilisateurs',
 	'UI-RequestManagementOverview-RequestByService' => 'Demandes par service',
 	'UI-RequestManagementOverview-RequestByPriority' => 'Demandes par priorité',
 	'UI-RequestManagementOverview-RequestUnassigned' => 'Demandes non affectées à un agent',
-
 	'UI:IncidentMgmtMenuOverview:Title' => 'Tableau de bord de la Gestion des Incidents',
 	'UI-IncidentManagementOverview-IncidentByService' => 'Incidents par service',
 	'UI-IncidentManagementOverview-IncidentByPriority' => 'Incidents par priorité',
 	'UI-IncidentManagementOverview-IncidentUnassigned' => 'Incidents non affectés à un agent',
-
 	'UI:ChangeMgmtMenuOverview:Title' => 'Tableau de bord de la Gestion des Changements',
 	'UI-ChangeManagementOverview-ChangeByType' => 'Changes par type',
 	'UI-ChangeManagementOverview-ChangeUnassigned' => 'Changes non affectés à un agent',
 	'UI-ChangeManagementOverview-ChangeWithOutage' => 'Interruptions de service liées à un changement',
-
 	'UI:ServiceMgmtMenuOverview:Title' => 'Tableau de bord de la Gestion des Services',
 	'UI-ServiceManagementOverview-CustomerContractToRenew' => 'Contrats clients à renouveler dans les 30 jours',
 	'UI-ServiceManagementOverview-ProviderContractToRenew' => 'Contrats fournisseurs à renouveler dans les 30 jours',
-
 	'UI:ContactsMenu' => 'Contacts',
 	'UI:ContactsMenu+' => 'Contacts',
 	'UI:ContactsMenu:Title' => 'Résumé des contacts',
 	'UI-ContactsMenu-ContactsByLocation' => 'Contacts par emplacement',
 	'UI-ContactsMenu-ContactsByType' => 'Contacts par type',
 	'UI-ContactsMenu-ContactsByStatus' => 'Contacts par état',
-
-	'Menu:CSVImportMenu' => 'Import CSV',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:CSVImportMenu+' => 'Import ou mise à jour en masse',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:DataModelMenu' => 'Modèle de données',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:DataModelMenu+' => 'Résumé du modèle de données',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:ExportMenu' => 'Export',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:ExportMenu+' => 'Export des résultats d\'une requête en HTML, CSV ou XML',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:NotificationsMenu' => 'Notifications',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:NotificationsMenu+' => 'Configuration des notifications',// Duplicated into itop-welcome-itil (will be removed from here...)
 	'UI:NotificationsMenu:Title' => 'Configuration des notifications',
 	'UI:NotificationsMenu:Help' => 'Aide',
 	'UI:NotificationsMenu:HelpContent' => '<p>Dans '.ITOP_APPLICATION_SHORT.' les notifications sont totalement configurables. Elles sont basées sur deux types d\'objets: <i>déclencheurs et actions</i>.</p>
@@ -1095,51 +1071,18 @@ Lors de l\'association à un déclencheur, on attribue à chaque action un numé
 	'UI:NotificationsMenu:Actions:ActionWebhook' => 'Actions de type webhook (intégrations sortantes)',
 	'UI:NotificationsMenu:Actions:Action' => 'Autres types d\'actions',
 	'UI:NotificationsMenu:AvailableActions' => 'Actions existantes',
-
 	'Menu:TagAdminMenu' => 'Étiquettes',
 	'Menu:TagAdminMenu+' => 'Gestion des étiquettes',
 	'UI:TagAdminMenu:Title' => 'Gestion des étiquettes',
 	'UI:TagAdminMenu:NoTags' => 'Pas de champ étiquette configuré',
 	'UI:TagSetFieldData:Error' => 'Erreur: %1$s',
-
-	'Menu:Notifications:Title' => 'Catégories d\'audit',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:RunQueriesMenu' => 'Requêtes OQL',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:RunQueriesMenu+' => 'Executer une requête OQL',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:QueryMenu' => 'Livre des requêtes',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:QueryMenu+' => 'Livre des requêtes',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:DataAdministration' => 'Administration des données',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:DataAdministration+' => 'Administration des données',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:UniversalSearchMenu' => 'Recherche universelle',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UniversalSearchMenu+' => 'Rechercher n\'importe quel objet...',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:UserManagementMenu' => 'Gestion des utilisateurs',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UserManagementMenu+' => 'Gestion des jutilisateurs',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:ProfilesMenu' => 'Profils',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:ProfilesMenu+' => 'Profils',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:ProfilesMenu:Title' => 'Profils',
-	// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:UserAccountsMenu' => 'Comptes utilisateurs',
-	// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UserAccountsMenu+' => 'Comptes utilisateurs',
-	// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UserAccountsMenu:Title' => 'Comptes utilisateurs',
-	// Duplicated into itop-welcome-itil (will be removed from here...)
-
 	'UI:iTopVersion:Short' => '%1$s version %2$s',
 	'UI:iTopVersion:Long' => '%1$s version %2$s-%3$s du %4$s',
 	'UI:PropertiesTab' => 'Propriétés',
-
 	'UI:OpenDocumentInNewWindow_' => 'Ouvrir',
 	'UI:DownloadDocument_' => 'Télécharger',
 	'UI:Document:NoPreview' => 'L\'aperçu n\'est pas disponible pour ce type de documents',
 	'UI:Download-CSV' => 'Télécharger %1$s',
-
 	'UI:DeadlineMissedBy_duration' => 'Passé de %1$s',
 	'UI:Deadline_LessThan1Min' => '< 1 min',
 	'UI:Deadline_Minutes' => '%1$d min',
@@ -1182,7 +1125,7 @@ Lors de l\'association à un déclencheur, on attribue à chaque action un numé
 	'UI:RelationTooltip:ImpactedItems_N_of_M' => 'Nb éléments impactés: %1$d / %2$d',
 	'UI:RelationTooltip:CriticalThreshold_N_of_M' => 'Seuil critique: %1$d / %2$d',
 	'Portal:Title' => 'Portail utilisateur '.ITOP_APPLICATION_SHORT,
-	'Portal:NoRequestMgmt' => 'Chèr(e) %1$s, vous avez été redirigé(e) vers cette page car votre compte utilisateur est configuré avec le profil \'Utilisateur du Portail\'. Malheureusement, iTop n\'a pas été installé avec le module de \'Gestion des Demandes\'. Merci de contacter votre administrateur '.ITOP_APPLICATION_SHORT.'.',
+	'Portal:NoRequestMgmt' => 'Chèr(e) %1$s, vous avez été redirigé(e) vers cette page car votre compte utilisateur est configuré avec le profil \'Utilisateur du Portail\'.Malheureusement, iTop n\'a pas été installé avec le module de \'Gestion des Demandes\'.Merci de contacter votre administrateur '.ITOP_APPLICATION_SHORT.'.',
 	'Portal:Refresh' => 'Rafraîchir',
 	'Portal:Back' => 'Retour',
 	'Portal:WelcomeUserOrg' => 'Bienvenue %1$s (%2$s)',
@@ -1284,7 +1227,6 @@ Lors de l\'association à un déclencheur, on attribue à chaque action un numé
 	'UI:PrintResolution:LetterLandscape' => 'US Letter Paysage',
 	'UI:Toggle:SwitchToStandardDashboard' => 'Basculer sur le tableau de bord standard',
 	'UI:Toggle:SwitchToCustomDashboard' => 'Basculer sur le tableau de bord modifié',
-
 	'UI:ConfigureThisList' => 'Configurer Cette Liste...',
 	'UI:ListConfigurationTitle' => 'Configuration de la liste',
 	'UI:ColumnsAndSortOrder' => 'Colonnes et ordre de tri:',
@@ -1300,10 +1242,8 @@ Lors de l\'association à un déclencheur, on attribue à chaque action un numé
 	'UI:ExtField_AsRemoteField' => '%1$s (%2$s)',
 	'UI:Button:MoveUp' => 'Monter',
 	'UI:Button:MoveDown' => 'Descendre',
-
 	'UI:OQL:UnknownClassAndFix' => 'La classe "%1$s" est inconnue. Essayez plutôt "%2$s".',
 	'UI:OQL:UnknownClassNoFix' => 'La classe "%1$s" est inconnue',
-
 	'UI:Dashboard:EditCustom' => 'Éditer la version modifiée...',
 	'UI:Dashboard:CreateCustom' => 'Créer une version modifiée...',
 	'UI:Dashboard:DeleteCustom' => 'Supprimer la version modifiée...',
@@ -1314,13 +1254,10 @@ Lors de l\'association à un déclencheur, on attribue à chaque action un numé
 	'UI:ImportDashboardText' => 'Choisissez un fichier de définition de tableau de bord :',
 	'UI:Dashboard:Actions' => 'Actions du tableau de bord',
 	'UI:Dashboard:NotUpToDateUntilContainerSaved' => 'Ce tableau de bord affiche des informations qui ne reflète pas les modifications en cours.',
-
-
 	'UI:DashletCreation:Title' => 'Créer un Indicateur',
 	'UI:DashletCreation:Dashboard' => 'Tableau de bord',
 	'UI:DashletCreation:DashletType' => 'Type d\'Indicateur',
 	'UI:DashletCreation:EditNow' => 'Modifier le tableau de bord',
-
 	'UI:DashboardEdit:Title' => 'Éditeur de tableau de bord',
 	'UI:DashboardEdit:DashboardTitle' => 'Titre',
 	'UI:DashboardEdit:AutoReload' => 'Réactualisation automatique',
@@ -1328,38 +1265,31 @@ Lors de l\'association à un déclencheur, on attribue à chaque action un numé
 	'UI:DashboardEdit:AutoReloadSec+' => 'Le minimum permis est de %1$d secondes',
 	'UI:DashboardEdit:Revert' => 'Revenir à la valeur précédente',
 	'UI:DashboardEdit:Apply' => 'Appliquer',
-
 	'UI:DashboardEdit:Layout' => 'Mise en page',
 	'UI:DashboardEdit:Properties' => 'Propriétés du tableau de bord',
 	'UI:DashboardEdit:Dashlets' => 'Indicateurs',
 	'UI:DashboardEdit:DashletProperties' => 'Propriétés de l\'Indicateur',
-
 	'UI:Form:Property' => 'Propriété',
 	'UI:Form:Value' => 'Valeur',
-
 	'UI:DashletUnknown:Label' => 'Inconnu',
 	'UI:DashletUnknown:Description' => 'Element inconnu (est peut-être désinstallé)',
 	'UI:DashletUnknown:RenderText:View' => 'Impossible d\'effectuer le rendu de cet élément.',
 	'UI:DashletUnknown:RenderText:Edit' => 'Impossible d\'effectuer le rendu de cet élément (classe "%1$s"). Vérifiez avec votre administrateur si il est toujours disponible.',
 	'UI:DashletUnknown:RenderNoDataText:Edit' => 'Impossible d\'effectuer le rendu de cet élément (classe "%1$s").',
 	'UI:DashletUnknown:Prop-XMLConfiguration' => 'Configuration (XML)',
-
 	'UI:DashletProxy:Label' => 'Proxy',
 	'UI:DashletProxy:Description' => 'Proxy',
 	'UI:DashletProxy:RenderNoDataText:Edit' => 'Impossible d\'effectuer le rendu de cet élément externe (classe "%1$s").',
 	'UI:DashletProxy:Prop-XMLConfiguration' => 'Configuration (XML)',
-
 	'UI:DashletPlainText:Label' => 'Texte',
 	'UI:DashletPlainText:Description' => 'Text pur (pas de mise en forme)',
 	'UI:DashletPlainText:Prop-Text' => 'Texte',
 	'UI:DashletPlainText:Prop-Text:Default' => 'Veuillez saisir votre texte ici...',
-
 	'UI:DashletObjectList:Label' => 'Liste d\'objets',
 	'UI:DashletObjectList:Description' => 'Liste d\'objets',
 	'UI:DashletObjectList:Prop-Title' => 'Titre',
 	'UI:DashletObjectList:Prop-Query' => 'Requête OQL',
 	'UI:DashletObjectList:Prop-Menu' => 'Menu',
-
 	'UI:DashletGroupBy:Prop-Title' => 'Titre',
 	'UI:DashletGroupBy:Prop-Query' => 'Requête OQL',
 	'UI:DashletGroupBy:Prop-Style' => 'Style',
@@ -1373,7 +1303,6 @@ Lors de l\'association à un déclencheur, on attribue à chaque action un numé
 	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfWeek' => '%1$s (jour de la semaine)',
 	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfMonth' => '%1$s (jour du mois)',
 	'UI:DashletGroupBy:MissingGroupBy' => 'Veuillez sélectionner le champ sur lequel les objets seront groupés',
-
 	'UI:DashletGroupByPie:Label' => 'Secteurs',
 	'UI:DashletGroupByPie:Description' => 'Graphique à secteur',
 	'UI:DashletGroupByBars:Label' => 'Barres',
@@ -1387,10 +1316,8 @@ Lors de l\'association à un déclencheur, on attribue à chaque action un numé
 	'UI:DashletGroupBy:Prop-OrderDirection' => 'Type de tri',
 	'UI:DashletGroupBy:Prop-OrderField' => 'Trié par',
 	'UI:DashletGroupBy:Prop-Limit' => 'Limite',
-
 	'UI:DashletGroupBy:Order:asc' => 'Croissant',
 	'UI:DashletGroupBy:Order:desc' => 'Décroissant',
-
 	'UI:GroupBy:count' => 'Nombre',
 	'UI:GroupBy:count+' => 'Nombre d\'éléments',
 	'UI:GroupBy:sum' => 'Somme',
@@ -1402,104 +1329,95 @@ Lors de l\'association à un déclencheur, on attribue à chaque action un numé
 	'UI:GroupBy:max' => 'Maximum',
 	'UI:GroupBy:max+' => 'Maximum des %1$s',
 	// ---
-
 	'UI:DashletHeaderStatic:Label' => 'En-tête',
 	'UI:DashletHeaderStatic:Description' => 'En-tête présenté comme une barre horizontale',
 	'UI:DashletHeaderStatic:Prop-Title' => 'Titre',
 	'UI:DashletHeaderStatic:Prop-Title:Default' => 'Contacts',
 	'UI:DashletHeaderStatic:Prop-Icon' => 'Icône',
-
-	'UI:DashletHeaderDynamic:Label'                 => 'En-tête dynamique',
-	'UI:DashletHeaderDynamic:Description'           => 'En-tête avec statistiques (regroupements)',
-	'UI:DashletHeaderDynamic:Prop-Title'            => 'Titre',
-	'UI:DashletHeaderDynamic:Prop-Title:Default'    => 'Contacts',
-	'UI:DashletHeaderDynamic:Prop-Icon'             => 'Icône',
-	'UI:DashletHeaderDynamic:Prop-Subtitle'         => 'Sous-titre',
+	'UI:DashletHeaderDynamic:Label' => 'En-tête dynamique',
+	'UI:DashletHeaderDynamic:Description' => 'En-tête avec statistiques (regroupements)',
+	'UI:DashletHeaderDynamic:Prop-Title' => 'Titre',
+	'UI:DashletHeaderDynamic:Prop-Title:Default' => 'Contacts',
+	'UI:DashletHeaderDynamic:Prop-Icon' => 'Icône',
+	'UI:DashletHeaderDynamic:Prop-Subtitle' => 'Sous-titre',
 	'UI:DashletHeaderDynamic:Prop-Subtitle:Default' => 'Contacts',
-	'UI:DashletHeaderDynamic:Prop-Query'            => 'Requête OQL',
-	'UI:DashletHeaderDynamic:Prop-GroupBy'          => 'Grouper par',
-	'UI:DashletHeaderDynamic:Prop-Values'           => 'Valeurs',
-
-	'UI:DashletBadge:Label'       => 'Badge',
+	'UI:DashletHeaderDynamic:Prop-Query' => 'Requête OQL',
+	'UI:DashletHeaderDynamic:Prop-GroupBy' => 'Grouper par',
+	'UI:DashletHeaderDynamic:Prop-Values' => 'Valeurs',
+	'UI:DashletBadge:Label' => 'Badge',
 	'UI:DashletBadge:Description' => 'Icône représentant une classe d\'objets, ainsi que des liens pour créer/rechercher',
-	'UI:DashletBadge:Prop-Class'  => 'Classe',
-
-	'DayOfWeek-Sunday'        => 'Dimanche',
-	'DayOfWeek-Monday'        => 'Lundi',
-	'DayOfWeek-Tuesday'       => 'Mardi',
-	'DayOfWeek-Wednesday'     => 'Mercredi',
-	'DayOfWeek-Thursday'      => 'Jeudi',
-	'DayOfWeek-Friday'        => 'Vendredi',
-	'DayOfWeek-Saturday'      => 'Samedi',
-	'Month-01'                => 'Janvier',
-	'Month-02'                => 'Février',
-	'Month-03'                => 'Mars',
-	'Month-04'                => 'Avril',
-	'Month-05'                => 'Mai',
-	'Month-06'                => 'Juin',
-	'Month-07'                => 'Juillet',
-	'Month-08'                => 'Août',
-	'Month-09'                => 'Septembre',
-	'Month-10'                => 'Octobre',
-	'Month-11'                => 'Novembre',
-	'Month-12'                => 'Décembre',
+	'UI:DashletBadge:Prop-Class' => 'Classe',
+	'DayOfWeek-Sunday' => 'Dimanche',
+	'DayOfWeek-Monday' => 'Lundi',
+	'DayOfWeek-Tuesday' => 'Mardi',
+	'DayOfWeek-Wednesday' => 'Mercredi',
+	'DayOfWeek-Thursday' => 'Jeudi',
+	'DayOfWeek-Friday' => 'Vendredi',
+	'DayOfWeek-Saturday' => 'Samedi',
+	'Month-01' => 'Janvier',
+	'Month-02' => 'Février',
+	'Month-03' => 'Mars',
+	'Month-04' => 'Avril',
+	'Month-05' => 'Mai',
+	'Month-06' => 'Juin',
+	'Month-07' => 'Juillet',
+	'Month-08' => 'Août',
+	'Month-09' => 'Septembre',
+	'Month-10' => 'Octobre',
+	'Month-11' => 'Novembre',
+	'Month-12' => 'Décembre',
 
 	// Short version for the DatePicker
-	'DayOfWeek-Sunday-Min'    => 'Di',
-	'DayOfWeek-Monday-Min'    => 'Lu',
-	'DayOfWeek-Tuesday-Min'   => 'Ma',
+	'DayOfWeek-Sunday-Min' => 'Di',
+	'DayOfWeek-Monday-Min' => 'Lu',
+	'DayOfWeek-Tuesday-Min' => 'Ma',
 	'DayOfWeek-Wednesday-Min' => 'Me',
-	'DayOfWeek-Thursday-Min'  => 'Je',
-	'DayOfWeek-Friday-Min'    => 'Ve',
-	'DayOfWeek-Saturday-Min'  => 'Sa',
-	'Month-01-Short'          => 'Jan',
-	'Month-02-Short'          => 'Fév',
-	'Month-03-Short'          => 'Mar',
-	'Month-04-Short'          => 'Avr',
-	'Month-05-Short'          => 'Mai',
-	'Month-06-Short'          => 'Juin',
-	'Month-07-Short'          => 'Juil',
-	'Month-08-Short'          => 'Août',
-	'Month-09-Short'          => 'Sept',
-	'Month-10-Short'          => 'Oct',
-	'Month-11-Short'          => 'Nov',
-	'Month-12-Short'          => 'Déc',
+	'DayOfWeek-Thursday-Min' => 'Je',
+	'DayOfWeek-Friday-Min' => 'Ve',
+	'DayOfWeek-Saturday-Min' => 'Sa',
+	'Month-01-Short' => 'Jan',
+	'Month-02-Short' => 'Fév',
+	'Month-03-Short' => 'Mar',
+	'Month-04-Short' => 'Avr',
+	'Month-05-Short' => 'Mai',
+	'Month-06-Short' => 'Juin',
+	'Month-07-Short' => 'Juil',
+	'Month-08-Short' => 'Août',
+	'Month-09-Short' => 'Sept',
+	'Month-10-Short' => 'Oct',
+	'Month-11-Short' => 'Nov',
+	'Month-12-Short' => 'Déc',
 	'Calendar-FirstDayOfWeek' => '1',
 	// 0 = Sunday, 1 = Monday, etc...
-
-	'UI:Menu:ShortcutList'                                 => 'Créer un Raccourci...',
-	'UI:Menu:FilterList'                                   => 'Afficher la liste et ses critères de recherche',
-	'UI:ShortcutRenameDlg:Title'                           => 'Renommer le raccourci',
-	'UI:ShortcutListDlg:Title'                             => 'Créer un raccourci pour la liste',
-	'UI:ShortcutDelete:Confirm'                            => 'Veuillez confirmer la suppression du ou des raccourci(s)',
-	'Menu:MyShortcuts'                                     => 'Mes raccourcis',
-	// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Class:Shortcut'                                       => 'Raccourci',
-	'Class:Shortcut+'                                      => '',
-	'Class:Shortcut/Attribute:name'                        => 'Nom',
-	'Class:Shortcut/Attribute:name+'                       => 'Label utilisé dans le menu et comme titre de la page',
-	'Class:ShortcutOQL'                                    => 'Raccourci vers une liste d\'objets',
-	'Class:ShortcutOQL+'                                   => '',
-	'Class:ShortcutOQL/Attribute:oql'                      => 'Requête',
-	'Class:ShortcutOQL/Attribute:oql+'                     => 'Requête de définition de l\'ensemble des objets',
-	'Class:ShortcutOQL/Attribute:auto_reload'              => 'Réactualisation automatique',
-	'Class:ShortcutOQL/Attribute:auto_reload/Value:none'   => 'Désactivée',
+	'UI:Menu:ShortcutList' => 'Créer un Raccourci...',
+	'UI:Menu:FilterList' => 'Afficher la liste et ses critères de recherche',
+	'UI:ShortcutRenameDlg:Title' => 'Renommer le raccourci',
+	'UI:ShortcutListDlg:Title' => 'Créer un raccourci pour la liste',
+	'UI:ShortcutDelete:Confirm' => 'Veuillez confirmer la suppression du ou des raccourci(s)',
+	'Class:Shortcut' => 'Raccourci',
+	'Class:Shortcut+' => '',
+	'Class:Shortcut/Attribute:name' => 'Nom',
+	'Class:Shortcut/Attribute:name+' => 'Label utilisé dans le menu et comme titre de la page',
+	'Class:ShortcutOQL' => 'Raccourci vers une liste d\'objets',
+	'Class:ShortcutOQL+' => '',
+	'Class:ShortcutOQL/Attribute:oql' => 'Requête',
+	'Class:ShortcutOQL/Attribute:oql+' => 'Requête de définition de l\'ensemble des objets',
+	'Class:ShortcutOQL/Attribute:auto_reload' => 'Réactualisation automatique',
+	'Class:ShortcutOQL/Attribute:auto_reload/Value:none' => 'Désactivée',
 	'Class:ShortcutOQL/Attribute:auto_reload/Value:custom' => 'Personnalisée',
-	'Class:ShortcutOQL/Attribute:auto_reload_sec'          => 'Réactualisation toutes les (secondes)',
-	'Class:ShortcutOQL/Attribute:auto_reload_sec/tip'      => 'Le minimum permis est de %1$d secondes',
-
+	'Class:ShortcutOQL/Attribute:auto_reload_sec' => 'Réactualisation toutes les (secondes)',
+	'Class:ShortcutOQL/Attribute:auto_reload_sec/tip' => 'Le minimum permis est de %1$d secondes',
 	'UI:FillAllMandatoryFields' => 'Veuillez remplir tous les champs obligatoires.',
-	'UI:ValueMustBeSet'         => 'Veuillez spécifier une valeur pour ce champ',
-	'UI:ValueMustBeChanged'     => 'Veuillez modifier la valeur de ce champ',
-	'UI:ValueInvalidFormat'     => 'Format invalide',
-
-	'UI:CSVImportConfirmTitle'                          => 'Veuillez confirmer cette opération',
-	'UI:CSVImportConfirmMessage'                        => 'Etes-vous sûr(e) de vouloir faire cela ?',
-	'UI:CSVImportError_items'                           => 'Erreurs: %1$d',
-	'UI:CSVImportCreated_items'                         => 'Créations: %1$d',
-	'UI:CSVImportModified_items'                        => 'Modifications: %1$d',
-	'UI:CSVImportUnchanged_items'                       => 'Inchangés: %1$d',
-	'UI:CSVImport:DateAndTimeFormats'                   => 'Format de date et heure',
+	'UI:ValueMustBeSet' => 'Veuillez spécifier une valeur pour ce champ',
+	'UI:ValueMustBeChanged' => 'Veuillez modifier la valeur de ce champ',
+	'UI:ValueInvalidFormat' => 'Format invalide',
+	'UI:CSVImportConfirmTitle' => 'Veuillez confirmer cette opération',
+	'UI:CSVImportConfirmMessage' => 'Etes-vous sûr(e) de vouloir faire cela ?',
+	'UI:CSVImportError_items' => 'Erreurs: %1$d',
+	'UI:CSVImportCreated_items' => 'Créations: %1$d',
+	'UI:CSVImportModified_items' => 'Modifications: %1$d',
+	'UI:CSVImportUnchanged_items' => 'Inchangés: %1$d',
+	'UI:CSVImport:DateAndTimeFormats' => 'Format de date et heure',
 	'UI:CSVImport:DefaultDateTimeFormat_Format_Example' => 'Format par défaut: %1$s (ex. %2$s)',
 	'UI:CSVImport:CustomDateTimeFormat' => 'Format spécial: %1$s',
 	'UI:CSVImport:CustomDateTimeFormatTooltip' => 'Codes de format:<table>
@@ -1518,11 +1436,9 @@ Lors de l\'association à un déclencheur, on attribue à chaque action un numé
 <tr><td>i</td><td>minutes (sur 2 chiffres: 00..59)</td></tr>
 <tr><td>s</td><td>secondes (sur 2 chiffres: 00..59)</td></tr>
 </table>',
-
 	'UI:Button:Remove' => 'Enlever',
 	'UI:AddAnExisting_Class' => 'Ajouter des objets de type %1$s...',
 	'UI:SelectionOf_Class' => 'Sélection d\'objets de type %1$s',
-
 	'UI:AboutBox' => 'A propos d\''.ITOP_APPLICATION_SHORT.'...',
 	'UI:About:Title' => 'A propos d\''.ITOP_APPLICATION_SHORT,
 	'UI:About:DataModel' => 'Modèle de données',
@@ -1532,12 +1448,10 @@ Lors de l\'association à un déclencheur, on attribue à chaque action un numé
 	'UI:About:ManualExtensionSource' => 'Extension',
 	'UI:About:Extension_Version' => 'Version: %1$s',
 	'UI:About:RemoteExtensionSource' => 'Data',
-
 	'UI:DisconnectedDlgMessage' => 'Vous êtes déconnecté(e). Vous devez vous identifier pour pouvoir continuer à utiliser l\'application.',
 	'UI:DisconnectedDlgTitle' => 'Attention !',
 	'UI:LoginAgain' => 'S\'identifier',
 	'UI:StayOnThePage' => 'Rester sur cette page',
-
 	'ExcelExporter:ExportMenu' => 'Exporter pour Excel...',
 	'ExcelExporter:ExportDialogTitle' => 'Export au format Excel',
 	'ExcelExporter:ExportButton' => 'Exporter',
@@ -1550,7 +1464,6 @@ Lors de l\'association à un déclencheur, on attribue à chaque action un numé
 	'ExcelExport:Statistics' => 'Statistiques',
 	'portal:legacy_portal' => 'Portail Utilisateurs',
 	'portal:backoffice' => 'Console '.ITOP_APPLICATION_SHORT,
-
 	'UI:CurrentObjectIsLockedBy_User' => 'L\'objet est verrouillé car il est en train d\'être modifié par %1$s.',
 	'UI:CurrentObjectIsLockedBy_User_Explanation' => 'L\'objet est en train d\'être modifié par %1$s. Vos modifications ne peuvent pas être acceptées car elles risquent d\'être écrasées.',
 	'UI:CurrentObjectIsSoftLockedBy_User' => 'L\'objet est en train d\'être modifié par %1$s. Vous pourrez envoyer vos modifications quand il/elle aura fini.',
@@ -1558,22 +1471,18 @@ Lors de l\'association à un déclencheur, on attribue à chaque action un numé
 	'UI:CurrentObjectLockExpired_Explanation' => 'Le verrouillage interdisant les modifications concurrentes a expiré. Vos modifications ne peuvent pas être acceptées car d\'autres utilisateurs peuvent modifier cet objet.',
 	'UI:ConcurrentLockKilled' => 'Le verrouillage en édition de l\'objet courant a été supprimé.',
 	'UI:Menu:KillConcurrentLock' => 'Supprimer le verrouillage !',
-
 	'UI:Menu:ExportPDF' => 'Exporter en PDF...',
 	'UI:Menu:PrintableVersion' => 'Version imprimable',
-
 	'UI:BrowseInlineImages' => 'Parcourir les images...',
 	'UI:UploadInlineImageLegend' => 'Ajouter une image',
 	'UI:SelectInlineImageToUpload' => 'Sélectionnez l\'image à ajouter',
 	'UI:AvailableInlineImagesLegend' => 'Images disponibles',
 	'UI:NoInlineImage' => 'Il n\'y a aucune image de disponible sur le serveur. Utilisez le bouton "Parcourir" (ci-dessus) pour sélectionner une image sur votre ordinateur et la télécharger sur le serveur.',
-
 	'UI:ToggleFullScreen' => 'Agrandir / Minimiser',
 	'UI:Button:ResetImage' => 'Récupérer l\'image initiale',
 	'UI:Button:RemoveImage' => 'Supprimer l\'image',
 	'UI:Button:UploadImage' => 'Upload an image from the disk~~',
 	'UI:UploadNotSupportedInThisMode' => 'La modification d\'images ou de fichiers n\'est pas supportée dans ce mode.',
-
 	'UI:Button:RemoveDocument' => 'Supprimer le document',
 
 	// Search form
@@ -1594,7 +1503,7 @@ Lors de l\'association à un déclencheur, on attribue à chaque action un numé
 	'UI:Search:Criteria:Locked' => 'Verrouillé',
 
 	// - Criteria titles
-	//   - Default widget
+ //   - Default widget
 	'UI:Search:Criteria:Title:Default:Any' => '%1$s : Indifférent',
 	'UI:Search:Criteria:Title:Default:Empty' => '%1$s vide',
 	'UI:Search:Criteria:Title:Default:NotEmpty' => '%1$s non vide',
@@ -1617,8 +1526,8 @@ Lors de l\'association à un déclencheur, on attribue à chaque action un numé
 	'UI:Search:Criteria:Title:Default:Between:From' => '%1$s à partir de %2$s',
 	'UI:Search:Criteria:Title:Default:Between:Until' => '%1$s jusqu\'à %2$s',
 	//   - Numeric widget
-	//   None yet
-	//   - DateTime widget
+ //   None yet
+ //   - DateTime widget
 	'UI:Search:Criteria:Title:DateTime:Between' => '%2$s <= 1$s <= %3$s',
 	//   - Enum widget
 	'UI:Search:Criteria:Title:Enum:In' => '%1$s : %2$s',
@@ -1642,7 +1551,7 @@ Lors de l\'association à un déclencheur, on attribue à chaque action un numé
 	'UI:Search:Criteria:Title:HierarchicalKey:In:All' => '%1$s : Indifférent',
 
 	// - Criteria operators
-	//   - Default widget
+ //   - Default widget
 	'UI:Search:Criteria:Operator:Default:Empty' => 'Vide',
 	'UI:Search:Criteria:Operator:Default:NotEmpty' => 'Non vide',
 	'UI:Search:Criteria:Operator:Default:Equals' => 'Egal',
@@ -1659,7 +1568,7 @@ Lors de l\'association à un déclencheur, on attribue à chaque action un numé
 	'UI:Search:Criteria:Operator:Numeric:LessThan' => 'Inférieur',// => '<',
 	'UI:Search:Criteria:Operator:Numeric:LessThanOrEquals' => 'Inf. / égal',// > '<=',
 	'UI:Search:Criteria:Operator:Numeric:Different' => 'Différent',// => '≠',
-	//   - Tag Set Widget
+ //   - Tag Set Widget
 	'UI:Search:Criteria:Operator:TagSet:Matches' => 'Contient',
 
 	// - Other translations
@@ -1685,10 +1594,8 @@ Lors de l\'association à un déclencheur, on attribue à chaque action un numé
 	'UI:Search:Criteria:DateTime:PlaceholderUntil' => 'Indifférent',
 	'UI:Search:Criteria:DateTime:PlaceholderUntilTime' => 'Indifférent',
 	'UI:Search:Criteria:HierarchicalKey:ChildrenIncluded:Hint' => 'Children of the selected objects will be included.~~',
-
 	'UI:Search:Criteria:Raw:Filtered' => 'Filtré',
 	'UI:Search:Criteria:Raw:FilteredOn' => 'Filtré sur %1$s',
-
 	'UI:StateChanged' => 'Etat modifié',
 ));
 
@@ -1699,16 +1606,13 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Expression:Operator:AND' => ' ET ',
 	'Expression:Operator:OR' => ' OU ',
 	'Expression:Operator:=' => ' : ',
-
 	'Expression:Unit:Short:DAY' => 'j',
 	'Expression:Unit:Short:WEEK' => 's',
 	'Expression:Unit:Short:MONTH' => 'm',
 	'Expression:Unit:Short:YEAR' => 'a',
-
 	'Expression:Unit:Long:DAY' => 'jour(s)',
 	'Expression:Unit:Long:HOUR' => 'heure(s)',
 	'Expression:Unit:Long:MINUTE' => 'minute(s)',
-
 	'Expression:Verb:NOW' => 'maintenant',
 	'Expression:Verb:ISNULL' => ' : non défini',
 ));
@@ -1728,27 +1632,13 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'UI:Newsroom:DisplayAtMost_X_Messages' => 'Afficher au plus %1$s messages dans le menu %2$s.',
 ));
 
+
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Menu:DataSources'            => 'Synchronisation',
-	'Menu:DataSources+'           => '',
-	'Menu:WelcomeMenu'            => 'Bienvenue',
-	'Menu:WelcomeMenu+'           => 'Bienvenue dans '.ITOP_APPLICATION_SHORT,
-	'Menu:WelcomeMenuPage'        => 'Bienvenue',
-	'Menu:WelcomeMenuPage+'       => 'Bienvenue dans '.ITOP_APPLICATION_SHORT,
-	'Menu:AdminTools'             => 'Administration',
-	'Menu:AdminTools+'            => 'Outils d\'administration',
-	'Menu:AdminTools?'            => 'Ces outils sont accessibles uniquement aux utilisateurs possédant le profil Administrateur.',
-	'Menu:DataModelMenu'          => 'Modèle de données',
-	'Menu:DataModelMenu+'         => 'Résumé du modèle de données',
-	'Menu:ExportMenu'             => 'Export',
-	'Menu:ExportMenu+'            => 'Export des résultats d\'une requête en HTML, CSV ou XML',
-	'Menu:NotificationsMenu'      => 'Notifications',
-	'Menu:NotificationsMenu+'     => 'Configurer les Notifications',
+	'Menu:DataSources+'           => 'Configurations d\'import de données issues de sources externes',
 	'Menu:AuditCategories'        => 'Configurer l\'audit',
-	'Menu:AuditCategories+'       => 'Définir de nouveaux audits',
+	'Menu:AuditCategories+'       => 'Définir des régles pour auditer la qualité des données',
 	'Menu:AuditCategories:Title'  => 'Configurer l\'audit',
-
-	//	'Menu:Notifications:Title'    => 'Catégories d\'audit',
 	'Menu:RunQueriesMenu'         => 'Requêtes OQL',
 	'Menu:RunQueriesMenu+'        => 'Executer une requête OQL',
 	'Menu:QueryMenu'              => 'Livre des requêtes',
@@ -1758,13 +1648,13 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Menu:UserManagementMenu'     => 'Gestion des Utilisateurs',
 	'Menu:UserManagementMenu+'    => 'Qui peut se connecter à '.ITOP_APPLICATION_SHORT.' et y faire quoi ?',
 	'Menu:ProfilesMenu'           => 'Profils',
-	'Menu:ProfilesMenu+'          => 'Consulter les profils existants',
-	'Menu:ProfilesMenu:Title'     => 'Profils',
-	'Menu:UserAccountsMenu'       => 'Comptes utilisateurs',
-	'Menu:UserAccountsMenu+'      => 'Gérer les comptes utilisateurs et leur droits',
+	'Menu:ProfilesMenu+' => 'Consulter les profils existants',
+	'Menu:ProfilesMenu:Title' => 'Profils',
+	'Menu:UserAccountsMenu' => 'Comptes utilisateurs',
+	'Menu:UserAccountsMenu+' => 'Gérer les comptes utilisateurs et leur droits',
 	'Menu:UserAccountsMenu:Title' => 'Comptes utilisateurs',
-	'Menu:MyShortcuts'            => 'Mes raccourcis',
-	'Menu:UserManagement'         => 'Utilisateurs',
-	'Menu:Queries'                => 'Requêtes',
-	'Menu:ConfigurationTools'     => 'Configuration',
+	'Menu:UserManagement' => 'Utilisateurs',
+	'Menu:Queries' => 'Requêtes',
+	'Menu:ConfigurationTools' => 'Configuration',
+
 ));
diff --git a/dictionaries/hu.dictionary.itop.core.php b/dictionaries/hu.dictionary.itop.core.php
index eb916a96b5..53bddc6f54 100755
--- a/dictionaries/hu.dictionary.itop.core.php
+++ b/dictionaries/hu.dictionary.itop.core.php
@@ -20,128 +20,95 @@
  * 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(
-    'Core:DeletedObjectLabel' => '%1s (törölve)',
-    'Core:DeletedObjectTip' => 'A %1$s objektum törölve (%2$s)',
-
-    'Core:UnknownObjectLabel' => 'Objektum nem található (osztály: %1$s, id: %2$d)',
-    'Core:UnknownObjectTip' => 'Az objektumot nem sikerült megtalálni. Lehet, hogy már törölték egy ideje, és a naplót azóta törölték.',
-
-    'Core:UniquenessDefaultError' => 'Egyediségi szabály %1$s hibás',
-    'Core:CheckConsistencyError' => 'A következetességi szabályok be nem tartása: %1$s',
-    'Core:CheckValueError' => 'A %1$s (%2$s) attribútum nem várt értéke : %3$s',
-
-    'Core:AttributeLinkedSet' => 'Objektumtömbök',
-    'Core:AttributeLinkedSet+' => 'Az azonos osztályba vagy alosztályba tartozó objektumok bármely fajtája',
-
-    'Core:AttributeLinkedSetDuplicatesFound' => 'Duplikátumok a %1$s mezőben : %2$s',
-
-    'Core:AttributeDashboard' => 'Műszerfal',
-    'Core:AttributeDashboard+' => '',
-
-    'Core:AttributePhoneNumber' => 'Telefonszám',
-    'Core:AttributePhoneNumber+' => '',
-
-    'Core:AttributeObsolescenceDate' => 'Elavulás dátuma',
-    'Core:AttributeObsolescenceDate+' => '',
-
-    'Core:AttributeTagSet' => 'Címkelista',
-    'Core:AttributeTagSet+' => '',
-    'Core:AttributeSet:placeholder' => 'Kattintson a hozzáadáshoz',
-    'Core:AttributeClassAttCodeSet:ItemLabel:AttributeFromClass' => '%1$s (%2$s)',
-    'Core:AttributeClassAttCodeSet:ItemLabel:AttributeFromOneChildClass' => '%1$s (%2$s a %3$s -ból)',
-    'Core:AttributeClassAttCodeSet:ItemLabel:AttributeFromSeveralChildClasses' => '%1$s (%2$s gyermekosztályokból)',
-
-    'Core:AttributeCaseLog' => 'Napló',
-    'Core:AttributeCaseLog+' => '',
-
-    'Core:AttributeMetaEnum' => 'Generált enum',
-    'Core:AttributeMetaEnum+' => '',
-
-    'Core:AttributeLinkedSetIndirect' => 'Objektumok tömbjei (N-N)',
-    'Core:AttributeLinkedSetIndirect+' => 'Bármilyen objektum [alosztály] ugyanabból az osztályból',
-
-    'Core:AttributeInteger' => 'Egész szám',
-    'Core:AttributeInteger+' => 'Numerikus érték (lehet negatív is)',
-
-    'Core:AttributeDecimal' => 'Decimális',
-    'Core:AttributeDecimal+' => 'Decimális érték (lehet negatív is)',
-
-    'Core:AttributeBoolean' => 'Logikai',
-    'Core:AttributeBoolean+' => '',
-    'Core:AttributeBoolean/Value:null' => '',
-    'Core:AttributeBoolean/Value:yes' => 'Igen',
-    'Core:AttributeBoolean/Value:no' => 'Nem',
-
-    'Core:AttributeArchiveFlag' => 'Archív jelölő',
-    'Core:AttributeArchiveFlag/Value:yes' => 'Igen',
-    'Core:AttributeArchiveFlag/Value:yes+' => 'Ez az objektum csak archív módban látható',
-    'Core:AttributeArchiveFlag/Value:no' => 'Nem',
-    'Core:AttributeArchiveFlag/Label' => 'Archivált',
-    'Core:AttributeArchiveFlag/Label+' => '',
-    'Core:AttributeArchiveDate/Label' => 'Archiválás dátuma',
-    'Core:AttributeArchiveDate/Label+' => '',
-
-    'Core:AttributeObsolescenceFlag' => 'Elavulás jelölő',
-    'Core:AttributeObsolescenceFlag/Value:yes' => 'Igen',
-    'Core:AttributeObsolescenceFlag/Value:yes+' => 'Ez az objektum ki van zárva a hatáselemzésből, és el van rejtve a keresési eredményekből.',
-    'Core:AttributeObsolescenceFlag/Value:no' => 'Nem',
-    'Core:AttributeObsolescenceFlag/Label' => 'Elavult',
-    'Core:AttributeObsolescenceFlag/Label+' => 'Egyéb attribútumok alapján dinamikusan kiszámított',
-    'Core:AttributeObsolescenceDate/Label' => 'Elavulás dátuma',
-    'Core:AttributeObsolescenceDate/Label+' => 'Az objektum elavultnak minősítésének hozzávetőleges dátuma',
-
-    'Core:AttributeString' => 'Karakterlánc',
-    'Core:AttributeString+' => 'Alfanumerikus karakterlánc',
-
-    'Core:AttributeClass' => 'Osztály',
-    'Core:AttributeClass+' => '',
-
-    'Core:AttributeApplicationLanguage' => 'Felhasználó nyelve',
-    'Core:AttributeApplicationLanguage+' => 'Nyelv és országkód (HU HU)',
-
-    'Core:AttributeFinalClass' => 'Osztály (automatikus)',
-    'Core:AttributeFinalClass+' => 'Az objektum valódi osztálya (a rendszer automatikusan létrehozza)',
-
-    'Core:AttributePassword' => 'Jelszó',
-    'Core:AttributePassword+' => 'A külső eszköz jelszava',
-
-    'Core:AttributeEncryptedString' => 'Titkosított karakterlánc',
-    'Core:AttributeEncryptedString+' => 'Helyi kulccsal titkosított karakterlánc',
-    'Core:AttributeEncryptUnknownLibrary' => 'A megadott (%1$s) titkosítási könyvtár ismeretlen',
-    'Core:AttributeEncryptFailedToDecrypt' => '** Titkosítási hiba **',
-
-    'Core:AttributeText' => 'Szöveg',
-    'Core:AttributeText+' => 'Többsoros karakterlánc',
-
-    'Core:AttributeHTML' => 'HTML',
-    'Core:AttributeHTML+' => 'HTML karakterlánc',
-
-    'Core:AttributeEmailAddress' => 'Email cím',
-    'Core:AttributeEmailAddress+' => 'Email cím',
-
-    'Core:AttributeIPAddress' => 'IP cím',
-    'Core:AttributeIPAddress+' => 'IP cím',
-
-    'Core:AttributeOQL' => 'OQL',
-    'Core:AttributeOQL+' => 'Objektum lekérdező nyelvi (OQL) kifejezés',
-
-    'Core:AttributeEnum' => 'Enum',
-    'Core:AttributeEnum+' => 'Előre definiált alfanumerikus karakterláncok listája',
-
-    'Core:AttributeTemplateString' => 'Karakterlánc sablon',
-    'Core:AttributeTemplateString+' => 'Helyőrzőket tartalmazó karakterlánc',
-
-    'Core:AttributeTemplateText' => 'Szövegsablon',
-    'Core:AttributeTemplateText+' => 'Helyőrzőket tartalmazó szöveg',
-
-    'Core:AttributeTemplateHTML' => 'HTML sablon',
-    'Core:AttributeTemplateHTML+' => 'Helyőrzőket tartalmazó HTML kód',
-
-    'Core:AttributeDateTime' => 'Dátum/idő',
-    'Core:AttributeDateTime+' => 'Dátum és idő (Év-hónap-nap óó:pp:mp)',
-    'Core:AttributeDateTime?SmartSearch' => '
+	'Core:DeletedObjectLabel' => '%1s (törölve)',
+	'Core:DeletedObjectTip' => 'A %1$s objektum törölve (%2$s)',
+	'Core:UnknownObjectLabel' => 'Objektum nem található (osztály: %1$s, id: %2$d)',
+	'Core:UnknownObjectTip' => 'Az objektumot nem sikerült megtalálni. Lehet, hogy már törölték egy ideje, és a naplót azóta törölték.',
+	'Core:UniquenessDefaultError' => 'Egyediségi szabály %1$s hibás',
+	'Core:CheckConsistencyError' => 'A következetességi szabályok be nem tartása: %1$s',
+	'Core:CheckValueError' => 'A %1$s (%2$s) attribútum nem várt értéke : %3$s',
+	'Core:AttributeLinkedSet' => 'Objektumtömbök',
+	'Core:AttributeLinkedSet+' => 'Az azonos osztályba vagy alosztályba tartozó objektumok bármely fajtája',
+	'Core:AttributeLinkedSetDuplicatesFound' => 'Duplikátumok a %1$s mezőben : %2$s',
+	'Core:AttributeDashboard' => 'Műszerfal',
+	'Core:AttributeDashboard+' => '',
+	'Core:AttributePhoneNumber' => 'Telefonszám',
+	'Core:AttributePhoneNumber+' => '',
+	'Core:AttributeObsolescenceDate' => 'Elavulás dátuma',
+	'Core:AttributeObsolescenceDate+' => '',
+	'Core:AttributeTagSet' => 'Címkelista',
+	'Core:AttributeTagSet+' => '',
+	'Core:AttributeSet:placeholder' => 'Kattintson a hozzáadáshoz',
+	'Core:AttributeClassAttCodeSet:ItemLabel:AttributeFromClass' => '%1$s (%2$s)',
+	'Core:AttributeClassAttCodeSet:ItemLabel:AttributeFromOneChildClass' => '%1$s (%2$s a %3$s -ból)',
+	'Core:AttributeClassAttCodeSet:ItemLabel:AttributeFromSeveralChildClasses' => '%1$s (%2$s gyermekosztályokból)',
+	'Core:AttributeCaseLog' => 'Napló',
+	'Core:AttributeCaseLog+' => '',
+	'Core:AttributeMetaEnum' => 'Generált enum',
+	'Core:AttributeMetaEnum+' => '',
+	'Core:AttributeLinkedSetIndirect' => 'Objektumok tömbjei (N-N)',
+	'Core:AttributeLinkedSetIndirect+' => 'Bármilyen objektum [alosztály] ugyanabból az osztályból',
+	'Core:AttributeInteger' => 'Egész szám',
+	'Core:AttributeInteger+' => 'Numerikus érték (lehet negatív is)',
+	'Core:AttributeDecimal' => 'Decimális',
+	'Core:AttributeDecimal+' => 'Decimális érték (lehet negatív is)',
+	'Core:AttributeBoolean' => 'Logikai',
+	'Core:AttributeBoolean+' => '',
+	'Core:AttributeBoolean/Value:null' => '',
+	'Core:AttributeBoolean/Value:yes' => 'Igen',
+	'Core:AttributeBoolean/Value:no' => 'Nem',
+	'Core:AttributeArchiveFlag' => 'Archív jelölő',
+	'Core:AttributeArchiveFlag/Value:yes' => 'Igen',
+	'Core:AttributeArchiveFlag/Value:yes+' => 'Ez az objektum csak archív módban látható',
+	'Core:AttributeArchiveFlag/Value:no' => 'Nem',
+	'Core:AttributeArchiveFlag/Label' => 'Archivált',
+	'Core:AttributeArchiveFlag/Label+' => '',
+	'Core:AttributeArchiveDate/Label' => 'Archiválás dátuma',
+	'Core:AttributeArchiveDate/Label+' => '',
+	'Core:AttributeObsolescenceFlag' => 'Elavulás jelölő',
+	'Core:AttributeObsolescenceFlag/Value:yes' => 'Igen',
+	'Core:AttributeObsolescenceFlag/Value:yes+' => 'Ez az objektum ki van zárva a hatáselemzésből, és el van rejtve a keresési eredményekből.',
+	'Core:AttributeObsolescenceFlag/Value:no' => 'Nem',
+	'Core:AttributeObsolescenceFlag/Label' => 'Elavult',
+	'Core:AttributeObsolescenceFlag/Label+' => 'Egyéb attribútumok alapján dinamikusan kiszámított',
+	'Core:AttributeObsolescenceDate/Label' => 'Elavulás dátuma',
+	'Core:AttributeObsolescenceDate/Label+' => 'Az objektum elavultnak minősítésének hozzávetőleges dátuma',
+	'Core:AttributeString' => 'Karakterlánc',
+	'Core:AttributeString+' => 'Alfanumerikus karakterlánc',
+	'Core:AttributeClass' => 'Osztály',
+	'Core:AttributeClass+' => '',
+	'Core:AttributeApplicationLanguage' => 'Felhasználó nyelve',
+	'Core:AttributeApplicationLanguage+' => 'Nyelv és országkód (HU HU)',
+	'Core:AttributeFinalClass' => 'Osztály (automatikus)',
+	'Core:AttributeFinalClass+' => 'Az objektum valódi osztálya (a rendszer automatikusan létrehozza)',
+	'Core:AttributePassword' => 'Jelszó',
+	'Core:AttributePassword+' => 'A külső eszköz jelszava',
+	'Core:AttributeEncryptedString' => 'Titkosított karakterlánc',
+	'Core:AttributeEncryptedString+' => 'Helyi kulccsal titkosított karakterlánc',
+	'Core:AttributeEncryptUnknownLibrary' => 'A megadott (%1$s) titkosítási könyvtár ismeretlen',
+	'Core:AttributeEncryptFailedToDecrypt' => '** Titkosítási hiba **',
+	'Core:AttributeText' => 'Szöveg',
+	'Core:AttributeText+' => 'Többsoros karakterlánc',
+	'Core:AttributeHTML' => 'HTML',
+	'Core:AttributeHTML+' => 'HTML karakterlánc',
+	'Core:AttributeEmailAddress' => 'Email cím',
+	'Core:AttributeEmailAddress+' => 'Email cím',
+	'Core:AttributeIPAddress' => 'IP cím',
+	'Core:AttributeIPAddress+' => 'IP cím',
+	'Core:AttributeOQL' => 'OQL',
+	'Core:AttributeOQL+' => 'Objektum lekérdező nyelvi (OQL) kifejezés',
+	'Core:AttributeEnum' => 'Enum',
+	'Core:AttributeEnum+' => 'Előre definiált alfanumerikus karakterláncok listája',
+	'Core:AttributeTemplateString' => 'Karakterlánc sablon',
+	'Core:AttributeTemplateString+' => 'Helyőrzőket tartalmazó karakterlánc',
+	'Core:AttributeTemplateText' => 'Szövegsablon',
+	'Core:AttributeTemplateText+' => 'Helyőrzőket tartalmazó szöveg',
+	'Core:AttributeTemplateHTML' => 'HTML sablon',
+	'Core:AttributeTemplateHTML+' => 'Helyőrzőket tartalmazó HTML kód',
+	'Core:AttributeDateTime' => 'Dátum/idő',
+	'Core:AttributeDateTime+' => 'Dátum és idő (Év-hónap-nap óó:pp:mp)',
+	'Core:AttributeDateTime?SmartSearch' => '
 <p>
     Dátumformátum:<br/>
     <b>%1$s</b><br/>
@@ -156,10 +123,9 @@ Operátorok:<br/>
 <p>
 Ha az időpontot nem adja meg, akkor az alapértelmezett értéke 00:00:00
 </p>',
-
-    'Core:AttributeDate' => 'Dátum',
-    'Core:AttributeDate+' => 'Dátum (év-hónap-nap)',
-    'Core:AttributeDate?SmartSearch' => '
+	'Core:AttributeDate' => 'Dátum',
+	'Core:AttributeDate+' => 'Dátum (év-hónap-nap)',
+	'Core:AttributeDate?SmartSearch' => '
 <p>
     Dátumformátum:<br/>
     <b>%1$s</b><br/>
@@ -171,49 +137,36 @@ Operátorok:<br/>
     <b>&lt;</b><em>dátum</em><br/>
     <b>[</b><em>dátum</em>,<em>dátum</em><b>]</b>
 </p>',
-
-    'Core:AttributeDeadline' => 'Határidő',
-    'Core:AttributeDeadline+' => 'Dátum, ami az aktuális időhöz viszonyítva jelenik meg',
-
-    'Core:AttributeExternalKey' => 'Külső kulcs',
-    'Core:AttributeExternalKey+' => 'Külső (vagy idegen) kulcs',
-
-    'Core:AttributeHierarchicalKey' => 'Hierarchikus kulcs',
-    'Core:AttributeHierarchicalKey+' => 'Külső (vagy idegen) kulcs a szülőhöz',
-
-    'Core:AttributeExternalField' => 'Külső mező',
-    'Core:AttributeExternalField+' => 'Külső kulcshoz rendelt mező',
-
-    'Core:AttributeURL' => 'URL',
-    'Core:AttributeURL+' => 'Abszolút vagy relatív URL szöveges karakterláncként',
-
-    'Core:AttributeBlob' => 'Blob',
-    'Core:AttributeBlob+' => 'Bármilyen bináris tartalom (dokumentum)',
-
-    'Core:AttributeOneWayPassword' => 'Egyirányú jelszó',
-    'Core:AttributeOneWayPassword+' => 'Egyirányú titkosított (hashed) jelszó',
-
-    'Core:AttributeTable' => 'Táblázat',
-    'Core:AttributeTable+' => 'Indexelt kétdimenziós tömb',
-
-    'Core:AttributePropertySet' => 'Tulajdonságok',
-    'Core:AttributePropertySet+' => 'A nem tipizált tulajdonságok listája (név és érték)',
-
-    'Core:AttributeFriendlyName' => 'Barátságos név',
-    'Core:AttributeFriendlyName+' => 'Automatikusan létrehozott attribútum ; a barátságos név több attribútum után kerül kiszámításra.',
-
-    'Core:FriendlyName-Label' => 'Név',
-    'Core:FriendlyName-Description' => 'Név',
-
-    'Core:AttributeTag' => 'Címkék',
-    'Core:AttributeTag+' => '',
-    
-    'Core:Context=REST/JSON' => 'REST',
-    'Core:Context=Synchro' => 'Synchro',
-    'Core:Context=Setup' => 'Setup',
-    'Core:Context=GUI:Console' => 'Console',
-    'Core:Context=CRON' => 'cron',
-    'Core:Context=GUI:Portal' => 'Portál',
+	'Core:AttributeDeadline' => 'Határidő',
+	'Core:AttributeDeadline+' => 'Dátum, ami az aktuális időhöz viszonyítva jelenik meg',
+	'Core:AttributeExternalKey' => 'Külső kulcs',
+	'Core:AttributeExternalKey+' => 'Külső (vagy idegen) kulcs',
+	'Core:AttributeHierarchicalKey' => 'Hierarchikus kulcs',
+	'Core:AttributeHierarchicalKey+' => 'Külső (vagy idegen) kulcs a szülőhöz',
+	'Core:AttributeExternalField' => 'Külső mező',
+	'Core:AttributeExternalField+' => 'Külső kulcshoz rendelt mező',
+	'Core:AttributeURL' => 'URL',
+	'Core:AttributeURL+' => 'Abszolút vagy relatív URL szöveges karakterláncként',
+	'Core:AttributeBlob' => 'Blob',
+	'Core:AttributeBlob+' => 'Bármilyen bináris tartalom (dokumentum)',
+	'Core:AttributeOneWayPassword' => 'Egyirányú jelszó',
+	'Core:AttributeOneWayPassword+' => 'Egyirányú titkosított (hashed) jelszó',
+	'Core:AttributeTable' => 'Táblázat',
+	'Core:AttributeTable+' => 'Indexelt kétdimenziós tömb',
+	'Core:AttributePropertySet' => 'Tulajdonságok',
+	'Core:AttributePropertySet+' => 'A nem tipizált tulajdonságok listája (név és érték)',
+	'Core:AttributeFriendlyName' => 'Barátságos név',
+	'Core:AttributeFriendlyName+' => 'Automatikusan létrehozott attribútum ; a barátságos név több attribútum után kerül kiszámításra.',
+	'Core:FriendlyName-Label' => 'Név',
+	'Core:FriendlyName-Description' => 'Név',
+	'Core:AttributeTag' => 'Címkék',
+	'Core:AttributeTag+' => '',
+	'Core:Context=REST/JSON' => 'REST',
+	'Core:Context=Synchro' => 'Synchro',
+	'Core:Context=Setup' => 'Setup',
+	'Core:Context=GUI:Console' => 'Console',
+	'Core:Context=CRON' => 'cron',
+	'Core:Context=GUI:Portal' => 'Portál',
 ));
 
 
@@ -227,20 +180,20 @@ Operátorok:<br/>
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:CMDBChange' => 'Változás',
-    'Class:CMDBChange+' => 'Változások nyomonkövetése',
-    'Class:CMDBChange/Attribute:date' => 'Dátum',
-    'Class:CMDBChange/Attribute:date+' => 'A változások rögzítésének dátuma és időpontja',
-    'Class:CMDBChange/Attribute:userinfo' => 'Egyéb infó',
-    'Class:CMDBChange/Attribute:userinfo+' => 'Kérelmező által meghatározott információk',
-    'Class:CMDBChange/Attribute:origin/Value:interactive' => 'Felhasználói interakció a grafikus felületen',
-    'Class:CMDBChange/Attribute:origin/Value:csv-import.php' => 'CSV import szkript',
-    'Class:CMDBChange/Attribute:origin/Value:csv-interactive' => 'CSV import a grafikus felületen',
-    'Class:CMDBChange/Attribute:origin/Value:email-processing' => 'Email feldolgozás',
-    'Class:CMDBChange/Attribute:origin/Value:synchro-data-source' => 'Szinkron adatforrás',
-    'Class:CMDBChange/Attribute:origin/Value:webservice-rest' => 'REST/JSON webszolgáltatás',
-    'Class:CMDBChange/Attribute:origin/Value:webservice-soap' => 'SOAP webszolgáltatás',
-    'Class:CMDBChange/Attribute:origin/Value:custom-extension' => 'Bővítmény által',
+	'Class:CMDBChange' => 'Változás',
+	'Class:CMDBChange+' => 'Változások nyomonkövetése',
+	'Class:CMDBChange/Attribute:date' => 'Dátum',
+	'Class:CMDBChange/Attribute:date+' => 'A változások rögzítésének dátuma és időpontja',
+	'Class:CMDBChange/Attribute:userinfo' => 'Egyéb infó',
+	'Class:CMDBChange/Attribute:userinfo+' => 'Kérelmező által meghatározott információk',
+	'Class:CMDBChange/Attribute:origin/Value:interactive' => 'Felhasználói interakció a grafikus felületen',
+	'Class:CMDBChange/Attribute:origin/Value:csv-import.php' => 'CSV import szkript',
+	'Class:CMDBChange/Attribute:origin/Value:csv-interactive' => 'CSV import a grafikus felületen',
+	'Class:CMDBChange/Attribute:origin/Value:email-processing' => 'Email feldolgozás',
+	'Class:CMDBChange/Attribute:origin/Value:synchro-data-source' => 'Szinkron adatforrás',
+	'Class:CMDBChange/Attribute:origin/Value:webservice-rest' => 'REST/JSON webszolgáltatás',
+	'Class:CMDBChange/Attribute:origin/Value:webservice-soap' => 'SOAP webszolgáltatás',
+	'Class:CMDBChange/Attribute:origin/Value:custom-extension' => 'Bővítmény által',
 ));
 
 //
@@ -248,20 +201,20 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:CMDBChangeOp' => 'Változás művelet',
-    'Class:CMDBChangeOp+' => 'Egyetlen személy által, egyetlen időpontban, egyetlen tárgyon végrehajtott változtatás.',
-    'Class:CMDBChangeOp/Attribute:change' => 'Változás',
-    'Class:CMDBChangeOp/Attribute:change+' => '',
-    'Class:CMDBChangeOp/Attribute:date' => 'Dátum',
-    'Class:CMDBChangeOp/Attribute:date+' => 'A változás dátuma és ideje',
-    'Class:CMDBChangeOp/Attribute:userinfo' => 'Felhasználó',
-    'Class:CMDBChangeOp/Attribute:userinfo+' => 'Aki a változtatást végbevitte',
-    'Class:CMDBChangeOp/Attribute:objclass' => 'Objektum osztály',
-    'Class:CMDBChangeOp/Attribute:objclass+' => 'Annak az objektumnak az osztályneve, amelyen a változtatás történt',
-    'Class:CMDBChangeOp/Attribute:objkey' => 'Objektum azonosító',
-    'Class:CMDBChangeOp/Attribute:objkey+' => 'Azon objektum azonosítója amelyen a változtatás történt',
-    'Class:CMDBChangeOp/Attribute:finalclass' => 'CMDBChangeOp al-osztály',
-    'Class:CMDBChangeOp/Attribute:finalclass+' => 'A végrehajtott változtatás típusa',
+	'Class:CMDBChangeOp' => 'Változás művelet',
+	'Class:CMDBChangeOp+' => 'Egyetlen személy által, egyetlen időpontban, egyetlen tárgyon végrehajtott változtatás.',
+	'Class:CMDBChangeOp/Attribute:change' => 'Változás',
+	'Class:CMDBChangeOp/Attribute:change+' => '',
+	'Class:CMDBChangeOp/Attribute:date' => 'Dátum',
+	'Class:CMDBChangeOp/Attribute:date+' => 'A változás dátuma és ideje',
+	'Class:CMDBChangeOp/Attribute:userinfo' => 'Felhasználó',
+	'Class:CMDBChangeOp/Attribute:userinfo+' => 'Aki a változtatást végbevitte',
+	'Class:CMDBChangeOp/Attribute:objclass' => 'Objektum osztály',
+	'Class:CMDBChangeOp/Attribute:objclass+' => 'Annak az objektumnak az osztályneve, amelyen a változtatás történt',
+	'Class:CMDBChangeOp/Attribute:objkey' => 'Objektum azonosító',
+	'Class:CMDBChangeOp/Attribute:objkey+' => 'Azon objektum azonosítója amelyen a változtatás történt',
+	'Class:CMDBChangeOp/Attribute:finalclass' => 'CMDBChangeOp al-osztály',
+	'Class:CMDBChangeOp/Attribute:finalclass+' => 'A végrehajtott változtatás típusa',
 ));
 
 //
@@ -269,8 +222,8 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:CMDBChangeOpCreate' => 'Objektum létrehozás	',
-    'Class:CMDBChangeOpCreate+' => 'Objektum létrehozás nyomonkövetése',
+	'Class:CMDBChangeOpCreate' => 'Objektum létrehozás	',
+	'Class:CMDBChangeOpCreate+' => 'Objektum létrehozás nyomonkövetése',
 ));
 
 //
@@ -278,8 +231,8 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:CMDBChangeOpDelete' => 'Objektum törlés',
-    'Class:CMDBChangeOpDelete+' => 'Objektum törlés nyomonkövetése',
+	'Class:CMDBChangeOpDelete' => 'Objektum törlés',
+	'Class:CMDBChangeOpDelete+' => 'Objektum törlés nyomonkövetése',
 ));
 
 //
@@ -287,10 +240,10 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:CMDBChangeOpSetAttribute' => 'Objektum változás',
-    'Class:CMDBChangeOpSetAttribute+' => 'Objektumtulajdonságok változáskövetése',
-    'Class:CMDBChangeOpSetAttribute/Attribute:attcode' => 'Attribútum',
-    'Class:CMDBChangeOpSetAttribute/Attribute:attcode+' => 'A módosított tulajdonság kódja',
+	'Class:CMDBChangeOpSetAttribute' => 'Objektum változás',
+	'Class:CMDBChangeOpSetAttribute+' => 'Objektumtulajdonságok változáskövetése',
+	'Class:CMDBChangeOpSetAttribute/Attribute:attcode' => 'Attribútum',
+	'Class:CMDBChangeOpSetAttribute/Attribute:attcode+' => 'A módosított tulajdonság kódja',
 ));
 
 //
@@ -298,31 +251,31 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:CMDBChangeOpSetAttributeScalar' => 'Tulajdonságváltozás',
-    'Class:CMDBChangeOpSetAttributeScalar+' => 'Objektum skalár tulajdonságok változáskövetése',
-    'Class:CMDBChangeOpSetAttributeScalar/Attribute:oldvalue' => 'Előző érték',
-    'Class:CMDBChangeOpSetAttributeScalar/Attribute:oldvalue+' => 'Az attribútum korábbi értéke',
-    'Class:CMDBChangeOpSetAttributeScalar/Attribute:newvalue' => 'Új érték',
-    'Class:CMDBChangeOpSetAttributeScalar/Attribute:newvalue+' => 'Az attribútum új értéke',
+	'Class:CMDBChangeOpSetAttributeScalar' => 'Tulajdonságváltozás',
+	'Class:CMDBChangeOpSetAttributeScalar+' => 'Objektum skalár tulajdonságok változáskövetése',
+	'Class:CMDBChangeOpSetAttributeScalar/Attribute:oldvalue' => 'Előző érték',
+	'Class:CMDBChangeOpSetAttributeScalar/Attribute:oldvalue+' => 'Az attribútum korábbi értéke',
+	'Class:CMDBChangeOpSetAttributeScalar/Attribute:newvalue' => 'Új érték',
+	'Class:CMDBChangeOpSetAttributeScalar/Attribute:newvalue+' => 'Az attribútum új értéke',
 ));
 // Used by CMDBChangeOp... & derived classes
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Change:ObjectCreated' => 'Objektum létrehozva',
-    'Change:ObjectDeleted' => 'Objektum törölve',
-    'Change:ObjectModified' => 'Objektum módosítva',
-    'Change:TwoAttributesChanged' => 'Szerkesztve %1$s és %2$s',
-    'Change:ThreeAttributesChanged' => 'Szerkesztve %1$s, %2$s és 1 másik',
-    'Change:FourOrMoreAttributesChanged' => 'Szerkesztve %1$s, %2$s és %3$s egyéb',
-    'Change:AttName_SetTo_NewValue_PreviousValue_OldValue' => 'A %1$s beállítva %2$s -re (előző érték: %3$s)',
-    'Change:AttName_SetTo' => 'A %1$s beállítva %2$s -re',
-    'Change:Text_AppendedTo_AttName' => 'A %1$s hozzáfűzve %2$s -hez',
-    'Change:AttName_Changed_PreviousValue_OldValue' => '%1$s módosítva, előző érték: %2$s',
-    'Change:AttName_Changed' => '%1$s módosítva',
-    'Change:AttName_EntryAdded' => '%1$s módosítva, új bejegyzés hozzáadva: %2$s',
-    'Change:State_Changed_NewValue_OldValue' => 'Változtatva %2$s -ről %1$s -re',
-    'Change:LinkSet:Added' => '%1$s hozzáadva',
-    'Change:LinkSet:Removed' => '%1$s eltávolítva',
-    'Change:LinkSet:Modified' => '%1$s módosítva',
+	'Change:ObjectCreated' => 'Objektum létrehozva',
+	'Change:ObjectDeleted' => 'Objektum törölve',
+	'Change:ObjectModified' => 'Objektum módosítva',
+	'Change:TwoAttributesChanged' => 'Szerkesztve %1$s és %2$s',
+	'Change:ThreeAttributesChanged' => 'Szerkesztve %1$s, %2$s és 1 másik',
+	'Change:FourOrMoreAttributesChanged' => 'Szerkesztve %1$s, %2$s és %3$s egyéb',
+	'Change:AttName_SetTo_NewValue_PreviousValue_OldValue' => 'A %1$s beállítva %2$s -re (előző érték: %3$s)',
+	'Change:AttName_SetTo' => 'A %1$s beállítva %2$s -re',
+	'Change:Text_AppendedTo_AttName' => 'A %1$s hozzáfűzve %2$s -hez',
+	'Change:AttName_Changed_PreviousValue_OldValue' => '%1$s módosítva, előző érték: %2$s',
+	'Change:AttName_Changed' => '%1$s módosítva',
+	'Change:AttName_EntryAdded' => '%1$s módosítva, új bejegyzés hozzáadva: %2$s',
+	'Change:State_Changed_NewValue_OldValue' => 'Változtatva %2$s -ről %1$s -re',
+	'Change:LinkSet:Added' => '%1$s hozzáadva',
+	'Change:LinkSet:Removed' => '%1$s eltávolítva',
+	'Change:LinkSet:Modified' => '%1$s módosítva',
 ));
 
 //
@@ -330,10 +283,10 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:CMDBChangeOpSetAttributeBlob' => 'Adatváltozás',
-    'Class:CMDBChangeOpSetAttributeBlob+' => 'Adatváltozás nyomonkövetése',
-    'Class:CMDBChangeOpSetAttributeBlob/Attribute:prevdata' => 'Előző adat',
-    'Class:CMDBChangeOpSetAttributeBlob/Attribute:prevdata+' => 'Az attribútum korábbi tartalma',
+	'Class:CMDBChangeOpSetAttributeBlob' => 'Adatváltozás',
+	'Class:CMDBChangeOpSetAttributeBlob+' => 'Adatváltozás nyomonkövetése',
+	'Class:CMDBChangeOpSetAttributeBlob/Attribute:prevdata' => 'Előző adat',
+	'Class:CMDBChangeOpSetAttributeBlob/Attribute:prevdata+' => 'Az attribútum korábbi tartalma',
 ));
 
 //
@@ -341,10 +294,10 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:CMDBChangeOpSetAttributeText' => 'Szövegváltozás',
-    'Class:CMDBChangeOpSetAttributeText+' => 'Szövegváltozás nyomonkövetése',
-    'Class:CMDBChangeOpSetAttributeText/Attribute:prevdata' => 'Előző adat',
-    'Class:CMDBChangeOpSetAttributeText/Attribute:prevdata+' => 'Az attribútum korábbi tartalma',
+	'Class:CMDBChangeOpSetAttributeText' => 'Szövegváltozás',
+	'Class:CMDBChangeOpSetAttributeText+' => 'Szövegváltozás nyomonkövetése',
+	'Class:CMDBChangeOpSetAttributeText/Attribute:prevdata' => 'Előző adat',
+	'Class:CMDBChangeOpSetAttributeText/Attribute:prevdata+' => 'Az attribútum korábbi tartalma',
 ));
 
 //
@@ -352,16 +305,16 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:Event' => 'Naplóesemény',
-    'Class:Event+' => 'Egy alkalmazás belső esemény',
-    'Class:Event/Attribute:message' => 'Üzenet',
-    'Class:Event/Attribute:message+' => 'Az esemény rövid leírása',
-    'Class:Event/Attribute:date' => 'Dátum',
-    'Class:Event/Attribute:date+' => 'A változások rögzítésének dátuma és időpontja',
-    'Class:Event/Attribute:userinfo' => 'Felhasználó infó',
-    'Class:Event/Attribute:userinfo+' => 'Annak a felhasználónak az azonosítása, aki az eseményt kiváltó műveletet végrehajtotta.',
-    'Class:Event/Attribute:finalclass' => 'Esemény al-osztály',
-    'Class:Event/Attribute:finalclass+' => 'A végleges osztály neve: a bekövetkezett esemény fajtáját határozza meg.',
+	'Class:Event' => 'Naplóesemény',
+	'Class:Event+' => 'Egy alkalmazás belső esemény',
+	'Class:Event/Attribute:message' => 'Üzenet',
+	'Class:Event/Attribute:message+' => 'Az esemény rövid leírása',
+	'Class:Event/Attribute:date' => 'Dátum',
+	'Class:Event/Attribute:date+' => 'A változások rögzítésének dátuma és időpontja',
+	'Class:Event/Attribute:userinfo' => 'Felhasználó infó',
+	'Class:Event/Attribute:userinfo+' => 'Annak a felhasználónak az azonosítása, aki az eseményt kiváltó műveletet végrehajtotta.',
+	'Class:Event/Attribute:finalclass' => 'Esemény al-osztály',
+	'Class:Event/Attribute:finalclass+' => 'A végleges osztály neve: a bekövetkezett esemény fajtáját határozza meg.',
 ));
 
 //
@@ -369,14 +322,14 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:EventNotification' => 'Értesítési esemény',
-    'Class:EventNotification+' => 'Az elküldött értesítések nyomonkövetése',
-    'Class:EventNotification/Attribute:trigger_id' => 'Eseményindító',
-    'Class:EventNotification/Attribute:trigger_id+' => '',
-    'Class:EventNotification/Attribute:action_id' => 'Művelet',
-    'Class:EventNotification/Attribute:action_id+' => '',
-    'Class:EventNotification/Attribute:object_id' => 'Objektum azonosító',
-    'Class:EventNotification/Attribute:object_id+' => 'Objektum azonosítója (eseményindító határozza meg az osztályt ?)',
+	'Class:EventNotification' => 'Értesítési esemény',
+	'Class:EventNotification+' => 'Az elküldött értesítések nyomonkövetése',
+	'Class:EventNotification/Attribute:trigger_id' => 'Eseményindító',
+	'Class:EventNotification/Attribute:trigger_id+' => '',
+	'Class:EventNotification/Attribute:action_id' => 'Művelet',
+	'Class:EventNotification/Attribute:action_id+' => '',
+	'Class:EventNotification/Attribute:object_id' => 'Objektum azonosító',
+	'Class:EventNotification/Attribute:object_id+' => 'Objektum azonosítója (eseményindító határozza meg az osztályt ?)',
 ));
 
 //
@@ -384,22 +337,22 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:EventNotificationEmail' => 'Email küldés esemény',
-    'Class:EventNotificationEmail+' => 'A kiküldött email-ek nyomonkövetése',
-    'Class:EventNotificationEmail/Attribute:to' => 'Címzett',
-    'Class:EventNotificationEmail/Attribute:to+' => '',
-    'Class:EventNotificationEmail/Attribute:cc' => 'Másolatot kap',
-    'Class:EventNotificationEmail/Attribute:cc+' => '',
-    'Class:EventNotificationEmail/Attribute:bcc' => 'Titkos másolatot kap',
-    'Class:EventNotificationEmail/Attribute:bcc+' => '',
-    'Class:EventNotificationEmail/Attribute:from' => 'Feladó',
-    'Class:EventNotificationEmail/Attribute:from+' => 'Az üzenet küldője',
-    'Class:EventNotificationEmail/Attribute:subject' => 'Tárgy',
-    'Class:EventNotificationEmail/Attribute:subject+' => '',
-    'Class:EventNotificationEmail/Attribute:body' => 'Levéltörzs',
-    'Class:EventNotificationEmail/Attribute:body+' => '',
-    'Class:EventNotificationEmail/Attribute:attachments' => 'Mellékletek',
-    'Class:EventNotificationEmail/Attribute:attachments+' => '',
+	'Class:EventNotificationEmail' => 'Email küldés esemény',
+	'Class:EventNotificationEmail+' => 'A kiküldött email-ek nyomonkövetése',
+	'Class:EventNotificationEmail/Attribute:to' => 'Címzett',
+	'Class:EventNotificationEmail/Attribute:to+' => '',
+	'Class:EventNotificationEmail/Attribute:cc' => 'Másolatot kap',
+	'Class:EventNotificationEmail/Attribute:cc+' => '',
+	'Class:EventNotificationEmail/Attribute:bcc' => 'Titkos másolatot kap',
+	'Class:EventNotificationEmail/Attribute:bcc+' => '',
+	'Class:EventNotificationEmail/Attribute:from' => 'Feladó',
+	'Class:EventNotificationEmail/Attribute:from+' => 'Az üzenet küldője',
+	'Class:EventNotificationEmail/Attribute:subject' => 'Tárgy',
+	'Class:EventNotificationEmail/Attribute:subject+' => '',
+	'Class:EventNotificationEmail/Attribute:body' => 'Levéltörzs',
+	'Class:EventNotificationEmail/Attribute:body+' => '',
+	'Class:EventNotificationEmail/Attribute:attachments' => 'Mellékletek',
+	'Class:EventNotificationEmail/Attribute:attachments+' => '',
 ));
 
 //
@@ -407,22 +360,22 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:EventIssue' => 'Probléma esemény',
-    'Class:EventIssue+' => 'Egy probléma (figyelmeztetés, hiba, stb. nyomonkövetése)',
-    'Class:EventIssue/Attribute:issue' => 'Probléma',
-    'Class:EventIssue/Attribute:issue+' => 'Mi történt',
-    'Class:EventIssue/Attribute:impact' => 'Hatása',
-    'Class:EventIssue/Attribute:impact+' => 'Mik a következmények',
-    'Class:EventIssue/Attribute:page' => 'Oldal',
-    'Class:EventIssue/Attribute:page+' => 'HTTP belépési pont',
-    'Class:EventIssue/Attribute:arguments_post' => 'Kiküldött bizonyítékok',
-    'Class:EventIssue/Attribute:arguments_post+' => 'HTTP POST bizonyítékok',
-    'Class:EventIssue/Attribute:arguments_get' => 'URL bizonyítékok',
-    'Class:EventIssue/Attribute:arguments_get+' => 'HTTP GET bizonyítékok',
-    'Class:EventIssue/Attribute:callstack' => 'Híváscsomag',
-    'Class:EventIssue/Attribute:callstack+' => '',
-    'Class:EventIssue/Attribute:data' => 'Adat',
-    'Class:EventIssue/Attribute:data+' => 'További információ',
+	'Class:EventIssue' => 'Probléma esemény',
+	'Class:EventIssue+' => 'Egy probléma (figyelmeztetés, hiba, stb. nyomonkövetése)',
+	'Class:EventIssue/Attribute:issue' => 'Probléma',
+	'Class:EventIssue/Attribute:issue+' => 'Mi történt',
+	'Class:EventIssue/Attribute:impact' => 'Hatása',
+	'Class:EventIssue/Attribute:impact+' => 'Mik a következmények',
+	'Class:EventIssue/Attribute:page' => 'Oldal',
+	'Class:EventIssue/Attribute:page+' => 'HTTP belépési pont',
+	'Class:EventIssue/Attribute:arguments_post' => 'Kiküldött bizonyítékok',
+	'Class:EventIssue/Attribute:arguments_post+' => 'HTTP POST bizonyítékok',
+	'Class:EventIssue/Attribute:arguments_get' => 'URL bizonyítékok',
+	'Class:EventIssue/Attribute:arguments_get+' => 'HTTP GET bizonyítékok',
+	'Class:EventIssue/Attribute:callstack' => 'Híváscsomag',
+	'Class:EventIssue/Attribute:callstack+' => '',
+	'Class:EventIssue/Attribute:data' => 'Adat',
+	'Class:EventIssue/Attribute:data+' => 'További információ',
 ));
 
 //
@@ -430,37 +383,37 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:EventWebService' => 'Webszolgáltatás esemény',
-    'Class:EventWebService+' => 'Webszolgáltatás hívás nyomonkövetése',
-    'Class:EventWebService/Attribute:verb' => 'Művelet',
-    'Class:EventWebService/Attribute:verb+' => 'A művelet neve',
-    'Class:EventWebService/Attribute:result' => 'Eredmény',
-    'Class:EventWebService/Attribute:result+' => 'Általánosságban siker/hiba',
-    'Class:EventWebService/Attribute:log_info' => 'Infó napló',
-    'Class:EventWebService/Attribute:log_info+' => 'A kapott eredmények naplója',
-    'Class:EventWebService/Attribute:log_warning' => 'Figyelmeztetés napló',
-    'Class:EventWebService/Attribute:log_warning+' => 'A kapott figyelmeztetések naplója',
-    'Class:EventWebService/Attribute:log_error' => 'Hibanapló',
-    'Class:EventWebService/Attribute:log_error+' => 'A kapott hibák naplója ',
-    'Class:EventWebService/Attribute:data' => 'Adat',
-    'Class:EventWebService/Attribute:data+' => 'A kapott adatok',
+	'Class:EventWebService' => 'Webszolgáltatás esemény',
+	'Class:EventWebService+' => 'Webszolgáltatás hívás nyomonkövetése',
+	'Class:EventWebService/Attribute:verb' => 'Művelet',
+	'Class:EventWebService/Attribute:verb+' => 'A művelet neve',
+	'Class:EventWebService/Attribute:result' => 'Eredmény',
+	'Class:EventWebService/Attribute:result+' => 'Általánosságban siker/hiba',
+	'Class:EventWebService/Attribute:log_info' => 'Infó napló',
+	'Class:EventWebService/Attribute:log_info+' => 'A kapott eredmények naplója',
+	'Class:EventWebService/Attribute:log_warning' => 'Figyelmeztetés napló',
+	'Class:EventWebService/Attribute:log_warning+' => 'A kapott figyelmeztetések naplója',
+	'Class:EventWebService/Attribute:log_error' => 'Hibanapló',
+	'Class:EventWebService/Attribute:log_error+' => 'A kapott hibák naplója ',
+	'Class:EventWebService/Attribute:data' => 'Adat',
+	'Class:EventWebService/Attribute:data+' => 'A kapott adatok',
 ));
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:EventRestService' => 'REST/JSON hívás',
-    'Class:EventRestService+' => 'REST/JSON szolgáltatáshívás nyomonkövetése',
-    'Class:EventRestService/Attribute:operation' => 'Művelet',
-    'Class:EventRestService/Attribute:operation+' => 'Argumentum \'művelet\'',
-    'Class:EventRestService/Attribute:version' => 'Verzió',
-    'Class:EventRestService/Attribute:version+' => 'Argumentum \'verzió\'',
-    'Class:EventRestService/Attribute:json_input' => 'Bemenet',
-    'Class:EventRestService/Attribute:json_input+' => 'Argumentum \'json_data\'',
-    'Class:EventRestService/Attribute:code' => 'Kód',
-    'Class:EventRestService/Attribute:code+' => 'Eredménykód',
-    'Class:EventRestService/Attribute:json_output' => 'Válasz',
-    'Class:EventRestService/Attribute:json_output+' => 'HTTP válasz (json)',
-    'Class:EventRestService/Attribute:provider' => 'Szolgáltató',
-    'Class:EventRestService/Attribute:provider+' => 'A várt műveletet végrehajtó PHP osztály',
+	'Class:EventRestService' => 'REST/JSON hívás',
+	'Class:EventRestService+' => 'REST/JSON szolgáltatáshívás nyomonkövetése',
+	'Class:EventRestService/Attribute:operation' => 'Művelet',
+	'Class:EventRestService/Attribute:operation+' => 'Argumentum \'művelet\'',
+	'Class:EventRestService/Attribute:version' => 'Verzió',
+	'Class:EventRestService/Attribute:version+' => 'Argumentum \'verzió\'',
+	'Class:EventRestService/Attribute:json_input' => 'Bemenet',
+	'Class:EventRestService/Attribute:json_input+' => 'Argumentum \'json_data\'',
+	'Class:EventRestService/Attribute:code' => 'Kód',
+	'Class:EventRestService/Attribute:code+' => 'Eredménykód',
+	'Class:EventRestService/Attribute:json_output' => 'Válasz',
+	'Class:EventRestService/Attribute:json_output+' => 'HTTP válasz (json)',
+	'Class:EventRestService/Attribute:provider' => 'Szolgáltató',
+	'Class:EventRestService/Attribute:provider+' => 'A várt műveletet végrehajtó PHP osztály',
 ));
 
 //
@@ -468,14 +421,14 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:EventLoginUsage' => 'Belépések',
-    'Class:EventLoginUsage+' => 'Kapcsolódások az alkalmazáshoz',
-    'Class:EventLoginUsage/Attribute:user_id' => 'Felhasználónév',
-    'Class:EventLoginUsage/Attribute:user_id+' => '',
-    'Class:EventLoginUsage/Attribute:contact_name' => 'Kapcsolattartó név',
-    'Class:EventLoginUsage/Attribute:contact_name+' => '',
-    'Class:EventLoginUsage/Attribute:contact_email' => 'Kapcsolattartó email cím',
-    'Class:EventLoginUsage/Attribute:contact_email+' => 'A felhasználó email címe',
+	'Class:EventLoginUsage' => 'Belépések',
+	'Class:EventLoginUsage+' => 'Kapcsolódások az alkalmazáshoz',
+	'Class:EventLoginUsage/Attribute:user_id' => 'Felhasználónév',
+	'Class:EventLoginUsage/Attribute:user_id+' => '',
+	'Class:EventLoginUsage/Attribute:contact_name' => 'Kapcsolattartó név',
+	'Class:EventLoginUsage/Attribute:contact_name+' => '',
+	'Class:EventLoginUsage/Attribute:contact_email' => 'Kapcsolattartó email cím',
+	'Class:EventLoginUsage/Attribute:contact_email+' => 'A felhasználó email címe',
 ));
 
 //
@@ -483,25 +436,26 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:Action' => 'Egyéni művelet',
-    'Class:Action+' => 'A felhasználó által meghatározott művelet',
-    'Class:Action/Attribute:name' => 'Név',
-    'Class:Action/Attribute:name+' => '',
-    'Class:Action/Attribute:description' => 'Leírás',
-    'Class:Action/Attribute:description+' => '',
-    'Class:Action/Attribute:status' => 'Állapot',
-    'Class:Action/Attribute:status+' => 'Ez az állapot határozza meg az akció viselkedését',
-    'Class:Action/Attribute:status/Value:test' => 'Tesztelés alatt',
-    'Class:Action/Attribute:status/Value:test+' => '',
-    'Class:Action/Attribute:status/Value:enabled' => 'Bevezetve',
-    'Class:Action/Attribute:status/Value:enabled+' => '',
-    'Class:Action/Attribute:status/Value:disabled' => 'Inaktív',
-    'Class:Action/Attribute:status/Value:disabled+' => '',
-    'Class:Action/Attribute:trigger_list' => 'Kapcsolódó eseményindítók',
-    'Class:Action/Attribute:trigger_list+' => 'Eseményindítók amik ehhez a művelethez vannak rendelve',
-    'Class:Action/Attribute:finalclass' => 'Művelet al-osztály',
-    'Class:Action/Attribute:finalclass+' => 'A végleges osztály neve',
-    'Action:WarningNoTriggerLinked' => 'Figyelmeztetés, nincs a művelethez kapcsolódó eseményindító. Addig nem lesz aktív, amíg legalább 1 nem lesz.',
+	'Class:Action' => 'Egyéni művelet',
+	'Class:Action+' => 'A felhasználó által meghatározott művelet',
+	'Class:Action/ComplementaryName' => '%1$s: %2$s~~',
+	'Class:Action/Attribute:name' => 'Név',
+	'Class:Action/Attribute:name+' => '',
+	'Class:Action/Attribute:description' => 'Leírás',
+	'Class:Action/Attribute:description+' => '',
+	'Class:Action/Attribute:status' => 'Állapot',
+	'Class:Action/Attribute:status+' => 'Ez az állapot határozza meg az akció viselkedését',
+	'Class:Action/Attribute:status/Value:test' => 'Tesztelés alatt',
+	'Class:Action/Attribute:status/Value:test+' => '',
+	'Class:Action/Attribute:status/Value:enabled' => 'Bevezetve',
+	'Class:Action/Attribute:status/Value:enabled+' => '',
+	'Class:Action/Attribute:status/Value:disabled' => 'Inaktív',
+	'Class:Action/Attribute:status/Value:disabled+' => '',
+	'Class:Action/Attribute:trigger_list' => 'Kapcsolódó eseményindítók',
+	'Class:Action/Attribute:trigger_list+' => 'Eseményindítók amik ehhez a művelethez vannak rendelve',
+	'Class:Action/Attribute:finalclass' => 'Művelet al-osztály',
+	'Class:Action/Attribute:finalclass+' => 'A végleges osztály neve',
+	'Action:WarningNoTriggerLinked' => 'Figyelmeztetés, nincs a művelethez kapcsolódó eseményindító. Addig nem lesz aktív, amíg legalább 1 nem lesz.',
 ));
 
 //
@@ -509,8 +463,8 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:ActionNotification' => 'Értesítés',
-    'Class:ActionNotification+' => 'Értesítés (absztrakt)',
+	'Class:ActionNotification' => 'Értesítés',
+	'Class:ActionNotification+' => 'Értesítés (absztrakt)',
 ));
 
 //
@@ -518,40 +472,56 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:ActionEmail' => 'Email értesítés',
-    'Class:ActionEmail+' => '',
-    'Class:ActionEmail/Attribute:status+' => 'Ez az állapot határozza meg, hogy ki kapjon értesítést: csak a teszt címzettje, mindenki (Címzett, cc és Bcc) vagy senki.',
-    'Class:ActionEmail/Attribute:status/Value:test+' => 'Csak a teszteléshez használt címzett kap értesítést',
-    'Class:ActionEmail/Attribute:status/Value:enabled+' => 'Minden Címzett, Cc és Bcc email értesítést fog kapni',
-    'Class:ActionEmail/Attribute:status/Value:disabled+' => 'Az email értesítés nem lesz elküldve',
-    'Class:ActionEmail/Attribute:test_recipient' => 'Teszt címzett',
-    'Class:ActionEmail/Attribute:test_recipient+' => 'Az értesítés tesztelésekor használt cél email cím',
-    'Class:ActionEmail/Attribute:from' => 'Feladó (email)',
-    'Class:ActionEmail/Attribute:from+' => 'A feladó email címe ami bekerül az email fejlécébe.',
-    'Class:ActionEmail/Attribute:from_label' => 'Feladó (címke)',
-    'Class:ActionEmail/Attribute:from_label+' => 'A feladó neve ami bekerül az email fejlécébe.',
-    'Class:ActionEmail/Attribute:reply_to' => 'Válaszcím (email)',
-    'Class:ActionEmail/Attribute:reply_to+' => 'A válasz az email cím ami bekerül az email fejlécébe.',
-    'Class:ActionEmail/Attribute:reply_to_label' => 'Válaszadó (címke)',
-    'Class:ActionEmail/Attribute:reply_to_label+' => 'A válaszadó a megjelenített neve ami az email fejlécébe kerül.',
-    'Class:ActionEmail/Attribute:to' => 'Címzett',
-    'Class:ActionEmail/Attribute:to+' => 'Az email címzettje',
-    'Class:ActionEmail/Attribute:cc' => 'Cc',
-    'Class:ActionEmail/Attribute:cc+' => 'Másolat',
-    'Class:ActionEmail/Attribute:bcc' => 'Bcc',
-    'Class:ActionEmail/Attribute:bcc+' => 'Titkos másolat',
-    'Class:ActionEmail/Attribute:subject' => 'Tárgy',
-    'Class:ActionEmail/Attribute:subject+' => 'Az email tárgya',
-    'Class:ActionEmail/Attribute:body' => 'Levéltörzs',
-    'Class:ActionEmail/Attribute:body+' => 'Az email tartalma',
-    'Class:ActionEmail/Attribute:importance' => 'Fontosság',
-    'Class:ActionEmail/Attribute:importance+' => 'Fontosság jelölő',
-    'Class:ActionEmail/Attribute:importance/Value:low' => 'Nem sürgős',
-    'Class:ActionEmail/Attribute:importance/Value:low+' => '',
-    'Class:ActionEmail/Attribute:importance/Value:normal' => 'Átlagos',
-    'Class:ActionEmail/Attribute:importance/Value:normal+' => '',
-    'Class:ActionEmail/Attribute:importance/Value:high' => 'Sürgős',
-    'Class:ActionEmail/Attribute:importance/Value:high+' => '',
+	'Class:ActionEmail' => 'Email értesítés',
+	'Class:ActionEmail+' => '',
+	'Class:ActionEmail/Attribute:status+' => 'Ez az állapot határozza meg, hogy ki kapjon értesítést: csak a teszt címzettje, mindenki (Címzett, cc és Bcc) vagy senki.',
+	'Class:ActionEmail/Attribute:status/Value:test+' => 'Csak a teszteléshez használt címzett kap értesítést',
+	'Class:ActionEmail/Attribute:status/Value:enabled+' => 'Minden Címzett, Cc és Bcc email értesítést fog kapni',
+	'Class:ActionEmail/Attribute:status/Value:disabled+' => 'Az email értesítés nem lesz elküldve',
+	'Class:ActionEmail/Attribute:test_recipient' => 'Teszt címzett',
+	'Class:ActionEmail/Attribute:test_recipient+' => 'Az értesítés tesztelésekor használt cél email cím',
+	'Class:ActionEmail/Attribute:from' => 'Feladó (email)',
+	'Class:ActionEmail/Attribute:from+' => 'A feladó email címe ami bekerül az email fejlécébe.',
+	'Class:ActionEmail/Attribute:from_label' => 'Feladó (címke)',
+	'Class:ActionEmail/Attribute:from_label+' => 'A feladó neve ami bekerül az email fejlécébe.',
+	'Class:ActionEmail/Attribute:reply_to' => 'Válaszcím (email)',
+	'Class:ActionEmail/Attribute:reply_to+' => 'A válasz az email cím ami bekerül az email fejlécébe.',
+	'Class:ActionEmail/Attribute:reply_to_label' => 'Válaszadó (címke)',
+	'Class:ActionEmail/Attribute:reply_to_label+' => 'A válaszadó a megjelenített neve ami az email fejlécébe kerül.',
+	'Class:ActionEmail/Attribute:to' => 'Címzett',
+	'Class:ActionEmail/Attribute:to+' => 'Az email címzettje',
+	'Class:ActionEmail/Attribute:cc' => 'Cc',
+	'Class:ActionEmail/Attribute:cc+' => 'Másolat',
+	'Class:ActionEmail/Attribute:bcc' => 'Bcc',
+	'Class:ActionEmail/Attribute:bcc+' => 'Titkos másolat',
+	'Class:ActionEmail/Attribute:subject' => 'Tárgy',
+	'Class:ActionEmail/Attribute:subject+' => 'Az email tárgya',
+	'Class:ActionEmail/Attribute:body' => 'Levéltörzs',
+	'Class:ActionEmail/Attribute:body+' => 'Az email tartalma',
+	'Class:ActionEmail/Attribute:importance' => 'Fontosság',
+	'Class:ActionEmail/Attribute:importance+' => 'Fontosság jelölő',
+	'Class:ActionEmail/Attribute:importance/Value:low' => 'Nem sürgős',
+	'Class:ActionEmail/Attribute:importance/Value:low+' => '',
+	'Class:ActionEmail/Attribute:importance/Value:normal' => 'Átlagos',
+	'Class:ActionEmail/Attribute:importance/Value:normal+' => '',
+	'Class:ActionEmail/Attribute:importance/Value:high' => 'Sürgős',
+	'Class:ActionEmail/Attribute:importance/Value:high+' => '',
+	'Class:ActionEmail/Attribute:language' => 'Language~~',
+	'Class:ActionEmail/Attribute:language+' => 'Language to use for placeholders ($xxx$) inside the message (state, importance, priority, etc)~~',
+	'Class:ActionEmail/Attribute:html_template' => 'HTML template~~',
+	'Class:ActionEmail/Attribute:html_template+' => 'Optional HTML template wrapping around the content of the \'Body\' attribute below, useful for tailored email layouts (in the template, content of the \'Body\' attribute will replace the $content$ placeholder)~~',
+	'Class:ActionEmail/Attribute:ignore_notify' => 'Ignore the Notify flag~~',
+	'Class:ActionEmail/Attribute:ignore_notify+' => 'If set to \'Yes\' the \'Notify\' flag on Contacts has no effect.~~',
+	'Class:ActionEmail/Attribute:ignore_notify/Value:no' => 'No~~',
+	'Class:ActionEmail/Attribute:ignore_notify/Value:yes' => 'Yes~~',
+	'ActionEmail:main' => 'Message~~',
+	'ActionEmail:trigger' => 'Triggers~~',
+	'ActionEmail:recipients' => 'Contacts~~',
+	'ActionEmail:preview_tab' => 'Preview~~',
+	'ActionEmail:preview_tab+' => 'Preview of the eMail template~~',
+	'ActionEmail:preview_warning' => 'The actual eMail may look different in the eMail client than this preview in your browser.~~',
+	'ActionEmail:preview_more_info' => 'For more information about the CSS features supported by the different eMail clients, refer to %1$s~~',
+	'ActionEmail:content_placeholder_missing' => 'The placeholder "%1$s" was not found in the HTML template. The content of the field "%2$s" will not be included in the generated emails.~~',
 ));
 
 //
@@ -559,16 +529,19 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:Trigger' => 'Eseményindító',
-    'Class:Trigger+' => 'Egyéni eseménykezelés',
-    'Class:Trigger/Attribute:description' => 'Leírás',
-    'Class:Trigger/Attribute:description+' => 'Egysoros leírás',
-    'Class:Trigger/Attribute:action_list' => 'Elindított műveletek',
-    'Class:Trigger/Attribute:action_list+' => 'Az eseményindító aktiválásakor végrehajtott műveletek',
-    'Class:Trigger/Attribute:finalclass' => 'Eseményindító al-osztály',
-    'Class:Trigger/Attribute:finalclass+' => 'A végleges osztály neve',
-    'Class:Trigger/Attribute:context' => 'Kontextus',
-    'Class:Trigger/Attribute:context+' => 'Kontextus, amely lehetővé teszi az eseményindító elindítását',
+	'Class:Trigger' => 'Eseményindító',
+	'Class:Trigger+' => 'Egyéni eseménykezelés',
+	'Class:Trigger/ComplementaryName' => '%1$s, %2$s~~',
+	'Class:Trigger/Attribute:description' => 'Leírás',
+	'Class:Trigger/Attribute:description+' => 'Egysoros leírás',
+	'Class:Trigger/Attribute:action_list' => 'Elindított műveletek',
+	'Class:Trigger/Attribute:action_list+' => 'Az eseményindító aktiválásakor végrehajtott műveletek',
+	'Class:Trigger/Attribute:finalclass' => 'Eseményindító al-osztály',
+	'Class:Trigger/Attribute:finalclass+' => 'A végleges osztály neve',
+	'Class:Trigger/Attribute:context' => 'Kontextus',
+	'Class:Trigger/Attribute:context+' => 'Kontextus, amely lehetővé teszi az eseményindító elindítását',
+	'Class:Trigger/Attribute:complement' => 'Additional information~~',
+	'Class:Trigger/Attribute:complement+' => 'Further information as provided in english, by this trigger~~',
 ));
 
 //
@@ -576,14 +549,14 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:TriggerOnObject' => 'Eseményindító (osztályfüggő)',
-    'Class:TriggerOnObject+' => 'Az objektumok egy adott osztályára történő eseményindítás',
-    'Class:TriggerOnObject/Attribute:target_class' => 'Cél osztály',
-    'Class:TriggerOnObject/Attribute:target_class+' => '',
-    'Class:TriggerOnObject/Attribute:filter' => 'Szűrő',
-    'Class:TriggerOnObject/Attribute:filter+' => 'Korlátozza az objektumlistát (a célosztályból), amely aktiválja az eseményindítót.',
-    'TriggerOnObject:WrongFilterQuery' => 'Helytelen szűrőkérdés: %1$s',
-    'TriggerOnObject:WrongFilterClass' => 'A szűrő lekérdezésnek %1$s osztályú objektumokat kell visszaadnia.',
+	'Class:TriggerOnObject' => 'Eseményindító (osztályfüggő)',
+	'Class:TriggerOnObject+' => 'Az objektumok egy adott osztályára történő eseményindítás',
+	'Class:TriggerOnObject/Attribute:target_class' => 'Cél osztály',
+	'Class:TriggerOnObject/Attribute:target_class+' => '',
+	'Class:TriggerOnObject/Attribute:filter' => 'Szűrő',
+	'Class:TriggerOnObject/Attribute:filter+' => 'Korlátozza az objektumlistát (a célosztályból), amely aktiválja az eseményindítót.',
+	'TriggerOnObject:WrongFilterQuery' => 'Helytelen szűrőkérdés: %1$s',
+	'TriggerOnObject:WrongFilterClass' => 'A szűrő lekérdezésnek %1$s osztályú objektumokat kell visszaadnia.',
 ));
 
 //
@@ -591,8 +564,8 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:TriggerOnPortalUpdate' => 'Eseményindító (amikor a portálról frissül)',
-    'Class:TriggerOnPortalUpdate+' => 'Eseményindító egy végfelhasználó által a portálon történő frissítéskor',
+	'Class:TriggerOnPortalUpdate' => 'Eseményindító (amikor a portálról frissül)',
+	'Class:TriggerOnPortalUpdate+' => 'Eseményindító egy végfelhasználó által a portálon történő frissítéskor',
 ));
 
 //
@@ -600,10 +573,10 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:TriggerOnStateChange' => 'Eseményindító (állapotváltozásnál)',
-    'Class:TriggerOnStateChange+' => 'Eseményindító egy objektum állapotának változásakor',
-    'Class:TriggerOnStateChange/Attribute:state' => 'Állapot',
-    'Class:TriggerOnStateChange/Attribute:state+' => '',
+	'Class:TriggerOnStateChange' => 'Eseményindító (állapotváltozásnál)',
+	'Class:TriggerOnStateChange+' => 'Eseményindító egy objektum állapotának változásakor',
+	'Class:TriggerOnStateChange/Attribute:state' => 'Állapot',
+	'Class:TriggerOnStateChange/Attribute:state+' => '',
 ));
 
 //
@@ -611,8 +584,8 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:TriggerOnStateEnter' => 'Eseményindító (állapot felvételekor)',
-    'Class:TriggerOnStateEnter+' => 'Az objektum állapotváltozásba lépéskor elinduló eseményindító',
+	'Class:TriggerOnStateEnter' => 'Eseményindító (állapot felvételekor)',
+	'Class:TriggerOnStateEnter+' => 'Az objektum állapotváltozásba lépéskor elinduló eseményindító',
 ));
 
 //
@@ -620,8 +593,8 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:TriggerOnStateLeave' => 'Eseményindító (állapot elhagyáskor)',
-    'Class:TriggerOnStateLeave+' => 'Az objektum állapotváltozás elhagyásakor elinduló eseményindító',
+	'Class:TriggerOnStateLeave' => 'Eseményindító (állapot elhagyáskor)',
+	'Class:TriggerOnStateLeave+' => 'Az objektum állapotváltozás elhagyásakor elinduló eseményindító',
 ));
 
 //
@@ -629,8 +602,8 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:TriggerOnObjectCreate' => 'Eseményindító (objektum létrehozáskor)',
-    'Class:TriggerOnObjectCreate+' => 'Az adott osztály [egy gyermekosztálya] objektumának létrehozásakor elinduló eseményindító.',
+	'Class:TriggerOnObjectCreate' => 'Eseményindító (objektum létrehozáskor)',
+	'Class:TriggerOnObjectCreate+' => 'Az adott osztály [egy gyermekosztálya] objektumának létrehozásakor elinduló eseményindító.',
 ));
 
 //
@@ -638,8 +611,8 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:TriggerOnObjectDelete' => 'Eseményindító (objektum törléskor)',
-    'Class:TriggerOnObjectDelete+' => 'Az adott osztály [egy gyermekosztálya] objektumának törlésekor elinduló eseményindító.',
+	'Class:TriggerOnObjectDelete' => 'Eseményindító (objektum törléskor)',
+	'Class:TriggerOnObjectDelete+' => 'Az adott osztály [egy gyermekosztálya] objektumának törlésekor elinduló eseményindító.',
 ));
 
 //
@@ -647,10 +620,10 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:TriggerOnObjectUpdate' => 'Eseményindító (objektum frissítéskor)',
-    'Class:TriggerOnObjectUpdate+' => 'Az adott osztály [egy gyermekosztálya] objektumának frissítésekor elinduló eseményindító',
-    'Class:TriggerOnObjectUpdate/Attribute:target_attcodes' => 'Célmezők',
-    'Class:TriggerOnObjectUpdate/Attribute:target_attcodes+' => '',
+	'Class:TriggerOnObjectUpdate' => 'Eseményindító (objektum frissítéskor)',
+	'Class:TriggerOnObjectUpdate+' => 'Az adott osztály [egy gyermekosztálya] objektumának frissítésekor elinduló eseményindító',
+	'Class:TriggerOnObjectUpdate/Attribute:target_attcodes' => 'Célmezők',
+	'Class:TriggerOnObjectUpdate/Attribute:target_attcodes+' => '',
 ));
 
 //
@@ -658,10 +631,21 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:TriggerOnObjectMention' => 'Eseményindító (objektumra hivatkozáskor)',
-    'Class:TriggerOnObjectMention+' => 'Az adott osztály [egy gyermekosztálya] objektumára (@xxx) hivatkozáskor egy naplóattribútumban',
-    'Class:TriggerOnObjectMention/Attribute:mentioned_filter' => 'Hivatkozás szűrő',
-    'Class:TriggerOnObjectMention/Attribute:mentioned_filter+' => 'A hivatkozott objektumok listájának korlátozása, amelyek aktiválják az eseményindítót. Ha üres, akkor bármelyik említett objektum (bármely osztályból) aktiválja azt.',
+	'Class:TriggerOnObjectMention' => 'Eseményindító (objektumra hivatkozáskor)',
+	'Class:TriggerOnObjectMention+' => 'Az adott osztály [egy gyermekosztálya] objektumára (@xxx) hivatkozáskor egy naplóattribútumban',
+	'Class:TriggerOnObjectMention/Attribute:mentioned_filter' => 'Hivatkozás szűrő',
+	'Class:TriggerOnObjectMention/Attribute:mentioned_filter+' => 'A hivatkozott objektumok listájának korlátozása, amelyek aktiválják az eseményindítót. Ha üres, akkor bármelyik említett objektum (bármely osztályból) aktiválja azt.',
+));
+
+//
+// Class: TriggerOnAttributeBlobDownload
+//
+
+Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
+	'Class:TriggerOnAttributeBlobDownload' => 'Trigger (on object\'s document download)~~',
+	'Class:TriggerOnAttributeBlobDownload+' => 'Trigger on object\'s document field download of [a child class of] the given class~~',
+	'Class:TriggerOnAttributeBlobDownload/Attribute:target_attcodes' => 'Target fields~~',
+	'Class:TriggerOnAttributeBlobDownload/Attribute:target_attcodes+' => '~~',
 ));
 
 //
@@ -669,12 +653,12 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:TriggerOnThresholdReached' => 'Eseményindító (küszöbértéknél)',
-    'Class:TriggerOnThresholdReached+' => 'Eseményindító egy időzítő küszöbértékének elérésekor',
-    'Class:TriggerOnThresholdReached/Attribute:stop_watch_code' => 'Időzítő',
-    'Class:TriggerOnThresholdReached/Attribute:stop_watch_code+' => '',
-    'Class:TriggerOnThresholdReached/Attribute:threshold_index' => 'Küszöbérték',
-    'Class:TriggerOnThresholdReached/Attribute:threshold_index+' => '',
+	'Class:TriggerOnThresholdReached' => 'Eseményindító (küszöbértéknél)',
+	'Class:TriggerOnThresholdReached+' => 'Eseményindító egy időzítő küszöbértékének elérésekor',
+	'Class:TriggerOnThresholdReached/Attribute:stop_watch_code' => 'Időzítő',
+	'Class:TriggerOnThresholdReached/Attribute:stop_watch_code+' => '',
+	'Class:TriggerOnThresholdReached/Attribute:threshold_index' => 'Küszöbérték',
+	'Class:TriggerOnThresholdReached/Attribute:threshold_index+' => '',
 ));
 
 //
@@ -682,417 +666,436 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:lnkTriggerAction' => 'Művelet/Eseményindító',
-    'Class:lnkTriggerAction+' => 'Kapcsolat egy eseményindító és egy művelet között',
-    'Class:lnkTriggerAction/Attribute:action_id' => 'Művelet',
-    'Class:lnkTriggerAction/Attribute:action_id+' => 'A végrehajtandó művelet',
-    'Class:lnkTriggerAction/Attribute:action_name' => 'Művelet név',
-    'Class:lnkTriggerAction/Attribute:action_name+' => '',
-    'Class:lnkTriggerAction/Attribute:trigger_id' => 'Eseményindító',
-    'Class:lnkTriggerAction/Attribute:trigger_id+' => '',
-    'Class:lnkTriggerAction/Attribute:trigger_name' => 'Eseményindító név',
-    'Class:lnkTriggerAction/Attribute:trigger_name+' => '',
-    'Class:lnkTriggerAction/Attribute:order' => 'Sorrend',
-    'Class:lnkTriggerAction/Attribute:order+' => 'A műveletek végrehajtási sorrendje',
+	'Class:lnkTriggerAction' => 'Művelet/Eseményindító',
+	'Class:lnkTriggerAction+' => 'Kapcsolat egy eseményindító és egy művelet között',
+	'Class:lnkTriggerAction/Attribute:action_id' => 'Művelet',
+	'Class:lnkTriggerAction/Attribute:action_id+' => 'A végrehajtandó művelet',
+	'Class:lnkTriggerAction/Attribute:action_name' => 'Művelet név',
+	'Class:lnkTriggerAction/Attribute:action_name+' => '',
+	'Class:lnkTriggerAction/Attribute:trigger_id' => 'Eseményindító',
+	'Class:lnkTriggerAction/Attribute:trigger_id+' => '',
+	'Class:lnkTriggerAction/Attribute:trigger_name' => 'Eseményindító név',
+	'Class:lnkTriggerAction/Attribute:trigger_name+' => '',
+	'Class:lnkTriggerAction/Attribute:order' => 'Sorrend',
+	'Class:lnkTriggerAction/Attribute:order+' => 'A műveletek végrehajtási sorrendje',
 ));
 
 //
 // Synchro Data Source
 //
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:SynchroDataSource/Attribute:name' => 'Név',
-    'Class:SynchroDataSource/Attribute:name+' => '',
-    'Class:SynchroDataSource/Attribute:description' => 'Leírás',
-    'Class:SynchroDataSource/Attribute:status' => 'Állapot',
-    'Class:SynchroDataSource/Attribute:scope_class' => 'Célosztály',
-    'Class:SynchroDataSource/Attribute:user_id' => 'Felhasználónév',
-    'Class:SynchroDataSource/Attribute:notify_contact_id' => 'Értesítési kapcsolattartó',
-    'Class:SynchroDataSource/Attribute:notify_contact_id+' => 'Hiba esetén az értesítendő kapcsolattartó',
-    'Class:SynchroDataSource/Attribute:url_icon' => 'Ikon URL',
-    'Class:SynchroDataSource/Attribute:url_icon+' => 'Hiperhivatkozás egy (kis) képre, amely azt az alkalmazást ábrázolja, amellyel a '.ITOP_APPLICATION_SHORT.' szinkronizálva van.',
-    'Class:SynchroDataSource/Attribute:url_application' => 'Alkalmazás URL',
-    'Class:SynchroDataSource/Attribute:url_application+' => 'Hiperhivatkozás a '.ITOP_APPLICATION_SHORT.' objektumra abban a külső alkalmazásban, amellyel a '.ITOP_APPLICATION_SHORT.' szinkronizálva van (ha van ilyen). Lehetséges helyörzők: $this->attribute$ és $replica->primary_key$',
-    'Class:SynchroDataSource/Attribute:reconciliation_policy' => 'Egyeztetési szabály',
-    'Class:SynchroDataSource/Attribute:full_load_periodicity' => 'Teljes betöltés időköze',
-    'Class:SynchroDataSource/Attribute:full_load_periodicity+' => 'Az összes adat teljes újratöltésének legalább az itt megadott gyakorisággal kell megtörténnie.',
-    'Class:SynchroDataSource/Attribute:action_on_zero' => 'Művelet nulla esetén',
-    'Class:SynchroDataSource/Attribute:action_on_zero+' => 'Művelet, amikor a keresés nem ad vissza objektumot',
-    'Class:SynchroDataSource/Attribute:action_on_one' => 'Művelet egy esetén',
-    'Class:SynchroDataSource/Attribute:action_on_one+' => 'Művelet, amikor a keresés pontosan egy objektumot ad vissza',
-    'Class:SynchroDataSource/Attribute:action_on_multiple' => 'Művelet több esetén',
-    'Class:SynchroDataSource/Attribute:action_on_multiple+' => 'Művelet, ha a keresés egynél több objektumot ad vissza',
-    'Class:SynchroDataSource/Attribute:user_delete_policy' => 'Engedélyezett felhasználók',
-    'Class:SynchroDataSource/Attribute:user_delete_policy+' => 'Akik törölhetik a szinkronizált objektumokat',
-    'Class:SynchroDataSource/Attribute:delete_policy/Value:never' => 'Senki',
-    'Class:SynchroDataSource/Attribute:delete_policy/Value:depends' => 'Csak rendszergazdák',
-    'Class:SynchroDataSource/Attribute:delete_policy/Value:always' => 'Minden engedélyezett felhasználó',
-    'Class:SynchroDataSource/Attribute:delete_policy_update' => 'Frissítési szabályok',
-    'Class:SynchroDataSource/Attribute:delete_policy_update+' => 'Szintaxis: mezo_nev:ertek; ...',
-    'Class:SynchroDataSource/Attribute:delete_policy_retention' => 'Megtartási idő',
-    'Class:SynchroDataSource/Attribute:delete_policy_retention+' => 'Mennyi ideig tartanak meg egy elavult objektumot törlés előtt.',
-    'Class:SynchroDataSource/Attribute:database_table_name' => 'Adattábla',
-    'Class:SynchroDataSource/Attribute:database_table_name+' => 'A szinkronizálási adatok tárolására szolgáló tábla neve. Ha üresen hagyja, akkor egy alapértelmezett név lesz generálva.',
-    'SynchroDataSource:Description' => 'Leírás',
-    'SynchroDataSource:Reconciliation' => 'Keresés &amp; egyeztetés',
-    'SynchroDataSource:Deletion' => 'Törlési szabályok',
-    'SynchroDataSource:Status' => 'Állapot',
-    'SynchroDataSource:Information' => 'Információ',
-    'SynchroDataSource:Definition' => 'Definíció',
-    'Core:SynchroAttributes' => 'Attribútumok',
-    'Core:SynchroStatus' => 'Állapot',
-    'Core:Synchro:ErrorsLabel' => 'Hibák',
-    'Core:Synchro:CreatedLabel' => 'Létrehozva',
-    'Core:Synchro:ModifiedLabel' => 'Módosítva',
-    'Core:Synchro:UnchangedLabel' => 'Változatlan',
-    'Core:Synchro:ReconciledErrorsLabel' => 'Hibák',
-    'Core:Synchro:ReconciledLabel' => 'Egyeztetve',
-    'Core:Synchro:ReconciledNewLabel' => 'Létrehozva',
-    'Core:SynchroReconcile:Yes' => 'Igen',
-    'Core:SynchroReconcile:No' => 'Nem',
-    'Core:SynchroUpdate:Yes' => 'Igen',
-    'Core:SynchroUpdate:No' => 'Nem',
-    'Core:Synchro:LastestStatus' => 'Utóbbi állapot',
-    'Core:Synchro:History' => 'Szinkronizáció előzmények',
-    'Core:Synchro:NeverRun' => 'Még nem futott szinkronizálás. Nincs naplóbejegyzés.',
-    'Core:Synchro:SynchroEndedOn_Date' => 'A legutóbbi szinkronizáció befejezésének ideje %1$s.',
-    'Core:Synchro:SynchroRunningStartedOn_Date' => 'A szinkronizálás %1$s -kor elindult és még fut...',
-    'Menu:DataSources' => 'Szinkronizációs adatforrások', // Duplicated into itop-welcome-itil (will be removed from here...)
-    'Menu:DataSources+' => 'Minden szinkronizációs adatforrás', // Duplicated into itop-welcome-itil (will be removed from here...)
-    'Core:Synchro:label_repl_ignored' => 'Figyelmen kívül hagyott (%1$s)',
-    'Core:Synchro:label_repl_disappeared' => 'Eltűnt (%1$s)',
-    'Core:Synchro:label_repl_existing' => 'Létező (%1$s)',
-    'Core:Synchro:label_repl_new' => 'Új (%1$s)',
-    'Core:Synchro:label_obj_deleted' => 'Törölt (%1$s)',
-    'Core:Synchro:label_obj_obsoleted' => 'Elavult (%1$s)',
-    'Core:Synchro:label_obj_disappeared_errors' => 'Hibák (%1$s)',
-    'Core:Synchro:label_obj_disappeared_no_action' => 'Nincs művelet (%1$s)',
-    'Core:Synchro:label_obj_unchanged' => 'Változatlan (%1$s)',
-    'Core:Synchro:label_obj_updated' => 'Frissített (%1$s)',
-    'Core:Synchro:label_obj_updated_errors' => 'Hibák (%1$s)',
-    'Core:Synchro:label_obj_new_unchanged' => 'Változatlan (%1$s)',
-    'Core:Synchro:label_obj_new_updated' => 'Frissített (%1$s)',
-    'Core:Synchro:label_obj_created' => 'Létrehozott (%1$s)',
-    'Core:Synchro:label_obj_new_errors' => 'Hibák (%1$s)',
-    'Core:SynchroLogTitle' => '%1$s - %2$s',
-    'Core:Synchro:Nb_Replica' => 'Feldolgozott replika: %1$s',
-    'Core:Synchro:Nb_Class:Objects' => '%1$s: %2$s',
-    'Class:SynchroDataSource/Error:AtLeastOneReconciliationKeyMustBeSpecified' => 'Legalább egy egyeztetési kulcsot meg kell adni, vagy az egyeztetési szabálynak az elsődleges kulcsot kell használnia.',
-    'Class:SynchroDataSource/Error:DeleteRetentionDurationMustBeSpecified' => 'Meg kell adni a törlési megőrzési időszakot, mivel az objektumokat az elavultként való megjelölés után törölni kell.',
-    'Class:SynchroDataSource/Error:DeletePolicyUpdateMustBeSpecified' => 'Az elavult objektumokat frissíteni kell, de nincs megadva frissítés.',
-    'Class:SynchroDataSource/Error:DataTableAlreadyExists' => 'A %1$s tábla már létezik az adatbázisban. Kérjük, használjon másik nevet a szinkronizálási adattáblához.',
-    'Core:SynchroReplica:PublicData' => 'Nyilvános adat',
-    'Core:SynchroReplica:PrivateDetails' => 'Személyi adatok',
-    'Core:SynchroReplica:BackToDataSource' => 'Visszatérés a szinkronizációs adatforráshoz: %1$s',
-    'Core:SynchroReplica:ListOfReplicas' => 'Replikák listája',
-    'Core:SynchroAttExtKey:ReconciliationById' => 'Azonosító (Elsődleges kulcs)',
-    'Core:SynchroAtt:attcode' => 'Attribútum',
-    'Core:SynchroAtt:attcode+' => 'Az objektum mezője',
-    'Core:SynchroAtt:reconciliation' => 'Egyeztetés ?',
-    'Core:SynchroAtt:reconciliation+' => 'Kereséshez használható',
-    'Core:SynchroAtt:update' => 'Frissítés ?',
-    'Core:SynchroAtt:update+' => 'Objektum frissítéshez használható',
-    'Core:SynchroAtt:update_policy' => 'Frissítési szabály',
-    'Core:SynchroAtt:update_policy+' => 'A frissített mező viselkedése',
-    'Core:SynchroAtt:reconciliation_attcode' => 'Egyeztető kulcs',
-    'Core:SynchroAtt:reconciliation_attcode+' => 'Attribútumkód a külső kulcs egyeztetéséhez',
-    'Core:SyncDataExchangeComment' => '(Adat szinkron)',
-    'Core:Synchro:ListOfDataSources' => 'Adatforrások listája:',
-    'Core:Synchro:LastSynchro' => 'Utolsó szinkronizálás:',
-    'Core:Synchro:ThisObjectIsSynchronized' => 'Ez az objektum egy külső adatforrással van szinkronizálva.',
-    'Core:Synchro:TheObjectWasCreatedBy_Source' => 'Az objektumot a %1$s külső adatforrás <b>létrehozta</b>',
-    'Core:Synchro:TheObjectCanBeDeletedBy_Source' => 'Az objektum <b>törölhető</b> a %1$s külső adatforrás által.',
-    'Core:Synchro:TheObjectCannotBeDeletedByUser_Source' => 'Az objektumot <b>nem lehet törölni</b>, mert az a %1$s külső adatforrás tulajdonában van',
-    'TitleSynchroExecution' => 'Szinkronizálás végrehajtása',
-    'Class:SynchroDataSource:DataTable' => 'Adatbázis tábla: %1$s',
-    'Core:SyncDataSourceObsolete' => 'Az adatforrás elavultnak van jelölve. A művelet törlésre került.',
-    'Core:SyncDataSourceAccessRestriction' => 'Ezt a műveletet csak a rendszergazdák vagy az adatforrásban megadott felhasználó végezheti el. A művelet törlésre került.',
-    'Core:SyncTooManyMissingReplicas' => 'Az összes rekordot egy ideje nem használta senki (az összes objektumot törölni lehet). Ellenőrizze, hogy a szinkronizációs táblába író folyamat még mindig fut-e. A művelet törlődött.',
-    'Core:SyncSplitModeCLIOnly' => 'A szinkronizálás csak akkor hajtható végre darabokban, ha CLI üzemmódban fut.',
-    'Core:Synchro:ListReplicas_AllReplicas_Errors_Warnings' => '%1$s replika, %2$s hiba, %3$s figyelmeztetés.',
-    'Core:SynchroReplica:TargetObject' => 'Szinkronizált objektum: %1$s',
-    'Class:AsyncSendEmail' => 'Email (aszinkron)',
-    'Class:AsyncSendEmail/Attribute:to' => 'Címzett',
-    'Class:AsyncSendEmail/Attribute:subject' => 'Tárgy',
-    'Class:AsyncSendEmail/Attribute:body' => 'Levéltörzs',
-    'Class:AsyncSendEmail/Attribute:header' => 'Fejléc',
-    'Class:CMDBChangeOpSetAttributeOneWayPassword' => 'Titkosított jelszó',
-    'Class:CMDBChangeOpSetAttributeOneWayPassword/Attribute:prev_pwd' => 'Előző érték',
-    'Class:CMDBChangeOpSetAttributeEncrypted' => 'Titkosított mező',
-    'Class:CMDBChangeOpSetAttributeEncrypted/Attribute:prevstring' => 'Előző érték',
-    'Class:CMDBChangeOpSetAttributeCaseLog' => 'Esetnapló',
-    'Class:CMDBChangeOpSetAttributeCaseLog/Attribute:lastentry' => 'Utolsó bejegyzés',
-    'Class:SynchroDataSource' => 'Szinkron adatforrás',
-    'Class:SynchroDataSource/Attribute:status/Value:implementation' => 'Megvalósítás',
-    'Class:SynchroDataSource/Attribute:status/Value:obsolete' => 'Elavult',
-    'Class:SynchroDataSource/Attribute:status/Value:production' => 'Bevezetve',
-    'Class:SynchroDataSource/Attribute:scope_restriction' => 'Tartalomszűkítés',
-    'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_attributes' => 'Használja az attribútumokat',
-    'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_primary_key' => 'Használja a primary_key mezőt',
-    'Class:SynchroDataSource/Attribute:action_on_zero/Value:create' => 'Létrehozás',
-    'Class:SynchroDataSource/Attribute:action_on_zero/Value:error' => 'Hiba',
-    'Class:SynchroDataSource/Attribute:action_on_one/Value:error' => 'Hiba',
-    'Class:SynchroDataSource/Attribute:action_on_one/Value:update' => 'Frissítés',
-    'Class:SynchroDataSource/Attribute:action_on_multiple/Value:create' => 'Létrehozás',
-    'Class:SynchroDataSource/Attribute:action_on_multiple/Value:error' => 'Hiba',
-    'Class:SynchroDataSource/Attribute:action_on_multiple/Value:take_first' => 'Vegye az elsőt (random?)',
-    'Class:SynchroDataSource/Attribute:delete_policy' => 'Szabály törlése',
-    'Class:SynchroDataSource/Attribute:delete_policy/Value:delete' => 'Törlés',
-    'Class:SynchroDataSource/Attribute:delete_policy/Value:ignore' => 'Figyelmen kívül hagyás',
-    'Class:SynchroDataSource/Attribute:delete_policy/Value:update' => 'Frissítés',
-    'Class:SynchroDataSource/Attribute:delete_policy/Value:update_then_delete' => 'Frissítés és törlés',
-    'Class:SynchroDataSource/Attribute:attribute_list' => 'Attribútum lista',
-    'Class:SynchroDataSource/Attribute:user_delete_policy/Value:administrators' => 'Csak rendszergazdák',
-    'Class:SynchroDataSource/Attribute:user_delete_policy/Value:everybody' => 'Mindenki törölhet ilyen objektumokat',
-    'Class:SynchroDataSource/Attribute:user_delete_policy/Value:nobody' => 'Senki',
-    'Class:SynchroAttribute' => 'Szinkron attribútum',
-    'Class:SynchroAttribute/Attribute:sync_source_id' => 'Szinkronizációs adatforrás',
-    'Class:SynchroAttribute/Attribute:attcode' => 'Attribútumkód',
-    'Class:SynchroAttribute/Attribute:update' => 'Frissítés',
-    'Class:SynchroAttribute/Attribute:reconcile' => 'Egyeztetés',
-    'Class:SynchroAttribute/Attribute:update_policy' => 'Frissítési szabály',
-    'Class:SynchroAttribute/Attribute:update_policy/Value:master_locked' => 'Zárolva',
-    'Class:SynchroAttribute/Attribute:update_policy/Value:master_unlocked' => 'Feloldva',
-    'Class:SynchroAttribute/Attribute:update_policy/Value:write_if_empty' => 'Inicializálás, ha üres',
-    'Class:SynchroAttribute/Attribute:finalclass' => 'Osztály',
-    'Class:SynchroAttExtKey' => 'Szinkron attribútum (ExtKey)',
-    'Class:SynchroAttExtKey/Attribute:reconciliation_attcode' => 'Egyeztető attribútum',
-    'Class:SynchroAttLinkSet' => 'Szinkron attribútum (Linkset)',
-    'Class:SynchroAttLinkSet/Attribute:row_separator' => 'Sorelválasztó',
-    'Class:SynchroAttLinkSet/Attribute:attribute_separator' => 'Elválasztó attribútumok',
-    'Class:SynchroLog' => 'Szinkron napló',
-    'Class:SynchroLog/Attribute:sync_source_id' => 'Szinkronizációs adatforrás',
-    'Class:SynchroLog/Attribute:start_date' => 'Kezdés dátuma',
-    'Class:SynchroLog/Attribute:end_date' => 'Befejezés dátuma',
-    'Class:SynchroLog/Attribute:status' => 'Állapot',
-    'Class:SynchroLog/Attribute:status/Value:completed' => 'Befejezett',
-    'Class:SynchroLog/Attribute:status/Value:error' => 'Hiba',
-    'Class:SynchroLog/Attribute:status/Value:running' => 'Még fut',
-    'Class:SynchroLog/Attribute:stats_nb_replica_seen' => 'Nb talált replika',
-    'Class:SynchroLog/Attribute:stats_nb_replica_total' => 'Nb összes replika',
-    'Class:SynchroLog/Attribute:stats_nb_obj_deleted' => 'Nb törölt objektum',
-    'Class:SynchroLog/Attribute:stats_nb_obj_deleted_errors' => 'Nb hiba törléskor',
-    'Class:SynchroLog/Attribute:stats_nb_obj_obsoleted' => 'Nb elavult objektum',
-    'Class:SynchroLog/Attribute:stats_nb_obj_obsoleted_errors' => 'Nb hiba elavuláskor',
-    'Class:SynchroLog/Attribute:stats_nb_obj_created' => 'Nb létrehozott objektum',
-    'Class:SynchroLog/Attribute:stats_nb_obj_created_errors' => 'Nb hiba létrehozáskor',
-    'Class:SynchroLog/Attribute:stats_nb_obj_updated' => 'Nb objektum létrehozva',
-    'Class:SynchroLog/Attribute:stats_nb_obj_updated_errors' => 'Nb hiba frissítéskor',
-    'Class:SynchroLog/Attribute:stats_nb_replica_reconciled_errors' => 'Nb hiba egyeztetéskor',
-    'Class:SynchroLog/Attribute:stats_nb_replica_disappeared_no_action' => 'Nb replika eltűnt',
-    'Class:SynchroLog/Attribute:stats_nb_obj_new_updated' => 'Nb objektum frissítve',
-    'Class:SynchroLog/Attribute:stats_nb_obj_new_unchanged' => 'Nb objektum változatlan',
-    'Class:SynchroLog/Attribute:last_error' => 'Utolsó hiba',
-    'Class:SynchroLog/Attribute:traces' => 'Nyomok',
-    'Class:SynchroReplica' => 'Szinkron replika',
-    'Class:SynchroReplica/Attribute:sync_source_id' => 'Szinkronizációs adatforrás',
-    'Class:SynchroReplica/Attribute:dest_id' => 'Célobjektum (ID)',
-    'Class:SynchroReplica/Attribute:dest_class' => 'Cél típus',
-    'Class:SynchroReplica/Attribute:status_last_seen' => 'Utolsó előfordulás',
-    'Class:SynchroReplica/Attribute:status' => 'Állapot',
-    'Class:SynchroReplica/Attribute:status/Value:modified' => 'Módosítva',
-    'Class:SynchroReplica/Attribute:status/Value:new' => 'Új',
-    'Class:SynchroReplica/Attribute:status/Value:obsolete' => 'Elavult',
-    'Class:SynchroReplica/Attribute:status/Value:orphan' => 'Árva',
-    'Class:SynchroReplica/Attribute:status/Value:synchronized' => 'Szinkronizált',
-    'Class:SynchroReplica/Attribute:status_dest_creator' => 'Objektum létrehozva ?',
-    'Class:SynchroReplica/Attribute:status_last_error' => 'Utolsó hiba',
-    'Class:SynchroReplica/Attribute:status_last_warning' => 'Figyelmeztetések',
-    'Class:SynchroReplica/Attribute:info_creation_date' => 'Létrehozás dátuma',
-    'Class:SynchroReplica/Attribute:info_last_modified' => 'Utolsó módosítás dátuma',
-    'Class:appUserPreferences' => 'Felhasználói beállítások',
-    'Class:appUserPreferences/Attribute:userid' => 'Felhasználónév',
-    'Class:appUserPreferences/Attribute:preferences' => 'Beállítások',
-    'Core:ExecProcess:Code1' => 'Helytelen parancs vagy hibásan befejezett parancs (pl. helytelen szkriptnév)',
-    'Core:ExecProcess:Code255' => 'PHP hiba (parsing, vagy runtime)',
-
+	'Class:SynchroDataSource' => 'Szinkron adatforrás',
+	'Class:SynchroDataSource/Attribute:name' => 'Név',
+	'Class:SynchroDataSource/Attribute:name+' => '',
+	'Class:SynchroDataSource/Attribute:description' => 'Leírás',
+	'Class:SynchroDataSource/Attribute:status' => 'Állapot',
+	'Class:SynchroDataSource/Attribute:scope_class' => 'Célosztály',
+	'Class:SynchroDataSource/Attribute:scope_class+' => 'A Synchro Data Source can only populate a single '.ITOP_APPLICATION_SHORT.' class~~',
+	'Class:SynchroDataSource/Attribute:user_id' => 'Felhasználónév',
+	'Class:SynchroDataSource/Attribute:notify_contact_id' => 'Értesítési kapcsolattartó',
+	'Class:SynchroDataSource/Attribute:notify_contact_id+' => 'Hiba esetén az értesítendő kapcsolattartó',
+	'Class:SynchroDataSource/Attribute:url_icon' => 'Ikon URL',
+	'Class:SynchroDataSource/Attribute:url_icon+' => 'Hiperhivatkozás egy (kis) képre, amely azt az alkalmazást ábrázolja, amellyel a '.ITOP_APPLICATION_SHORT.' szinkronizálva van.',
+	'Class:SynchroDataSource/Attribute:url_application' => 'Alkalmazás URL',
+	'Class:SynchroDataSource/Attribute:url_application+' => 'Hiperhivatkozás a '.ITOP_APPLICATION_SHORT.' objektumra abban a külső alkalmazásban, amellyel a '.ITOP_APPLICATION_SHORT.' szinkronizálva van (ha van ilyen). Lehetséges helyörzők: $this->attribute$ és $replica->primary_key$',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy' => 'Egyeztetési szabály',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy+' => '"Use the attributes": '.ITOP_APPLICATION_SHORT.' object matches replica values for each Synchro attributes flagged for Reconciliation.
+"Use primary_key": the column primary_key of the replica is expected to contain the identifier of the '.ITOP_APPLICATION_SHORT.' object~~',
+	'Class:SynchroDataSource/Attribute:full_load_periodicity' => 'Teljes betöltés időköze',
+	'Class:SynchroDataSource/Attribute:full_load_periodicity+' => 'Az összes adat teljes újratöltésének legalább az itt megadott gyakorisággal kell megtörténnie.',
+	'Class:SynchroDataSource/Attribute:action_on_zero' => 'Művelet nulla esetén',
+	'Class:SynchroDataSource/Attribute:action_on_zero+' => 'Művelet, amikor a keresés nem ad vissza objektumot',
+	'Class:SynchroDataSource/Attribute:action_on_one' => 'Művelet egy esetén',
+	'Class:SynchroDataSource/Attribute:action_on_one+' => 'Művelet, amikor a keresés pontosan egy objektumot ad vissza',
+	'Class:SynchroDataSource/Attribute:action_on_multiple' => 'Művelet több esetén',
+	'Class:SynchroDataSource/Attribute:action_on_multiple+' => 'Művelet, ha a keresés egynél több objektumot ad vissza',
+	'Class:SynchroDataSource/Attribute:user_delete_policy' => 'Engedélyezett felhasználók',
+	'Class:SynchroDataSource/Attribute:user_delete_policy+' => 'Akik törölhetik a szinkronizált objektumokat',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:never' => 'Senki',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:depends' => 'Csak rendszergazdák',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:always' => 'Minden engedélyezett felhasználó',
+	'Class:SynchroDataSource/Attribute:delete_policy_update' => 'Frissítési szabályok',
+	'Class:SynchroDataSource/Attribute:delete_policy_update+' => 'Szintaxis: mezo_nev:ertek; ...',
+	'Class:SynchroDataSource/Attribute:delete_policy_retention' => 'Megtartási idő',
+	'Class:SynchroDataSource/Attribute:delete_policy_retention+' => 'Mennyi ideig tartanak meg egy elavult objektumot törlés előtt.',
+	'Class:SynchroDataSource/Attribute:database_table_name' => 'Adattábla',
+	'Class:SynchroDataSource/Attribute:database_table_name+' => 'A szinkronizálási adatok tárolására szolgáló tábla neve. Ha üresen hagyja, akkor egy alapértelmezett név lesz generálva.',
+	'Class:SynchroDataSource/Attribute:status/Value:implementation' => 'Megvalósítás',
+	'Class:SynchroDataSource/Attribute:status/Value:obsolete' => 'Elavult',
+	'Class:SynchroDataSource/Attribute:status/Value:production' => 'Bevezetve',
+	'Class:SynchroDataSource/Attribute:scope_restriction' => 'Tartalomszűkítés',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_attributes' => 'Használja az attribútumokat',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_primary_key' => 'Használja a primary_key mezőt',
+	'Class:SynchroDataSource/Attribute:action_on_zero/Value:create' => 'Létrehozás',
+	'Class:SynchroDataSource/Attribute:action_on_zero/Value:error' => 'Hiba',
+	'Class:SynchroDataSource/Attribute:action_on_one/Value:error' => 'Hiba',
+	'Class:SynchroDataSource/Attribute:action_on_one/Value:update' => 'Frissítés',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:create' => 'Létrehozás',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:error' => 'Hiba',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:take_first' => 'Vegye az elsőt (random?)',
+	'Class:SynchroDataSource/Attribute:delete_policy' => 'Szabály törlése',
+	'Class:SynchroDataSource/Attribute:delete_policy+' => 'What to do when a replica becomes obsolete:
+"Ignore": do nothing, the associated object remains as is in iTop.
+"Delete": Delete the associated object in iTop (and the replica in the data table).
+"Update": Update the associated object as specified by the Update rules (see below).
+"Update then Delete": apply the "Update rules". When Retention Duration expires, execute a "Delete" ~~',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:delete' => 'Törlés',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:ignore' => 'Figyelmen kívül hagyás',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:update' => 'Frissítés',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:update_then_delete' => 'Frissítés és törlés',
+	'Class:SynchroDataSource/Attribute:attribute_list' => 'Attribútum lista',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:administrators' => 'Csak rendszergazdák',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:everybody' => 'Mindenki törölhet ilyen objektumokat',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:nobody' => 'Senki',
+	'SynchroDataSource:Description' => 'Leírás',
+	'SynchroDataSource:Reconciliation' => 'Keresés &amp; egyeztetés',
+	'SynchroDataSource:Deletion' => 'Törlési szabályok',
+	'SynchroDataSource:Status' => 'Állapot',
+	'SynchroDataSource:Information' => 'Információ',
+	'SynchroDataSource:Definition' => 'Definíció',
+	'Core:SynchroAttributes' => 'Attribútumok',
+	'Core:SynchroStatus' => 'Állapot',
+	'Core:Synchro:ErrorsLabel' => 'Hibák',
+	'Core:Synchro:CreatedLabel' => 'Létrehozva',
+	'Core:Synchro:ModifiedLabel' => 'Módosítva',
+	'Core:Synchro:UnchangedLabel' => 'Változatlan',
+	'Core:Synchro:ReconciledErrorsLabel' => 'Hibák',
+	'Core:Synchro:ReconciledLabel' => 'Egyeztetve',
+	'Core:Synchro:ReconciledNewLabel' => 'Létrehozva',
+	'Core:SynchroReconcile:Yes' => 'Igen',
+	'Core:SynchroReconcile:No' => 'Nem',
+	'Core:SynchroUpdate:Yes' => 'Igen',
+	'Core:SynchroUpdate:No' => 'Nem',
+	'Core:Synchro:LastestStatus' => 'Utóbbi állapot',
+	'Core:Synchro:History' => 'Szinkronizáció előzmények',
+	'Core:Synchro:NeverRun' => 'Még nem futott szinkronizálás. Nincs naplóbejegyzés.',
+	'Core:Synchro:SynchroEndedOn_Date' => 'A legutóbbi szinkronizáció befejezésének ideje %1$s.',
+	'Core:Synchro:SynchroRunningStartedOn_Date' => 'A szinkronizálás %1$s -kor elindult és még fut...',
+	'Menu:DataSources' => 'Szinkronizációs adatforrások',
+    // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataSources+' => 'Minden szinkronizációs adatforrás',
+    // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Core:Synchro:label_repl_ignored' => 'Figyelmen kívül hagyott (%1$s)',
+	'Core:Synchro:label_repl_disappeared' => 'Eltűnt (%1$s)',
+	'Core:Synchro:label_repl_existing' => 'Létező (%1$s)',
+	'Core:Synchro:label_repl_new' => 'Új (%1$s)',
+	'Core:Synchro:label_obj_deleted' => 'Törölt (%1$s)',
+	'Core:Synchro:label_obj_obsoleted' => 'Elavult (%1$s)',
+	'Core:Synchro:label_obj_disappeared_errors' => 'Hibák (%1$s)',
+	'Core:Synchro:label_obj_disappeared_no_action' => 'Nincs művelet (%1$s)',
+	'Core:Synchro:label_obj_unchanged' => 'Változatlan (%1$s)',
+	'Core:Synchro:label_obj_updated' => 'Frissített (%1$s)',
+	'Core:Synchro:label_obj_updated_errors' => 'Hibák (%1$s)',
+	'Core:Synchro:label_obj_new_unchanged' => 'Változatlan (%1$s)',
+	'Core:Synchro:label_obj_new_updated' => 'Frissített (%1$s)',
+	'Core:Synchro:label_obj_created' => 'Létrehozott (%1$s)',
+	'Core:Synchro:label_obj_new_errors' => 'Hibák (%1$s)',
+	'Core:SynchroLogTitle' => '%1$s - %2$s',
+	'Core:Synchro:Nb_Replica' => 'Feldolgozott replika: %1$s',
+	'Core:Synchro:Nb_Class:Objects' => '%1$s: %2$s',
+	'Class:SynchroDataSource/Error:AtLeastOneReconciliationKeyMustBeSpecified' => 'Legalább egy egyeztetési kulcsot meg kell adni, vagy az egyeztetési szabálynak az elsődleges kulcsot kell használnia.',
+	'Class:SynchroDataSource/Error:DeleteRetentionDurationMustBeSpecified' => 'Meg kell adni a törlési megőrzési időszakot, mivel az objektumokat az elavultként való megjelölés után törölni kell.',
+	'Class:SynchroDataSource/Error:DeletePolicyUpdateMustBeSpecified' => 'Az elavult objektumokat frissíteni kell, de nincs megadva frissítés.',
+	'Class:SynchroDataSource/Error:DataTableAlreadyExists' => 'A %1$s tábla már létezik az adatbázisban. Kérjük, használjon másik nevet a szinkronizálási adattáblához.',
+	'Core:SynchroReplica:PublicData' => 'Nyilvános adat',
+	'Core:SynchroReplica:PrivateDetails' => 'Személyi adatok',
+	'Core:SynchroReplica:BackToDataSource' => 'Visszatérés a szinkronizációs adatforráshoz: %1$s',
+	'Core:SynchroReplica:ListOfReplicas' => 'Replikák listája',
+	'Core:SynchroAttExtKey:ReconciliationById' => 'Azonosító (Elsődleges kulcs)',
+	'Core:SynchroAtt:attcode' => 'Attribútum',
+	'Core:SynchroAtt:attcode+' => 'Az objektum mezője',
+	'Core:SynchroAtt:reconciliation' => 'Egyeztetés ?',
+	'Core:SynchroAtt:reconciliation+' => 'Kereséshez használható',
+	'Core:SynchroAtt:update' => 'Frissítés ?',
+	'Core:SynchroAtt:update+' => 'Objektum frissítéshez használható',
+	'Core:SynchroAtt:update_policy' => 'Frissítési szabály',
+	'Core:SynchroAtt:update_policy+' => 'A frissített mező viselkedése',
+	'Core:SynchroAtt:reconciliation_attcode' => 'Egyeztető kulcs',
+	'Core:SynchroAtt:reconciliation_attcode+' => 'Attribútumkód a külső kulcs egyeztetéséhez',
+	'Core:SyncDataExchangeComment' => '(Adat szinkron)',
+	'Core:Synchro:ListOfDataSources' => 'Adatforrások listája:',
+	'Core:Synchro:LastSynchro' => 'Utolsó szinkronizálás:',
+	'Core:Synchro:ThisObjectIsSynchronized' => 'Ez az objektum egy külső adatforrással van szinkronizálva.',
+	'Core:Synchro:TheObjectWasCreatedBy_Source' => 'Az objektumot a %1$s külső adatforrás <b>létrehozta</b>',
+	'Core:Synchro:TheObjectCanBeDeletedBy_Source' => 'Az objektum <b>törölhető</b> a %1$s külső adatforrás által.',
+	'Core:Synchro:TheObjectCannotBeDeletedByUser_Source' => 'Az objektumot <b>nem lehet törölni</b>, mert az a %1$s külső adatforrás tulajdonában van',
+	'TitleSynchroExecution' => 'Szinkronizálás végrehajtása',
+	'Class:SynchroDataSource:DataTable' => 'Adatbázis tábla: %1$s',
+	'Core:SyncDataSourceObsolete' => 'Az adatforrás elavultnak van jelölve. A művelet törlésre került.',
+	'Core:SyncDataSourceAccessRestriction' => 'Ezt a műveletet csak a rendszergazdák vagy az adatforrásban megadott felhasználó végezheti el. A művelet törlésre került.',
+	'Core:SyncTooManyMissingReplicas' => 'Az összes rekordot egy ideje nem használta senki (az összes objektumot törölni lehet). Ellenőrizze, hogy a szinkronizációs táblába író folyamat még mindig fut-e. A művelet törlődött.',
+	'Core:SyncSplitModeCLIOnly' => 'A szinkronizálás csak akkor hajtható végre darabokban, ha CLI üzemmódban fut.',
+	'Core:Synchro:ListReplicas_AllReplicas_Errors_Warnings' => '%1$s replika, %2$s hiba, %3$s figyelmeztetés.',
+	'Core:SynchroReplica:TargetObject' => 'Szinkronizált objektum: %1$s',
+	'Class:AsyncSendEmail' => 'Email (aszinkron)',
+	'Class:AsyncSendEmail/Attribute:to' => 'Címzett',
+	'Class:AsyncSendEmail/Attribute:subject' => 'Tárgy',
+	'Class:AsyncSendEmail/Attribute:body' => 'Levéltörzs',
+	'Class:AsyncSendEmail/Attribute:header' => 'Fejléc',
+	'Class:CMDBChangeOpSetAttributeOneWayPassword' => 'Titkosított jelszó',
+	'Class:CMDBChangeOpSetAttributeOneWayPassword/Attribute:prev_pwd' => 'Előző érték',
+	'Class:CMDBChangeOpSetAttributeEncrypted' => 'Titkosított mező',
+	'Class:CMDBChangeOpSetAttributeEncrypted/Attribute:prevstring' => 'Előző érték',
+	'Class:CMDBChangeOpSetAttributeCaseLog' => 'Esetnapló',
+	'Class:CMDBChangeOpSetAttributeCaseLog/Attribute:lastentry' => 'Utolsó bejegyzés',
+	'Class:SynchroAttribute' => 'Szinkron attribútum',
+	'Class:SynchroAttribute/Attribute:sync_source_id' => 'Szinkronizációs adatforrás',
+	'Class:SynchroAttribute/Attribute:attcode' => 'Attribútumkód',
+	'Class:SynchroAttribute/Attribute:update' => 'Frissítés',
+	'Class:SynchroAttribute/Attribute:reconcile' => 'Egyeztetés',
+	'Class:SynchroAttribute/Attribute:update_policy' => 'Frissítési szabály',
+	'Class:SynchroAttribute/Attribute:update_policy/Value:master_locked' => 'Zárolva',
+	'Class:SynchroAttribute/Attribute:update_policy/Value:master_unlocked' => 'Feloldva',
+	'Class:SynchroAttribute/Attribute:update_policy/Value:write_if_empty' => 'Inicializálás, ha üres',
+	'Class:SynchroAttribute/Attribute:finalclass' => 'Osztály',
+	'Class:SynchroAttExtKey' => 'Szinkron attribútum (ExtKey)',
+	'Class:SynchroAttExtKey/Attribute:reconciliation_attcode' => 'Egyeztető attribútum',
+	'Class:SynchroAttLinkSet' => 'Szinkron attribútum (Linkset)',
+	'Class:SynchroAttLinkSet/Attribute:row_separator' => 'Sorelválasztó',
+	'Class:SynchroAttLinkSet/Attribute:attribute_separator' => 'Elválasztó attribútumok',
+	'Class:SynchroLog' => 'Szinkron napló',
+	'Class:SynchroLog/Attribute:sync_source_id' => 'Szinkronizációs adatforrás',
+	'Class:SynchroLog/Attribute:start_date' => 'Kezdés dátuma',
+	'Class:SynchroLog/Attribute:end_date' => 'Befejezés dátuma',
+	'Class:SynchroLog/Attribute:status' => 'Állapot',
+	'Class:SynchroLog/Attribute:status/Value:completed' => 'Befejezett',
+	'Class:SynchroLog/Attribute:status/Value:error' => 'Hiba',
+	'Class:SynchroLog/Attribute:status/Value:running' => 'Még fut',
+	'Class:SynchroLog/Attribute:stats_nb_replica_seen' => 'Nb talált replika',
+	'Class:SynchroLog/Attribute:stats_nb_replica_total' => 'Nb összes replika',
+	'Class:SynchroLog/Attribute:stats_nb_obj_deleted' => 'Nb törölt objektum',
+	'Class:SynchroLog/Attribute:stats_nb_obj_deleted_errors' => 'Nb hiba törléskor',
+	'Class:SynchroLog/Attribute:stats_nb_obj_obsoleted' => 'Nb elavult objektum',
+	'Class:SynchroLog/Attribute:stats_nb_obj_obsoleted_errors' => 'Nb hiba elavuláskor',
+	'Class:SynchroLog/Attribute:stats_nb_obj_created' => 'Nb létrehozott objektum',
+	'Class:SynchroLog/Attribute:stats_nb_obj_created_errors' => 'Nb hiba létrehozáskor',
+	'Class:SynchroLog/Attribute:stats_nb_obj_updated' => 'Nb objektum létrehozva',
+	'Class:SynchroLog/Attribute:stats_nb_obj_updated_errors' => 'Nb hiba frissítéskor',
+	'Class:SynchroLog/Attribute:stats_nb_replica_reconciled_errors' => 'Nb hiba egyeztetéskor',
+	'Class:SynchroLog/Attribute:stats_nb_replica_disappeared_no_action' => 'Nb replika eltűnt',
+	'Class:SynchroLog/Attribute:stats_nb_obj_new_updated' => 'Nb objektum frissítve',
+	'Class:SynchroLog/Attribute:stats_nb_obj_new_unchanged' => 'Nb objektum változatlan',
+	'Class:SynchroLog/Attribute:last_error' => 'Utolsó hiba',
+	'Class:SynchroLog/Attribute:traces' => 'Nyomok',
+	'Class:SynchroReplica' => 'Szinkron replika',
+	'Class:SynchroReplica/Attribute:sync_source_id' => 'Szinkronizációs adatforrás',
+	'Class:SynchroReplica/Attribute:dest_id' => 'Célobjektum (ID)',
+	'Class:SynchroReplica/Attribute:dest_class' => 'Cél típus',
+	'Class:SynchroReplica/Attribute:status_last_seen' => 'Utolsó előfordulás',
+	'Class:SynchroReplica/Attribute:status' => 'Állapot',
+	'Class:SynchroReplica/Attribute:status/Value:modified' => 'Módosítva',
+	'Class:SynchroReplica/Attribute:status/Value:new' => 'Új',
+	'Class:SynchroReplica/Attribute:status/Value:obsolete' => 'Elavult',
+	'Class:SynchroReplica/Attribute:status/Value:orphan' => 'Árva',
+	'Class:SynchroReplica/Attribute:status/Value:synchronized' => 'Szinkronizált',
+	'Class:SynchroReplica/Attribute:status_dest_creator' => 'Objektum létrehozva ?',
+	'Class:SynchroReplica/Attribute:status_last_error' => 'Utolsó hiba',
+	'Class:SynchroReplica/Attribute:status_last_warning' => 'Figyelmeztetések',
+	'Class:SynchroReplica/Attribute:info_creation_date' => 'Létrehozás dátuma',
+	'Class:SynchroReplica/Attribute:info_last_modified' => 'Utolsó módosítás dátuma',
+	'Class:appUserPreferences' => 'Felhasználói beállítások',
+	'Class:appUserPreferences/Attribute:userid' => 'Felhasználónév',
+	'Class:appUserPreferences/Attribute:preferences' => 'Beállítások',
+	'Core:ExecProcess:Code1' => 'Helytelen parancs vagy hibásan befejezett parancs (pl. helytelen szkriptnév)',
+	'Core:ExecProcess:Code255' => 'PHP hiba (parsing, vagy runtime)',
     // Attribute Duration
-    'Core:Duration_Seconds' => '%1$ds',
-    'Core:Duration_Minutes_Seconds' => '%1$dmin %2$ds',
-    'Core:Duration_Hours_Minutes_Seconds' => '%1$dh %2$dmin %3$ds',
-    'Core:Duration_Days_Hours_Minutes_Seconds' => '%1$sd %2$dh %3$dmin %4$ds',
-
+	'Core:Duration_Seconds' => '%1$ds',
+	'Core:Duration_Minutes_Seconds' => '%1$dmin %2$ds',
+	'Core:Duration_Hours_Minutes_Seconds' => '%1$dh %2$dmin %3$ds',
+	'Core:Duration_Days_Hours_Minutes_Seconds' => '%1$sd %2$dh %3$dmin %4$ds',
     // Explain working time computing
-    'Core:ExplainWTC:ElapsedTime' => 'Eltelt idő (tárolva mint %1$s)',
-    'Core:ExplainWTC:StopWatch-TimeSpent' => '%1$s ráfordított ideje',
-    'Core:ExplainWTC:StopWatch-Deadline' => '%1$s határideje %2$d%% -kor',
-
+	'Core:ExplainWTC:ElapsedTime' => 'Eltelt idő (tárolva mint %1$s)',
+	'Core:ExplainWTC:StopWatch-TimeSpent' => '%1$s ráfordított ideje',
+	'Core:ExplainWTC:StopWatch-Deadline' => '%1$s határideje %2$d%% -kor',
     // Bulk export
-    'Core:BulkExport:MissingParameter_Param' => '%1$s paramétere hiányzik',
-    'Core:BulkExport:InvalidParameter_Query' => 'A query paraméter értéke érvénytelen. Nincs lekérdezés gyűjtemény ehhez az azonosítóhoz: %1$s.',
-    'Core:BulkExport:ExportFormatPrompt' => 'Export formátum:',
-    'Core:BulkExportOf_Class' => '%1$s exportálás',
-    'Core:BulkExport:ClickHereToDownload_FileName' => 'Kattintson a %1$s letöltéséhez',
-    'Core:BulkExport:ExportResult' => 'Exportálás eredménye:',
-    'Core:BulkExport:RetrievingData' => 'Adatlekérés...',
-    'Core:BulkExport:HTMLFormat' => 'Weblap (*.html)',
-    'Core:BulkExport:CSVFormat' => 'Vesszővel elválasztott értékek (*.csv)',
-    'Core:BulkExport:XLSXFormat' => 'Excel 2007 vagy újabb (*.xlsx)',
-    'Core:BulkExport:PDFFormat' => 'PDF dokumentum (*.pdf)',
-    'Core:BulkExport:DragAndDropHelp' => 'Húzza az oszlopok fejléceit az oszlopok elrendezéséhez. A %1$s sorok előnézete. Az exportálandó sorok száma: %2$s.',
-    'Core:BulkExport:EmptyPreview' => 'Válassza ki az exportálandó oszlopokat a fenti listából.',
-    'Core:BulkExport:ColumnsOrder' => 'Oszlopsorrend',
-    'Core:BulkExport:AvailableColumnsFrom_Class' => 'Elérhető oszlopok %1$s -tól',
-    'Core:BulkExport:NoFieldSelected' => 'Válasszon ki legalább egy exportálandó oszlopot',
-    'Core:BulkExport:CheckAll' => 'Összes bejelölése',
-    'Core:BulkExport:UncheckAll' => 'Bejelölések megszüntetése',
-    'Core:BulkExport:ExportCancelledByUser' => 'Az exportálást a felhasználó megszakította',
-    'Core:BulkExport:CSVOptions' => 'CSV beállítások',
-    'Core:BulkExport:CSVLocalization' => 'Lokalizáció',
-    'Core:BulkExport:PDFOptions' => 'PDF beállítások',
-    'Core:BulkExport:PDFPageFormat' => 'Oldalformátum',
-    'Core:BulkExport:PDFPageSize' => 'Oldalméret:',
-    'Core:BulkExport:PageSize-A4' => 'A4',
-    'Core:BulkExport:PageSize-A3' => 'A3',
-    'Core:BulkExport:PageSize-Letter' => 'Letter',
-    'Core:BulkExport:PDFPageOrientation' => 'Tájolás:',
-    'Core:BulkExport:PageOrientation-L' => 'Vízszintes',
-    'Core:BulkExport:PageOrientation-P' => 'Függőleges',
-    'Core:BulkExport:XMLFormat' => 'XML fájl (*.xml)',
-    'Core:BulkExport:XMLOptions' => 'XML beállítások',
-    'Core:BulkExport:SpreadsheetFormat' => 'Táblázat HTML formátumban (*.html)',
-    'Core:BulkExport:SpreadsheetOptions' => 'Táblázat beállítások',
-    'Core:BulkExport:OptionNoLocalize' => 'Címke helyett kód exportálása',
-    'Core:BulkExport:OptionLinkSets' => 'Kapcsolódó objektumok bevonása',
-    'Core:BulkExport:OptionFormattedText' => 'Szövegformázás megtartása',
-    'Core:BulkExport:ScopeDefinition' => 'Az exportálandó objektumok meghatározása',
-    'Core:BulkExportLabelOQLExpression' => 'OQL lekérdezés:',
-    'Core:BulkExportLabelPhrasebookEntry' => 'Lekérdezés gyűjtemény bejegyzés:',
-    'Core:BulkExportMessageEmptyOQL' => 'Érvényes OQL lekérdezést adjon meg.',
-    'Core:BulkExportMessageEmptyPhrasebookEntry' => 'Érvényes lekérdezés gyűjtemény bejegyzést adjon meg.',
-    'Core:BulkExportQueryPlaceholder' => 'Ide írja az OQL lekérdezést...',
-    'Core:BulkExportCanRunNonInteractive' => 'Kattintson ide az exportálás nem interaktív módban történő futtatásához.',
-    'Core:BulkExportLegacyExport' => 'Kattintson ide a régebbi típusú exportálás eléréséhez.',
-    'Core:BulkExport:XLSXOptions' => 'Excel beállítások',
-    'Core:BulkExport:TextFormat' => 'HTML jelölést tartalmazó szöveges mezők',
-    'Core:BulkExport:DateTimeFormat' => 'Dátum és időformátum',
-    'Core:BulkExport:DateTimeFormatDefault_Example' => 'Alapértelmezett formátum (%1$s), Pl. %2$s',
-    'Core:BulkExport:DateTimeFormatCustom_Format' => 'Egyéni formátum: %1$s',
-    'Core:BulkExport:PDF:PageNumber' => '%1$s oldal',
-    'Core:DateTime:Placeholder_d' => 'DD', // Day of the month: 2 digits (with leading zero)
-    'Core:DateTime:Placeholder_j' => 'D', // Day of the month: 1 or 2 digits (without leading zero)
-    'Core:DateTime:Placeholder_m' => 'MM', // Month on 2 digits i.e. 01-12
-    'Core:DateTime:Placeholder_n' => 'M', // Month on 1 or 2 digits 1-12
-    'Core:DateTime:Placeholder_Y' => 'YYYY', // Year on 4 digits
-    'Core:DateTime:Placeholder_y' => 'YY', // Year on 2 digits
-    'Core:DateTime:Placeholder_H' => 'hh', // Hour 00..23
-    'Core:DateTime:Placeholder_h' => 'h', // Hour 01..12
-    'Core:DateTime:Placeholder_G' => 'hh', // Hour 0..23
-    'Core:DateTime:Placeholder_g' => 'h', // Hour 1..12
-    'Core:DateTime:Placeholder_a' => 'am/pm', // am/pm (lowercase)
-    'Core:DateTime:Placeholder_A' => 'AM/PM', // AM/PM (uppercase)
-    'Core:DateTime:Placeholder_i' => 'mm', // minutes, 2 digits: 00..59
-    'Core:DateTime:Placeholder_s' => 'ss', // seconds, 2 digits 00..59
-    'Core:Validator:Default' => 'Helytelen formátum',
-    'Core:Validator:Mandatory' => 'Töltse ki ezt a mezőt',
-    'Core:Validator:MustBeInteger' => 'Egész számnak kell lennie',
-    'Core:Validator:MustSelectOne' => 'Egyet válasszon',
+	'Core:BulkExport:MissingParameter_Param' => '%1$s paramétere hiányzik',
+	'Core:BulkExport:InvalidParameter_Query' => 'A query paraméter értéke érvénytelen. Nincs lekérdezés gyűjtemény ehhez az azonosítóhoz: %1$s.',
+	'Core:BulkExport:ExportFormatPrompt' => 'Export formátum:',
+	'Core:BulkExportOf_Class' => '%1$s exportálás',
+	'Core:BulkExport:ClickHereToDownload_FileName' => 'Kattintson a %1$s letöltéséhez',
+	'Core:BulkExport:ExportResult' => 'Exportálás eredménye:',
+	'Core:BulkExport:RetrievingData' => 'Adatlekérés...',
+	'Core:BulkExport:HTMLFormat' => 'Weblap (*.html)',
+	'Core:BulkExport:CSVFormat' => 'Vesszővel elválasztott értékek (*.csv)',
+	'Core:BulkExport:XLSXFormat' => 'Excel 2007 vagy újabb (*.xlsx)',
+	'Core:BulkExport:PDFFormat' => 'PDF dokumentum (*.pdf)',
+	'Core:BulkExport:DragAndDropHelp' => 'Húzza az oszlopok fejléceit az oszlopok elrendezéséhez. A %1$s sorok előnézete. Az exportálandó sorok száma: %2$s.',
+	'Core:BulkExport:EmptyPreview' => 'Válassza ki az exportálandó oszlopokat a fenti listából.',
+	'Core:BulkExport:ColumnsOrder' => 'Oszlopsorrend',
+	'Core:BulkExport:AvailableColumnsFrom_Class' => 'Elérhető oszlopok %1$s -tól',
+	'Core:BulkExport:NoFieldSelected' => 'Válasszon ki legalább egy exportálandó oszlopot',
+	'Core:BulkExport:CheckAll' => 'Összes bejelölése',
+	'Core:BulkExport:UncheckAll' => 'Bejelölések megszüntetése',
+	'Core:BulkExport:ExportCancelledByUser' => 'Az exportálást a felhasználó megszakította',
+	'Core:BulkExport:CSVOptions' => 'CSV beállítások',
+	'Core:BulkExport:CSVLocalization' => 'Lokalizáció',
+	'Core:BulkExport:PDFOptions' => 'PDF beállítások',
+	'Core:BulkExport:PDFPageFormat' => 'Oldalformátum',
+	'Core:BulkExport:PDFPageSize' => 'Oldalméret:',
+	'Core:BulkExport:PageSize-A4' => 'A4',
+	'Core:BulkExport:PageSize-A3' => 'A3',
+	'Core:BulkExport:PageSize-Letter' => 'Letter',
+	'Core:BulkExport:PDFPageOrientation' => 'Tájolás:',
+	'Core:BulkExport:PageOrientation-L' => 'Vízszintes',
+	'Core:BulkExport:PageOrientation-P' => 'Függőleges',
+	'Core:BulkExport:XMLFormat' => 'XML fájl (*.xml)',
+	'Core:BulkExport:XMLOptions' => 'XML beállítások',
+	'Core:BulkExport:SpreadsheetFormat' => 'Táblázat HTML formátumban (*.html)',
+	'Core:BulkExport:SpreadsheetOptions' => 'Táblázat beállítások',
+	'Core:BulkExport:OptionNoLocalize' => 'Címke helyett kód exportálása',
+	'Core:BulkExport:OptionLinkSets' => 'Kapcsolódó objektumok bevonása',
+	'Core:BulkExport:OptionFormattedText' => 'Szövegformázás megtartása',
+	'Core:BulkExport:ScopeDefinition' => 'Az exportálandó objektumok meghatározása',
+	'Core:BulkExportLabelOQLExpression' => 'OQL lekérdezés:',
+	'Core:BulkExportLabelPhrasebookEntry' => 'Lekérdezés gyűjtemény bejegyzés:',
+	'Core:BulkExportMessageEmptyOQL' => 'Érvényes OQL lekérdezést adjon meg.',
+	'Core:BulkExportMessageEmptyPhrasebookEntry' => 'Érvényes lekérdezés gyűjtemény bejegyzést adjon meg.',
+	'Core:BulkExportQueryPlaceholder' => 'Ide írja az OQL lekérdezést...',
+	'Core:BulkExportCanRunNonInteractive' => 'Kattintson ide az exportálás nem interaktív módban történő futtatásához.',
+	'Core:BulkExportLegacyExport' => 'Kattintson ide a régebbi típusú exportálás eléréséhez.',
+	'Core:BulkExport:XLSXOptions' => 'Excel beállítások',
+	'Core:BulkExport:TextFormat' => 'HTML jelölést tartalmazó szöveges mezők',
+	'Core:BulkExport:DateTimeFormat' => 'Dátum és időformátum',
+	'Core:BulkExport:DateTimeFormatDefault_Example' => 'Alapértelmezett formátum (%1$s), Pl. %2$s',
+	'Core:BulkExport:DateTimeFormatCustom_Format' => 'Egyéni formátum: %1$s',
+	'Core:BulkExport:PDF:PageNumber' => '%1$s oldal',
+	'Core:DateTime:Placeholder_d' => 'DD',
+    // Day of the month: 2 digits (with leading zero)
+	'Core:DateTime:Placeholder_j' => 'D',
+    // Day of the month: 1 or 2 digits (without leading zero)
+	'Core:DateTime:Placeholder_m' => 'MM',
+    // Month on 2 digits i.e. 01-12
+	'Core:DateTime:Placeholder_n' => 'M',
+    // Month on 1 or 2 digits 1-12
+	'Core:DateTime:Placeholder_Y' => 'YYYY',
+    // Year on 4 digits
+	'Core:DateTime:Placeholder_y' => 'YY',
+    // Year on 2 digits
+	'Core:DateTime:Placeholder_H' => 'hh',
+    // Hour 00..23
+	'Core:DateTime:Placeholder_h' => 'h',
+    // Hour 01..12
+	'Core:DateTime:Placeholder_G' => 'hh',
+    // Hour 0..23
+	'Core:DateTime:Placeholder_g' => 'h',
+    // Hour 1..12
+	'Core:DateTime:Placeholder_a' => 'am/pm',
+    // am/pm (lowercase)
+	'Core:DateTime:Placeholder_A' => 'AM/PM',
+    // AM/PM (uppercase)
+	'Core:DateTime:Placeholder_i' => 'mm',
+    // minutes, 2 digits: 00..59
+	'Core:DateTime:Placeholder_s' => 'ss',
+    // seconds, 2 digits 00..59
+	'Core:Validator:Default' => 'Helytelen formátum',
+	'Core:Validator:Mandatory' => 'Töltse ki ezt a mezőt',
+	'Core:Validator:MustBeInteger' => 'Egész számnak kell lennie',
+	'Core:Validator:MustSelectOne' => 'Egyet válasszon',
 ));
 
 //
 // Class: TagSetFieldData
 //
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:TagSetFieldData' => '%2$s a %1$s osztályhoz',
-    'Class:TagSetFieldData+' => '',
-
-    'Class:TagSetFieldData/Attribute:code' => 'Kód',
-    'Class:TagSetFieldData/Attribute:code+' => 'Belső kód. Legalább 3 alfanumerikus karaktert kell tartalmaznia.',
-    'Class:TagSetFieldData/Attribute:label' => 'Címke',
-    'Class:TagSetFieldData/Attribute:label+' => 'Megjelenített címke',
-    'Class:TagSetFieldData/Attribute:description' => 'Leírás',
-    'Class:TagSetFieldData/Attribute:description+' => '',
-    'Class:TagSetFieldData/Attribute:finalclass' => 'Címke típus',
-    'Class:TagSetFieldData/Attribute:obj_class' => 'Objektum osztály',
-    'Class:TagSetFieldData/Attribute:obj_attcode' => 'Mezőkód',
-
-    'Core:TagSetFieldData:ErrorDeleteUsedTag' => 'A felhasznált címkék nem törölhetők',
-    'Core:TagSetFieldData:ErrorDuplicateTagCodeOrLabel' => 'A címkekódoknak egyedinek kell lennie',
-    'Core:TagSetFieldData:ErrorTagCodeSyntax' => 'A címkekódnak 3 és %1$d közötti, betűvel kezdődő alfanumerikus karaktereket kell tartalmaznia.',
-    'Core:TagSetFieldData:ErrorTagCodeReservedWord' => 'A választott címkekód egy foglalt szóval egyezik',
-    'Core:TagSetFieldData:ErrorTagLabelSyntax' => 'A címkék felirata nem tartalmazhat %1$s -et és nem lehet üres.',
-    'Core:TagSetFieldData:ErrorCodeUpdateNotAllowed' => 'A címkekód nem változtatható, ha használatban van',
-    'Core:TagSetFieldData:ErrorClassUpdateNotAllowed' => 'Az "Object Class" címkék nem módosíthatók',
-    'Core:TagSetFieldData:ErrorAttCodeUpdateNotAllowed' => 'Az "Attribútumkód" címkék nem módosíthatók',
-    'Core:TagSetFieldData:WhereIsThisTagTab' => 'Címkehasználat (%1$d)',
-    'Core:TagSetFieldData:NoEntryFound' => 'Nincs bejegyzés ehhez a címkéhez',
+	'Class:TagSetFieldData' => '%2$s a %1$s osztályhoz',
+	'Class:TagSetFieldData+' => '',
+	'Class:TagSetFieldData/Attribute:code' => 'Kód',
+	'Class:TagSetFieldData/Attribute:code+' => 'Belső kód. Legalább 3 alfanumerikus karaktert kell tartalmaznia.',
+	'Class:TagSetFieldData/Attribute:label' => 'Címke',
+	'Class:TagSetFieldData/Attribute:label+' => 'Megjelenített címke',
+	'Class:TagSetFieldData/Attribute:description' => 'Leírás',
+	'Class:TagSetFieldData/Attribute:description+' => '',
+	'Class:TagSetFieldData/Attribute:finalclass' => 'Címke típus',
+	'Class:TagSetFieldData/Attribute:obj_class' => 'Objektum osztály',
+	'Class:TagSetFieldData/Attribute:obj_attcode' => 'Mezőkód',
+	'Core:TagSetFieldData:ErrorDeleteUsedTag' => 'A felhasznált címkék nem törölhetők',
+	'Core:TagSetFieldData:ErrorDuplicateTagCodeOrLabel' => 'A címkekódoknak egyedinek kell lennie',
+	'Core:TagSetFieldData:ErrorTagCodeSyntax' => 'A címkekódnak 3 és %1$d közötti, betűvel kezdődő alfanumerikus karaktereket kell tartalmaznia.',
+	'Core:TagSetFieldData:ErrorTagCodeReservedWord' => 'A választott címkekód egy foglalt szóval egyezik',
+	'Core:TagSetFieldData:ErrorTagLabelSyntax' => 'A címkék felirata nem tartalmazhat %1$s -et és nem lehet üres.',
+	'Core:TagSetFieldData:ErrorCodeUpdateNotAllowed' => 'A címkekód nem változtatható, ha használatban van',
+	'Core:TagSetFieldData:ErrorClassUpdateNotAllowed' => 'Az "Object Class" címkék nem módosíthatók',
+	'Core:TagSetFieldData:ErrorAttCodeUpdateNotAllowed' => 'Az "Attribútumkód" címkék nem módosíthatók',
+	'Core:TagSetFieldData:WhereIsThisTagTab' => 'Címkehasználat (%1$d)',
+	'Core:TagSetFieldData:NoEntryFound' => 'Nincs bejegyzés ehhez a címkéhez',
 ));
 
 //
 // Class: DBProperty
 //
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:DBProperty' => 'DB tulajdonságok',
-    'Class:DBProperty+' => '',
-    'Class:DBProperty/Attribute:name' => 'Név',
-    'Class:DBProperty/Attribute:name+' => '',
-    'Class:DBProperty/Attribute:description' => 'Leírás',
-    'Class:DBProperty/Attribute:description+' => '',
-    'Class:DBProperty/Attribute:value' => 'Érték',
-    'Class:DBProperty/Attribute:value+' => '',
-    'Class:DBProperty/Attribute:change_date' => 'Változás dátuma',
-    'Class:DBProperty/Attribute:change_date+' => '',
-    'Class:DBProperty/Attribute:change_comment' => 'Megjegyzés',
-    'Class:DBProperty/Attribute:change_comment+' => '',
+	'Class:DBProperty' => 'DB tulajdonságok',
+	'Class:DBProperty+' => '',
+	'Class:DBProperty/Attribute:name' => 'Név',
+	'Class:DBProperty/Attribute:name+' => '',
+	'Class:DBProperty/Attribute:description' => 'Leírás',
+	'Class:DBProperty/Attribute:description+' => '',
+	'Class:DBProperty/Attribute:value' => 'Érték',
+	'Class:DBProperty/Attribute:value+' => '',
+	'Class:DBProperty/Attribute:change_date' => 'Változás dátuma',
+	'Class:DBProperty/Attribute:change_date+' => '',
+	'Class:DBProperty/Attribute:change_comment' => 'Megjegyzés',
+	'Class:DBProperty/Attribute:change_comment+' => '',
 ));
 
 //
 // Class: BackgroundTask
 //
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:BackgroundTask' => 'Háttérfeladat',
-    'Class:BackgroundTask+' => '',
-    'Class:BackgroundTask/Attribute:class_name' => 'Osztálynév',
-    'Class:BackgroundTask/Attribute:class_name+' => '',
-    'Class:BackgroundTask/Attribute:first_run_date' => 'Első futás dátuma',
-    'Class:BackgroundTask/Attribute:first_run_date+' => '',
-    'Class:BackgroundTask/Attribute:latest_run_date' => 'Utolsó futás dátuma',
-    'Class:BackgroundTask/Attribute:latest_run_date+' => '',
-    'Class:BackgroundTask/Attribute:next_run_date' => 'Következő futás ideje',
-    'Class:BackgroundTask/Attribute:next_run_date+' => '',
-    'Class:BackgroundTask/Attribute:total_exec_count' => 'Futások száma',
-    'Class:BackgroundTask/Attribute:total_exec_count+' => '',
-    'Class:BackgroundTask/Attribute:latest_run_duration' => 'Utolsó futás időtartama',
-    'Class:BackgroundTask/Attribute:latest_run_duration+' => '',
-    'Class:BackgroundTask/Attribute:min_run_duration' => 'Legrövidebb futási idő',
-    'Class:BackgroundTask/Attribute:min_run_duration+' => '',
-    'Class:BackgroundTask/Attribute:max_run_duration' => 'Leghosszabb futási idő',
-    'Class:BackgroundTask/Attribute:max_run_duration+' => '',
-    'Class:BackgroundTask/Attribute:average_run_duration' => 'Átlagos futási idő',
-    'Class:BackgroundTask/Attribute:average_run_duration+' => '',
-    'Class:BackgroundTask/Attribute:running' => 'Fut',
-    'Class:BackgroundTask/Attribute:running+' => '',
-    'Class:BackgroundTask/Attribute:status' => 'Állapot',
-    'Class:BackgroundTask/Attribute:status+' => '',
+	'Class:BackgroundTask' => 'Háttérfeladat',
+	'Class:BackgroundTask+' => '',
+	'Class:BackgroundTask/Attribute:class_name' => 'Osztálynév',
+	'Class:BackgroundTask/Attribute:class_name+' => '',
+	'Class:BackgroundTask/Attribute:first_run_date' => 'Első futás dátuma',
+	'Class:BackgroundTask/Attribute:first_run_date+' => '',
+	'Class:BackgroundTask/Attribute:latest_run_date' => 'Utolsó futás dátuma',
+	'Class:BackgroundTask/Attribute:latest_run_date+' => '',
+	'Class:BackgroundTask/Attribute:next_run_date' => 'Következő futás ideje',
+	'Class:BackgroundTask/Attribute:next_run_date+' => '',
+	'Class:BackgroundTask/Attribute:total_exec_count' => 'Futások száma',
+	'Class:BackgroundTask/Attribute:total_exec_count+' => '',
+	'Class:BackgroundTask/Attribute:latest_run_duration' => 'Utolsó futás időtartama',
+	'Class:BackgroundTask/Attribute:latest_run_duration+' => '',
+	'Class:BackgroundTask/Attribute:min_run_duration' => 'Legrövidebb futási idő',
+	'Class:BackgroundTask/Attribute:min_run_duration+' => '',
+	'Class:BackgroundTask/Attribute:max_run_duration' => 'Leghosszabb futási idő',
+	'Class:BackgroundTask/Attribute:max_run_duration+' => '',
+	'Class:BackgroundTask/Attribute:average_run_duration' => 'Átlagos futási idő',
+	'Class:BackgroundTask/Attribute:average_run_duration+' => '',
+	'Class:BackgroundTask/Attribute:running' => 'Fut',
+	'Class:BackgroundTask/Attribute:running+' => '',
+	'Class:BackgroundTask/Attribute:status' => 'Állapot',
+	'Class:BackgroundTask/Attribute:status+' => '',
 ));
 
 //
 // Class: AsyncTask
 //
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:AsyncTask' => 'Aszinkron feladat',
-    'Class:AsyncTask+' => '',
-    'Class:AsyncTask/Attribute:created' => 'Létrehozva',
-    'Class:AsyncTask/Attribute:created+' => '',
-    'Class:AsyncTask/Attribute:started' => 'Elindítva',
-    'Class:AsyncTask/Attribute:started+' => '',
-    'Class:AsyncTask/Attribute:planned' => 'Betervezve',
-    'Class:AsyncTask/Attribute:planned+' => '',
-    'Class:AsyncTask/Attribute:event_id' => 'Esemény',
-    'Class:AsyncTask/Attribute:event_id+' => '',
-    'Class:AsyncTask/Attribute:finalclass' => 'Végleges osztály',
-    'Class:AsyncTask/Attribute:finalclass+' => '',
-    'Class:AsyncTask/Attribute:status' => 'Állapot',
-    'Class:AsyncTask/Attribute:status+' => '',
-    'Class:AsyncTask/Attribute:remaining_retries' => 'Maradék próbálkozás',
-    'Class:AsyncTask/Attribute:remaining_retries+' => '',
-    'Class:AsyncTask/Attribute:last_error_code' => 'Utolsó hibakód',
-    'Class:AsyncTask/Attribute:last_error_code+' => '',
-    'Class:AsyncTask/Attribute:last_error' => 'Utolsó hiba',
-    'Class:AsyncTask/Attribute:last_error+' => '',
-    'Class:AsyncTask/Attribute:last_attempt' => 'Utolsó próbálkozás',
-    'Class:AsyncTask/Attribute:last_attempt+' => '',
-    'Class:AsyncTask:InvalidConfig_Class_Keys' => 'Érvénytelen formátum az async_task_retries[%1$s] konfigurációhoz. A következő kulcsokkal rendelkező tömböt vár: %2$s',
-    'Class:AsyncTask:InvalidConfig_Class_InvalidKey_Keys' => 'Az async_task_retries[%1$s] konfigurációjának érvénytelen formátuma: %2$s váratlan kulcs. Csak a következő kulcsokat várja: %3$s',
+	'Class:AsyncTask' => 'Aszinkron feladat',
+	'Class:AsyncTask+' => '',
+	'Class:AsyncTask/Attribute:created' => 'Létrehozva',
+	'Class:AsyncTask/Attribute:created+' => '',
+	'Class:AsyncTask/Attribute:started' => 'Elindítva',
+	'Class:AsyncTask/Attribute:started+' => '',
+	'Class:AsyncTask/Attribute:planned' => 'Betervezve',
+	'Class:AsyncTask/Attribute:planned+' => '',
+	'Class:AsyncTask/Attribute:event_id' => 'Esemény',
+	'Class:AsyncTask/Attribute:event_id+' => '',
+	'Class:AsyncTask/Attribute:finalclass' => 'Végleges osztály',
+	'Class:AsyncTask/Attribute:finalclass+' => '',
+	'Class:AsyncTask/Attribute:status' => 'Állapot',
+	'Class:AsyncTask/Attribute:status+' => '',
+	'Class:AsyncTask/Attribute:remaining_retries' => 'Maradék próbálkozás',
+	'Class:AsyncTask/Attribute:remaining_retries+' => '',
+	'Class:AsyncTask/Attribute:last_error_code' => 'Utolsó hibakód',
+	'Class:AsyncTask/Attribute:last_error_code+' => '',
+	'Class:AsyncTask/Attribute:last_error' => 'Utolsó hiba',
+	'Class:AsyncTask/Attribute:last_error+' => '',
+	'Class:AsyncTask/Attribute:last_attempt' => 'Utolsó próbálkozás',
+	'Class:AsyncTask/Attribute:last_attempt+' => '',
+	'Class:AsyncTask:InvalidConfig_Class_Keys' => 'Érvénytelen formátum az async_task_retries[%1$s] konfigurációhoz. A következő kulcsokkal rendelkező tömböt vár: %2$s',
+	'Class:AsyncTask:InvalidConfig_Class_InvalidKey_Keys' => 'Az async_task_retries[%1$s] konfigurációjának érvénytelen formátuma: %2$s váratlan kulcs. Csak a következő kulcsokat várja: %3$s',
 ));
 
 //
@@ -1100,8 +1103,8 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:AbstractResource' => 'Absztrakt erőforrás',
-    'Class:AbstractResource+' => '',
+	'Class:AbstractResource' => 'Absztrakt erőforrás',
+	'Class:AbstractResource+' => '',
 ));
 
 //
@@ -1109,8 +1112,8 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:ResourceAdminMenu' => 'Erőforrás admin menü',
-    'Class:ResourceAdminMenu+' => '',
+	'Class:ResourceAdminMenu' => 'Erőforrás admin menü',
+	'Class:ResourceAdminMenu+' => '',
 ));
 
 //
@@ -1118,8 +1121,8 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:ResourceRunQueriesMenu' => 'Erőforrás lekérdezések futtatása menü',
-    'Class:ResourceRunQueriesMenu+' => '',
+	'Class:ResourceRunQueriesMenu' => 'Erőforrás lekérdezések futtatása menü',
+	'Class:ResourceRunQueriesMenu+' => '',
 ));
 
 //
@@ -1127,8 +1130,8 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:ResourceSystemMenu' => 'Erőforrás rendszer menü',
-    'Class:ResourceSystemMenu+' => '',
+	'Class:ResourceSystemMenu' => 'Erőforrás rendszer menü',
+	'Class:ResourceSystemMenu+' => '',
 ));
 
 
diff --git a/dictionaries/hu.dictionary.itop.ui.php b/dictionaries/hu.dictionary.itop.ui.php
index 44bd009949..de34c2e237 100755
--- a/dictionaries/hu.dictionary.itop.ui.php
+++ b/dictionaries/hu.dictionary.itop.ui.php
@@ -4,16 +4,22 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:AuditCategory' => 'Audit kategória',
-    'Class:AuditCategory+' => '',
-    'Class:AuditCategory/Attribute:name' => 'Kategórianév',
-    'Class:AuditCategory/Attribute:name+' => '',
-    'Class:AuditCategory/Attribute:description' => 'Leírás',
-    'Class:AuditCategory/Attribute:description+' => '',
-    'Class:AuditCategory/Attribute:definition_set' => 'Definíciókészlet',
-    'Class:AuditCategory/Attribute:definition_set+' => '',
-    'Class:AuditCategory/Attribute:rules_list' => 'Auditszabályok',
-    'Class:AuditCategory/Attribute:rules_list+' => 'Audit rules for this category~~',
+	'Class:AuditCategory' => 'Audit kategória',
+	'Class:AuditCategory+' => '',
+	'Class:AuditCategory/Attribute:name' => 'Kategórianév',
+	'Class:AuditCategory/Attribute:name+' => '',
+	'Class:AuditCategory/Attribute:description' => 'Leírás',
+	'Class:AuditCategory/Attribute:description+' => '',
+	'Class:AuditCategory/Attribute:definition_set' => 'Definíciókészlet',
+	'Class:AuditCategory/Attribute:definition_set+' => '',
+	'Class:AuditCategory/Attribute:rules_list' => 'Auditszabályok',
+	'Class:AuditCategory/Attribute:rules_list+' => 'Audit rules for this category~~',
+	'Class:AuditCategory/Attribute:ok_error_tolerance' => 'Warning threshold~~',
+	'Class:AuditCategory/Attribute:ok_error_tolerance+' => 'Percentage of invalid objects below which the result is a warning (orange)~~',
+	'Class:AuditCategory/Attribute:warning_error_tolerance' => 'Error threshold~~',
+	'Class:AuditCategory/Attribute:warning_error_tolerance+' => 'Percentage of invalid objects below which the result is in error (red)~~',
+	'Class:AuditCategory/Attribute:domains_list' => 'Domains~~',
+	'Class:AuditCategory/Attribute:domains_list+' => 'Domains which includes this category~~',
 ));
 
 //
@@ -21,27 +27,62 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:AuditRule' => 'Auditszabály',
-    'Class:AuditRule+' => '',
-    'Class:AuditRule/Attribute:name' => 'Szabály név',
-    'Class:AuditRule/Attribute:name+' => '',
-    'Class:AuditRule/Attribute:description' => 'Leírás',
-    'Class:AuditRule/Attribute:description+' => '',
-    'Class:TagSetFieldData/Attribute:finalclass' => 'Címkeosztály',
-    'Class:TagSetFieldData/Attribute:obj_class' => 'Objektumosztály',
-    'Class:TagSetFieldData/Attribute:obj_attcode' => 'Mezőkód',
-    'Class:AuditRule/Attribute:query' => 'Lekérdezés',
-    'Class:AuditRule/Attribute:query+' => '',
-    'Class:AuditRule/Attribute:valid_flag' => 'Érvényes objektum?',
-    'Class:AuditRule/Attribute:valid_flag+' => '',
-    'Class:AuditRule/Attribute:valid_flag/Value:true' => 'igaz',
-    'Class:AuditRule/Attribute:valid_flag/Value:true+' => '',
-    'Class:AuditRule/Attribute:valid_flag/Value:false' => 'hamis',
-    'Class:AuditRule/Attribute:valid_flag/Value:false+' => '',
-    'Class:AuditRule/Attribute:category_id' => 'Kategória',
-    'Class:AuditRule/Attribute:category_id+' => '',
-    'Class:AuditRule/Attribute:category_name' => 'Kategórianév',
-    'Class:AuditRule/Attribute:category_name+' => '',
+	'Class:AuditRule' => 'Auditszabály',
+	'Class:AuditRule+' => '',
+	'Class:AuditRule/Attribute:name' => 'Szabály név',
+	'Class:AuditRule/Attribute:name+' => '',
+	'Class:AuditRule/Attribute:description' => 'Leírás',
+	'Class:AuditRule/Attribute:description+' => '',
+	'Class:TagSetFieldData/Attribute:finalclass' => 'Címkeosztály',
+	'Class:TagSetFieldData/Attribute:obj_class' => 'Objektumosztály',
+	'Class:TagSetFieldData/Attribute:obj_attcode' => 'Mezőkód',
+	'Class:AuditRule/Attribute:query' => 'Lekérdezés',
+	'Class:AuditRule/Attribute:query+' => '',
+	'Class:AuditRule/Attribute:valid_flag' => 'Érvényes objektum?',
+	'Class:AuditRule/Attribute:valid_flag+' => '',
+	'Class:AuditRule/Attribute:valid_flag/Value:true' => 'igaz',
+	'Class:AuditRule/Attribute:valid_flag/Value:true+' => '',
+	'Class:AuditRule/Attribute:valid_flag/Value:false' => 'hamis',
+	'Class:AuditRule/Attribute:valid_flag/Value:false+' => '',
+	'Class:AuditRule/Attribute:category_id' => 'Kategória',
+	'Class:AuditRule/Attribute:category_id+' => '',
+	'Class:AuditRule/Attribute:category_name' => 'Kategórianév',
+	'Class:AuditRule/Attribute:category_name+' => ''
+));
+
+//
+// Class: AuditDomain
+//
+
+Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
+	'Class:AuditDomain' => 'Audit Domain~~',
+	'Class:AuditDomain+' => 'Audit domains allow to group the audit categories.
+Domain usually correspond to who is responsible for checking and fixing errors~~',
+	'Class:AuditDomain/Attribute:name' => 'Name~~',
+	'Class:AuditDomain/Attribute:name+' => 'Its a segmentation of the Audit by who is in charge of fixing it or just interested~~',
+	'Class:AuditDomain/Attribute:description' => 'Description~~',
+	'Class:AuditDomain/Attribute:description+' => '~~',
+	'Class:AuditDomain/Attribute:icon' => 'Icon~~',
+	'Class:AuditDomain/Attribute:icon+' => '~~',
+	'Class:AuditDomain/Attribute:categories_list' => 'Categories~~',
+	'Class:AuditDomain/Attribute:categories_list+' => 'Related audit categories. When running the audit on a domain, all related audit categories are checked and only those.~~',
+));
+
+//
+// Class: lnkAuditCategoryToAuditDomain
+//
+
+Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
+	'Class:lnkAuditCategoryToAuditDomain' => 'Link AuditCategory / AuditDomain~~',
+	'Class:lnkAuditCategoryToAuditDomain+' => '~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:category_id' => 'Category~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:category_id+' => 'Audit Category~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:category_name' => 'Category name~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:category_name+' => 'Audit category name~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:domain_id' => 'Domain~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:domain_id+' => 'Audit domain~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:domain_name' => 'Domain name~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:domain_name+' => 'Audit domain name~~',
 ));
 
 //
@@ -49,22 +90,32 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:Query' => 'Lekérdezés',
-    'Class:Query+' => 'A query is a data set defined in a dynamic way~~',
-    'Class:Query/Attribute:name' => 'Név',
-    'Class:Query/Attribute:name+' => 'Identifies the query~~',
-    'Class:Query/Attribute:description' => 'Leírás',
-    'Class:Query/Attribute:description+' => 'Long description for the query (purpose, usage, etc.)~~',
-    'Class:Query/Attribute:is_template' => 'OQL mező sablonok',
-    'Class:Query/Attribute:is_template+' => 'Usable as source for recipient OQL in Notifications~~',
-    'Class:Query/Attribute:is_template/Value:yes' => 'Igen',
-    'Class:Query/Attribute:is_template/Value:no' => 'Nem',
-    'Class:QueryOQL/Attribute:fields' => 'Mezők',
-    'Class:QueryOQL/Attribute:fields+' => 'Comma separated list of attributes (or alias.attribute) to export~~',
-    'Class:QueryOQL' => 'OQL lekérdezés',
-    'Class:QueryOQL+' => 'A query based on the Object Query Language~~',
-    'Class:QueryOQL/Attribute:oql' => 'Kifejezés',
-    'Class:QueryOQL/Attribute:oql+' => 'OQL kifejezés',
+	'Class:Query' => 'Lekérdezés',
+	'Class:Query+' => 'A query is a data set defined in a dynamic way~~',
+	'Class:Query/Attribute:name' => 'Név',
+	'Class:Query/Attribute:name+' => 'Identifies the query~~',
+	'Class:Query/Attribute:description' => 'Leírás',
+	'Class:Query/Attribute:description+' => 'Long description for the query (purpose, usage, etc.)~~',
+	'Class:Query/Attribute:is_template' => 'OQL mező sablonok',
+	'Class:Query/Attribute:is_template+' => 'Usable as source for recipient OQL in Notifications~~',
+	'Class:Query/Attribute:is_template/Value:yes' => 'Igen',
+	'Class:Query/Attribute:is_template/Value:no' => 'Nem',
+	'Class:Query/Attribute:export_count' => 'Export counter~~',
+	'Class:Query/Attribute:export_count+' => 'Counter reflecting the number of time this query has been executed~~',
+	'Class:Query/Attribute:export_last_date' => 'Last export~~',
+	'Class:Query/Attribute:export_last_date+' => 'Date and time of the last export execution~~',
+	'Class:Query/Attribute:export_last_user_id' => 'User~~',
+	'Class:Query/Attribute:export_last_user_id+' => 'The user who executed the last export~~',
+	'Class:Query/Attribute:export_last_user_contact' => 'Contact~~',
+	'Class:Query/Attribute:export_last_user_contact+' => 'The contact who executed the last export~~',
+	'Query:baseinfo' => 'General information~~',
+	'Query:exportInfo' => 'Export information~~',
+	'Class:QueryOQL/Attribute:fields' => 'Mezők',
+	'Class:QueryOQL/Attribute:fields+' => 'Comma separated list of attributes (or alias.attribute) to export~~',
+	'Class:QueryOQL' => 'OQL lekérdezés',
+	'Class:QueryOQL+' => 'A query based on the Object Query Language~~',
+	'Class:QueryOQL/Attribute:oql' => 'Kifejezés',
+	'Class:QueryOQL/Attribute:oql+' => 'OQL kifejezés',
 ));
 
 //////////////////////////////////////////////////////////////////////
@@ -77,49 +128,48 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:User' => 'Felhasználó',
-    'Class:User+' => '',
-    'Class:User/Attribute:finalclass' => 'Felhasználó típus',
-    'Class:User/Attribute:finalclass+' => '',
-    'Class:User/Attribute:contactid' => 'Kapcsolattartó',
-    'Class:User/Attribute:contactid+' => '',
-    'Class:User/Attribute:org_id' => 'Szervezeti egység',
-    'Class:User/Attribute:org_id+' => 'A társított személy szervezeti egysége',
-    'Class:User/Attribute:last_name' => 'Családnév',
-    'Class:User/Attribute:last_name+' => '',
-    'Class:User/Attribute:first_name' => 'Keresztnév',
-    'Class:User/Attribute:first_name+' => '',
-    'Class:User/Attribute:email' => 'Email cím',
-    'Class:User/Attribute:email+' => '',
-    'Class:User/Attribute:login' => 'Felhasználónév',
-    'Class:User/Attribute:login+' => '',
-    'Class:User/Attribute:language' => 'Nyelv',
-    'Class:User/Attribute:language+' => '',
-    'Class:User/Attribute:language/Value:EN US' => 'Angol',
-    'Class:User/Attribute:language/Value:EN US+' => '',
-    'Class:User/Attribute:language/Value:FR FR' => 'Francia',
-    'Class:User/Attribute:language/Value:FR FR+' => '',
-    'Class:User/Attribute:profile_list' => 'Profil',
-    'Class:User/Attribute:profile_list+' => 'Roles, granting rights for that person~~',
-    'Class:User/Attribute:allowed_org_list' => 'Engedélyezett szervezeti egységek',
-    'Class:User/Attribute:allowed_org_list+' => 'The end user is allowed to see data belonging to the following organizations. If no organization is specified, there is no restriction.~~',
-    'Class:User/Attribute:status' => 'Állapot',
-    'Class:User/Attribute:status+' => 'Whether the user account is enabled or disabled.~~',
-    'Class:User/Attribute:status/Value:enabled' => 'Engedélyezett',
-    'Class:User/Attribute:status/Value:disabled' => 'Letiltott',
-
-    'Class:User/Error:LoginMustBeUnique' => 'A felhasználónévnek egyedinek kell lennie - %1s már létezik.',
-    'Class:User/Error:AtLeastOneProfileIsNeeded' => 'Legalább egy profilt a felhasználóhoz kell rendelni.',
-    'Class:User/Error:ProfileNotAllowed' => 'A %1$s profil nem adható hozzá, le lesz tiltva',
-    'Class:User/Error:StatusChangeIsNotAllowed' => 'A saját felhasználó státuszának cseréje nem engedélyezett',
-    'Class:User/Error:AllowedOrgsMustContainUserOrg' => 'Az engedélyezett szervezeteknek tartalmazniuk kell a felhasználói szervezetet',
-    'Class:User/Error:CurrentProfilesHaveInsufficientRights' => 'A profilok jelenlegi listája nem ad elegendő hozzáférési jogot (a felhasználók már nem módosíthatók)',
-    'Class:User/Error:AtLeastOneOrganizationIsNeeded' => 'A felhasználóhoz legalább egy szervezeti egységet hozzá kell rendelni',
-    'Class:User/Error:OrganizationNotAllowed' => 'A szervezeti egység nem engedélyezett.',
-    'Class:User/Error:UserOrganizationNotAllowed' => 'A felhasználói fiók nem tartozik engedélyezett szervezeti egységhez.',
-    'Class:User/Error:PersonIsMandatory' => 'A kapcsolattartó megadása kötelező',
-    'Class:UserInternal' => 'Belső felhasználó',
-    'Class:UserInternal+' => ''.ITOP_APPLICATION_SHORT.'-ban létrehozott felhasználó',
+	'Class:User' => 'Felhasználó',
+	'Class:User+' => '',
+	'Class:User/Attribute:finalclass' => 'Felhasználó típus',
+	'Class:User/Attribute:finalclass+' => '',
+	'Class:User/Attribute:contactid' => 'Kapcsolattartó',
+	'Class:User/Attribute:contactid+' => '',
+	'Class:User/Attribute:org_id' => 'Szervezeti egység',
+	'Class:User/Attribute:org_id+' => 'A társított személy szervezeti egysége',
+	'Class:User/Attribute:last_name' => 'Családnév',
+	'Class:User/Attribute:last_name+' => '',
+	'Class:User/Attribute:first_name' => 'Keresztnév',
+	'Class:User/Attribute:first_name+' => '',
+	'Class:User/Attribute:email' => 'Email cím',
+	'Class:User/Attribute:email+' => '',
+	'Class:User/Attribute:login' => 'Felhasználónév',
+	'Class:User/Attribute:login+' => '',
+	'Class:User/Attribute:language' => 'Nyelv',
+	'Class:User/Attribute:language+' => '',
+	'Class:User/Attribute:language/Value:EN US' => 'Angol',
+	'Class:User/Attribute:language/Value:EN US+' => '',
+	'Class:User/Attribute:language/Value:FR FR' => 'Francia',
+	'Class:User/Attribute:language/Value:FR FR+' => '',
+	'Class:User/Attribute:profile_list' => 'Profil',
+	'Class:User/Attribute:profile_list+' => 'Roles, granting rights for that person~~',
+	'Class:User/Attribute:allowed_org_list' => 'Engedélyezett szervezeti egységek',
+	'Class:User/Attribute:allowed_org_list+' => 'The end user is allowed to see data belonging to the following organizations. If no organization is specified, there is no restriction.~~',
+	'Class:User/Attribute:status' => 'Állapot',
+	'Class:User/Attribute:status+' => 'Whether the user account is enabled or disabled.~~',
+	'Class:User/Attribute:status/Value:enabled' => 'Engedélyezett',
+	'Class:User/Attribute:status/Value:disabled' => 'Letiltott',
+	'Class:User/Error:LoginMustBeUnique' => 'A felhasználónévnek egyedinek kell lennie - "%1s" már létezik.',
+	'Class:User/Error:AtLeastOneProfileIsNeeded' => 'Legalább egy profilt a felhasználóhoz kell rendelni.',
+	'Class:User/Error:ProfileNotAllowed' => 'A "%1$s" profil nem adható hozzá, le lesz tiltva',
+	'Class:User/Error:StatusChangeIsNotAllowed' => 'A saját felhasználó státuszának cseréje nem engedélyezett',
+	'Class:User/Error:AllowedOrgsMustContainUserOrg' => 'Az engedélyezett szervezeteknek tartalmazniuk kell a felhasználói szervezetet',
+	'Class:User/Error:CurrentProfilesHaveInsufficientRights' => 'A profilok jelenlegi listája nem ad elegendő hozzáférési jogot (a felhasználók már nem módosíthatók)',
+	'Class:User/Error:AtLeastOneOrganizationIsNeeded' => 'A felhasználóhoz legalább egy szervezeti egységet hozzá kell rendelni',
+	'Class:User/Error:OrganizationNotAllowed' => 'A szervezeti egység nem engedélyezett.',
+	'Class:User/Error:UserOrganizationNotAllowed' => 'A felhasználói fiók nem tartozik engedélyezett szervezeti egységhez.',
+	'Class:User/Error:PersonIsMandatory' => 'A kapcsolattartó megadása kötelező',
+	'Class:UserInternal' => 'Belső felhasználó',
+	'Class:UserInternal+' => ''.ITOP_APPLICATION_SHORT.'-ban létrehozott felhasználó',
 ));
 
 //
@@ -127,14 +177,14 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:URP_Profiles' => 'Profil',
-    'Class:URP_Profiles+' => '',
-    'Class:URP_Profiles/Attribute:name' => 'Profilnév',
-    'Class:URP_Profiles/Attribute:name+' => '',
-    'Class:URP_Profiles/Attribute:description' => 'Leírás',
-    'Class:URP_Profiles/Attribute:description+' => '',
-    'Class:URP_Profiles/Attribute:user_list' => 'Felhasználók',
-    'Class:URP_Profiles/Attribute:user_list+' => '',
+	'Class:URP_Profiles' => 'Profil',
+	'Class:URP_Profiles+' => '',
+	'Class:URP_Profiles/Attribute:name' => 'Profilnév',
+	'Class:URP_Profiles/Attribute:name+' => '',
+	'Class:URP_Profiles/Attribute:description' => 'Leírás',
+	'Class:URP_Profiles/Attribute:description+' => '',
+	'Class:URP_Profiles/Attribute:user_list' => 'Felhasználók',
+	'Class:URP_Profiles/Attribute:user_list+' => '',
 ));
 
 //
@@ -142,14 +192,14 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:URP_Dimensions' => 'Dimenzió',
-    'Class:URP_Dimensions+' => '',
-    'Class:URP_Dimensions/Attribute:name' => 'Dimenziónév',
-    'Class:URP_Dimensions/Attribute:name+' => '',
-    'Class:URP_Dimensions/Attribute:description' => 'Leírás',
-    'Class:URP_Dimensions/Attribute:description+' => '',
-    'Class:URP_Dimensions/Attribute:type' => 'Típus',
-    'Class:URP_Dimensions/Attribute:type+' => '',
+	'Class:URP_Dimensions' => 'Dimenzió',
+	'Class:URP_Dimensions+' => '',
+	'Class:URP_Dimensions/Attribute:name' => 'Dimenziónév',
+	'Class:URP_Dimensions/Attribute:name+' => '',
+	'Class:URP_Dimensions/Attribute:description' => 'Leírás',
+	'Class:URP_Dimensions/Attribute:description+' => '',
+	'Class:URP_Dimensions/Attribute:type' => 'Típus',
+	'Class:URP_Dimensions/Attribute:type+' => '',
 ));
 
 //
@@ -157,19 +207,19 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:URP_UserProfile' => 'Profilhoz rendelt felhasználók',
-    'Class:URP_UserProfile+' => '',
-    'Class:URP_UserProfile/Name' => 'Kapcsolat %1$s és %2$s között',
-    'Class:URP_UserProfile/Attribute:userid' => 'Felhasználó',
-    'Class:URP_UserProfile/Attribute:userid+' => '',
-    'Class:URP_UserProfile/Attribute:userlogin' => 'Felhasználónév',
-    'Class:URP_UserProfile/Attribute:userlogin+' => '',
-    'Class:URP_UserProfile/Attribute:profileid' => 'Profil',
-    'Class:URP_UserProfile/Attribute:profileid+' => '',
-    'Class:URP_UserProfile/Attribute:profile' => 'Profilnév',
-    'Class:URP_UserProfile/Attribute:profile+' => '',
-    'Class:URP_UserProfile/Attribute:reason' => 'Indoklás',
-    'Class:URP_UserProfile/Attribute:reason+' => '',
+	'Class:URP_UserProfile' => 'Profilhoz rendelt felhasználók',
+	'Class:URP_UserProfile+' => '',
+	'Class:URP_UserProfile/Name' => 'Kapcsolat %1$s és %2$s között',
+	'Class:URP_UserProfile/Attribute:userid' => 'Felhasználó',
+	'Class:URP_UserProfile/Attribute:userid+' => '',
+	'Class:URP_UserProfile/Attribute:userlogin' => 'Felhasználónév',
+	'Class:URP_UserProfile/Attribute:userlogin+' => '',
+	'Class:URP_UserProfile/Attribute:profileid' => 'Profil',
+	'Class:URP_UserProfile/Attribute:profileid+' => '',
+	'Class:URP_UserProfile/Attribute:profile' => 'Profilnév',
+	'Class:URP_UserProfile/Attribute:profile+' => '',
+	'Class:URP_UserProfile/Attribute:reason' => 'Indoklás',
+	'Class:URP_UserProfile/Attribute:reason+' => '',
 ));
 
 //
@@ -178,19 +228,19 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:URP_UserOrg' => 'Felhasználó szervezeti tagsága',
-    'Class:URP_UserOrg+' => '',
-    'Class:URP_UserOrg/Name' => 'Kapcsolat %1$s és %2$s között',
-    'Class:URP_UserOrg/Attribute:userid' => 'Felhasználó',
-    'Class:URP_UserOrg/Attribute:userid+' => '',
-    'Class:URP_UserOrg/Attribute:userlogin' => 'Felhasználónév',
-    'Class:URP_UserOrg/Attribute:userlogin+' => '',
-    'Class:URP_UserOrg/Attribute:allowed_org_id' => 'Szervezeti egység',
-    'Class:URP_UserOrg/Attribute:allowed_org_id+' => '',
-    'Class:URP_UserOrg/Attribute:allowed_org_name' => 'Szervezeti egység név',
-    'Class:URP_UserOrg/Attribute:allowed_org_name+' => '',
-    'Class:URP_UserOrg/Attribute:reason' => 'Indoklás',
-    'Class:URP_UserOrg/Attribute:reason+' => '',
+	'Class:URP_UserOrg' => 'Felhasználó szervezeti tagsága',
+	'Class:URP_UserOrg+' => '',
+	'Class:URP_UserOrg/Name' => 'Kapcsolat %1$s és %2$s között',
+	'Class:URP_UserOrg/Attribute:userid' => 'Felhasználó',
+	'Class:URP_UserOrg/Attribute:userid+' => '',
+	'Class:URP_UserOrg/Attribute:userlogin' => 'Felhasználónév',
+	'Class:URP_UserOrg/Attribute:userlogin+' => '',
+	'Class:URP_UserOrg/Attribute:allowed_org_id' => 'Szervezeti egység',
+	'Class:URP_UserOrg/Attribute:allowed_org_id+' => '',
+	'Class:URP_UserOrg/Attribute:allowed_org_name' => 'Szervezeti egység név',
+	'Class:URP_UserOrg/Attribute:allowed_org_name+' => '',
+	'Class:URP_UserOrg/Attribute:reason' => 'Indoklás',
+	'Class:URP_UserOrg/Attribute:reason+' => '',
 ));
 
 //
@@ -198,20 +248,20 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:URP_ProfileProjection' => 'profile_projection',
-    'Class:URP_ProfileProjection+' => '',
-    'Class:URP_ProfileProjection/Attribute:dimensionid' => 'Dimenzió',
-    'Class:URP_ProfileProjection/Attribute:dimensionid+' => '',
-    'Class:URP_ProfileProjection/Attribute:dimension' => 'Dimenziónév',
-    'Class:URP_ProfileProjection/Attribute:dimension+' => '',
-    'Class:URP_ProfileProjection/Attribute:profileid' => 'Profil',
-    'Class:URP_ProfileProjection/Attribute:profileid+' => '',
-    'Class:URP_ProfileProjection/Attribute:profile' => 'Profilnév',
-    'Class:URP_ProfileProjection/Attribute:profile+' => '',
-    'Class:URP_ProfileProjection/Attribute:value' => 'Érték',
-    'Class:URP_ProfileProjection/Attribute:value+' => '',
-    'Class:URP_ProfileProjection/Attribute:attribute' => 'Attribútum',
-    'Class:URP_ProfileProjection/Attribute:attribute+' => '',
+	'Class:URP_ProfileProjection' => 'profile_projection',
+	'Class:URP_ProfileProjection+' => '',
+	'Class:URP_ProfileProjection/Attribute:dimensionid' => 'Dimenzió',
+	'Class:URP_ProfileProjection/Attribute:dimensionid+' => '',
+	'Class:URP_ProfileProjection/Attribute:dimension' => 'Dimenziónév',
+	'Class:URP_ProfileProjection/Attribute:dimension+' => '',
+	'Class:URP_ProfileProjection/Attribute:profileid' => 'Profil',
+	'Class:URP_ProfileProjection/Attribute:profileid+' => '',
+	'Class:URP_ProfileProjection/Attribute:profile' => 'Profilnév',
+	'Class:URP_ProfileProjection/Attribute:profile+' => '',
+	'Class:URP_ProfileProjection/Attribute:value' => 'Érték',
+	'Class:URP_ProfileProjection/Attribute:value+' => '',
+	'Class:URP_ProfileProjection/Attribute:attribute' => 'Attribútum',
+	'Class:URP_ProfileProjection/Attribute:attribute+' => '',
 ));
 
 //
@@ -219,18 +269,18 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:URP_ClassProjection' => 'class_projection',
-    'Class:URP_ClassProjection+' => '',
-    'Class:URP_ClassProjection/Attribute:dimensionid' => 'Dimenzió',
-    'Class:URP_ClassProjection/Attribute:dimensionid+' => '',
-    'Class:URP_ClassProjection/Attribute:dimension' => 'Dimenziónév',
-    'Class:URP_ClassProjection/Attribute:dimension+' => '',
-    'Class:URP_ClassProjection/Attribute:class' => 'Osztály',
-    'Class:URP_ClassProjection/Attribute:class+' => '',
-    'Class:URP_ClassProjection/Attribute:value' => 'Érték',
-    'Class:URP_ClassProjection/Attribute:value+' => '',
-    'Class:URP_ClassProjection/Attribute:attribute' => 'Attribútum',
-    'Class:URP_ClassProjection/Attribute:attribute+' => '',
+	'Class:URP_ClassProjection' => 'class_projection',
+	'Class:URP_ClassProjection+' => '',
+	'Class:URP_ClassProjection/Attribute:dimensionid' => 'Dimenzió',
+	'Class:URP_ClassProjection/Attribute:dimensionid+' => '',
+	'Class:URP_ClassProjection/Attribute:dimension' => 'Dimenziónév',
+	'Class:URP_ClassProjection/Attribute:dimension+' => '',
+	'Class:URP_ClassProjection/Attribute:class' => 'Osztály',
+	'Class:URP_ClassProjection/Attribute:class+' => '',
+	'Class:URP_ClassProjection/Attribute:value' => 'Érték',
+	'Class:URP_ClassProjection/Attribute:value+' => '',
+	'Class:URP_ClassProjection/Attribute:attribute' => 'Attribútum',
+	'Class:URP_ClassProjection/Attribute:attribute+' => '',
 ));
 
 //
@@ -238,22 +288,22 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:URP_ActionGrant' => 'action_permission',
-    'Class:URP_ActionGrant+' => '',
-    'Class:URP_ActionGrant/Attribute:profileid' => 'Profil',
-    'Class:URP_ActionGrant/Attribute:profileid+' => '',
-    'Class:URP_ActionGrant/Attribute:profile' => 'Profilnév',
-    'Class:URP_ActionGrant/Attribute:profile+' => '',
-    'Class:URP_ActionGrant/Attribute:class' => 'Osztály',
-    'Class:URP_ActionGrant/Attribute:class+' => '',
-    'Class:URP_ActionGrant/Attribute:permission' => 'Jogosultság',
-    'Class:URP_ActionGrant/Attribute:permission+' => '',
-    'Class:URP_ActionGrant/Attribute:permission/Value:yes' => 'Igen',
-    'Class:URP_ActionGrant/Attribute:permission/Value:yes+' => '',
-    'Class:URP_ActionGrant/Attribute:permission/Value:no' => 'Nem',
-    'Class:URP_ActionGrant/Attribute:permission/Value:no+' => '',
-    'Class:URP_ActionGrant/Attribute:action' => 'Művelet',
-    'Class:URP_ActionGrant/Attribute:action+' => '',
+	'Class:URP_ActionGrant' => 'action_permission',
+	'Class:URP_ActionGrant+' => '',
+	'Class:URP_ActionGrant/Attribute:profileid' => 'Profil',
+	'Class:URP_ActionGrant/Attribute:profileid+' => '',
+	'Class:URP_ActionGrant/Attribute:profile' => 'Profilnév',
+	'Class:URP_ActionGrant/Attribute:profile+' => '',
+	'Class:URP_ActionGrant/Attribute:class' => 'Osztály',
+	'Class:URP_ActionGrant/Attribute:class+' => '',
+	'Class:URP_ActionGrant/Attribute:permission' => 'Jogosultság',
+	'Class:URP_ActionGrant/Attribute:permission+' => '',
+	'Class:URP_ActionGrant/Attribute:permission/Value:yes' => 'Igen',
+	'Class:URP_ActionGrant/Attribute:permission/Value:yes+' => '',
+	'Class:URP_ActionGrant/Attribute:permission/Value:no' => 'Nem',
+	'Class:URP_ActionGrant/Attribute:permission/Value:no+' => '',
+	'Class:URP_ActionGrant/Attribute:action' => 'Művelet',
+	'Class:URP_ActionGrant/Attribute:action+' => '',
 ));
 
 //
@@ -261,22 +311,22 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:URP_StimulusGrant' => 'stimulus_permission',
-    'Class:URP_StimulusGrant+' => '',
-    'Class:URP_StimulusGrant/Attribute:profileid' => 'Profil',
-    'Class:URP_StimulusGrant/Attribute:profileid+' => '',
-    'Class:URP_StimulusGrant/Attribute:profile' => 'Profilnév',
-    'Class:URP_StimulusGrant/Attribute:profile+' => '',
-    'Class:URP_StimulusGrant/Attribute:class' => 'Osztály',
-    'Class:URP_StimulusGrant/Attribute:class+' => '',
-    'Class:URP_StimulusGrant/Attribute:permission' => 'Jogosultság',
-    'Class:URP_StimulusGrant/Attribute:permission+' => '',
-    'Class:URP_StimulusGrant/Attribute:permission/Value:yes' => 'Igen',
-    'Class:URP_StimulusGrant/Attribute:permission/Value:yes+' => '',
-    'Class:URP_StimulusGrant/Attribute:permission/Value:no' => 'Nem',
-    'Class:URP_StimulusGrant/Attribute:permission/Value:no+' => '',
-    'Class:URP_StimulusGrant/Attribute:stimulus' => 'Stimulus',
-    'Class:URP_StimulusGrant/Attribute:stimulus+' => '',
+	'Class:URP_StimulusGrant' => 'stimulus_permission',
+	'Class:URP_StimulusGrant+' => '',
+	'Class:URP_StimulusGrant/Attribute:profileid' => 'Profil',
+	'Class:URP_StimulusGrant/Attribute:profileid+' => '',
+	'Class:URP_StimulusGrant/Attribute:profile' => 'Profilnév',
+	'Class:URP_StimulusGrant/Attribute:profile+' => '',
+	'Class:URP_StimulusGrant/Attribute:class' => 'Osztály',
+	'Class:URP_StimulusGrant/Attribute:class+' => '',
+	'Class:URP_StimulusGrant/Attribute:permission' => 'Jogosultság',
+	'Class:URP_StimulusGrant/Attribute:permission+' => '',
+	'Class:URP_StimulusGrant/Attribute:permission/Value:yes' => 'Igen',
+	'Class:URP_StimulusGrant/Attribute:permission/Value:yes+' => '',
+	'Class:URP_StimulusGrant/Attribute:permission/Value:no' => 'Nem',
+	'Class:URP_StimulusGrant/Attribute:permission/Value:no+' => '',
+	'Class:URP_StimulusGrant/Attribute:stimulus' => 'Stimulus',
+	'Class:URP_StimulusGrant/Attribute:stimulus+' => '',
 ));
 
 //
@@ -284,54 +334,72 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:URP_AttributeGrant' => 'attribute_permission',
-    'Class:URP_AttributeGrant+' => '',
-    'Class:URP_AttributeGrant/Attribute:actiongrantid' => 'Művelet engedély',
-    'Class:URP_AttributeGrant/Attribute:actiongrantid+' => '',
-    'Class:URP_AttributeGrant/Attribute:attcode' => 'Attribútum',
-    'Class:URP_AttributeGrant/Attribute:attcode+' => '',
+	'Class:URP_AttributeGrant' => 'attribute_permission',
+	'Class:URP_AttributeGrant+' => '',
+	'Class:URP_AttributeGrant/Attribute:actiongrantid' => 'Művelet engedély',
+	'Class:URP_AttributeGrant/Attribute:actiongrantid+' => '',
+	'Class:URP_AttributeGrant/Attribute:attcode' => 'Attribútum',
+	'Class:URP_AttributeGrant/Attribute:attcode+' => '',
 ));
 
 //
 // Class: UserDashboard
 //
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Class:UserDashboard' => 'Felhasználói műszerfal',
-    'Class:UserDashboard+' => '~~',
-    'Class:UserDashboard/Attribute:user_id' => 'Felhasználó',
-    'Class:UserDashboard/Attribute:user_id+' => '~~',
-    'Class:UserDashboard/Attribute:menu_code' => 'Menükód',
-    'Class:UserDashboard/Attribute:menu_code+' => '~~',
-    'Class:UserDashboard/Attribute:contents' => 'Tartalom',
-    'Class:UserDashboard/Attribute:contents+' => '~~',
+	'Class:UserDashboard' => 'Felhasználói műszerfal',
+	'Class:UserDashboard+' => '~~',
+	'Class:UserDashboard/Attribute:user_id' => 'Felhasználó',
+	'Class:UserDashboard/Attribute:user_id+' => '~~',
+	'Class:UserDashboard/Attribute:menu_code' => 'Menükód',
+	'Class:UserDashboard/Attribute:menu_code+' => '~~',
+	'Class:UserDashboard/Attribute:contents' => 'Tartalom',
+	'Class:UserDashboard/Attribute:contents+' => '~~',
 ));
 
 //
 // Expression to Natural language
 //
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Expression:Unit:Short:DAY' => 'n',
-    'Expression:Unit:Short:WEEK' => 'w~~',
-    'Expression:Unit:Short:MONTH' => 'h',
-    'Expression:Unit:Short:YEAR' => 'é',
+	'Expression:Unit:Short:DAY' => 'n',
+	'Expression:Unit:Short:WEEK' => 'w',
+	'Expression:Unit:Short:MONTH' => 'h',
+	'Expression:Unit:Short:YEAR' => 'é',
 ));
 
+//
+// Duplicated into itop-welcome-itil ( will be removed from here...)
+//
+Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
+	'Menu:WelcomeMenu' => 'Kezdőoldal',
+	'Menu:WelcomeMenu+' => '',
+	'Menu:WelcomeMenuPage' => 'Áttekintő',
+	'Menu:WelcomeMenuPage+' => '',
+	'Menu:AdminTools' => 'Adminisztrációs eszközök',
+	'Menu:AdminTools+' => '',
+	'Menu:AdminTools?' => 'Az eszközök csak az adminisztrátori profilhoz rendelt felhasználók számára elérhetők.',
+	'Menu:CSVImportMenu' => 'CSV importálás',
+	'Menu:CSVImportMenu+' => '',
+	'Menu:DataModelMenu' => 'Adatmodell',
+	'Menu:DataModelMenu+' => '',
+	'Menu:ExportMenu' => 'Exportálás',
+	'Menu:ExportMenu+' => '',
+	'Menu:NotificationsMenu' => 'Értesítések',
+	'Menu:NotificationsMenu+' => '',
+	'Menu:MyShortcuts' => 'Saját gyorsgombok',
+	'Menu:DataAdministration' => 'Adat adminisztráció',
+	'Menu:DataAdministration+' => '',
+));
 
 //
 // String from the User Interface: menu, messages, buttons, etc...
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'BooleanLabel:yes' => 'Igen',
-    'BooleanLabel:no' => 'Nem',
-    'UI:Login:Title' => ITOP_APPLICATION_SHORT.' bejelentkezés',
-    'Menu:WelcomeMenu' => 'Főoldal',// Duplicated into itop-welcome-itil (will be removed from here...)
-    'Menu:WelcomeMenu+' => '',// Duplicated into itop-welcome-itil (will be removed from here...)
-    'Menu:WelcomeMenuPage' => 'Áttekintő',// Duplicated into itop-welcome-itil (will be removed from here...)
-    'Menu:WelcomeMenuPage+' => '',// Duplicated into itop-welcome-itil (will be removed from here...)
-    'UI:WelcomeMenu:Title' => 'Üdvözli az '.ITOP_APPLICATION_SHORT,
-
-    'UI:WelcomeMenu:LeftBlock' => '<p>'.ITOP_APPLICATION_SHORT.' egy teljeskörű, OpenSource, IT üzemeltetés támogató portál.</p>
+	'BooleanLabel:yes' => 'Igen',
+	'BooleanLabel:no' => 'Nem',
+	'UI:Login:Title' => ITOP_APPLICATION_SHORT.' bejelentkezés',
+	'UI:WelcomeMenu:Title' => 'Üdvözli az '.ITOP_APPLICATION_SHORT,
+	'UI:WelcomeMenu:LeftBlock' => '<p>'.ITOP_APPLICATION_SHORT.' egy teljeskörű, OpenSource, IT üzemeltetés támogató portál.</p>
 <ul>A következőket tartalmazza:
 <li>Teljeskörű CMDB (Konfigurációkezelés adatbázis) az IT eszközök dokumentálására és verzió kezelésére.</li>
 <li>Incidenskezelés modul az összes IT-hez kapcsolódó kérelem életciklusának követésére.</li>
@@ -341,8 +409,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 <li>Műszerfalak az IT infrastruktúra pillanatnyi állapotának gyors áttekintésére.</li>
 </ul>
 <p>Mindegyik modul önállóan telepíthető és használható.</p>',
-
-    'UI:WelcomeMenu:RightBlock' => '<p>'.ITOP_APPLICATION_SHORT.' egy szolgáltatás-orientált megoldás, amely segít az IT szakembereknek több ügyfél és szervezet egyidejű menedzselését.
+	'UI:WelcomeMenu:RightBlock' => '<p>'.ITOP_APPLICATION_SHORT.' egy szolgáltatás-orientált megoldás, amely segít az IT szakembereknek több ügyfél és szervezet egyidejű menedzselését.
 <ul>az iTop az üzleti folyamatok javításához egy hatékony eszköz, mert:
 <li>javítja az IT menedzsment hatékonyságát</li> 
 <li>növeli IT üzemeltetés teljesítményét</li> 
@@ -357,621 +424,624 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 <li>hatékonyan tudja kezelni az egyik legfontosabb IT eszközt, a dokumentációt.</li>
 </ul>
 </p>',
-    'UI:WelcomeMenu:Text'=> '<div>Gratulálunk, megérkezett a '.ITOP_APPLICATION.' '.ITOP_VERSION_NAME.' oldalára!</div>
+	'UI:WelcomeMenu:Text' => '<div>Gratulálunk, megérkezett a '.ITOP_APPLICATION.' '.ITOP_VERSION_NAME.' oldalára!</div>
 
 <div>Ez a verzió egy vadonatúj, modern és könnyen hozzáférhető backoffice dizájnnal rendelkezik..</div>
 
 <div>Megtartottuk az '.ITOP_APPLICATION.' alapvető funkcióit és modernizáltuk őket, hogy megszerettessük önnel.
-Reméljük, hogy ezt a verziót ugyanúgy kedvelni fogja, mint ahogy mi élveztük a megtervezéssét és létrehozását.</div>
+Reméljük, hogy ezt a verziót ugyanúgy kedvelni fogja, mint ahogy mi élveztük a megtervezését és létrehozását.</div>
 
 <div>Szabja testre az '.ITOP_APPLICATION.' beállításait a kényelmesebb használathoz.</div>',
-    'UI:WelcomeMenu:AllOpenRequests' => 'Összes nyitott kérelem: %1$d',
-    'UI:WelcomeMenu:MyCalls' => 'Saját kérelmek',
-    'UI:WelcomeMenu:OpenIncidents' => 'Nyitott incidensek: %1$d',
-    'UI:WelcomeMenu:AllConfigItems' => 'Konfigurációs elemek: %1$d',
-    'UI:WelcomeMenu:MyIncidents' => 'Hozzám rendelt incidensek',
-    'UI:AllOrganizations' => 'Összes Szervezeti egység',
-    'UI:YourSearch' => 'Saját keresések',
-    'UI:LoggedAsMessage' => 'Bejelentkezve %1$s (%2$s)',
-    'UI:LoggedAsMessage+Admin' => 'Bejelentkezve %1$s (%2$s, Administrator)',
-    'UI:Button:Logoff' => 'Kijelentkezés',
-    'UI:Button:GlobalSearch' => 'Globális keresés',
-    'UI:Button:Search' => ' Keresés',
-    'UI:Button:Clear' => ' Törlés',
-    'UI:Button:SearchInHierarchy' => 'Keresés a hierarchiában',
-    'UI:Button:Query' => ' Lekérdezés',
-    'UI:Button:Ok' => 'OK',
-    'UI:Button:Save' => 'Mentés',
-    'UI:Button:SaveAnd' => 'Mentés és %1$s',
-    'UI:Button:Cancel' => 'Mégse',
-    'UI:Button:Close' => 'Bezárás',
-    'UI:Button:Apply' => 'Alkalmazás',
-    'UI:Button:Send' => 'Küldés',
-    'UI:Button:SendAnd' => 'Küldés és %1$s',
-    'UI:Button:Back' => ' << Vissza',
-    'UI:Button:Restart' => ' |<< Újraindítás',
-    'UI:Button:Next' => ' Következő >>',
-    'UI:Button:Finish' => ' Befejezés',
-    'UI:Button:DoImport' => ' Importálás indítása',
-    'UI:Button:Done' => ' Kész',
-    'UI:Button:SimulateImport' => ' Importálás szimulálása',
-    'UI:Button:Test' => 'Teszt!',
-    'UI:Button:Evaluate' => ' Kiértékelés',
-    'UI:Button:Evaluate:Title' => ' Értékelés (Ctrl+Enter)',
-    'UI:Button:AddObject' => ' Hozzáadás...',
-    'UI:Button:BrowseObjects' => ' Böngészés...',
-    'UI:Button:Add' => ' Hozzáadás ',
-    'UI:Button:AddToList' => ' << Hozzáadás ',
-    'UI:Button:RemoveFromList' => ' Eltávolítás >> ',
-    'UI:Button:FilterList' => ' Szűrés... ',
-    'UI:Button:Create' => ' Létrehozás',
-    'UI:Button:Delete' => ' Törlés',
-    'UI:Button:Rename' => ' Átnevezés... ',
-    'UI:Button:ChangePassword' => ' Jelszó változtatás',
-    'UI:Button:ResetPassword' => ' Jelszó visszaállítás',
-    'UI:Button:Insert' => 'Beillesztés',
-    'UI:Button:More' => 'Több',
-    'UI:Button:Less' => 'Kevesebb',
-    'UI:Button:Wait' => 'Várjon, amíg a mezők frissülnek',
-    'UI:Treeview:CollapseAll' => 'Összes összecsukása',
-    'UI:Treeview:ExpandAll' => 'Összes lenyitása',
-    'UI:UserPref:DoNotShowAgain' => 'Ne mutassa újra',
-    'UI:InputFile:NoFileSelected' => 'Nincs fájl kiválasztva',
-    'UI:InputFile:SelectFile' => 'Válasszon egy fájlt',
-
-    'UI:SearchToggle' => 'Keresés',
-    'UI:ClickToCreateNew' => 'Új %1$s létrehozása',
-    'UI:SearchFor_Class' => '%1$s objektumok keresése',
-    'UI:NoObjectToDisplay' => 'Nincs megjeleníthető objektum',
-    'UI:Error:SaveFailed' => 'Az objektum nem menthető le :',
-    'UI:Error:MandatoryTemplateParameter_object_id' => 'object_id paraméter kötelező a link_attr megadásánál. Ellenőrizze a sablon definíciót.',
-    'UI:Error:MandatoryTemplateParameter_target_attr' => 'target_attr paraméter kötelező a link_attr megadásánál. Ellenőrizze a sablon definíciót.',
-    'UI:Error:MandatoryTemplateParameter_group_by' => 'group_by paraméter kötelező. Ellenőrizze a sablon definíciót.',
-    'UI:Error:InvalidGroupByFields' => 'Csoportosításnál használt érvénytelen mezők: %1$s.',
-    'UI:Error:UnsupportedStyleOfBlock' => 'Hiba: nem támogatott stílus tömb: %1$s.',
-    'UI:Error:IncorrectLinkDefinition_LinkedClass_Class' => 'Nem megfelelő kapcsolat meghatározás: kapcsolódó osztály: %1$s nem külső kulcs a %2$s osztályban',
-    'UI:Error:Object_Class_Id_NotFound' => 'Objektum: %1$s:%2$d nem található.',
-    'UI:Error:WizardCircularReferenceInDependencies' => 'Hiba: Körkörös hivatkozás az egymásra mutató mezők között. Ellenőrizze az adatmodellt.',
-    'UI:Error:UploadedFileTooBig' => 'A feltöltendő fájl túl nagy. (Maximális méret: %1$s). Ellenőrizze a PHP konfigurációs fájlban az upload_max_filesize és post_max_size beállításokat.',
-    'UI:Error:UploadedFileTruncated.' => 'Feltöltött fájl átméretezett!',
-    'UI:Error:NoTmpDir' => 'Az átmeneti könyvtár nem meghatározott.',
-    'UI:Error:CannotWriteToTmp_Dir' => 'Az átmeneti fájl nem írható. upload_tmp_dir = %1$s.',
-    'UI:Error:UploadStoppedByExtension_FileName' => 'A feltöltés megállt a fájl kiterjesztése miatt. (Eredeti fájl név = %1$s).',
-    'UI:Error:UploadFailedUnknownCause_Code' => 'Fájl feltöltés sikertelen ismeretlen hiba miatt. (Hibakód = %1$s).',
-
-    'UI:Error:1ParametersMissing' => 'Hiba: a következő paramétert meg kell adni ennél a műveletnél: %1$s.',
-    'UI:Error:2ParametersMissing' => 'Hiba: a következő paramétereket meg kell adni ennél a műveletnél: %1$s és %2$s.',
-    'UI:Error:3ParametersMissing' => 'Hiba: a következő paramétereket meg kell adni ennél a műveletnél: %1$s, %2$s és %3$s.',
-    'UI:Error:4ParametersMissing' => 'Hiba: a következő paramétereket meg kell adni ennél a műveletnél: %1$s, %2$s, %3$s és %4$s.',
-    'UI:Error:IncorrectOQLQuery_Message' => 'Hiba: nem megfelelő OQL lekérdezés: %1$',
-    'UI:Error:AnErrorOccuredWhileRunningTheQuery_Message' => 'Hiba történt a lekérdezés futtatása közben: %1$s',
-    'UI:Error:ObjectAlreadyUpdated' => 'Hiba: az objketum már korábban módosításra került.',
-    'UI:Error:ObjectCannotBeUpdated' => 'Hiba: az objektum nem frissíthető.',
-    'UI:Error:ObjectsAlreadyDeleted' => 'Hiba: az objektum már korában törlésre került!',
-    'UI:Error:BulkDeleteNotAllowedOn_Class' => 'Az osztály objektumainak tömeges törlése nem engedélyezett %1$s',
-    'UI:Error:DeleteNotAllowedOn_Class' => 'Az osztály objektumainak törlése nem engedélyezett %1$s',
-    'UI:Error:ReadNotAllowedOn_Class' => ' Nincs engedélye hogy a %1$s osztály objektumait lássa',
-    'UI:Error:BulkModifyNotAllowedOn_Class' => 'Az osztály objektumainak tömeges frissítése nem engedélyezett %1$s',
-    'UI:Error:ObjectAlreadyCloned' => 'Hiba: az objektum már klónozott!',
-    'UI:Error:ObjectAlreadyCreated' => 'Hiba: az objektum már létrehozva!',
-    'UI:Error:Invalid_Stimulus_On_Object_In_State' => 'Hiba: érvénytelen stimulus %1$s a következő objektum %2$s következő állapotában %3$s.',
-    'UI:Error:InvalidDashboardFile' => 'Hiba: Érvénytelen műszerfal fájl',
-    'UI:Error:InvalidDashboard' => 'Hiba: Érvénytelen műszerfal',
-    'UI:Error:MaintenanceMode' => 'Az alkalmazás jelenleg karbantartás alatt van',
-    'UI:Error:MaintenanceTitle' => 'Karbantartás',
-    'UI:Error:InvalidToken' => 'Hiba: a kért művelet már végrehajtásra került (CSRF token nem található)',
-
-    'UI:Error:SMTP:UnknownVendor' => 'A %1$s OAuth SMTP szolgáltató nem létezik  (email_transport_smtp.oauth.provider)',
-
-    'UI:GroupBy:Count' => 'Mennyiség',
-    'UI:GroupBy:Count+' => '',
-    'UI:CountOfObjects' => '%1$d darab objektum felel meg a kritériumoknak.',
-    'UI_CountOfObjectsShort' => '%1$d objektum.',
-    'UI:NoObject_Class_ToDisplay' => 'Nincs megjeleníthető %1$s',
-    'UI:History:LastModified_On_By' => 'Utolsó módosítást a következő objektumon %1$s %2$s végezte.',
-    'UI:HistoryTab' => 'Előzmény',
-    'UI:NotificationsTab' => 'Értesítés',
-    'UI:History:BulkImports' => 'Előzmények',
-    'UI:History:BulkImports+' => '',
-    'UI:History:BulkImportDetails' => 'CSV importálás végrehajtva: %1$s (%2$s által)',
-    'UI:History:Date' => 'Dátum',
-    'UI:History:Date+' => '',
-    'UI:History:User' => 'Felhasználó',
-    'UI:History:User+' => '',
-    'UI:History:Changes' => 'Változások',
-    'UI:History:Changes+' => '',
-    'UI:History:StatsCreations' => 'Létrehozva',
-    'UI:History:StatsCreations+' => '',
-    'UI:History:StatsModifs' => 'Módosítva',
-    'UI:History:StatsModifs+' => '',
-    'UI:History:StatsDeletes' => 'Törölve',
-    'UI:History:StatsDeletes+' => '',
-    'UI:Loading' => 'Betöltés...',
-    'UI:Menu:Actions' => 'Műveletek',
-    'UI:Menu:OtherActions' => 'Egyéb műveletek',
-    'UI:Menu:Transitions' => 'Átvezetés',
-    'UI:Menu:OtherTransitions' => 'Más átvezetések',
-    'UI:Menu:New' => 'Új...',
-    'UI:Menu:Add' => 'Hozzáadás...',
-    'UI:Menu:Manage' => 'Kezelés...',
-    'UI:Menu:EMail' => 'Email',
-    'UI:Menu:CSVExport' => 'CSV exportálás...',
-    'UI:Menu:Modify' => 'Módosítás...',
-    'UI:Menu:Delete' => 'Törlés...',
-    'UI:Menu:BulkDelete' => 'Törlés...',
-    'UI:UndefinedObject' => 'Nem meghatározott',
-    'UI:Document:OpenInNewWindow:Download' => 'Megnyitás új ablakban: %1$s, Letöltés: %2$s',
-    'UI:SplitDateTime-Date' => 'Dátum',
-    'UI:SplitDateTime-Time' => 'Idő',
-    'UI:TruncatedResults' => '%1$d objektum megjelenítve %2$d példányból',
-    'UI:DisplayAll' => 'Összes megjelenítése',
-    'UI:CollapseList' => 'Elemek',
-    'UI:CountOfResults' => '%1$d objektum',
-    'UI:ChangesLogTitle' => 'Változásnapló (%1$d):',
-    'UI:EmptyChangesLogTitle' => 'Változásnapló üres',
-    'UI:SearchFor_Class_Objects' => 'Keresés %1$s objektumra',
-    'UI:OQLQueryBuilderTitle' => 'OQL lekérdezés szerkesztő',
-    'UI:OQLQueryTab' => 'OQL lekérdezés',
-    'UI:SimpleSearchTab' => 'Egyszerű keresés',
-    'UI:Details+' => '',
-    'UI:SearchValue:Any' => '* Bármely *',
-    'UI:SearchValue:Mixed' => '* Kevert *',
-    'UI:SearchValue:NbSelected' => '# kiválasztva',
-    'UI:SearchValue:CheckAll' => 'Összes bejelölése',
-    'UI:SearchValue:UncheckAll' => 'Bejelölés megszüntetése',
-    'UI:SelectOne' => '-- válasszon ki egyet --',
-    'UI:Login:Welcome' => 'Üdvözli az '.ITOP_APPLICATION_SHORT.'!',
-    'UI:Login:IncorrectLoginPassword' => 'Nem megfelelő bejelentkezési név/jelszó, kérjük próbálja újra.',
-    'UI:Login:IdentifyYourself' => 'Folytatás előtt azonosítsa magát',
-    'UI:Login:UserNamePrompt' => 'Felhasználónév',
-    'UI:Login:PasswordPrompt' => 'Jelszó',
-    'UI:Login:ForgotPwd' => 'Elfelejtette a jelszavát?',
-    'UI:Login:ForgotPwdForm' => 'Elfelejtett jelszó',
-    'UI:Login:ForgotPwdForm+' => ITOP_APPLICATION_SHORT.' küldhet Önnek egy emailt, amelyben utasításokat talál a fiókja visszaállításához.',
-    'UI:Login:ResetPassword' => 'Küldje most!',
-    'UI:Login:ResetPwdFailed' => 'Sikertelen email küldés: %1$s',
-    'UI:Login:SeparatorOr' => 'Vagy',
-
-    'UI:ResetPwd-Error-WrongLogin' => '%1$s nem érvényes fiók',
-    'UI:ResetPwd-Error-NotPossible' => 'a külső fiókok jelszava itt nem állítható vissza.',
-    'UI:ResetPwd-Error-FixedPwd' => 'a fiók nem teszi lehetővé a jelszó visszaállítását.',
-    'UI:ResetPwd-Error-NoContact' => 'a fiók nem személyhez tartozik',
-    'UI:ResetPwd-Error-NoEmailAtt' => 'a fiók nem olyan személyhez tartozik amelynek van email címe. Keresse a rendszergazdát.',
-    'UI:ResetPwd-Error-NoEmail' => 'hiányzik az email cím. Keresse a rendszergazdát.',
-    'UI:ResetPwd-Error-Send' => 'email továbbítási hiba. Keresse a rendszergazdát',
-    'UI:ResetPwd-EmailSent' => 'Kérjük, ellenőrizze az email postafiókját, és kövesse az utasításokat. Ha nem kap emailt, kérjük, ellenőrizze a beírt bejelentkezési adatait.',
-    'UI:ResetPwd-EmailSubject' => 'Állítsa vissza az '.ITOP_APPLICATION_SHORT.' jelszavát',
-    'UI:ResetPwd-EmailBody' => '<body><p>Ön vissza szeretné állítani az '.ITOP_APPLICATION_SHORT.' jelszavát.</p><p>Kattintson erre a linkre <a href="%1$s">új jelszó</a></p>.',
-
-    'UI:ResetPwd-Title' => 'Jelszó visszaállítás',
-    'UI:ResetPwd-Error-InvalidToken' => 'Sajnáljuk, de vagy már visszaállították a jelszót, vagy már több emailt is kapott. Kérjük, mindenképpen használja a legutolsó kapott emailben megadott linket.',
-    'UI:ResetPwd-Error-EnterPassword' => 'Adja meg az új jelszavát a %1$s a fiókjának',
-    'UI:ResetPwd-Ready' => 'A jelszó megváltozott',
-    'UI:ResetPwd-Login' => 'Jelentkezzen be...',
-
-    'UI:Login:About'                               => 'Névjegy',
-    'UI:Login:ChangeYourPassword'                  => 'Jelszó változtatás',
-    'UI:Login:OldPasswordPrompt'                   => 'Jelenlegi jelszó',
-    'UI:Login:NewPasswordPrompt'                   => 'Új jelszó',
-    'UI:Login:RetypeNewPasswordPrompt'             => 'Jelszó megerősítése',
-    'UI:Login:IncorrectOldPassword'                => 'Hiba: a jelenlegi jelszó hibás',
-    'UI:LogOffMenu'                                => 'Kilépés',
-    'UI:LogOff:ThankYou' => 'Köszönjük, hogy az '.ITOP_APPLICATION_SHORT.'-ot használja!',
-    'UI:LogOff:ClickHereToLoginAgain'              => 'Ismételt bejelentkezéshez kattintson ide',
-    'UI:ChangePwdMenu'                             => 'Jelszó módosítás...',
-    'UI:Login:PasswordChanged'                     => 'Jelszó sikeresen beállítva!',
-    'UI:AccessRO-All' => ITOP_APPLICATION_SHORT.' csak olvasás módban',
-    'UI:AccessRO-Users' => ITOP_APPLICATION_SHORT.' csak olvasás módban a végfelhasználók számára',
-    'UI:ApplicationEnvironment'                    => 'Alkalmazáskörnyezet: %1$s',
-    'UI:Login:RetypePwdDoesNotMatch'               => 'A jelszavak nem egyeznek!',
-    'UI:Button:Login' => 'Belépés az '.ITOP_APPLICATION_SHORT.' alkalmazásba',
-    'UI:Login:Error:AccessRestricted' => ITOP_APPLICATION_SHORT.' hozzáférés korlátozva. Kérem forduljon az '.ITOP_APPLICATION_SHORT.' rendszergazdához!',
-    'UI:Login:Error:AccessAdmin' => 'Adminisztrátori hozzáférés korlátozott. Kérem forduljon az '.ITOP_APPLICATION_SHORT.' rendszergazdához!',
-    'UI:Login:Error:WrongOrganizationName'         => 'Ismeretlen szervezeti egység',
-    'UI:Login:Error:MultipleContactsHaveSameEmail' => 'Több kapcsolattartónál ugyanez az emailcím',
-    'UI:Login:Error:NoValidProfiles'               => 'Érvénytelen a megadott profil',
-    'UI:CSVImport:MappingSelectOne'                => '-- válasszon ki egyet --',
-    'UI:CSVImport:MappingNotApplicable'            => '-- mező figyelmen kívül hagyása --',
-    'UI:CSVImport:NoData'                          => 'Üres mező..., kérem adjon meg adatot!',
-    'UI:Title:DataPreview'                         => 'Adatok előnézete',
-    'UI:CSVImport:ErrorOnlyOneColumn'              => 'Hiba: Az import fájl egyetlen oszlopot tartalmaz. A megfelelő elválasztó karaktert adta meg?',
-    'UI:CSVImport:FieldName'                       => 'Mező %1$d',
-    'UI:CSVImport:DataLine1'                       => 'Adatsor 1',
-    'UI:CSVImport:DataLine2'                       => 'Adatsor 2',
-    'UI:CSVImport:idField'                         => 'id (elsődeges kulcs)',
-    'UI:Title:BulkImport' => ITOP_APPLICATION_SHORT.' - tömeges betöltés',
-    'UI:Title:BulkImport+'                         => '',
-    'UI:Title:BulkSynchro_nbItem_ofClass_class'    => '%2$s osztály %1$d objektumának szinkronizációja',
-    'UI:CSVImport:ClassesSelectOne'                => '-- válasszon ki egyet --',
-    'UI:CSVImport:ErrorExtendedAttCode'            => 'Belső hiba: %1$s nem megfelelő kód, mert %2$s nem külső kulcsa a %3$s osztálynak',
-    'UI:CSVImport:ObjectsWillStayUnchanged'        => '%1$d objektumok változatlanok maradnak.',
-    'UI:CSVImport:ObjectsWillBeModified'           => '%1$d objektumok fognak megváltozni.',
-    'UI:CSVImport:ObjectsWillBeAdded' => '%1$d objektumok hozzáadásra kerülnek.',
-    'UI:CSVImport:ObjectsWillHaveErrors' => '%1$d objektumok hibásak lesznek.',
-    'UI:CSVImport:ObjectsRemainedUnchanged' => '%1$d objektumok változatlanak maradtak',
-    'UI:CSVImport:ObjectsWereModified' => '%1$d objektumok módosításra kerültek.',
-    'UI:CSVImport:ObjectsWereAdded' => '%1$d objektumok hozzáadásra kerültek.',
-    'UI:CSVImport:ObjectsHadErrors' => '%1$d objektumok hibásak.',
-    'UI:Title:CSVImportStep2' => '2. lépés az 5-ből: CSV adat beállítások',
-    'UI:Title:CSVImportStep3' => '3. lépés az 5-ből: Adatok összerendelés',
-    'UI:Title:CSVImportStep4' => '4. lépés az 5-ből: Importálás szimuláció',
-    'UI:Title:CSVImportStep5' => '5. lépés az 5-ből: Importálás befejezve',
-    'UI:CSVImport:LinesNotImported' => 'Sorok, melyek nem lettek betöltve:',
-    'UI:CSVImport:LinesNotImported+' => '',
-    'UI:CSVImport:SeparatorComma+' => 'vessző',
-    'UI:CSVImport:SeparatorSemicolon+' => 'pontosvessző',
-    'UI:CSVImport:SeparatorTab+' => 'tabulátor',
-    'UI:CSVImport:SeparatorOther' => 'egyéb:',
-    'UI:CSVImport:QualifierDoubleQuote+' => 'dupla idézőjel',
-    'UI:CSVImport:QualifierSimpleQuote+' => 'szimpla idézőjel',
-    'UI:CSVImport:QualifierOther' => 'egyéb:',
-    'UI:CSVImport:TreatFirstLineAsHeader' => 'Első sor fejléc információkat tartalmaz (oszlopok nevei)',
-    'UI:CSVImport:Skip_N_LinesAtTheBeginning' => '%1$s sor kihagyása a fájl elejéről',
-    'UI:CSVImport:CSVDataPreview' => 'CSV adat előnézet',
-    'UI:CSVImport:SelectFile' => 'Import fájl kiválasztása:',
-    'UI:CSVImport:Tab:LoadFromFile' => 'Betöltés fájlból',
-    'UI:CSVImport:Tab:CopyPaste' => 'Adat másolás és beillesztés',
-    'UI:CSVImport:Tab:Templates' => 'Sablonok',
-    'UI:CSVImport:PasteData' => 'Import adatok beillesztése:',
-    'UI:CSVImport:PickClassForTemplate' => 'Letöltendő sablon kiválasztása:',
-    'UI:CSVImport:SeparatorCharacter' => 'Elválasztó karakter:',
-    'UI:CSVImport:TextQualifierCharacter' => 'Szövegjelölő karakter',
-    'UI:CSVImport:CommentsAndHeader' => 'Megjegyzések és fejléc',
-    'UI:CSVImport:SelectClass' => 'Importálandó osztály kiválasztása:',
-    'UI:CSVImport:AdvancedMode' => 'Haladó mód',
-    'UI:CSVImport:AdvancedMode+' => '',
-    'UI:CSVImport:SelectAClassFirst' => 'Adat összerendeléshez először válassza ki az osztályt.',
-    'UI:CSVImport:HeaderFields' => 'Mező',
-    'UI:CSVImport:HeaderMappings' => 'Összerendelés',
-    'UI:CSVImport:HeaderSearch' => 'Keresés?',
-    'UI:CSVImport:AlertIncompleteMapping' => 'Kérem adja meg az összes mezőre az összerendelési szabályokat.',
-    'UI:CSVImport:AlertMultipleMapping' => 'Győződjön meg arról, hogy egy célmező csak egyszer kerül hozzárendelésre.',
-    'UI:CSVImport:AlertNoSearchCriteria' => 'Kérem adjon eg legalább egy keresési kritériumot',
-    'UI:CSVImport:Encoding' => 'Karakterkódolás',
-    'UI:UniversalSearchTitle' => ITOP_APPLICATION_SHORT.' - Univerzális kereső',
-    'UI:UniversalSearch:Error' => 'Hiba: %1$s',
-    'UI:UniversalSearch:LabelSelectTheClass' => 'Keresendő osztály kiválasztása:',
-
-    'UI:CSVReport-Value-Modified' => 'Módosítva',
-    'UI:CSVReport-Value-SetIssue' => 'Érvénytelen érték az attribútumhoz',
-    'UI:CSVReport-Value-ChangeIssue' => '%1$s egy érvénytelen érték',
-    'UI:CSVReport-Value-NoMatch' => 'Nincs egyezés a %1$s értékhez',
-    'UI:CSVReport-Value-Missing' => 'Hiányzó kötelező érték',
-    'UI:CSVReport-Value-Ambiguous' => 'Kétértelműség: %1$s objektumban találva',
-    'UI:CSVReport-Row-Unchanged' => 'változatlan',
-    'UI:CSVReport-Row-Created' => 'létrehozva',
-    'UI:CSVReport-Row-Updated' => '%1$d oszlop frissítve',
-    'UI:CSVReport-Row-Disappeared' => '%1$d eltűnt, megváltozott oszlop',
-    'UI:CSVReport-Row-Issue' => 'Probléma: %1$s',
-    'UI:CSVReport-Value-Issue-Null' => 'A nulla nem engedélyezett',
-    'UI:CSVReport-Value-Issue-NotFound' => 'Az objektum nincs meg',
-    'UI:CSVReport-Value-Issue-FoundMany' => '%1$d egyezés található',
-    'UI:CSVReport-Value-Issue-Readonly' => 'A %1$s attribútum csak olvasható (jelenlegi érték: %2$s, várható érték: %3$s)',
-    'UI:CSVReport-Value-Issue-Format' => 'A bevitel feldolgozása sikertelen: %1$s',
-    'UI:CSVReport-Value-Issue-NoMatch' => 'A %1$s attribútum nem várt értéket kapott: nincs egyezés, ellenőrizze a beírást',
-    'UI:CSVReport-Value-Issue-Unknown' => 'A %1$s attribútum nem várt értéket kapott: %2$s',
-    'UI:CSVReport-Row-Issue-Inconsistent' => 'Egymással nem konzisztens attribútumok: %1$s',
-    'UI:CSVReport-Row-Issue-Attribute' => 'Nem várt attribútum érték(ek)',
-    'UI:CSVReport-Row-Issue-MissingExtKey' => 'Nem lehetett létrehozni hiányzó külső kulcs(ok) miatt: %1$s',
-    'UI:CSVReport-Row-Issue-DateFormat' => 'hibás dátumformátum',
-    'UI:CSVReport-Row-Issue-Reconciliation' => 'nem sikerült összeegyeztetni',
-    'UI:CSVReport-Row-Issue-Ambiguous' => 'kétértelmű összeegyeztetés',
-    'UI:CSVReport-Row-Issue-Internal' => 'Belső hiba: %1$s, %2$s',
-
-    'UI:CSVReport-Icon-Unchanged' => 'Változatlan',
-    'UI:CSVReport-Icon-Modified' => 'Módosított',
-    'UI:CSVReport-Icon-Missing' => 'Hiányzó',
-    'UI:CSVReport-Object-MissingToUpdate' => 'Hiányzó objektum: frissítve lesz',
-    'UI:CSVReport-Object-MissingUpdated' => 'Hiányzó objektum: frissítve',
-    'UI:CSVReport-Icon-Created' => 'Létrehozva',
-    'UI:CSVReport-Object-ToCreate' => 'Az objektum létre lesz hozva',
-    'UI:CSVReport-Object-Created' => 'Az objektum létrehozva',
-    'UI:CSVReport-Icon-Error' => 'Hiba',
-    'UI:CSVReport-Object-Error' => 'HIBA: %1$s',
-    'UI:CSVReport-Object-Ambiguous' => 'KÉTÉRTELMŰ: %1$s',
-    'UI:CSVReport-Stats-Errors' => '%1$.0f %% -a a betöltött objektumoknak hibás, ezért figyelmen kívül lesznek hagyva.',
-    'UI:CSVReport-Stats-Created' => '%1$.0f %% -a a betöltött objektumoknak létre lesz hozva.',
-    'UI:CSVReport-Stats-Modified' => '%1$.0f %% -a a betöltött objektumoknak módosítva lesz.',
-
-    'UI:CSVExport:AdvancedMode' => 'Haladó mód',
-    'UI:CSVExport:AdvancedMode+' => 'Haladó módban több oszlopot is hozzáadunk az exportáláshoz: az objektum azonosítóját, a külső kulcsok azonosítóját és egyeztetési attribútumait.',
-    'UI:CSVExport:LostChars' => 'Kódolási probléma',
-    'UI:CSVExport:LostChars+' => 'A letöltött fájl %1$s kódolású lesz. '.ITOP_APPLICATION_SHORT.' olyan karaktereket észlelt, amelyek nem kompatibilisek ezzel a formátummal. Ezeket a karaktereket vagy helyettesítő karakterekkel helyettesítjük (pl. az ékezetes karakterek elveszítik az ékezetet), vagy elvetjük őket. Az adatokat a webböngészőből másolhatja/beillesztheti. Alternatívaként a rendszergazdához is fordulhat a kódolás megváltoztatásához (lásd a \'csv_file_default_charset\' paramétert).',
-
-    'UI:Audit:Title' => ITOP_APPLICATION_SHORT.' - CMDB Audit',
-    'UI:Audit:InteractiveAudit' => 'Interaktív Audit',
-    'UI:Audit:HeaderAuditRule' => 'Auditszabály',
-    'UI:Audit:HeaderNbObjects' => '# Objektumok',
-    'UI:Audit:HeaderNbErrors' => '# Hibák',
-    'UI:Audit:PercentageOk' => '% OK',
-    'UI:Audit:OqlError' => 'OQL hiba',
-    'UI:Audit:Error:ValueNA' => 'n/a',
-    'UI:Audit:ErrorIn_Rule' => 'Hiba a szabályban',
-    'UI:Audit:ErrorIn_Rule_Reason' => 'OQL hiba a %1$s szabályban: %2$s.',
-    'UI:Audit:ErrorIn_Category' => 'Hiba a kategóriában',
-    'UI:Audit:ErrorIn_Category_Reason' => 'OQL hiba a %1$s kategóriában: %2$s.',
-    'UI:Audit:AuditErrors' => 'Audit hibák',
-    'UI:Audit:Dashboard:ObjectsAudited' => 'Auditált objektum',
-    'UI:Audit:Dashboard:ObjectsInError' => 'Hibás objektum',
-    'UI:Audit:Dashboard:ObjectsValidated' => 'Érvényesített objektum',
-    'UI:Audit:AuditCategory:Subtitle' => '%1$s hiba a %2$s - %3$s%% -ból',
-
-
-    'UI:RunQuery:Title' => ITOP_APPLICATION_SHORT.' - OQL lekérdezés értékelés',
-    'UI:RunQuery:QueryExamples' => 'Lekérdezés példák',
-    'UI:RunQuery:QueryResults' => 'Lekérdezés eredményei',
-    'UI:RunQuery:HeaderPurpose' => 'Cél',
-    'UI:RunQuery:HeaderPurpose+' => '',
-    'UI:RunQuery:HeaderOQLExpression' => 'OQL kifejezés',
-    'UI:RunQuery:HeaderOQLExpression+' => '',
-    'UI:RunQuery:ExpressionToEvaluate' => 'Kiértékelendő kifejezés: ',
-    'UI:RunQuery:QueryArguments' => 'Lekérdezés argumentumok',
-    'UI:RunQuery:MoreInfo' => 'Több információ a lekérdezésről: ',
-    'UI:RunQuery:DevelopedQuery' => 'Fejlesztett lekérdezés kiértékelés: ',
-    'UI:RunQuery:SerializedFilter' => 'Szerializált szűrő: ',
-    'UI:RunQuery:DevelopedOQL' => 'Fejlesztett OQL',
-    'UI:RunQuery:DevelopedOQLCount' => 'Fejlesztett OQL a számításhoz',
-    'UI:RunQuery:ResultSQLCount' => 'Létrejött SQL',
-    'UI:RunQuery:ResultSQL' => 'Létrejött SQL',
-    'UI:RunQuery:Error' => 'A lekérdezés futtatása közben a következő hiba jelentkezett',
-    'UI:Query:UrlForExcel' => 'URL az MS-Excel web-lekérdezésekhez',
-    'UI:Query:UrlV1' => 'A mezők listája nem került meghatározásra. Az <em>export-V2.php</em> oldal nem hívható meg ezen információ nélkül. Ezért az alábbiakban javasolt URL az örökölt oldalra mutat: <em>export.php</em>. Az exportálásnak ez a régi változata a következő korlátozással rendelkezik: az exportált mezők listája a kimeneti formátumtól és a '.ITOP_APPLICATION_SHORT.' adatmodelltől függően változhat. Ha garantálni szeretné, hogy az exportált oszlopok listája hosszú távon stabil maradjon, akkor meg kell adnia a "Fields" attribútum értékét, és használnia kell a <em>export-V2.php</em> oldalt.',
-    'UI:Schema:Title' => ITOP_APPLICATION_SHORT.' objektum séma',
-    'UI:Schema:TitleForClass' => '%1$s séma',
-    'UI:Schema:CategoryMenuItem' => '<b>%1$s</b> kategória',
-    'UI:Schema:Relationships' => 'Kapcsolatok',
-    'UI:Schema:AbstractClass' => 'Absztrakt osztály: nem példányosítható belőle objektum.',
-    'UI:Schema:NonAbstractClass' => 'Nem absztrakt osztály: objektum példányosítható belőle.',
-    'UI:Schema:ClassHierarchyTitle' => 'Osztály hierarchia',
-    'UI:Schema:AllClasses' => 'Összes osztály',
-    'UI:Schema:ExternalKey_To' => 'Külső kulcs %1$s-hoz',
-    'UI:Schema:Columns_Description' => 'Oszlopok: <em>%1$s</em>',
-    'UI:Schema:Default_Description' => 'Alapértelmezett: %1$s',
-    'UI:Schema:NullAllowed' => 'Null érték engedélyezett',
-    'UI:Schema:NullNotAllowed' => 'Null érték nem engedélyezett',
-    'UI:Schema:Attributes' => 'Attribútumok',
-    'UI:Schema:AttributeCode' => 'Attribútum kód',
-    'UI:Schema:AttributeCode+' => '',
-    'UI:Schema:Label' => 'Címke',
-    'UI:Schema:Label+' => '',
-    'UI:Schema:Type' => 'Típus',
-
-    'UI:Schema:Type+' => '',
-    'UI:Schema:Origin' => 'Származás',
-    'UI:Schema:Origin+' => '',
-    'UI:Schema:Description' => 'Leírás',
-    'UI:Schema:Description+' => '',
-    'UI:Schema:AllowedValues' => 'Engedélyezett értékek',
-    'UI:Schema:AllowedValues+' => '',
-    'UI:Schema:MoreInfo' => 'További információ',
-    'UI:Schema:MoreInfo+' => '',
-    'UI:Schema:SearchCriteria' => 'Keresési kritériumok',
-    'UI:Schema:FilterCode' => 'Szűrőkód',
-    'UI:Schema:FilterCode+' => '',
-    'UI:Schema:FilterDescription' => 'Leírás',
-    'UI:Schema:FilterDescription+' => '',
-    'UI:Schema:AvailOperators' => 'Elérhető műveletek',
-    'UI:Schema:AvailOperators+' => '',
-    'UI:Schema:ChildClasses' => 'Leszármazott osztályok',
-    'UI:Schema:ReferencingClasses' => 'Referált osztályok',
-    'UI:Schema:RelatedClasses' => 'Kapcsolódó osztályok',
-    'UI:Schema:LifeCycle' => 'Életciklus',
-    'UI:Schema:Triggers' => 'Eseményindítók',
-    'UI:Schema:Relation_Code_Description' => 'Kapcsolat <em>%1$s</em> (%2$s)',
-    'UI:Schema:RelationDown_Description' => 'Lenn: %1$s',
-    'UI:Schema:RelationUp_Description' => 'Fenn: %1$s',
-    'UI:Schema:RelationPropagates' => '%1$s: kiterjesztése %2$d szintre, lekérdezés: %3$s',
-    'UI:Schema:RelationDoesNotPropagate' => '%1$s: nincs kiterjesztve (%2$d szintekre), lekérdezés: %3$s',
-    'UI:Schema:Class_ReferencingClasses_From_By' => '%1$s hivatkozva %2$s az osztályban %3$s mezőn keresztül',
-    'UI:Schema:Class_IsLinkedTo_Class_Via_ClassAndAttribute' => '%1$s hozzácsatolva %2$s-hoz %3$s-n keresztül::<em>%4$s</em>',
-    'UI:Schema:Links:1-n' => 'A következő osztályok mutatnak %1$s-ra (1:n kapcsolat):',
-    'UI:Schema:Links:n-n' => 'A következő osztályok mutatnak %1$s-ra (n:n kapcsolat):',
-    'UI:Schema:Links:All' => 'Összekapcsolódó osztályok grafikonja',
-    'UI:Schema:NoLifeCyle' => 'Nincs életciklus rendelve ehhez az osztályhoz.',
-    'UI:Schema:LifeCycleTransitions' => 'Átvezetés',
-    'UI:Schema:LifeCyleAttributeOptions' => 'Attribútum opciók',
-    'UI:Schema:LifeCycleHiddenAttribute' => 'Rejtett',
-    'UI:Schema:LifeCycleReadOnlyAttribute' => 'Csak olvasható',
-    'UI:Schema:LifeCycleMandatoryAttribute' => 'Kötelező',
-    'UI:Schema:LifeCycleAttributeMustChange' => 'Változtatni kell',
-    'UI:Schema:LifeCycleAttributeMustPrompt' => 'Felhasználó kéri a változtatását',
-    'UI:Schema:LifeCycleEmptyList' => 'Üres lista',
-    'UI:Schema:ClassFilter' => 'Osztály:',
-    'UI:Schema:DisplayLabel' => 'Megjelenítés:',
-    'UI:Schema:DisplaySelector/LabelAndCode' => 'Felirat és kód',
-    'UI:Schema:DisplaySelector/Label' => 'Címke',
-    'UI:Schema:DisplaySelector/Code' => 'Kód',
-    'UI:Schema:Attribute/Filter' => 'Szűrő',
-    'UI:Schema:DefaultNullValue' => 'Alapértelmezett null érték : %1$s',
-    'UI:LinksWidget:Autocomplete+' => '',
-    'UI:Edit:SearchQuery' => 'Válasszon egy előre megadott lekérdezést',
-    'UI:Edit:TestQuery' => 'Teszt lekérdezés',
-    'UI:Combo:SelectValue' => '--- válasszon értéket ---',
-    'UI:Label:SelectedObjects' => 'Kiválasztott objektumok: ',
-    'UI:Label:AvailableObjects' => 'Lehetséges objektumok: ',
-    'UI:Link_Class_Attributes' => '%1$s attribútumai',
-    'UI:SelectAllToggle+' => '',
-    'UI:AddObjectsOf_Class_LinkedWith_Class_Instance' => '%1$s objektumok hozzáadása %2$s osztályhoz kapcsolással: %3$s',
-    'UI:AddObjectsOf_Class_LinkedWith_Class' => '%1$s objektumok hozzáadása %2$s osztályhoz csatolással',
-    'UI:ManageObjectsOf_Class_LinkedWith_Class_Instance' => '%2$s osztályhoz kapcsolt %1$s objektumok kezelése: %3$s',
-    'UI:AddLinkedObjectsOf_Class' => 'Hozzáadás %1$s osztályhoz',
-    'UI:RemoveLinkedObjectsOf_Class' => 'Kiválasztott objektum eltávolítása',
-    'UI:Message:EmptyList:UseAdd' => 'A lista üres, használja a "Hozzáadás..." gombot az elemekre.',
-    'UI:Message:EmptyList:UseSearchForm' => 'Használja a keresőmezőt a hozzáadandó objektumok kiválasztásához.',
-    'UI:Wizard:FinalStepTitle' => 'Utolsó lépés: megerősítés',
-    'UI:Title:DeletionOf_Object' => '%1$s törlése',
-    'UI:Title:BulkDeletionOf_Count_ObjectsOf_Class' => '%2$s osztály %1$d objektumának tömeges törlése',
-    'UI:Delete:NotAllowedToDelete' => 'Nem engedélyezett az objektum törlése',
-    'UI:Delete:NotAllowedToUpdate_Fields' => 'A következő mező módosítása nem engedélyezett: %1$s',
-    'UI:Error:ActionNotAllowed' => 'Önnek nem engedélyezett ez a művelet',
-    'UI:Error:NotEnoughRightsToDelete' => 'Az objektum nem törölhető, mert a felhasználónak nincs elegendő jogosultsága',
-    'UI:Error:CannotDeleteBecause' => 'Az objektum nem törölhető, mert: %1$s',
-    'UI:Error:CannotDeleteBecauseOfDepencies' => 'Az objektum nem törölhető, mert néhány hozzá kapcsolódó magasabb prioritású manuális művelet végrehajtásra vár',
-    'UI:Error:CannotDeleteBecauseManualOpNeeded' => 'Az objektum nem törölhető, mert néhány hozzá kapcsolódó magasabb prioritású manuális művelet végrehajtásra vár',
-    'UI:Archive_User_OnBehalfOf_User' => '%1$s felhasználó %2$s nevében',
-    'UI:Delete:Deleted' => 'törölve',
-    'UI:Delete:AutomaticallyDeleted' => 'automatikusan törölve',
-    'UI:Delete:AutomaticResetOf_Fields' => ' következő mezők automatikus újratöltése: %1$s',
-    'UI:Delete:CleaningUpRefencesTo_Object' => 'Összes referencia tisztítása %1$s...',
-    'UI:Delete:CleaningUpRefencesTo_Several_ObjectsOf_Class' => '%2$s osztály %1$d objektumára mutató referenciák tisztítása',
-    'UI:Delete:Done+' => '',
-    'UI:Delete:_Name_Class_Deleted' => '%1$s - %2$s törölve.',
-    'UI:Delete:ConfirmDeletionOf_Name' => '%1$s törlése',
-    'UI:Delete:ConfirmDeletionOf_Count_ObjectsOf_Class' => '%2$s osztály %1$d objektumának törlése',
-    'UI:Delete:CannotDeleteBecause' => 'Sikertelenül töröltek: %1$s',
-    'UI:Delete:ShouldBeDeletedAtomaticallyButNotPossible' => 'Automatikusan kellett volna törlődniük, de a művelet nem volt végrehajtható: %1$s',
-    'UI:Delete:MustBeDeletedManuallyButNotPossible' => 'Manuális törlés nem végrehajtható: %1$s',
-    'UI:Delete:WillBeDeletedAutomatically' => 'Automatikusan lesznek törölve',
-    'UI:Delete:MustBeDeletedManually' => 'Manuálisan törlendők',
-    'UI:Delete:CannotUpdateBecause_Issue' => 'Automatikus frissítés sikertelen: %1$s',
-    'UI:Delete:WillAutomaticallyUpdate_Fields' => 'Automatikusan lesznek frissítve (reset: %1$s)',
-    'UI:Delete:Count_Objects/LinksReferencing_Object' => '%1$d objektumok / kapcsolatok hivatkoznak erre: %2$s',
-    'UI:Delete:Count_Objects/LinksReferencingTheObjects' => '%1$d objektumok / kapcsolatok hivatkoznak törlendő objektumokra',
-    'UI:Delete:ReferencesMustBeDeletedToEnsureIntegrity' => 'Adatbázis integritás ellenőrzés szükséges. Néhány hivatkozás megszüntetésre kerül.',
-    'UI:Delete:Consequence+' => '',
-    'UI:Delete:SorryDeletionNotAllowed' => 'Az objektum törlése nem engedélyezett. Részletes magyarázat a következő sorokban.',
-    'UI:Delete:PleaseDoTheManualOperations' => 'Hajtsa végre a következő listában található műveleteket manuálisan az objektum törlésének kéréséhez',
-    'UI:Delect:Confirm_Object' => 'Hagyja jóvá a %1$s törlését!',
-    'UI:Delect:Confirm_Count_ObjectsOf_Class' => 'Hagyja jóvá a %2$s osztály %1$d objektumának törlését!',
-    'UI:WelcomeToITop' => 'Üdvözli az '.ITOP_APPLICATION_SHORT,
-    'UI:DetailsPageTitle' => ITOP_APPLICATION_SHORT.' - %1$s - %2$s részletek',
-    'UI:ErrorPageTitle' => ITOP_APPLICATION_SHORT.' - Hiba',
-    'UI:ObjectDoesNotExist' => 'Sajnáljuk, ez az objektum nem létezik (vagy a megtekintése nem engedélyezett a felhasználó számára).',
-    'UI:ObjectArchived' => 'Ez az objektum archiválva lett. Kérjük, engedélyezze az archív módot, vagy lépjen kapcsolatba a rendszergazdával.',
-    'Tag:Archived' => 'Archivált',
-    'Tag:Archived+' => 'Csak archív módban hozzáférhető',
-    'Tag:Obsolete' => 'Elavult',
-    'Tag:Obsolete+' => 'Kizárva a hatáselemzésből és a keresési eredményekből',
-    'Tag:Synchronized' => 'Szinkronizált',
-    'ObjectRef:Archived' => 'Archivált',
-    'ObjectRef:Obsolete' => 'Elavult',
-    'UI:SearchResultsPageTitle' => ITOP_APPLICATION_SHORT.' - Keresés eredményei',
-    'UI:SearchResultsTitle' => 'Keresés eredményei',
-    'UI:SearchResultsTitle+' => 'Szöveges keresés eredményei',
-    'UI:Search:NoSearch' => 'Nincs keresés',
-    'UI:Search:NeedleTooShort' => 'A %1$s kereső karakterlánc túl rövid. Legalább %2$d karaktert írjon be.',
-    'UI:Search:Ongoing' => '%1$s keresése',
-    'UI:Search:Enlarge' => 'Keresés kibővítése',
-    'UI:FullTextSearchTitle_Text' => '%1$s keresés eredményei:',
-    'UI:Search:Count_ObjectsOf_Class_Found' => '%2$s osztály %1$d objektuma',
-    'UI:Search:NoObjectFound' => 'Objektum nem található',
-    'UI:ModificationPageTitle_Object_Class' => ITOP_APPLICATION_SHORT.' - %1$s - %2$s módosítása',
-    'UI:ModificationTitle_Class_Object' => '%1$s: <span class=\\"hilite\\">%2$s</span> módosítása',
-    'UI:ClonePageTitle_Object_Class' => ITOP_APPLICATION_SHORT.' - %1$s - %2$s klón módosítása',
-    'UI:CloneTitle_Class_Object' => '%1$s: <span class=\\"hilite\\">%2$s</span> klón',
-    'UI:CreationPageTitle_Class' => ITOP_APPLICATION_SHORT.' - %1$s létrehozása',
-    'UI:CreationTitle_Class' => '%1$s létrehozása',
-    'UI:SelectTheTypeOf_Class_ToCreate' => 'Válassza ki a létrehozni kívánt %1$s osztály típusát:',
-    'UI:Class_Object_NotUpdated' => 'Változás nem történt, %1$s (%2$s) <strong>NEM</strong> lett módosítva.',
-    'UI:Class_Object_Updated' => '%1$s (%2$s) frissítve.',
-    'UI:BulkDeletePageTitle' => ITOP_APPLICATION_SHORT.' - Tömeges törlés',
-    'UI:BulkDeleteTitle' => 'Válassza ki a törölni kívánt objektumokat:',
-    'UI:PageTitle:ObjectCreated' => ITOP_APPLICATION_SHORT.' objektum létrehozva.',
-    'UI:Title:Object_Of_Class_Created' => '%1$s - %2$s létrehozva.',
-    'UI:Apply_Stimulus_On_Object_In_State_ToTarget_State' => 'Alkalmazva %1$s objektumon: %2$s.Kinduló állapot: %3$s cél állapot: %4$s.',
-    'UI:ObjectCouldNotBeWritten' => 'Az objektum írása sikertelen: %1$s',
-    'UI:PageTitle:FatalError' => ITOP_APPLICATION_SHORT.' - Végzetes hiba',
-    'UI:SystemIntrusion' => 'Hozzáférés megtagadva. A művelet végrehajtása nem engedélyezett.',
-    'UI:FatalErrorMessage' => 'Végzetes hiba, '.ITOP_APPLICATION_SHORT.' nem tudja a műveletet folytatni',
-    'UI:Error_Details' => 'Hiba: %1$s.',
-
-    'UI:PageTitle:ProfileProjections' => ITOP_APPLICATION_SHORT.' Felhasználókezelés - Profiltervezés',
-    'UI:UserManagement:Class' => 'Osztály',
-    'UI:UserManagement:Class+' => '',
-    'UI:UserManagement:ProjectedObject' => 'Objektum',
-    'UI:UserManagement:ProjectedObject+' => '',
-    'UI:UserManagement:AnyObject' => '* Bármely *',
-    'UI:UserManagement:User' => 'Felhasználó',
-    'UI:UserManagement:User+' => '',
-    'UI:UserManagement:Action:Read' => 'Olvasás',
-    'UI:UserManagement:Action:Read+' => '',
-    'UI:UserManagement:Action:Modify' => 'Módosítás',
-    'UI:UserManagement:Action:Modify+' => '',
-    'UI:UserManagement:Action:Delete' => 'Törlés',
-    'UI:UserManagement:Action:Delete+' => '',
-    'UI:UserManagement:Action:BulkRead' => 'Tömeges beolvasás (Export)',
-    'UI:UserManagement:Action:BulkRead+' => '',
-    'UI:UserManagement:Action:BulkModify' => 'Tömeges módosítás',
-    'UI:UserManagement:Action:BulkModify+' => '',
-    'UI:UserManagement:Action:BulkDelete' => 'Tömeges törlés',
-    'UI:UserManagement:Action:BulkDelete+' => '',
-    'UI:UserManagement:Action:Stimuli' => 'Stimuli',
-    'UI:UserManagement:Action:Stimuli+' => '',
-    'UI:UserManagement:Action' => 'Művelet',
-    'UI:UserManagement:Action+' => '',
-    'UI:UserManagement:TitleActions' => 'Műveletek',
-    'UI:UserManagement:Permission' => 'Jogosultság',
-    'UI:UserManagement:Permission+' => '',
-    'UI:UserManagement:Attributes' => 'Attribútumok',
-    'UI:UserManagement:ActionAllowed:Yes' => 'Igen',
-    'UI:UserManagement:ActionAllowed:No' => 'Nem',
-    'UI:UserManagement:AdminProfile+' => '',
-    'UI:UserManagement:NoLifeCycleApplicable' => 'N/A',
-    'UI:UserManagement:NoLifeCycleApplicable+' => '',
-    'UI:UserManagement:GrantMatrix' => 'Jogosultságmátrix',
-
-    'Menu:AdminTools' => 'Adminisztrációs eszközök',// Duplicated into itop-welcome-itil (will be removed from here...)
-    'Menu:AdminTools+' => '',// Duplicated into itop-welcome-itil (will be removed from here...)
-    'Menu:AdminTools?' => 'Az eszközök csak az adminisztrátori profilhoz rendelt felhasználók számára elérhetők.',// Duplicated into itop-welcome-itil (will be removed from here...)
-    'Menu:SystemTools' => 'Rendszereszközök',
-
-    'UI:ChangeManagementMenu' => 'Változáskezelés',
-    'UI:ChangeManagementMenu+' => '',
-    'UI:ChangeManagementMenu:Title' => 'Változások áttekintése',
-    'UI-ChangeManagementMenu-ChangesByType' => 'Változások típusonként',
-    'UI-ChangeManagementMenu-ChangesByStatus' => 'Változások állapotuk szerint',
-    'UI-ChangeManagementMenu-ChangesNotYetAssigned' => 'Még nem kiosztott változások',
-
-    'UI:ConfigurationManagementMenu' => 'Konfigurációkezelés',
-    'UI:ConfigurationManagementMenu+' => '',
-    'UI:ConfigurationManagementMenu:Title' => 'Infrastruktúra áttekintő',
-    'UI-ConfigurationManagementMenu-InfraByType' => 'Infrastruktúra objektumok típusonként',
-    'UI-ConfigurationManagementMenu-InfraByStatus' => 'Infrastruktúra objektumok állapotuk szerint',
-
-    'UI:ConfigMgmtMenuOverview:Title' => 'Konfigurációkezelés műszerfal',
-    'UI-ConfigMgmtMenuOverview-FunctionalCIbyStatus' => 'Konfigurációs elemek állapotuk szerint',
-    'UI-ConfigMgmtMenuOverview-FunctionalCIByType' => 'Konfigurációs elemek típusonként',
-
-    'UI:RequestMgmtMenuOverview:Title' => 'Kérelemkezelés műszerfal',
-    'UI-RequestManagementOverview-RequestByService' => 'Felhasználói kérelmek szolgáltatásonként',
-    'UI-RequestManagementOverview-RequestByPriority' => 'Felhasználói kérelmek prioritás szerint',
-    'UI-RequestManagementOverview-RequestUnassigned' => 'Felhasználói kérelmek, amelyek még nem lettek ügyintézőhöz rendelve',
-
-    'UI:IncidentMgmtMenuOverview:Title' => 'Incidenskezelés műszerfal',
-    'UI-IncidentManagementOverview-IncidentByService' => 'Incidensek szolgáltatásonként',
-    'UI-IncidentManagementOverview-IncidentByPriority' => 'Incidensek prioritás szerint',
-    'UI-IncidentManagementOverview-IncidentUnassigned' => 'Incidensek, amelyek még nem lettek ügyintézőhöz rendelve',
-
-    'UI:ChangeMgmtMenuOverview:Title' => 'Változáskezelés műszerfal',
-    'UI-ChangeManagementOverview-ChangeByType' => 'Változások típusonként',
-    'UI-ChangeManagementOverview-ChangeUnassigned' => 'Változások, amelyek még nem lettek ügyintézőhöz rendelve',
-    'UI-ChangeManagementOverview-ChangeWithOutage' => 'Változások által okozott üzemszünet',
-
-    'UI:ServiceMgmtMenuOverview:Title' => 'Szolgáltatáskezelés műszerfal',
-    'UI-ServiceManagementOverview-CustomerContractToRenew' => 'A következő 30 napban lejáró ügyfélszerződések',
-    'UI-ServiceManagementOverview-ProviderContractToRenew' => 'A következő 30 napban lejáró szolgáltatói szerződések',
-
-    'UI:ContactsMenu' => 'Kapcsolattartók',
-    'UI:ContactsMenu+' => '',
-    'UI:ContactsMenu:Title' => 'Kapcsolattartó áttekintő',
-    'UI-ContactsMenu-ContactsByLocation' => 'Kapcsolattartók helyszín szerint',
-    'UI-ContactsMenu-ContactsByType' => 'Kapcsolattartók típusonként',
-    'UI-ContactsMenu-ContactsByStatus' => 'Kapcsolattartók állapotuk szerint',
-
-    'Menu:CSVImportMenu' => 'CSV importálás',// Duplicated into itop-welcome-itil (will be removed from here...)
-    'Menu:CSVImportMenu+' => '',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-    'Menu:DataModelMenu' => 'Adatmodell',// Duplicated into itop-welcome-itil (will be removed from here...)
-    'Menu:DataModelMenu+' => '',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-    'Menu:ExportMenu' => 'Exportálás',// Duplicated into itop-welcome-itil (will be removed from here...)
-    'Menu:ExportMenu+' => '',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-    'Menu:NotificationsMenu' => 'Értesítések',// Duplicated into itop-welcome-itil (will be removed from here...)
-    'Menu:NotificationsMenu+' => '',// Duplicated into itop-welcome-itil (will be removed from here...)
-    'UI:NotificationsMenu:Title' => 'Értesítések beállítása',
-    'UI:NotificationsMenu:Help' => 'Súgó',
-    'UI:NotificationsMenu:HelpContent' => '<p>Az '.ITOP_APPLICATION_SHORT.' alkalmazásban az értesítések teljesen testreszabhatók. Értesítések az objektumok két csoportjára épülnek: <i>eseményindítók és műveletek</i>.</p>
+	'UI:WelcomeMenu:AllOpenRequests' => 'Nyitott kérelmek: %1$d',
+	'UI:WelcomeMenu:MyCalls' => 'Saját kérelmek',
+	'UI:WelcomeMenu:OpenIncidents' => 'Nyitott incidensek: %1$d',
+	'UI:WelcomeMenu:AllConfigItems' => 'Konfigurációs elemek: %1$d',
+	'UI:WelcomeMenu:MyIncidents' => 'Hozzám rendelt incidensek',
+	'UI:AllOrganizations' => 'Szervezeti egységek',
+	'UI:YourSearch' => 'Saját keresések',
+	'UI:LoggedAsMessage' => 'Bejelentkezve %1$s (%2$s)',
+	'UI:LoggedAsMessage+Admin' => 'Bejelentkezve %1$s (%2$s, Administrator)',
+	'UI:Button:Logoff' => 'Kijelentkezés',
+	'UI:Button:GlobalSearch' => 'Globális keresés',
+	'UI:Button:Search' => ' Keresés',
+	'UI:Button:Clear' => ' Törlés',
+	'UI:Button:Confirm' => ' Confirm ~~',
+	'UI:Button:SearchInHierarchy' => 'Keresés a hierarchiában',
+	'UI:Button:Query' => ' Lekérdezés',
+	'UI:Button:Ok' => 'OK',
+	'UI:Button:Save' => 'Mentés',
+	'UI:Button:SaveAnd' => 'Mentés és %1$s',
+	'UI:Button:Cancel' => 'Mégse',
+	'UI:Button:Close' => 'Bezárás',
+	'UI:Button:Apply' => 'Alkalmazás',
+	'UI:Button:Send' => 'Küldés',
+	'UI:Button:SendAnd' => 'Küldés és %1$s',
+	'UI:Button:Back' => ' << Vissza',
+	'UI:Button:Restart' => ' |<< Újraindítás',
+	'UI:Button:Next' => ' Következő >>',
+	'UI:Button:Finish' => ' Befejezés',
+	'UI:Button:DoImport' => ' Importálás indítása',
+	'UI:Button:Done' => ' Kész',
+	'UI:Button:SimulateImport' => ' Importálás szimulálása',
+	'UI:Button:Test' => 'Teszt!',
+	'UI:Button:Evaluate' => ' Kiértékelés',
+	'UI:Button:Evaluate:Title' => ' Értékelés (Ctrl+Enter)',
+	'UI:Button:AddObject' => ' Hozzáadás...',
+	'UI:Button:BrowseObjects' => ' Böngészés...',
+	'UI:Button:Add' => ' Hozzáadás ',
+	'UI:Button:AddToList' => ' << Hozzáadás ',
+	'UI:Button:RemoveFromList' => ' Eltávolítás >> ',
+	'UI:Button:FilterList' => ' Szűrés... ',
+	'UI:Button:Create' => ' Létrehozás',
+	'UI:Button:Delete' => ' Törlés',
+	'UI:Button:Rename' => ' Átnevezés... ',
+	'UI:Button:ChangePassword' => ' Jelszó változtatás',
+	'UI:Button:ResetPassword' => ' Jelszó visszaállítás',
+	'UI:Button:Insert' => 'Beillesztés',
+	'UI:Button:More' => 'Több',
+	'UI:Button:Less' => 'Kevesebb',
+	'UI:Button:Wait' => 'Várjon, amíg a mezők frissülnek',
+	'UI:Treeview:CollapseAll' => 'Összes összecsukása',
+	'UI:Treeview:ExpandAll' => 'Összes lenyitása',
+	'UI:UserPref:DoNotShowAgain' => 'Ne mutassa újra',
+	'UI:InputFile:NoFileSelected' => 'Nincs fájl kiválasztva',
+	'UI:InputFile:SelectFile' => 'Válasszon egy fájlt',
+	'UI:SearchToggle' => 'Keresés',
+	'UI:ClickToCreateNew' => 'Új %1$s létrehozása',
+	'UI:SearchFor_Class' => '%1$s objektumok keresése',
+	'UI:NoObjectToDisplay' => 'Nincs megjeleníthető objektum',
+	'UI:Error:SaveFailed' => 'Az objektum nem menthető le :',
+	'UI:Error:MandatoryTemplateParameter_object_id' => 'object_id paraméter kötelező a link_attr megadásánál. Ellenőrizze a sablon definíciót.',
+	'UI:Error:MandatoryTemplateParameter_target_attr' => 'target_attr paraméter kötelező a link_attr megadásánál. Ellenőrizze a sablon definíciót.',
+	'UI:Error:MandatoryTemplateParameter_group_by' => 'group_by paraméter kötelező. Ellenőrizze a sablon definíciót.',
+	'UI:Error:InvalidGroupByFields' => 'Csoportosításnál használt érvénytelen mezők: "%1$s".',
+	'UI:Error:UnsupportedStyleOfBlock' => 'Hiba: nem támogatott stílus tömb: "%1$s".',
+	'UI:Error:IncorrectLinkDefinition_LinkedClass_Class' => 'Nem megfelelő kapcsolat meghatározás: kapcsolódó osztály: %1$s nem külső kulcs a %2$s osztályban',
+	'UI:Error:Object_Class_Id_NotFound' => 'Objektum: %1$s:%2$d nem található.',
+	'UI:Error:WizardCircularReferenceInDependencies' => 'Hiba: Körkörös hivatkozás az egymásra mutató mezők között. Ellenőrizze az adatmodellt.',
+	'UI:Error:UploadedFileTooBig' => 'Feltöltendő fájl túl nagy. (Maximális méret: %1$s). Ellenőrizze a PHP konfigurációs fájlban az upload_max_filesize és post_max_size beállításokat.',
+	'UI:Error:UploadedFileTruncated.' => 'Feltöltött fájl átméretezett!',
+	'UI:Error:NoTmpDir' => 'Az átmeneti könyvtár nem meghatározott.',
+	'UI:Error:CannotWriteToTmp_Dir' => 'Az átmeneti fájl nem írható. upload_tmp_dir = "%1$s".',
+	'UI:Error:UploadStoppedByExtension_FileName' => 'Feltöltés megállt a fájl kiterjesztés miatt. (Eredeti fájl név = "%1$s").',
+	'UI:Error:UploadFailedUnknownCause_Code' => 'Fájl feltöltés sikertelen ismeretlen hiba miatt. (Hibakód = "%1$s").',
+	'UI:Error:1ParametersMissing' => 'Hiba: a következő paramétert meg kell adni ennél a műveletnél: %1$s.',
+	'UI:Error:2ParametersMissing' => 'Hiba: a következő paramétereket meg kell adni ennél a műveletnél: %1$s és %2$s.',
+	'UI:Error:3ParametersMissing' => 'Hiba: a következő paramétereket meg kell adni ennél a műveletnél: %1$s, %2$s és %3$s.',
+	'UI:Error:4ParametersMissing' => 'Hiba: a következő paramétereket meg kell adni ennél a műveletnél: %1$s, %2$s, %3$s és %4$s.',
+	'UI:Error:IncorrectOQLQuery_Message' => 'Hiba: nem megfelelő OQL lekérdezés: %1$',
+	'UI:Error:AnErrorOccuredWhileRunningTheQuery_Message' => 'Hiba történt a lekérdezés futtatása közben: %1$s',
+	'UI:Error:ObjectAlreadyUpdated' => 'Hiba: az objketum már korábban módosításra került.',
+	'UI:Error:ObjectCannotBeUpdated' => 'Hiba: az objektum nem frissíthető.',
+	'UI:Error:ObjectsAlreadyDeleted' => 'Hiba: az objektum már korában törlésre került!',
+	'UI:Error:BulkDeleteNotAllowedOn_Class' => 'Az osztály objektumainak tömeges törlése nem engedélyezett %1$s',
+	'UI:Error:DeleteNotAllowedOn_Class' => 'Az osztály objektumainak törlése nem engedélyezett %1$s',
+	'UI:Error:ReadNotAllowedOn_Class' => ' Nincs engedélye hogy a %1$s osztály objektumait lássa',
+	'UI:Error:BulkModifyNotAllowedOn_Class' => 'Az osztály objektumainak tömeges frissítése nem engedélyezett %1$s',
+	'UI:Error:ObjectAlreadyCloned' => 'Hiba: az objektum már klónozott!',
+	'UI:Error:ObjectAlreadyCreated' => 'Hiba: az objektum már létrehozva!',
+	'UI:Error:Invalid_Stimulus_On_Object_In_State' => 'Hiba: érvénytelen stimulus "%1$s" a következő objektum %2$s következő állapotában "%3$s".',
+	'UI:Error:InvalidDashboardFile' => 'Hiba: Érvénytelen műszerfal fájl',
+	'UI:Error:InvalidDashboard' => 'Hiba: Érvénytelen műszerfal',
+	'UI:Error:MaintenanceMode' => 'Az alkalmazás jelenleg karbantartás alatt van',
+	'UI:Error:MaintenanceTitle' => 'Karbantartás',
+	'UI:Error:InvalidToken' => 'Hiba: a kért művelet már végrehajtásra került (CSRF token nem található)',
+	'UI:Error:SMTP:UnknownVendor' => 'A %1$s OAuth SMTP szolgáltató nem létezik  (email_transport_smtp.oauth.provider)',
+	'UI:GroupBy:Count' => 'Mennyiség',
+	'UI:GroupBy:Count+' => '',
+	'UI:CountOfObjects' => '%1$d darab objektum felel meg a kritériumoknak.',
+	'UI_CountOfObjectsShort' => '%1$d objektum.',
+	'UI:NoObject_Class_ToDisplay' => 'Nincs megjeleníthető %1$s',
+	'UI:History:LastModified_On_By' => 'Utolsó módosítást a következő objektumon %1$s %2$s végezte.',
+	'UI:HistoryTab' => 'Előzmény',
+	'UI:NotificationsTab' => 'Értesítés',
+	'UI:History:BulkImports' => 'Előzmények',
+	'UI:History:BulkImports+' => '',
+	'UI:History:BulkImportDetails' => 'CSV importálás végrehajtva: %1$s (%2$s által)',
+	'UI:History:Date' => 'Dátum',
+	'UI:History:Date+' => '',
+	'UI:History:User' => 'Felhasználó',
+	'UI:History:User+' => '',
+	'UI:History:Changes' => 'Változások',
+	'UI:History:Changes+' => '',
+	'UI:History:StatsCreations' => 'Létrehozva',
+	'UI:History:StatsCreations+' => '',
+	'UI:History:StatsModifs' => 'Módosítva',
+	'UI:History:StatsModifs+' => '',
+	'UI:History:StatsDeletes' => 'Törölve',
+	'UI:History:StatsDeletes+' => '',
+	'UI:Loading' => 'Betöltés...',
+	'UI:Menu:Actions' => 'Műveletek',
+	'UI:Menu:OtherActions' => 'Egyéb műveletek',
+	'UI:Menu:Transitions' => 'Átvezetés',
+	'UI:Menu:OtherTransitions' => 'Más átvezetések',
+	'UI:Menu:View' => 'View this object~~',
+	'UI:Menu:New' => 'Új...',
+	'UI:Menu:Add' => 'Hozzáadás...',
+	'UI:Menu:Manage' => 'Kezelés...',
+	'UI:Menu:EMail' => 'Email',
+	'UI:Menu:CSVExport' => 'CSV exportálás...',
+	'UI:Menu:Modify' => 'Módosítás...',
+	'UI:Menu:Delete' => 'Törlés...',
+	'UI:Menu:BulkDelete' => 'Törlés...',
+	'UI:Menu:BulkDelete_Class' => 'Delete %1$s objects...~~',
+	'UI:Menu:BulkDelete_Link' => 'Delete %1$s...~~',
+	'UI:Menu:BulkDelete_Remote' => 'Delete %1$s...~~',
+	'UI:UndefinedObject' => 'Nem meghatározott',
+	'UI:Document:OpenInNewWindow:Download' => 'Megnyitás új ablakban: %1$s, Letöltés: %2$s',
+	'UI:SplitDateTime-Date' => 'Dátum',
+	'UI:SplitDateTime-Time' => 'Idő',
+	'UI:TruncatedResults' => '%1$d objektum megjelenítve %2$d példányból',
+	'UI:DisplayAll' => 'Összes megjelenítése',
+	'UI:CollapseList' => 'Elemek',
+	'UI:CountOfResults' => '%1$d objektum',
+	'UI:ChangesLogTitle' => 'Változásnapló (%1$d):',
+	'UI:EmptyChangesLogTitle' => 'Változásnapló üres',
+	'UI:SearchFor_Class_Objects' => 'Keresés %1$s objektumra',
+	'UI:OQLQueryBuilderTitle' => 'OQL lekérdezés szerkesztő',
+	'UI:OQLQueryTab' => 'OQL lekérdezés',
+	'UI:SimpleSearchTab' => 'Egyszerű keresés',
+	'UI:Details+' => '',
+	'UI:SearchValue:Any' => '* Bármely *',
+	'UI:SearchValue:Mixed' => '* Kevert *',
+	'UI:SearchValue:NbSelected' => '# kiválasztva',
+	'UI:SearchValue:CheckAll' => 'Összes bejelölése',
+	'UI:SearchValue:UncheckAll' => 'Bejelölés megszüntetése',
+	'UI:SelectOne' => '-- válasszon ki egyet --',
+	'UI:Login:Welcome' => 'Üdvözli az '.ITOP_APPLICATION_SHORT.'!',
+	'UI:Login:IncorrectLoginPassword' => 'Nem megfelelő bejelentkezési név/jelszó, kérjük próbálja újra.',
+	'UI:Login:IdentifyYourself' => 'Folytatás előtt azonosítsa magát',
+	'UI:Login:UserNamePrompt' => 'Felhasználónév',
+	'UI:Login:PasswordPrompt' => 'Jelszó',
+	'UI:Login:ForgotPwd' => 'Elfelejtette a jelszavát?',
+	'UI:Login:ForgotPwdForm' => 'Elfelejtett jelszó',
+	'UI:Login:ForgotPwdForm+' => ITOP_APPLICATION_SHORT.' küldhet Önnek egy emailt, amelyben utasításokat talál a fiókja visszaállításához.',
+	'UI:Login:ResetPassword' => 'Küldje most!',
+	'UI:Login:ResetPwdFailed' => 'Sikertelen email küldés: %1$s',
+	'UI:Login:SeparatorOr' => 'Vagy',
+	'UI:ResetPwd-Error-WrongLogin' => '\'%1$s\' nem érvényes fiók',
+	'UI:ResetPwd-Error-NotPossible' => 'a külső fiókok jelszava itt nem állítható vissza.',
+	'UI:ResetPwd-Error-FixedPwd' => 'a fiók nem teszi lehetővé a jelszó visszaállítását.',
+	'UI:ResetPwd-Error-NoContact' => 'a fiók nem személyhez tartozik',
+	'UI:ResetPwd-Error-NoEmailAtt' => 'a fiók nem olyan személyhez tartozik amelynek van email címe. Keresse a rendszergazdát.',
+	'UI:ResetPwd-Error-NoEmail' => 'hiányzik az email cím. Keresse a rendszergazdát.',
+	'UI:ResetPwd-Error-Send' => 'email továbbítási hiba. Keresse a rendszergazdát',
+	'UI:ResetPwd-EmailSent' => 'Kérjük, ellenőrizze az email postafiókját, és kövesse az utasításokat. Ha nem kap emailt, kérjük, ellenőrizze a beírt bejelentkezési adatait.',
+	'UI:ResetPwd-EmailSubject' => 'Állítsa vissza az '.ITOP_APPLICATION_SHORT.' jelszavát',
+	'UI:ResetPwd-EmailBody' => '<body><p>Ön vissza szeretné állítani az '.ITOP_APPLICATION_SHORT.' jelszavát.</p><p>Kattintson erre a linkre <a href="%1$s">új jelszó</a></p>.',
+	'UI:ResetPwd-Title' => 'Jelszó visszaállítás',
+	'UI:ResetPwd-Error-InvalidToken' => 'Sajnáljuk, de vagy már visszaállították a jelszót, vagy már több emailt is kapott. Kérjük, mindenképpen használja a legutolsó kapott emailben megadott linket.',
+	'UI:ResetPwd-Error-EnterPassword' => 'Adja meg az új jelszavát a %1$s a fiókjának',
+	'UI:ResetPwd-Ready' => 'A jelszó megváltozott',
+	'UI:ResetPwd-Login' => 'Jelentkezzen be...',
+	'UI:Login:About' => 'Névjegy',
+	'UI:Login:ChangeYourPassword' => 'Jelszó változtatás',
+	'UI:Login:OldPasswordPrompt' => 'Jelenlegi jelszó',
+	'UI:Login:NewPasswordPrompt' => 'Új jelszó',
+	'UI:Login:RetypeNewPasswordPrompt' => 'Jelszó megerősítése',
+	'UI:Login:IncorrectOldPassword' => 'Hiba: a jelenlegi jelszó hibás',
+	'UI:LogOffMenu' => 'Kilépés',
+	'UI:LogOff:ThankYou' => 'Köszönjük, hogy az '.ITOP_APPLICATION_SHORT.'-ot használja!',
+	'UI:LogOff:ClickHereToLoginAgain' => 'Ismételt bejelentkezéshez kattintson ide',
+	'UI:ChangePwdMenu' => 'Jelszó módosítás...',
+	'UI:Login:PasswordChanged' => 'Jelszó sikeresen beállítva!',
+	'UI:Login:PasswordNotChanged' => 'Error: Password is the same!~~',
+	'UI:AccessRO-All' => ITOP_APPLICATION_SHORT.' csak olvasás módban',
+	'UI:AccessRO-Users' => ITOP_APPLICATION_SHORT.' csak olvasás módban a végfelhasználók számára',
+	'UI:ApplicationEnvironment' => 'Alkalmazáskörnyezet: %1$s',
+	'UI:Login:RetypePwdDoesNotMatch' => 'A jelszavak nem egyeznek!',
+	'UI:Button:Login' => 'Belépés az '.ITOP_APPLICATION_SHORT.' alkalmazásba',
+	'UI:Login:Error:AccessRestricted' => ITOP_APPLICATION_SHORT.' hozzáférés korlátozva. Kérem forduljon az '.ITOP_APPLICATION_SHORT.' rendszergazdához!',
+	'UI:Login:Error:AccessAdmin' => 'Adminisztrátori hozzáférés korlátozott. Kérem forduljon az '.ITOP_APPLICATION_SHORT.' rendszergazdához!',
+	'UI:Login:Error:WrongOrganizationName' => 'Ismeretlen szervezeti egység',
+	'UI:Login:Error:MultipleContactsHaveSameEmail' => 'Több kapcsolattartónál ugyanez az emailcím',
+	'UI:Login:Error:NoValidProfiles' => 'Érvénytelen a megadott profil',
+	'UI:CSVImport:MappingSelectOne' => '-- válasszon ki egyet --',
+	'UI:CSVImport:MappingNotApplicable' => '-- mező figyelmen kívül hagyása --',
+	'UI:CSVImport:NoData' => 'Üres mező..., kérem adjon meg adatot!',
+	'UI:Title:DataPreview' => 'Adatok előnézete',
+	'UI:CSVImport:ErrorOnlyOneColumn' => 'Hiba: Az import fájl egyetlen oszlopot tartalmaz. A megfelelő elválasztó karaktert adta meg?',
+	'UI:CSVImport:FieldName' => 'Mező %1$d',
+	'UI:CSVImport:DataLine1' => 'Adatsor 1',
+	'UI:CSVImport:DataLine2' => 'Adatsor 2',
+	'UI:CSVImport:idField' => 'id (elsődleges kulcs)',
+	'UI:Title:BulkImport' => ITOP_APPLICATION_SHORT.' - tömeges betöltés',
+	'UI:Title:BulkImport+' => '',
+	'UI:Title:BulkSynchro_nbItem_ofClass_class' => '%2$s osztály %1$d objektumának szinkronizációja',
+	'UI:CSVImport:ClassesSelectOne' => '-- válasszon ki egyet --',
+	'UI:CSVImport:ErrorExtendedAttCode' => 'Belső hiba: "%1$s" nem megfelelő kód, mert "%2$s" nem külső kulcsa a "%3$s" osztálynak',
+	'UI:CSVImport:ObjectsWillStayUnchanged' => '%1$d objektumok változatlanok maradnak.',
+	'UI:CSVImport:ObjectsWillBeModified' => '%1$d objektumok fognak megváltozni.',
+	'UI:CSVImport:ObjectsWillBeAdded' => '%1$d objektumok hozzáadásra kerülnek.',
+	'UI:CSVImport:ObjectsWillHaveErrors' => '%1$d objektumok hibásak lesznek.',
+	'UI:CSVImport:ObjectsRemainedUnchanged' => '%1$d objektumok változatlanak maradtak',
+	'UI:CSVImport:ObjectsWereModified' => '%1$d objektumok módosításra kerültek.',
+	'UI:CSVImport:ObjectsWereAdded' => '%1$d objektumok hozzáadásra kerültek.',
+	'UI:CSVImport:ObjectsHadErrors' => '%1$d objektumok hibásak.',
+	'UI:Title:CSVImportStep2' => '2. lépés az 5-ből: CSV adat beállítások',
+	'UI:Title:CSVImportStep3' => '3. lépés az 5-ből: Adatok összerendelés',
+	'UI:Title:CSVImportStep4' => '4. lépés az 5-ből: Importálás szimuláció',
+	'UI:Title:CSVImportStep5' => '5. lépés az 5-ből: Importálás befejezve',
+	'UI:CSVImport:LinesNotImported' => 'Sorok, melyek nem lettek betöltve:',
+	'UI:CSVImport:LinesNotImported+' => '',
+	'UI:CSVImport:SeparatorComma+' => 'vessző',
+	'UI:CSVImport:SeparatorSemicolon+' => 'pontosvessző',
+	'UI:CSVImport:SeparatorTab+' => 'tabulátor',
+	'UI:CSVImport:SeparatorOther' => 'egyéb:',
+	'UI:CSVImport:QualifierDoubleQuote+' => 'dupla idézőjel',
+	'UI:CSVImport:QualifierSimpleQuote+' => 'szimpla idézőjel',
+	'UI:CSVImport:QualifierOther' => 'egyéb:',
+	'UI:CSVImport:TreatFirstLineAsHeader' => 'Első sor fejléc információkat tartalmaz (oszlopok nevei)',
+	'UI:CSVImport:Skip_N_LinesAtTheBeginning' => '%1$s sor kihagyása a fájl elejéről',
+	'UI:CSVImport:CSVDataPreview' => 'CSV adat előnézet',
+	'UI:CSVImport:SelectFile' => 'Import fájl kiválasztása:',
+	'UI:CSVImport:Tab:LoadFromFile' => 'Betöltés fájlból',
+	'UI:CSVImport:Tab:CopyPaste' => 'Adat másolás és beillesztés',
+	'UI:CSVImport:Tab:Templates' => 'Sablonok',
+	'UI:CSVImport:PasteData' => 'Import adatok beillesztése:',
+	'UI:CSVImport:PickClassForTemplate' => 'Letöltendő sablon kiválasztása:',
+	'UI:CSVImport:SeparatorCharacter' => 'Elválasztó karakter:',
+	'UI:CSVImport:TextQualifierCharacter' => 'Szövegjelölő karakter',
+	'UI:CSVImport:CommentsAndHeader' => 'Megjegyzések és fejléc',
+	'UI:CSVImport:SelectClass' => 'Importálandó osztály kiválasztása:',
+	'UI:CSVImport:AdvancedMode' => 'Haladó mód',
+	'UI:CSVImport:AdvancedMode+' => '',
+	'UI:CSVImport:SelectAClassFirst' => 'Adat összerendeléshez először válassza ki az osztályt.',
+	'UI:CSVImport:HeaderFields' => 'Mező',
+	'UI:CSVImport:HeaderMappings' => 'Összerendelés',
+	'UI:CSVImport:HeaderSearch' => 'Keresés?',
+	'UI:CSVImport:AlertIncompleteMapping' => 'Kérem adja meg az összes mezőre az összerendelési szabályokat.',
+	'UI:CSVImport:AlertMultipleMapping' => 'Győződjön meg arról, hogy egy célmező csak egyszer kerül hozzárendelésre.',
+	'UI:CSVImport:AlertNoSearchCriteria' => 'Kérem adjon eg legalább egy keresési kritériumot',
+	'UI:CSVImport:Encoding' => 'Karakterkódolás',
+	'UI:UniversalSearchTitle' => ITOP_APPLICATION_SHORT.' - Univerzális kereső',
+	'UI:UniversalSearch:Error' => 'Hiba: %1$s',
+	'UI:UniversalSearch:LabelSelectTheClass' => 'Keresendő osztály kiválasztása:',
+	'UI:CSVReport-Value-Modified' => 'Módosítva',
+	'UI:CSVReport-Value-SetIssue' => 'Érvénytelen érték az attribútumhoz',
+	'UI:CSVReport-Value-ChangeIssue' => '\'%1$s\' egy érvénytelen érték',
+	'UI:CSVReport-Value-NoMatch' => 'Nincs egyezés a \'%1$s\' értékhez',
+	'UI:CSVReport-Value-NoMatch-PossibleValues' => 'Some possible \'%1$s\' value(s): %2$s~~',
+	'UI:CSVReport-Value-NoMatch-NoObject' => 'There are no \'%1$s\' objects~~',
+	'UI:CSVReport-Value-NoMatch-NoObject-ForCurrentUser' => 'There are no \'%1$s\' objects found with your current profile~~',
+	'UI:CSVReport-Value-NoMatch-SomeObjectNotVisibleForCurrentUser' => 'There are some \'%1$s\' objects not visible with your current profile~~',
+	'UI:CSVReport-Value-Missing' => 'Hiányzó kötelező érték',
+	'UI:CSVReport-Value-Ambiguous' => 'Kétértelműség: %1$s objektumban találva',
+	'UI:CSVReport-Row-Unchanged' => 'változatlan',
+	'UI:CSVReport-Row-Created' => 'létrehozva',
+	'UI:CSVReport-Row-Updated' => '%1$d oszlop frissítve',
+	'UI:CSVReport-Row-Disappeared' => '%1$d eltűnt, megváltozott oszlop',
+	'UI:CSVReport-Row-Issue' => 'Probléma: %1$s',
+	'UI:CSVReport-Value-Issue-Null' => 'A nulla nem engedélyezett',
+	'UI:CSVReport-Value-Issue-NotFound' => 'Az objektum nincs meg',
+	'UI:CSVReport-Value-Issue-FoundMany' => '%1$d egyezés található',
+	'UI:CSVReport-Value-Issue-Readonly' => 'A \'%1$\'s attribútum csak olvasható (jelenlegi érték: %2$s, várható érték: %3$s)',
+	'UI:CSVReport-Value-Issue-Format' => 'A bevitel feldolgozása sikertelen: %1$s',
+	'UI:CSVReport-Value-Issue-NoMatch' => 'A \'%1$s\' attribútum nem várt értéket kapott: nincs egyezés, ellenőrizze a beírást',
+	'UI:CSVReport-Value-Issue-AllowedValues' => 'Allowed \'%1$s\' value(s): %2$s~~',
+	'UI:CSVReport-Value-Issue-Unknown' => 'A \'%1$s\' attribútum nem várt értéket kapott: %2$s',
+	'UI:CSVReport-Row-Issue-Inconsistent' => 'Egymással nem konzisztens attribútumok: %1$s',
+	'UI:CSVReport-Row-Issue-Attribute' => 'Nem várt attribútum érték(ek)',
+	'UI:CSVReport-Row-Issue-MissingExtKey' => 'Nem lehetett létrehozni hiányzó külső kulcs(ok) miatt: %1$s',
+	'UI:CSVReport-Row-Issue-DateFormat' => 'hibás dátumformátum',
+	'UI:CSVReport-Row-Issue-ExpectedDateFormat' => 'Expected format: %1$s~~',
+	'UI:CSVReport-Row-Issue-Reconciliation' => 'nem sikerült összeegyeztetni',
+	'UI:CSVReport-Row-Issue-Ambiguous' => 'kétértelmű összeegyeztetés',
+	'UI:CSVReport-Row-Issue-Internal' => 'Belső hiba: %1$s, %2$s',
+	'UI:CSVReport-Icon-Unchanged' => 'Változatlan',
+	'UI:CSVReport-Icon-Modified' => 'Módosított',
+	'UI:CSVReport-Icon-Missing' => 'Hiányzó',
+	'UI:CSVReport-Object-MissingToUpdate' => 'Hiányzó objektum: frissítve lesz',
+	'UI:CSVReport-Object-MissingUpdated' => 'Hiányzó objektum: frissítve',
+	'UI:CSVReport-Icon-Created' => 'Létrehozva',
+	'UI:CSVReport-Object-ToCreate' => 'Az objektum létre lesz hozva',
+	'UI:CSVReport-Object-Created' => 'Az objektum létrehozva',
+	'UI:CSVReport-Icon-Error' => 'Hiba',
+	'UI:CSVReport-Object-Error' => 'HIBA: %1$s',
+	'UI:CSVReport-Object-Ambiguous' => 'KÉTÉRTELMŰ: %1$s',
+	'UI:CSVReport-Stats-Errors' => '%1$.0f %% -a a betöltött objektumoknak hibás, ezért figyelmen kívül lesznek hagyva.',
+	'UI:CSVReport-Stats-Created' => '%1$.0f %% -a a betöltött objektumoknak létre lesz hozva.',
+	'UI:CSVReport-Stats-Modified' => '%1$.0f %% -a a betöltött objektumoknak módosítva lesz.',
+	'UI:CSVExport:AdvancedMode' => 'Haladó mód',
+	'UI:CSVExport:AdvancedMode+' => 'Haladó módban több oszlopot is hozzáadunk az exportáláshoz: az objektum azonosítóját, a külső kulcsok azonosítóját és egyeztetési attribútumait.',
+	'UI:CSVExport:LostChars' => 'Kódolási probléma',
+	'UI:CSVExport:LostChars+' => 'A letöltött fájl %1$s kódolású lesz. '.ITOP_APPLICATION_SHORT.' olyan karaktereket észlelt, amelyek nem kompatibilisek ezzel a formátummal. Ezeket a karaktereket vagy helyettesítő karakterekkel helyettesítjük (pl. az ékezetes karakterek elveszítik az ékezetet), vagy elvetjük őket. Az adatokat a webböngészőből másolhatja/beillesztheti. Alternatívaként a rendszergazdához is fordulhat a kódolás megváltoztatásához (lásd a \'csv_file_default_charset\' paramétert).',
+	'UI:Audit:Title' => ITOP_APPLICATION_SHORT.' - CMDB Audit',
+	'UI:Audit:InteractiveAudit' => 'Interaktív Audit',
+	'UI:Audit:Interactive:All:Title' => 'Audit results~~',
+	'UI:Audit:Interactive:All:SubTitle' => 'Full audit: includes all rules, all categories, all domains~~',
+	'UI:Audit:Interactive:All:BreadCrumb' => 'Full audit~~',
+	'UI:Audit:Interactive:All:BreadCrumb+' => 'Audit results for all rules~~',
+	'UI:Audit:Interactive:Categories:Title' => 'Audit results for categories: %1$s~~',
+	'UI:Audit:Interactive:Categories:SubTitle' => 'Audit results for all the rules belonging to one of those %1$s categories~~',
+	'UI:Audit:Interactive:Categories:BreadCrumb' => 'Categories~~',
+	'UI:Audit:Interactive:Categories:BreadCrumb+' => 'Audit categories: %1$s~~',
+	'UI:Audit:Interactive:Domain:Title' => 'Audit results for Domain: %1$s~~',
+	'UI:Audit:Interactive:Domain:SubTitle' => 'Audit results for all the rules belonging to a category related to the domain: %1$s~~',
+	'UI:Audit:Interactive:Domain:BreadCrumb' => '%1$s~~',
+	'UI:Audit:Interactive:Domain:BreadCrumb+' => 'Audit for Domain: %1$s~~',
+	'UI:Audit:Interactive:Selection:Title' => 'Selection of an audit~~',
+	'UI:Audit:Interactive:Selection:SubTitle' => 'Select a domain to get the results limited to this domain or select "All categories" to get a full audit (can take time or even fail if too much data to audit)~~',
+	'UI:Audit:Interactive:Selection:BreadCrumb' => 'Selection~~',
+	'UI:Audit:Interactive:Selection:BreadCrumb+' => 'Selection of an Audit to run~~',
+	'UI:Audit:Interactive:Selection:BadgeAll' => 'All categories~~',
+	'UI:Audit:Interactive:Button:Back' => 'Back to the audit~~',
+	'UI:Audit:Interactive:Button:Configuration' => 'Audit configuration~~',
+	'UI:Audit:ViewRules' => 'Check the rules~~',
+	'UI:Audit:HeaderAuditRule' => 'Auditszabály',
+	'UI:Audit:HeaderNbObjects' => '# Objektumok',
+	'UI:Audit:HeaderNbErrors' => '# Hibák',
+	'UI:Audit:PercentageOk' => '% OK',
+	'UI:Audit:OqlError' => 'OQL hiba',
+	'UI:Audit:Error:ValueNA' => 'n/a',
+	'UI:Audit:ErrorIn_Rule' => 'Hiba a szabályban',
+	'UI:Audit:ErrorIn_Rule_Reason' => 'OQL hiba a %1$s szabályban: %2$s.',
+	'UI:Audit:ErrorIn_Category' => 'Hiba a kategóriában',
+	'UI:Audit:ErrorIn_Category_Reason' => 'OQL hiba a %1$s kategóriában: %2$s.',
+	'UI:Audit:AuditErrors' => 'Audit hibák',
+	'UI:Audit:Dashboard:ObjectsAudited' => 'Auditált objektum',
+	'UI:Audit:Dashboard:ObjectsInError' => 'Hibás objektum',
+	'UI:Audit:Dashboard:ObjectsValidated' => 'Érvényesített objektum',
+	'UI:Audit:AuditCategory:Subtitle' => '%1$s hiba a %2$s - %3$s%% -ból',
+	'UI:RunQuery:Title' => ITOP_APPLICATION_SHORT.' - OQL lekérdezés értékelés',
+	'UI:RunQuery:QueryExamples' => 'Lekérdezés példák',
+	'UI:RunQuery:QueryResults' => 'Lekérdezés eredményei',
+	'UI:RunQuery:HeaderPurpose' => 'Cél',
+	'UI:RunQuery:HeaderPurpose+' => '',
+	'UI:RunQuery:HeaderOQLExpression' => 'OQL kifejezés',
+	'UI:RunQuery:HeaderOQLExpression+' => '',
+	'UI:RunQuery:ExpressionToEvaluate' => 'Kiértékelendő kifejezés: ',
+	'UI:RunQuery:QueryArguments' => 'Lekérdezés argumentumok',
+	'UI:RunQuery:MoreInfo' => 'Több információ a lekérdezésről: ',
+	'UI:RunQuery:DevelopedQuery' => 'Fejlesztett lekérdezés kiértékelés: ',
+	'UI:RunQuery:SerializedFilter' => 'Szerializált szűrő: ',
+	'UI:RunQuery:DevelopedOQL' => 'Fejlesztett OQL',
+	'UI:RunQuery:DevelopedOQLCount' => 'Fejlesztett OQL a számításhoz',
+	'UI:RunQuery:ResultSQLCount' => 'Létrejött SQL',
+	'UI:RunQuery:ResultSQL' => 'Létrejött SQL',
+	'UI:RunQuery:Error' => 'A lekérdezés futtatása közben a következő hiba jelentkezett',
+	'UI:Query:UrlForExcel' => 'URL az MS-Excel web-lekérdezésekhez',
+	'UI:Query:UrlV1' => 'A mezők listája nem került meghatározásra. Az <em>export-V2.php</em> oldal nem hívható meg ezen információ nélkül. Ezért az alábbiakban javasolt URL az örökölt oldalra mutat: <em>export.php</em>. Az exportálásnak ez a régi változata a következő korlátozással rendelkezik: az exportált mezők listája a kimeneti formátumtól és a '.ITOP_APPLICATION_SHORT.' adatmodelltől függően változhat. Ha garantálni szeretné, hogy az exportált oszlopok listája hosszú távon stabil maradjon, akkor meg kell adnia a "Fields" attribútum értékét, és használnia kell a <em>export-V2.php</em> oldalt.',
+	'UI:Schema:Title' => ITOP_APPLICATION_SHORT.' objektum séma',
+	'UI:Schema:TitleForClass' => '%1$s séma',
+	'UI:Schema:CategoryMenuItem' => '<b>%1$s</b> kategória',
+	'UI:Schema:Relationships' => 'Kapcsolatok',
+	'UI:Schema:AbstractClass' => 'Absztrakt osztály: nem példányosítható belőle objektum.',
+	'UI:Schema:NonAbstractClass' => 'Nem absztrakt osztály: objektum példányosítható belőle.',
+	'UI:Schema:ClassHierarchyTitle' => 'Osztály hierarchia',
+	'UI:Schema:AllClasses' => 'Osztályok',
+	'UI:Schema:ExternalKey_To' => 'Külső kulcs %1$s-hoz',
+	'UI:Schema:Columns_Description' => 'Oszlopok: <em>%1$s</em>',
+	'UI:Schema:Default_Description' => 'Alapértelmezett: "%1$s"',
+	'UI:Schema:NullAllowed' => 'Null érték engedélyezett',
+	'UI:Schema:NullNotAllowed' => 'Null érték nem engedélyezett',
+	'UI:Schema:Attributes' => 'Attribútumok',
+	'UI:Schema:AttributeCode' => 'Attribútum kód',
+	'UI:Schema:AttributeCode+' => '',
+	'UI:Schema:Label' => 'Címke',
+	'UI:Schema:Label+' => '',
+	'UI:Schema:Type' => 'Típus',
+	'UI:Schema:Type+' => '',
+	'UI:Schema:Origin' => 'Származás',
+	'UI:Schema:Origin+' => '',
+	'UI:Schema:Description' => 'Leírás',
+	'UI:Schema:Description+' => '',
+	'UI:Schema:AllowedValues' => 'Engedélyezett értékek',
+	'UI:Schema:AllowedValues+' => '',
+	'UI:Schema:MoreInfo' => 'További információ',
+	'UI:Schema:MoreInfo+' => '',
+	'UI:Schema:SearchCriteria' => 'Keresési kritériumok',
+	'UI:Schema:FilterCode' => 'Szűrőkód',
+	'UI:Schema:FilterCode+' => '',
+	'UI:Schema:FilterDescription' => 'Leírás',
+	'UI:Schema:FilterDescription+' => '',
+	'UI:Schema:AvailOperators' => 'Elérhető műveletek',
+	'UI:Schema:AvailOperators+' => '',
+	'UI:Schema:ChildClasses' => 'Leszármazott osztályok',
+	'UI:Schema:ReferencingClasses' => 'Referált osztályok',
+	'UI:Schema:RelatedClasses' => 'Kapcsolódó osztályok',
+	'UI:Schema:LifeCycle' => 'Életciklus',
+	'UI:Schema:Triggers' => 'Eseményindítók',
+	'UI:Schema:Relation_Code_Description' => 'Kapcsolat <em>%1$s</em> (%2$s)',
+	'UI:Schema:RelationDown_Description' => 'Lenn: %1$s',
+	'UI:Schema:RelationUp_Description' => 'Fenn: %1$s',
+	'UI:Schema:RelationPropagates' => '%1$s: kiterjesztése %2$d szintre, lekérdezés: %3$s',
+	'UI:Schema:RelationDoesNotPropagate' => '%1$s: nincs kiterjesztve (%2$d szintekre), lekérdezés: %3$s',
+	'UI:Schema:Class_ReferencingClasses_From_By' => '%1$s hivatkozva %2$s az osztályban %3$s mezőn keresztül',
+	'UI:Schema:Class_IsLinkedTo_Class_Via_ClassAndAttribute' => '%1$s hozzácsatolva %2$s-hoz %3$s-n keresztül::<em>%4$s</em>',
+	'UI:Schema:Links:1-n' => 'A következő osztályok mutatnak %1$s-ra (1:n kapcsolat):',
+	'UI:Schema:Links:n-n' => 'A következő osztályok mutatnak %1$s-ra (n:n kapcsolat):',
+	'UI:Schema:Links:All' => 'Összekapcsolódó osztályok grafikonja',
+	'UI:Schema:NoLifeCyle' => 'Nincs életciklus rendelve ehhez az osztályhoz.',
+	'UI:Schema:LifeCycleTransitions' => 'Átvezetés',
+	'UI:Schema:LifeCyleAttributeOptions' => 'Attribútum opciók',
+	'UI:Schema:LifeCycleHiddenAttribute' => 'Rejtett',
+	'UI:Schema:LifeCycleReadOnlyAttribute' => 'Csak olvasható',
+	'UI:Schema:LifeCycleMandatoryAttribute' => 'Kötelező',
+	'UI:Schema:LifeCycleAttributeMustChange' => 'Változtatni kell',
+	'UI:Schema:LifeCycleAttributeMustPrompt' => 'Felhasználó kéri a változtatását',
+	'UI:Schema:LifeCycleEmptyList' => 'Üres lista',
+	'UI:Schema:ClassFilter' => 'Osztály:',
+	'UI:Schema:DisplayLabel' => 'Megjelenítés:',
+	'UI:Schema:DisplaySelector/LabelAndCode' => 'Felirat és kód',
+	'UI:Schema:DisplaySelector/Label' => 'Címke',
+	'UI:Schema:DisplaySelector/Code' => 'Kód',
+	'UI:Schema:Attribute/Filter' => 'Szűrő',
+	'UI:Schema:DefaultNullValue' => 'Alapértelmezett null érték : "%1$s"',
+	'UI:Schema:Events' => 'Events~~',
+	'UI:Schema:Events:Defined' => 'Defined events~~',
+	'UI:Schema:Events:NoEvent' => 'No event defined~~',
+	'UI:Schema:Events:Listeners' => 'Event listeners~~',
+	'UI:Schema:Events:NoListener' => 'No event listener~~',
+	'UI:Schema:Events:Event' => 'Event~~',
+	'UI:Schema:Events:Description' => 'Description~~',
+	'UI:Schema:Events:Listener' => 'Listener~~',
+	'UI:Schema:Events:Rank' => 'Rank~~',
+	'UI:Schema:Events:Module' => 'Module~~',
+	'UI:LinksWidget:Autocomplete+' => '',
+	'UI:Edit:SearchQuery' => 'Válasszon egy előre megadott lekérdezést',
+	'UI:Edit:TestQuery' => 'Teszt lekérdezés',
+	'UI:Combo:SelectValue' => '--- válasszon értéket ---',
+	'UI:Label:SelectedObjects' => 'Kiválasztott objektumok: ',
+	'UI:Label:AvailableObjects' => 'Lehetséges objektumok: ',
+	'UI:Link_Class_Attributes' => '%1$s attribútumai',
+	'UI:SelectAllToggle+' => '',
+	'UI:AddObjectsOf_Class_LinkedWith_Class_Instance' => '%1$s objektumok hozzáadása %2$s osztályhoz kapcsolással: %3$s',
+	'UI:AddObjectsOf_Class_LinkedWith_Class' => '%1$s objektumok hozzáadása %2$s osztályhoz csatolással',
+	'UI:ManageObjectsOf_Class_LinkedWith_Class_Instance' => '%2$s osztályhoz kapcsolt %1$s objektumok kezelése: %3$s',
+	'UI:AddLinkedObjectsOf_Class' => 'Hozzáadás %1$s osztályhoz',
+	'UI:RemoveLinkedObjectsOf_Class' => 'Kiválasztott objektum eltávolítása',
+	'UI:Message:EmptyList:UseAdd' => 'A lista üres, használja a "Hozzáadás..." gombot az elemekre.',
+	'UI:Message:EmptyList:UseSearchForm' => 'Használja a keresőmezőt a hozzáadandó objektumok kiválasztásához.',
+	'UI:Wizard:FinalStepTitle' => 'Utolsó lépés: megerősítés',
+	'UI:Title:DeletionOf_Object' => '%1$s törlése',
+	'UI:Title:BulkDeletionOf_Count_ObjectsOf_Class' => '%2$s osztály %1$d objektumának tömeges törlése',
+	'UI:Delete:NotAllowedToDelete' => 'Nem engedélyezett az objektum törlése',
+	'UI:Delete:NotAllowedToUpdate_Fields' => 'A következő mező módosítása nem engedélyezett: %1$s',
+	'UI:Error:ActionNotAllowed' => 'Önnek nem engedélyezett ez a művelet',
+	'UI:Error:NotEnoughRightsToDelete' => 'Az objektum nem törölhető, mert a felhasználónak nincs elegendő jogosultsága',
+	'UI:Error:CannotDeleteBecause' => 'Az objektum nem törölhető, mert: %1$s',
+	'UI:Error:CannotDeleteBecauseOfDepencies' => 'Az objektum nem törölhető, mert néhány hozzá kapcsolódó magasabb prioritású manuális művelet végrehajtásra vár',
+	'UI:Error:CannotDeleteBecauseManualOpNeeded' => 'Az objektum nem törölhető, mert néhány hozzá kapcsolódó magasabb prioritású manuális művelet végrehajtásra vár',
+	'UI:Archive_User_OnBehalfOf_User' => '%1$s felhasználó %2$s nevében',
+	'UI:Delete:Deleted' => 'törölve',
+	'UI:Delete:AutomaticallyDeleted' => 'automatikusan törölve',
+	'UI:Delete:AutomaticResetOf_Fields' => ' következő mezők automatikus újratöltése: %1$s',
+	'UI:Delete:CleaningUpRefencesTo_Object' => 'Referenciák tisztítása %1$s...',
+	'UI:Delete:CleaningUpRefencesTo_Several_ObjectsOf_Class' => '%2$s osztály %1$d objektumára mutató referenciák tisztítása',
+	'UI:Delete:Done+' => '',
+	'UI:Delete:_Name_Class_Deleted' => '%1$s - %2$s törölve.',
+	'UI:Delete:ConfirmDeletionOf_Name' => '%1$s törlése',
+	'UI:Delete:ConfirmDeletionOf_Count_ObjectsOf_Class' => '%2$s osztály %1$d objektumának törlése',
+	'UI:Delete:CannotDeleteBecause' => 'Sikertelenül töröltek: %1$s',
+	'UI:Delete:ShouldBeDeletedAtomaticallyButNotPossible' => 'Automatikusan kellett volna törlődniük, de a művelet nem volt végrehajtható: %1$s',
+	'UI:Delete:MustBeDeletedManuallyButNotPossible' => 'Manuális törlés nem végrehajtható: %1$s',
+	'UI:Delete:WillBeDeletedAutomatically' => 'Automatikusan lesznek törölve',
+	'UI:Delete:MustBeDeletedManually' => 'Manuálisan törlendők',
+	'UI:Delete:CannotUpdateBecause_Issue' => 'Automatikus frissítés sikertelen: %1$s',
+	'UI:Delete:WillAutomaticallyUpdate_Fields' => 'Automatikusan lesznek frissítve (reset: %1$s)',
+	'UI:Delete:Count_Objects/LinksReferencing_Object' => '%1$d objektumok / kapcsolatok hivatkoznak erre: %2$s',
+	'UI:Delete:Count_Objects/LinksReferencingTheObjects' => '%1$d objektumok / kapcsolatok hivatkoznak törlendő objektumokra',
+	'UI:Delete:ReferencesMustBeDeletedToEnsureIntegrity' => 'Adatbázis integritás ellenőrzés szükséges. Néhány hivatkozás megszüntetésre kerül.',
+	'UI:Delete:Consequence+' => '',
+	'UI:Delete:SorryDeletionNotAllowed' => 'Az objektum törlése nem engedélyezett. Részletes magyarázat a következő sorokban.',
+	'UI:Delete:PleaseDoTheManualOperations' => 'Hajtsa végre a következő listában található műveleteket manuálisan az objektum törlésének kéréséhez',
+	'UI:Delect:Confirm_Object' => 'Hagyja jóvá a %1$s törlését!',
+	'UI:Delect:Confirm_Count_ObjectsOf_Class' => 'Hagyja jóvá a %2$s osztály %1$d objektumának törlését!',
+	'UI:WelcomeToITop' => 'Üdvözli az '.ITOP_APPLICATION_SHORT,
+	'UI:DetailsPageTitle' => ITOP_APPLICATION_SHORT.' - %1$s - %2$s részletek',
+	'UI:ErrorPageTitle' => ITOP_APPLICATION_SHORT.' - Hiba',
+	'UI:ObjectDoesNotExist' => 'Sajnáljuk, ez az objektum nem létezik (vagy a megtekintése nem engedélyezett a felhasználó számára).',
+	'UI:ObjectArchived' => 'Ez az objektum archiválva lett. Kérjük, engedélyezze az archív módot, vagy lépjen kapcsolatba a rendszergazdával.',
+	'Tag:Archived' => 'Archivált',
+	'Tag:Archived+' => 'Csak archív módban hozzáférhető',
+	'Tag:Obsolete' => 'Elavult',
+	'Tag:Obsolete+' => 'Kizárva a hatáselemzésből és a keresési eredményekből',
+	'Tag:Synchronized' => 'Szinkronizált',
+	'ObjectRef:Archived' => 'Archivált',
+	'ObjectRef:Obsolete' => 'Elavult',
+	'UI:SearchResultsPageTitle' => ITOP_APPLICATION_SHORT.' - Keresés eredményei',
+	'UI:SearchResultsTitle' => 'Keresés eredményei',
+	'UI:SearchResultsTitle+' => 'Szöveges keresés eredményei',
+	'UI:Search:NoSearch' => 'Nincs keresés',
+	'UI:Search:NeedleTooShort' => 'A \\"%1$s\\" kereső karakterlánc túl rövid. Legalább %2$d karaktert írjon be.',
+	'UI:Search:Ongoing' => '\\"%1$s\\" keresése',
+	'UI:Search:Enlarge' => 'Keresés kibővítése',
+	'UI:FullTextSearchTitle_Text' => '"%1$s" keresés eredményei:',
+	'UI:Search:Count_ObjectsOf_Class_Found' => '%2$s osztály %1$d objektuma',
+	'UI:Search:NoObjectFound' => 'Objektum nem található',
+	'UI:ModificationPageTitle_Object_Class' => ITOP_APPLICATION_SHORT.' - %1$s - %2$s módosítása',
+	'UI:ModificationTitle_Class_Object' => '%1$s: <span class=\\"hilite\\">%2$s</span> módosítása',
+	'UI:ClonePageTitle_Object_Class' => ITOP_APPLICATION_SHORT.' - %1$s - %2$s klón módosítása',
+	'UI:CloneTitle_Class_Object' => '%1$s: <span class=\\"hilite\\">%2$s</span> klón',
+	'UI:CreationPageTitle_Class' => ITOP_APPLICATION_SHORT.' - %1$s létrehozása',
+	'UI:CreationTitle_Class' => '%1$s létrehozása',
+	'UI:SelectTheTypeOf_Class_ToCreate' => 'Válassza ki a létrehozni kívánt %1$s osztály típusát:',
+	'UI:Class_Object_NotUpdated' => 'Változás nem történt, %1$s (%2$s) <strong>NEM</strong> lett módosítva.',
+	'UI:Class_Object_Updated' => '%1$s (%2$s) frissítve.',
+	'UI:BulkDeletePageTitle' => ITOP_APPLICATION_SHORT.' - Tömeges törlés',
+	'UI:BulkDeleteTitle' => 'Válassza ki a törölni kívánt objektumokat:',
+	'UI:PageTitle:ObjectCreated' => ITOP_APPLICATION_SHORT.' objektum létrehozva.',
+	'UI:Title:Object_Of_Class_Created' => '%1$s - %2$s létrehozva.',
+	'UI:Apply_Stimulus_On_Object_In_State_ToTarget_State' => 'Alkalmazva %1$s objektumon: %2$s. Kiinduló állapot: %3$s cél állapot: %4$s.',
+	'UI:ObjectCouldNotBeWritten' => 'Az objektum írása sikertelen: %1$s',
+	'UI:PageTitle:FatalError' => ITOP_APPLICATION_SHORT.' - Végzetes hiba',
+	'UI:SystemIntrusion' => 'Hozzáférés megtagadva. A művelet végrehajtása nem engedélyezett.',
+	'UI:FatalErrorMessage' => 'Végzetes hiba, '.ITOP_APPLICATION_SHORT.' nem tudja a műveletet folytatni',
+	'UI:Error_Details' => 'Hiba: %1$s.',
+	'UI:PageTitle:ProfileProjections' => ITOP_APPLICATION_SHORT.' Felhasználókezelés - Profiltervezés',
+	'UI:UserManagement:Class' => 'Osztály',
+	'UI:UserManagement:Class+' => '',
+	'UI:UserManagement:ProjectedObject' => 'Objektum',
+	'UI:UserManagement:ProjectedObject+' => '',
+	'UI:UserManagement:AnyObject' => '* Bármely *',
+	'UI:UserManagement:User' => 'Felhasználó',
+	'UI:UserManagement:User+' => '',
+	'UI:UserManagement:Action:Read' => 'Olvasás',
+	'UI:UserManagement:Action:Read+' => '',
+	'UI:UserManagement:Action:Modify' => 'Módosítás',
+	'UI:UserManagement:Action:Modify+' => '',
+	'UI:UserManagement:Action:Delete' => 'Törlés',
+	'UI:UserManagement:Action:Delete+' => '',
+	'UI:UserManagement:Action:BulkRead' => 'Tömeges beolvasás (Export)',
+	'UI:UserManagement:Action:BulkRead+' => '',
+	'UI:UserManagement:Action:BulkModify' => 'Tömeges módosítás',
+	'UI:UserManagement:Action:BulkModify+' => '',
+	'UI:UserManagement:Action:BulkDelete' => 'Tömeges törlés',
+	'UI:UserManagement:Action:BulkDelete+' => '',
+	'UI:UserManagement:Action:Stimuli' => 'Stimuli',
+	'UI:UserManagement:Action:Stimuli+' => '',
+	'UI:UserManagement:Action' => 'Művelet',
+	'UI:UserManagement:Action+' => '',
+	'UI:UserManagement:TitleActions' => 'Műveletek',
+	'UI:UserManagement:Permission' => 'Jogosultság',
+	'UI:UserManagement:Permission+' => '',
+	'UI:UserManagement:Attributes' => 'Attribútumok',
+	'UI:UserManagement:ActionAllowed:Yes' => 'Igen',
+	'UI:UserManagement:ActionAllowed:No' => 'Nem',
+	'UI:UserManagement:AdminProfile+' => '',
+	'UI:UserManagement:NoLifeCycleApplicable' => 'N/A',
+	'UI:UserManagement:NoLifeCycleApplicable+' => '',
+	'UI:UserManagement:GrantMatrix' => 'Jogosultságmátrix',
+	'Menu:SystemTools' => 'Rendszereszközök',
+	'UI:ChangeManagementMenu' => 'Változáskezelés',
+	'UI:ChangeManagementMenu+' => '',
+	'UI:ChangeManagementMenu:Title' => 'Változások áttekintése',
+	'UI-ChangeManagementMenu-ChangesByType' => 'Változások típusonként',
+	'UI-ChangeManagementMenu-ChangesByStatus' => 'Változások állapotuk szerint',
+	'UI-ChangeManagementMenu-ChangesNotYetAssigned' => 'Még nem kiosztott változások',
+	'UI:ConfigurationManagementMenu' => 'Konfigurációkezelés',
+	'UI:ConfigurationManagementMenu+' => '',
+	'UI:ConfigurationManagementMenu:Title' => 'Infrastruktúra áttekintő',
+	'UI-ConfigurationManagementMenu-InfraByType' => 'Infrastruktúra objektumok típusonként',
+	'UI-ConfigurationManagementMenu-InfraByStatus' => 'Infrastruktúra objektumok állapotuk szerint',
+	'UI:ConfigMgmtMenuOverview:Title' => 'Konfigurációkezelés műszerfal',
+	'UI-ConfigMgmtMenuOverview-FunctionalCIbyStatus' => 'Konfigurációs elemek állapotuk szerint',
+	'UI-ConfigMgmtMenuOverview-FunctionalCIByType' => 'Konfigurációs elemek típusonként',
+	'UI:RequestMgmtMenuOverview:Title' => 'Kérelemkezelés műszerfal',
+	'UI-RequestManagementOverview-RequestByService' => 'Felhasználói kérelmek szolgáltatásonként',
+	'UI-RequestManagementOverview-RequestByPriority' => 'Felhasználói kérelmek prioritás szerint',
+	'UI-RequestManagementOverview-RequestUnassigned' => 'Felhasználói kérelmek, amelyek még nem lettek ügyintézőhöz rendelve',
+	'UI:IncidentMgmtMenuOverview:Title' => 'Incidenskezelés műszerfal',
+	'UI-IncidentManagementOverview-IncidentByService' => 'Incidensek szolgáltatásonként',
+	'UI-IncidentManagementOverview-IncidentByPriority' => 'Incidensek prioritás szerint',
+	'UI-IncidentManagementOverview-IncidentUnassigned' => 'Incidensek, amelyek még nem lettek ügyintézőhöz rendelve',
+	'UI:ChangeMgmtMenuOverview:Title' => 'Változáskezelés műszerfal',
+	'UI-ChangeManagementOverview-ChangeByType' => 'Változások típusonként',
+	'UI-ChangeManagementOverview-ChangeUnassigned' => 'Változások, amelyek még nem lettek ügyintézőhöz rendelve',
+	'UI-ChangeManagementOverview-ChangeWithOutage' => 'Változások által okozott üzemszünet',
+	'UI:ServiceMgmtMenuOverview:Title' => 'Szolgáltatáskezelés műszerfal',
+	'UI-ServiceManagementOverview-CustomerContractToRenew' => 'A következő 30 napban lejáró ügyfélszerződések',
+	'UI-ServiceManagementOverview-ProviderContractToRenew' => 'A következő 30 napban lejáró szolgáltatói szerződések',
+	'UI:ContactsMenu' => 'Kapcsolattartók',
+	'UI:ContactsMenu+' => '',
+	'UI:ContactsMenu:Title' => 'Kapcsolattartó áttekintő',
+	'UI-ContactsMenu-ContactsByLocation' => 'Kapcsolattartók helyszín szerint',
+	'UI-ContactsMenu-ContactsByType' => 'Kapcsolattartók típusonként',
+	'UI-ContactsMenu-ContactsByStatus' => 'Kapcsolattartók állapotuk szerint',
+	'UI:NotificationsMenu:Title' => 'Értesítések beállítása',
+	'UI:NotificationsMenu:Help' => 'Súgó',
+	'UI:NotificationsMenu:HelpContent' => '<p>Az '.ITOP_APPLICATION_SHORT.' alkalmazásban az értesítések teljesen testreszabhatók. Értesítések az objektumok két csoportjára épülnek: <i>eseményindítók és műveletek</i>.</p>
 <p><i><b>Az eseményindítók</b></i> meghatározzák, hogy mikor kerüljön végrehajtásra az értesítés. Az iTop magjának részei a különböző eseményindítók, de a bővítményekkel továbbiak is létrehozhatók:
 <ol>
     <li>Egyes eseményindítók akkor hajtódnak végre, amikor a megadott osztály egy objektuma <b>létrehozódik</b>, <b>frissül</b> vagy <b>törlődik</b></li>
@@ -989,419 +1059,364 @@ Reméljük, hogy ezt a verziót ugyanúgy kedvelni fogja, mint ahogy mi élvezt
 </p>
 <p>Művelet végrehjatásához azt egy eseményindítóhoz kell rendelni.
 A művelet eseményindítóhoz rendelésekor kap egy sorszámot , amely meghatározza a műveletek végrehajtási sorrendjét.</p>',
-    'UI:NotificationsMenu:Triggers' => 'Eseményindítók',
-    'UI:NotificationsMenu:AvailableTriggers' => 'Elérhető eseményindítók',
-    'UI:NotificationsMenu:OnCreate' => 'Objektum létrehozás',
-    'UI:NotificationsMenu:OnStateEnter' => 'Objektum állapot felvétele',
-    'UI:NotificationsMenu:OnStateLeave' => 'Objektum állapot elhagyása',
-    'UI:NotificationsMenu:Actions' => 'Műveletek',
-    'UI:NotificationsMenu:Actions:ActionEmail' => 'Email műveletek',
-    'UI:NotificationsMenu:Actions:ActionWebhook' => 'Webhook műveletek (kimenő integrációk)',
-    'UI:NotificationsMenu:Actions:Action' => 'Más műveletek',
-    'UI:NotificationsMenu:AvailableActions' => 'Elérhető műveletek',
-
-    'Menu:TagAdminMenu' => 'Címkék konfigurációja',
-    'Menu:TagAdminMenu+' => 'Címkeérték kezelés',
-    'UI:TagAdminMenu:Title' => 'Címke konfiguráció',
-    'UI:TagAdminMenu:NoTags' => 'Nincs címkemező konfigurálva',
-    'UI:TagSetFieldData:Error' => 'Hiba: %1$s',
-
-    'Menu:AuditCategories' => 'Audit-kategóriák',// Duplicated into itop-welcome-itil (will be removed from here...)
-    'Menu:AuditCategories+' => '',// Duplicated into itop-welcome-itil (will be removed from here...)
-    'Menu:Notifications:Title' => 'Audit-kategóriák',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-    'Menu:RunQueriesMenu' => 'Lekérdezés futtatás',// Duplicated into itop-welcome-itil (will be removed from here...)
-    'Menu:RunQueriesMenu+' => '',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-    'Menu:QueryMenu' => 'Lekérdezés-gyűjtemény',// Duplicated into itop-welcome-itil (will be removed from here...)
-    'Menu:QueryMenu+' => 'Query phrasebook~~',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-    'Menu:DataAdministration' => 'Adat adminisztráció',// Duplicated into itop-welcome-itil (will be removed from here...)
-    'Menu:DataAdministration+' => '',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-    'Menu:UniversalSearchMenu' => 'Univerzális keresés',// Duplicated into itop-welcome-itil (will be removed from here...)
-    'Menu:UniversalSearchMenu+' => '',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-    'Menu:UserManagementMenu' => 'Felhasználókezelés',// Duplicated into itop-welcome-itil (will be removed from here...)
-    'Menu:UserManagementMenu+' => '',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-    'Menu:ProfilesMenu' => 'Profilok',// Duplicated into itop-welcome-itil (will be removed from here...)
-    'Menu:ProfilesMenu+' => '',// Duplicated into itop-welcome-itil (will be removed from here...)
-    'Menu:ProfilesMenu:Title' => 'Profilok',
-    // Duplicated into itop-welcome-itil (will be removed from here...)
-
-    'Menu:UserAccountsMenu' => 'Felhasználói fiókok',
-    // Duplicated into itop-welcome-itil (will be removed from here...)
-    'Menu:UserAccountsMenu+' => '',
-    // Duplicated into itop-welcome-itil (will be removed from here...)
-    'Menu:UserAccountsMenu:Title' => 'Felhasználói fiókok',
-    // Duplicated into itop-welcome-itil (will be removed from here...)
-
-    'UI:iTopVersion:Short' => '%1$s verzió: %2$s',
-    'UI:iTopVersion:Long' => '%1$s verzió: %2$s-%3$s %4$s',
-    'UI:PropertiesTab' => 'Tulajdonságok',
-
-    'UI:OpenDocumentInNewWindow_' => 'Megnyitás',
-    'UI:DownloadDocument_' => 'Letöltés',
-    'UI:Document:NoPreview' => 'Nincs elérhető előnézet ehhez a dokumentumhoz',
-    'UI:Download-CSV' => '%1$s letöltése',
-
-    'UI:DeadlineMissedBy_duration' => 'Túllépve: %1$s ',
-    'UI:Deadline_LessThan1Min' => '< 1 perc',
-    'UI:Deadline_Minutes' => '%1$d perc',
-    'UI:Deadline_Hours_Minutes' => '%1$d óra %2$d perc',
-    'UI:Deadline_Days_Hours_Minutes' => '%1$d nap %2$d óra %3$d perc',
-    'UI:Help' => 'Súgó',
-    'UI:PasswordConfirm' => 'Jóváhagyás',
-    'UI:BeforeAdding_Class_ObjectsSaveThisObject' => '%1$s objektumok hozzáadása előtt mentse ezt az objektumot',
-    'UI:DisplayThisMessageAtStartup' => 'Az üzenet megjelenítése indításkor',
-    'UI:RelationshipGraph' => 'Grafikus nézet',
-    'UI:RelationshipList' => 'Lista',
-    'UI:RelationGroups' => 'Csoportok',
-    'UI:OperationCancelled' => 'Művelet visszavonva',
-    'UI:ElementsDisplayed' => 'Szűrés',
-    'UI:RelationGroupNumber_N' => '#%1$d csoport',
-    'UI:Relation:ExportAsPDF' => 'Exportálás PDF-ként...',
-    'UI:RelationOption:GroupingThreshold' => 'Csoportosítási küszöb',
-    'UI:Relation:AdditionalContextInfo' => 'További háttér-információk',
-    'UI:Relation:NoneSelected' => 'Nincs',
-    'UI:Relation:Zoom' => 'Nagyítás',
-    'UI:Relation:ExportAsAttachment' => 'Exportálás mellékletként...',
-    'UI:Relation:DrillDown' => 'Részletek...',
-    'UI:Relation:PDFExportOptions' => 'PDF Exportálás beállításai',
-    'UI:Relation:AttachmentExportOptions_Name' => 'Melléklet beállításai %1$s -hoz',
-    'UI:RelationOption:Untitled' => 'Névtelen',
-    'UI:Relation:Key' => 'Kulcs',
-    'UI:Relation:Comments' => 'Megjegyzések',
-    'UI:RelationOption:Title' => 'Cím',
-    'UI:RelationOption:IncludeList' => 'Foglalja bele az objektumok listáját',
-    'UI:RelationOption:Comments' => 'Megjegyzések',
-    'UI:Button:Export' => 'Exportálás',
-    'UI:Relation:PDFExportPageFormat' => 'Oldalformátum',
-    'UI:PageFormat_A3' => 'A3',
-    'UI:PageFormat_A4' => 'A4',
-    'UI:PageFormat_Letter' => 'Letter',
-    'UI:Relation:PDFExportPageOrientation' => 'Tájolás',
-    'UI:PageOrientation_Portrait' => 'Függőleges',
-    'UI:PageOrientation_Landscape' => 'Vízszintes',
-    'UI:RelationTooltip:Redundancy' => 'Redundancia',
-    'UI:RelationTooltip:ImpactedItems_N_of_M' => '# érintett elemei: %1$d / %2$d',
-    'UI:RelationTooltip:CriticalThreshold_N_of_M' => 'Kritikus küszöb: %1$d / %2$d',
-    'Portal:Title' => ITOP_APPLICATION_SHORT.' felhasználói portál',
-    'Portal:NoRequestMgmt' => 'Üdv, %1$s, Önt erre az oldalra irányítottuk át, mert fiókjában a \'Portál felhasználó\' profil van beállítva. Sajnos a '.ITOP_APPLICATION_SHORT.' nem lett telepítve \'Kérelemkezelés\' funkcióval. Kérjük, lépjen kapcsolatba a rendszergazdával.',
-    'Portal:Refresh' => 'Frissítés',
-    'Portal:Back' => 'Vissza',
-    'Portal:WelcomeUserOrg' => 'Üdvözöljük %1$s, a %2$s -ból',
-    'Portal:TitleDetailsFor_Request' => 'Kérelem részletei',
-    'Portal:ShowOngoing' => 'Nyitott kérelmek megjelenítése',
-    'Portal:ShowClosed' => 'Lezárt kérelmek megjelenítése',
-    'Portal:CreateNewRequest' => 'Új kérelem létrehozása',
-    'Portal:CreateNewRequestItil' => 'Új kérelem létrehozása',
-    'Portal:CreateNewIncidentItil' => 'Új incidensjelentés létrehozása',
-    'Portal:ChangeMyPassword' => 'Jelszóváltoztatás',
-    'Portal:Disconnect' => 'Kilépés',
-    'Portal:OpenRequests' => 'Nyitott kérelmeim',
-    'Portal:ClosedRequests' => 'Lezárt kérelmeim',
-    'Portal:ResolvedRequests' => 'Megoldott kérelmeim',
-    'Portal:SelectService' => 'Válasszon szolgáltatást a katalógusból:',
-    'Portal:PleaseSelectOneService' => 'Kérem válasszon egy szolgáltatást',
-    'Portal:SelectSubcategoryFrom_Service' => 'Válassza ki a %1$s szolgáltatás alkategóriáját:',
-    'Portal:PleaseSelectAServiceSubCategory' => 'Kérem válasszon egy alkategóriát',
-    'Portal:DescriptionOfTheRequest' => 'Adja meg a kérelem leírását:',
-    'Portal:TitleRequestDetailsFor_Request' => '%1$s kérelem részletei:',
-    'Portal:NoOpenRequest' => 'A kategóriához nem tartozik nyitott kérelem.',
-    'Portal:NoClosedRequest' => 'Nincs kérelem ebben a kategóriában',
-    'Portal:Button:ReopenTicket' => 'Hibajegy újranyitása',
-    'Portal:Button:CloseTicket' => 'Hibajegy lezárása',
-    'Portal:Button:UpdateRequest' => 'Kérelem frissítése',
-    'Portal:EnterYourCommentsOnTicket' => 'Adjon megjegyzést a megoldáshoz:',
-    'Portal:ErrorNoContactForThisUser' => 'Hiba: az aktuális felhasználó nem tartozik egyetlen Kapcsolattartóhoz / Személyhez sem. Kérem vegye fel a kapcsolatot a rendszergazdával.',
-    'Portal:Attachments' => 'Mellékletek',
-    'Portal:AddAttachment' => 'Melléklet hozzáadása',
-    'Portal:RemoveAttachment' => 'Melléklet eltávolítása',
-    'Portal:Attachment_No_To_Ticket_Name' => 'Mellékletek: #%1$d a %2$s (%3$s) hibajegyhez',
-    'Portal:SelectRequestTemplate' => 'Válasszon sablont %1$s -hoz',
-    'Enum:Undefined' => 'Nem meghatározott',
-    'UI:DurationForm_Days_Hours_Minutes_Seconds' => '%1$s nap %2$s óra %3$s perc %4$s másodperc',
-    'UI:ModifyAllPageTitle' => 'Összes módosítása',
-    'UI:Modify_N_ObjectsOf_Class' => '%2$s osztály %1$d objektumainak módosítása',
-    'UI:Modify_M_ObjectsOf_Class_OutOf_N' => '%2$s osztály %1$d objektumának módosítása, a %3$d -ban',
-    'UI:Menu:ModifyAll' => 'Módosítás...',
-    'UI:Button:ModifyAll' => 'Összes módosítása',
-    'UI:Button:PreviewModifications' => 'Módosítások előnézete >>',
-    'UI:ModifiedObject' => 'Objektum módosítva',
-    'UI:BulkModifyStatus' => 'Állapot',
-    'UI:BulkModifyStatus+' => '',
-    'UI:BulkModifyErrors' => 'Hibák (ha vannak)',
-    'UI:BulkModifyErrors+' => '',
-    'UI:BulkModifyStatusOk' => 'OK',
-    'UI:BulkModifyStatusError' => 'Hiba',
-    'UI:BulkModifyStatusModified' => 'Módosítva',
-    'UI:BulkModifyStatusSkipped' => 'Átugorva',
-    'UI:BulkModify_Count_DistinctValues' => '%1$d eltérő értékek:',
-    'UI:BulkModify:Value_Exists_N_Times' => '%1$s *, %2$d *',
-    'UI:BulkModify:N_MoreValues' => '%1$d további értékei ...',
-    'UI:AttemptingToSetAReadOnlyAttribute_Name' => 'Kísérlet a következő csak olvaható mező beállítására: %1$s',
-    'UI:FailedToApplyStimuli' => 'A művelet sikertelen',
-    'UI:StimulusModify_N_ObjectsOf_Class' => '%1$s: %3$s osztály %2$d objketumainak módosítása',
-    'UI:CaseLogTypeYourTextHere' => 'Írjon ide:',
-    'UI:CaseLog:Header_Date_UserName' => '%1$s - %2$s:',
-    'UI:CaseLog:InitialValue' => 'Kezdeti érték:',
-    'UI:AttemptingToSetASlaveAttribute_Name' => '%1$s mező nem írható, mert az a szinkronizációnál használt kulcs. Érték nem lett beállítva.',
-    'UI:ActionNotAllowed' => 'Ennek a műveletnek a végrehajtása nem engedélyezett ezen az objektumon.',
-    'UI:BulkAction:NoObjectSelected' => 'Válasszon ki legalább egy objektumot a művelet végrehajtásához',
-    'UI:AttemptingToChangeASlaveAttribute_Name' => '%1$s mező nem írható, mert az a szinkronizációnál használt kulcs. Érték változatlan maradt.',
-    'UI:Pagination:HeaderSelection' => 'Összesen: %1$s objektum (%2$s objektum kiválasztva).',
-    'UI:Pagination:HeaderNoSelection' => 'Összesen: %1$s objektum',
-    'UI:Pagination:PageSize' => '%1$s objektum oldalanként',
-    'UI:Pagination:PagesLabel' => 'Oldalak:',
-    'UI:Pagination:All' => 'Összes',
-    'UI:HierarchyOf_Class' => '%1$s hierarchiája',
-    'UI:Preferences' => 'Beállítások...',
-    'UI:ArchiveModeOn' => 'Archív módba lépés',
-    'UI:ArchiveModeOff' => 'Kilépés az archív módból',
-    'UI:ArchiveMode:Banner' => 'Archív mód',
-    'UI:ArchiveMode:Banner+' => 'Az archivált objektumok láthatók és nincs lehetőség a módosításukra',
-    'UI:FavoriteOrganizations' => 'Előnyben részesített szervezeti egységek',
-    'UI:FavoriteOrganizations+' => 'Jelölje be az alábbi listában azokat a szervezeti egységeket, amelyeket a gyors hozzáférés érdekében a legördülő menüben szeretne látni. Vegye figyelembe, hogy ez nem biztonsági beállítás, bármely szervezet objektumai továbbra is láthatóak és elérhetők a legördülő listában a \\"Minden szervezet\\" kiválasztásával..',
-    'UI:FavoriteLanguage' => 'A felhasználói felület nyelve',
-    'UI:Favorites:SelectYourLanguage' => 'Válassza ki a kívánt nyelvet',
-    'UI:FavoriteOtherSettings' => 'Egyéb beállítások',
-    'UI:Favorites:Default_X_ItemsPerPage' => 'Alapértelmezett hossz:  %1$s elem oldalanként',
-    'UI:Favorites:ShowObsoleteData' => 'Elavult adatok megjelenítése',
-    'UI:Favorites:ShowObsoleteData+' => 'Elavult adatok megjelenítése a keresési eredményekben és a kiválasztandó elemek listáiban',
-    'UI:NavigateAwayConfirmationMessage' => 'Bármely módosítás eldobásra kerül',
-    'UI:CancelConfirmationMessage' => 'A változtatásai elvesznek. Mindenképp folytatja?',
-    'UI:AutoApplyConfirmationMessage' => 'Néhány változtatás még nem került alkalmazásra. Szeretné, ha az iTop figyelembe venné őket?',
-    'UI:Create_Class_InState' => '%1$s létrehozása: ',
-    'UI:OrderByHint_Values' => 'Rendezési sorrend: %1$s',
-    'UI:Menu:AddToDashboard' => 'Hozzáadás a műszerfalhoz...',
-    'UI:Button:Refresh' => 'Frissítés',
-    'UI:Button:GoPrint' => 'Nyomtatás...',
-    'UI:ExplainPrintable' => 'Kattintson a %1$s ikonra az elemek elrejtéséhez a nyomtatásból.<br/>A nyomtatás előtti előnézet megtekintéséhez használja a böngésző "nyomtatási előnézet" funkcióját.<br/>Figyelem: ez a fejléc és a többi hangolási vezérlőelem nem kerül kinyomtatásra.',
-    'UI:PrintResolution:FullSize' => 'Teljes méret',
-    'UI:PrintResolution:A4Portrait' => 'A4 függőleges',
-    'UI:PrintResolution:A4Landscape' => 'A4 vízszintes',
-    'UI:PrintResolution:LetterPortrait' => 'Letter függőleges',
-    'UI:PrintResolution:LetterLandscape' => 'Letter vízszintes',
-    'UI:Toggle:SwitchToStandardDashboard' => 'Átváltás a standard műszerfalra',
-    'UI:Toggle:SwitchToCustomDashboard' => 'Átváltás az egyéni műszerfalra',
-
-    'UI:ConfigureThisList' => 'Lista konfigurálása...',
-    'UI:ListConfigurationTitle' => 'Lista konfiguráció',
-    'UI:ColumnsAndSortOrder' => 'Oszlopok és sorbarendezés:',
-    'UI:UseDefaultSettings' => 'Használja az alapbeállításokat',
-    'UI:UseSpecificSettings' => 'Használja a következő beállításokat:',
-    'UI:Display_X_ItemsPerPage_prefix' => 'Megjelenítés',
-    'UI:Display_X_ItemsPerPage_suffix' => 'Elemek oldalanként',
-    'UI:UseSavetheSettings' => 'Beállítások mentése',
-    'UI:OnlyForThisList' => 'Csak ehhez a listához',
-    'UI:ForAllLists' => 'Alapértelmezett minden listához',
-    'UI:ExtKey_AsLink' => '%1$s (Link)',
-    'UI:ExtKey_AsFriendlyName' => '%1$s (Barátságos név)',
-    'UI:ExtField_AsRemoteField' => '%1$s (%2$s)',
-    'UI:Button:MoveUp' => 'Feljebb',
-    'UI:Button:MoveDown' => 'Lejjebb',
-
-    'UI:OQL:UnknownClassAndFix' => 'Ismeretlen osztály: %1$s. Próbálja meg %2$s -t helyette',
-    'UI:OQL:UnknownClassNoFix' => 'Ismeretlen osztály: %1$s',
-
-    'UI:Dashboard:EditCustom' => 'Egyéni verzió szerkesztése...',
-    'UI:Dashboard:CreateCustom' => 'Egyéni verzió létrehozása...',
-    'UI:Dashboard:DeleteCustom' => 'Egyéni verzió törlése...',
-    'UI:Dashboard:RevertConfirm' => 'Az eredeti változaton végrehajtott minden változtatás elveszik. Kérjük, erősítse meg, hogy ezt szeretné.',
-    'UI:ExportDashBoard' => 'Exportálás fájlba',
-    'UI:ImportDashBoard' => 'Importálás fájlból...',
-    'UI:ImportDashboardTitle' => 'Importálás egy fájlból',
-    'UI:ImportDashboardText' => 'Importáláshoz válasszon ki egy műszerfal fájlt',
-    'UI:Dashboard:Actions' => 'Műszerfal műveletek',
-    'UI:Dashboard:NotUpToDateUntilContainerSaved' => 'Ez a műszerfal olyan információkat jelenít meg, amelyek nem tartalmazzák a folyamatban lévő változásokat.',
-
-
-    'UI:DashletCreation:Title' => 'Új műszer létrehozása',
-    'UI:DashletCreation:Dashboard' => 'Műszerfal',
-    'UI:DashletCreation:DashletType' => 'Műszerfal típus',
-    'UI:DashletCreation:EditNow' => 'Műszerfal szerkesztése',
-
-    'UI:DashboardEdit:Title' => 'Műszerfal szerkesztő',
-    'UI:DashboardEdit:DashboardTitle' => 'Cím',
-    'UI:DashboardEdit:AutoReload' => 'Automatikus frissítés',
-    'UI:DashboardEdit:AutoReloadSec' => 'Frissítési időköz (mp)',
-    'UI:DashboardEdit:AutoReloadSec+' => 'A megengedett minimum %1$d mp',
-    'UI:DashboardEdit:Revert' => 'Visszavonás',
-    'UI:DashboardEdit:Apply' => 'Alkalmazás',
-
-    'UI:DashboardEdit:Layout' => 'Elrendezés',
-    'UI:DashboardEdit:Properties' => 'Műszerfal tulajdonságai',
-    'UI:DashboardEdit:Dashlets' => 'Elérhető műszerek',
-    'UI:DashboardEdit:DashletProperties' => 'Műszer tulajdonságai',
-
-    'UI:Form:Property' => 'Tulajdonság',
-    'UI:Form:Value' => 'Érték',
-
-    'UI:DashletUnknown:Label' => 'Ismeretlen',
-    'UI:DashletUnknown:Description' => 'Ismeretlen műszer (talán eltávolították)',
-    'UI:DashletUnknown:RenderText:View' => 'Nem lehet megjeleníteni ezt a műszert.',
-    'UI:DashletUnknown:RenderText:Edit' => 'Nem lehet megjeleníteni ezt a műszert (%1$s osztály). Ellenőriztesse a rendszergazdával, hogy elérhető-e.',
-    'UI:DashletUnknown:RenderNoDataText:Edit' => 'Nincs előnézet ehhez a műszerhez (%1$s osztály).',
-    'UI:DashletUnknown:Prop-XMLConfiguration' => 'Konfiguráció (nyers XML)',
-
-    'UI:DashletProxy:Label' => 'Proxy',
-    'UI:DashletProxy:Description' => 'Proxy műszer',
-    'UI:DashletProxy:RenderNoDataText:Edit' => 'Nincs előnézet ehhez a harmadik féltől származó műszerhez (%1$s osztály).',
-    'UI:DashletProxy:Prop-XMLConfiguration' => 'Konfiguráció (nyers XML)',
-
-    'UI:DashletPlainText:Label' => 'Szöveg',
-    'UI:DashletPlainText:Description' => 'Egyszerű szöveg (nincs formázás)',
-    'UI:DashletPlainText:Prop-Text' => 'Szöveg',
-    'UI:DashletPlainText:Prop-Text:Default' => 'Ide írja a szöveget...',
-
-    'UI:DashletObjectList:Label' => 'Objektumlista',
-    'UI:DashletObjectList:Description' => 'Objektumlista műszer',
-    'UI:DashletObjectList:Prop-Title' => 'Cím',
-    'UI:DashletObjectList:Prop-Query' => 'Lekérdezés',
-    'UI:DashletObjectList:Prop-Menu' => 'Menü',
-
-    'UI:DashletGroupBy:Prop-Title' => 'Cím',
-    'UI:DashletGroupBy:Prop-Query' => 'Lekérdezés',
-    'UI:DashletGroupBy:Prop-Style' => 'Stílus',
-    'UI:DashletGroupBy:Prop-GroupBy' => 'Csoportosítás...',
-    'UI:DashletGroupBy:Prop-GroupBy:Hour' => '%1$s órája (0-23)',
-    'UI:DashletGroupBy:Prop-GroupBy:Month' => '%1$s hónapja (1 - 12)',
-    'UI:DashletGroupBy:Prop-GroupBy:DayOfWeek' => '%1$s hét napján',
-    'UI:DashletGroupBy:Prop-GroupBy:DayOfMonth' => '%1$s hónap napján',
-    'UI:DashletGroupBy:Prop-GroupBy:Select-Hour' => '%1$s (óra)',
-    'UI:DashletGroupBy:Prop-GroupBy:Select-Month' => '%1$s (hónap)',
-    'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfWeek' => '%1$s (a hét napja)',
-    'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfMonth' => '%1$s (a hónap napja)',
-    'UI:DashletGroupBy:MissingGroupBy' => 'Válassza ki azt a mezőt, amelyen az objektumok csoportosítva lesznek.',
-
-    'UI:DashletGroupByPie:Label' => 'Tortadiagram',
-    'UI:DashletGroupByPie:Description' => 'Tortadiagram',
-    'UI:DashletGroupByBars:Label' => 'Oszlopdiagram',
-    'UI:DashletGroupByBars:Description' => 'Oszlopdiagram',
-    'UI:DashletGroupByTable:Label' => 'Csoportosítás (táblánként)',
-    'UI:DashletGroupByTable:Description' => 'Lista (mezőnként csoportosítva)',
-
+	'UI:NotificationsMenu:Triggers' => 'Eseményindítók',
+	'UI:NotificationsMenu:AvailableTriggers' => 'Elérhető eseményindítók',
+	'UI:NotificationsMenu:OnCreate' => 'Objektum létrehozás',
+	'UI:NotificationsMenu:OnStateEnter' => 'Objektum állapot felvétele',
+	'UI:NotificationsMenu:OnStateLeave' => 'Objektum állapot elhagyása',
+	'UI:NotificationsMenu:Actions' => 'Műveletek',
+	'UI:NotificationsMenu:Actions:ActionEmail' => 'Email műveletek',
+	'UI:NotificationsMenu:Actions:ActionWebhook' => 'Webhook műveletek (kimenő integrációk)',
+	'UI:NotificationsMenu:Actions:Action' => 'Más műveletek',
+	'UI:NotificationsMenu:AvailableActions' => 'Elérhető műveletek',
+	'Menu:TagAdminMenu' => 'Címkék konfigurációja',
+	'Menu:TagAdminMenu+' => 'Címkeérték kezelés',
+	'UI:TagAdminMenu:Title' => 'Címke konfiguráció',
+	'UI:TagAdminMenu:NoTags' => 'Nincs címkemező konfigurálva',
+	'UI:TagSetFieldData:Error' => 'Hiba: %1$s',
+	'UI:iTopVersion:Short' => '%1$s verzió: %2$s',
+	'UI:iTopVersion:Long' => '%1$s verzió: %2$s-%3$s %4$s',
+	'UI:PropertiesTab' => 'Tulajdonságok',
+	'UI:OpenDocumentInNewWindow_' => 'Megnyitás',
+	'UI:DownloadDocument_' => 'Letöltés',
+	'UI:Document:NoPreview' => 'Nincs elérhető előnézet ehhez a dokumentumhoz',
+	'UI:Download-CSV' => '%1$s letöltése',
+	'UI:DeadlineMissedBy_duration' => 'Túllépve: %1$s ',
+	'UI:Deadline_LessThan1Min' => '< 1 perc',
+	'UI:Deadline_Minutes' => '%1$d perc',
+	'UI:Deadline_Hours_Minutes' => '%1$d óra %2$d perc',
+	'UI:Deadline_Days_Hours_Minutes' => '%1$d nap %2$d óra %3$d perc',
+	'UI:Help' => 'Súgó',
+	'UI:PasswordConfirm' => 'Jóváhagyás',
+	'UI:BeforeAdding_Class_ObjectsSaveThisObject' => '%1$s objektumok hozzáadása előtt mentse ezt az objektumot',
+	'UI:DisplayThisMessageAtStartup' => 'Az üzenet megjelenítése indításkor',
+	'UI:RelationshipGraph' => 'Grafikus nézet',
+	'UI:RelationshipList' => 'Lista',
+	'UI:RelationGroups' => 'Csoportok',
+	'UI:OperationCancelled' => 'Művelet visszavonva',
+	'UI:ElementsDisplayed' => 'Szűrés',
+	'UI:RelationGroupNumber_N' => '#%1$d csoport',
+	'UI:Relation:ExportAsPDF' => 'Exportálás PDF-ként...',
+	'UI:RelationOption:GroupingThreshold' => 'Csoportosítási küszöb',
+	'UI:Relation:AdditionalContextInfo' => 'További háttér-információk',
+	'UI:Relation:NoneSelected' => 'Nincs',
+	'UI:Relation:Zoom' => 'Nagyítás',
+	'UI:Relation:ExportAsAttachment' => 'Exportálás mellékletként...',
+	'UI:Relation:DrillDown' => 'Részletek...',
+	'UI:Relation:PDFExportOptions' => 'PDF Exportálás beállításai',
+	'UI:Relation:AttachmentExportOptions_Name' => 'Melléklet beállításai %1$s -hoz',
+	'UI:RelationOption:Untitled' => 'Névtelen',
+	'UI:Relation:Key' => 'Kulcs',
+	'UI:Relation:Comments' => 'Megjegyzések',
+	'UI:RelationOption:Title' => 'Cím',
+	'UI:RelationOption:IncludeList' => 'Foglalja bele az objektumok listáját',
+	'UI:RelationOption:Comments' => 'Megjegyzések',
+	'UI:Button:Export' => 'Exportálás',
+	'UI:Relation:PDFExportPageFormat' => 'Oldalformátum',
+	'UI:PageFormat_A3' => 'A3',
+	'UI:PageFormat_A4' => 'A4',
+	'UI:PageFormat_Letter' => 'Letter',
+	'UI:Relation:PDFExportPageOrientation' => 'Tájolás',
+	'UI:PageOrientation_Portrait' => 'Függőleges',
+	'UI:PageOrientation_Landscape' => 'Vízszintes',
+	'UI:RelationTooltip:Redundancy' => 'Redundancia',
+	'UI:RelationTooltip:ImpactedItems_N_of_M' => '# érintett elemei: %1$d / %2$d',
+	'UI:RelationTooltip:CriticalThreshold_N_of_M' => 'Kritikus küszöb: %1$d / %2$d',
+	'Portal:Title' => ITOP_APPLICATION_SHORT.' felhasználói portál',
+	'Portal:NoRequestMgmt' => 'Üdv, %1$s, Önt erre az oldalra irányítottuk át, mert fiókjában a \'Portál felhasználó\' profil van beállítva. Sajnos a '.ITOP_APPLICATION_SHORT.' nem lett telepítve \'Kérelemkezelés\' funkcióval. Kérjük, lépjen kapcsolatba a rendszergazdával.',
+	'Portal:Refresh' => 'Frissítés',
+	'Portal:Back' => 'Vissza',
+	'Portal:WelcomeUserOrg' => 'Üdvözöljük %1$s, a %2$s -ból',
+	'Portal:TitleDetailsFor_Request' => 'Kérelem részletei',
+	'Portal:ShowOngoing' => 'Nyitott kérelmek megjelenítése',
+	'Portal:ShowClosed' => 'Lezárt kérelmek megjelenítése',
+	'Portal:CreateNewRequest' => 'Új kérelem létrehozása',
+	'Portal:CreateNewRequestItil' => 'Új kérelem létrehozása',
+	'Portal:CreateNewIncidentItil' => 'Új incidensjelentés létrehozása',
+	'Portal:ChangeMyPassword' => 'Jelszóváltoztatás',
+	'Portal:Disconnect' => 'Kilépés',
+	'Portal:OpenRequests' => 'Nyitott kérelmeim',
+	'Portal:ClosedRequests' => 'Lezárt kérelmeim',
+	'Portal:ResolvedRequests' => 'Megoldott kérelmeim',
+	'Portal:SelectService' => 'Válasszon szolgáltatást a katalógusból:',
+	'Portal:PleaseSelectOneService' => 'Kérem válasszon egy szolgáltatást',
+	'Portal:SelectSubcategoryFrom_Service' => 'Válassza ki a %1$s szolgáltatás alkategóriáját:',
+	'Portal:PleaseSelectAServiceSubCategory' => 'Kérem válasszon egy alkategóriát',
+	'Portal:DescriptionOfTheRequest' => 'Adja meg a kérelem leírását:',
+	'Portal:TitleRequestDetailsFor_Request' => '%1$s kérelem részletei:',
+	'Portal:NoOpenRequest' => 'A kategóriához nem tartozik nyitott kérelem.',
+	'Portal:NoClosedRequest' => 'Nincs kérelem ebben a kategóriában',
+	'Portal:Button:ReopenTicket' => 'Hibajegy újranyitása',
+	'Portal:Button:CloseTicket' => 'Hibajegy lezárása',
+	'Portal:Button:UpdateRequest' => 'Kérelem frissítése',
+	'Portal:EnterYourCommentsOnTicket' => 'Adjon megjegyzést a megoldáshoz:',
+	'Portal:ErrorNoContactForThisUser' => 'Hiba: az aktuális felhasználó nem tartozik egyetlen Kapcsolattartóhoz / Személyhez sem. Kérem vegye fel a kapcsolatot a rendszergazdával.',
+	'Portal:Attachments' => 'Mellékletek',
+	'Portal:AddAttachment' => 'Melléklet hozzáadása',
+	'Portal:RemoveAttachment' => 'Melléklet eltávolítása',
+	'Portal:Attachment_No_To_Ticket_Name' => 'Mellékletek: #%1$d a %2$s (%3$s) hibajegyhez',
+	'Portal:SelectRequestTemplate' => 'Válasszon sablont %1$s -hoz',
+	'Enum:Undefined' => 'Nem meghatározott',
+	'UI:DurationForm_Days_Hours_Minutes_Seconds' => '%1$s nap %2$s óra %3$s perc %4$s másodperc',
+	'UI:ModifyAllPageTitle' => 'Összes módosítása',
+	'UI:Modify_ObjectsOf_Class' => 'Modifying objects of class %1$s~~',
+	'UI:Modify_N_ObjectsOf_Class' => '%2$s osztály %1$d objektumainak módosítása',
+	'UI:Modify_M_ObjectsOf_Class_OutOf_N' => '%2$s osztály %1$d objektumának módosítása, a %3$d -ban',
+	'UI:Menu:ModifyAll' => 'Módosítás...',
+	'UI:Menu:ModifyAll_Class' => 'Modify %1$s objects...~~',
+	'UI:Menu:ModifyAll_Link' => 'Modify %1$s...~~',
+	'UI:Menu:ModifyAll_Remote' => 'Modify %1$s...~~',
+	'UI:Button:ModifyAll' => 'Összes módosítása',
+	'UI:Button:PreviewModifications' => 'Módosítások előnézete >>',
+	'UI:ModifiedObject' => 'Objektum módosítva',
+	'UI:BulkModifyStatus' => 'Állapot',
+	'UI:BulkModifyStatus+' => '',
+	'UI:BulkModifyErrors' => 'Hibák (ha vannak)',
+	'UI:BulkModifyErrors+' => '',
+	'UI:BulkModifyStatusOk' => 'OK',
+	'UI:BulkModifyStatusError' => 'Hiba',
+	'UI:BulkModifyStatusModified' => 'Módosítva',
+	'UI:BulkModifyStatusSkipped' => 'Átugorva',
+	'UI:BulkModify_Count_DistinctValues' => '%1$d eltérő értékek:',
+	'UI:BulkModify:Value_Exists_N_Times' => '%1$s *, %2$d *',
+	'UI:BulkModify:N_MoreValues' => '%1$d további értékei ...',
+	'UI:AttemptingToSetAReadOnlyAttribute_Name' => 'Kísérlet a következő csak olvasható mező beállítására: %1$s',
+	'UI:FailedToApplyStimuli' => 'A művelet sikertelen',
+	'UI:StimulusModify_N_ObjectsOf_Class' => '%1$s: %3$s osztály %2$d objektumainak módosítása',
+	'UI:CaseLogTypeYourTextHere' => 'Írjon ide:',
+	'UI:CaseLog:Header_Date_UserName' => '%1$s - %2$s:',
+	'UI:CaseLog:InitialValue' => 'Kezdeti érték:',
+	'UI:AttemptingToSetASlaveAttribute_Name' => '%1$s mező nem írható, mert az a szinkronizációnál használt kulcs. Érték nem lett beállítva.',
+	'UI:ActionNotAllowed' => 'Ennek a műveletnek a végrehajtása nem engedélyezett ezen az objektumon.',
+	'UI:BulkAction:NoObjectSelected' => 'Válasszon ki legalább egy objektumot a művelet végrehajtásához',
+	'UI:AttemptingToChangeASlaveAttribute_Name' => '%1$s mező nem írható, mert az a szinkronizációnál használt kulcs. Érték változatlan maradt.',
+	'UI:Pagination:HeaderSelection' => 'Összesen: %1$s objektum (%2$s objektum kiválasztva).',
+	'UI:Pagination:HeaderNoSelection' => 'Összesen: %1$s objektum',
+	'UI:Pagination:PageSize' => '%1$s objektum oldalanként',
+	'UI:Pagination:PagesLabel' => 'Oldalak:',
+	'UI:Pagination:All' => 'Összes',
+	'UI:HierarchyOf_Class' => '%1$s hierarchiája',
+	'UI:Preferences' => 'Beállítások...',
+	'UI:ArchiveModeOn' => 'Archív módba lépés',
+	'UI:ArchiveModeOff' => 'Kilépés az archív módból',
+	'UI:ArchiveMode:Banner' => 'Archív mód',
+	'UI:ArchiveMode:Banner+' => 'Az archivált objektumok láthatók és nincs lehetőség a módosításukra',
+	'UI:FavoriteOrganizations' => 'Előnyben részesített szervezeti egységek',
+	'UI:FavoriteOrganizations+' => 'Jelölje be az alábbi listában azokat a szervezeti egységeket, amelyeket a gyors hozzáférés érdekében a legördülő menüben szeretne látni. Vegye figyelembe, hogy ez nem biztonsági beállítás, bármely szervezet objektumai továbbra is láthatóak és elérhetők a legördülő listában a \\"Minden szervezet\\" kiválasztásával..',
+	'UI:FavoriteLanguage' => 'A felhasználói felület nyelve',
+	'UI:Favorites:SelectYourLanguage' => 'Válassza ki a kívánt nyelvet',
+	'UI:FavoriteOtherSettings' => 'Egyéb beállítások',
+	'UI:Favorites:Default_X_ItemsPerPage' => 'Alapértelmezett hossz:  %1$s elem oldalanként',
+	'UI:Favorites:ShowObsoleteData' => 'Elavult adatok megjelenítése',
+	'UI:Favorites:ShowObsoleteData+' => 'Elavult adatok megjelenítése a keresési eredményekben és a kiválasztandó elemek listáiban',
+	'UI:NavigateAwayConfirmationMessage' => 'Bármely módosítás eldobásra kerül',
+	'UI:CancelConfirmationMessage' => 'A változtatásai elvesznek. Mindenképp folytatja?',
+	'UI:AutoApplyConfirmationMessage' => 'Néhány változtatás még nem került alkalmazásra. Szeretné, ha az iTop figyelembe venné őket?',
+	'UI:Create_Class_InState' => '%1$s létrehozása: ',
+	'UI:OrderByHint_Values' => 'Rendezési sorrend: %1$s',
+	'UI:Menu:AddToDashboard' => 'Hozzáadás a műszerfalhoz...',
+	'UI:Button:Refresh' => 'Frissítés',
+	'UI:Button:GoPrint' => 'Nyomtatás...',
+	'UI:ExplainPrintable' => 'Kattintson a %1$s ikonra az elemek elrejtéséhez a nyomtatásból.<br/>A nyomtatás előtti előnézet megtekintéséhez használja a böngésző "nyomtatási előnézet" funkcióját.<br/>Figyelem: ez a fejléc és a többi hangolási vezérlőelem nem kerül kinyomtatásra.',
+	'UI:PrintResolution:FullSize' => 'Teljes méret',
+	'UI:PrintResolution:A4Portrait' => 'A4 függőleges',
+	'UI:PrintResolution:A4Landscape' => 'A4 vízszintes',
+	'UI:PrintResolution:LetterPortrait' => 'Letter függőleges',
+	'UI:PrintResolution:LetterLandscape' => 'Letter vízszintes',
+	'UI:Toggle:SwitchToStandardDashboard' => 'Átváltás a standard műszerfalra',
+	'UI:Toggle:SwitchToCustomDashboard' => 'Átváltás az egyéni műszerfalra',
+	'UI:ConfigureThisList' => 'Lista konfigurálása...',
+	'UI:ListConfigurationTitle' => 'Lista konfiguráció',
+	'UI:ColumnsAndSortOrder' => 'Oszlopok és sorbarendezés:',
+	'UI:UseDefaultSettings' => 'Használja az alapbeállításokat',
+	'UI:UseSpecificSettings' => 'Használja a következő beállításokat:',
+	'UI:Display_X_ItemsPerPage_prefix' => 'Megjelenítés',
+	'UI:Display_X_ItemsPerPage_suffix' => 'Elemek oldalanként',
+	'UI:UseSavetheSettings' => 'Beállítások mentése',
+	'UI:OnlyForThisList' => 'Csak ehhez a listához',
+	'UI:ForAllLists' => 'Alapértelmezett minden listához',
+	'UI:ExtKey_AsLink' => '%1$s (Link)',
+	'UI:ExtKey_AsFriendlyName' => '%1$s (Barátságos név)',
+	'UI:ExtField_AsRemoteField' => '%1$s (%2$s)',
+	'UI:Button:MoveUp' => 'Feljebb',
+	'UI:Button:MoveDown' => 'Lejjebb',
+	'UI:OQL:UnknownClassAndFix' => 'Ismeretlen osztály: \\"%1$s\\". Próbálja meg \\"%2$s\\" -t helyette',
+	'UI:OQL:UnknownClassNoFix' => 'Ismeretlen osztály: \\"%1$s\\"',
+	'UI:Dashboard:EditCustom' => 'Egyéni verzió szerkesztése...',
+	'UI:Dashboard:CreateCustom' => 'Egyéni verzió létrehozása...',
+	'UI:Dashboard:DeleteCustom' => 'Egyéni verzió törlése...',
+	'UI:Dashboard:RevertConfirm' => 'Az eredeti változaton végrehajtott minden változtatás elveszik. Kérjük, erősítse meg, hogy ezt szeretné.',
+	'UI:ExportDashBoard' => 'Exportálás fájlba',
+	'UI:ImportDashBoard' => 'Importálás fájlból...',
+	'UI:ImportDashboardTitle' => 'Importálás egy fájlból',
+	'UI:ImportDashboardText' => 'Importáláshoz válasszon ki egy műszerfal fájlt',
+	'UI:Dashboard:Actions' => 'Műszerfal műveletek',
+	'UI:Dashboard:NotUpToDateUntilContainerSaved' => 'Ez a műszerfal olyan információkat jelenít meg, amelyek nem tartalmazzák a folyamatban lévő változásokat.',
+	'UI:DashletCreation:Title' => 'Új műszer létrehozása',
+	'UI:DashletCreation:Dashboard' => 'Műszerfal',
+	'UI:DashletCreation:DashletType' => 'Műszerfal típus',
+	'UI:DashletCreation:EditNow' => 'Műszerfal szerkesztése',
+	'UI:DashboardEdit:Title' => 'Műszerfal szerkesztő',
+	'UI:DashboardEdit:DashboardTitle' => 'Cím',
+	'UI:DashboardEdit:AutoReload' => 'Automatikus frissítés',
+	'UI:DashboardEdit:AutoReloadSec' => 'Frissítési időköz (mp)',
+	'UI:DashboardEdit:AutoReloadSec+' => 'A megengedett minimum %1$d mp',
+	'UI:DashboardEdit:Revert' => 'Visszavonás',
+	'UI:DashboardEdit:Apply' => 'Alkalmazás',
+	'UI:DashboardEdit:Layout' => 'Elrendezés',
+	'UI:DashboardEdit:Properties' => 'Műszerfal tulajdonságai',
+	'UI:DashboardEdit:Dashlets' => 'Elérhető műszerek',
+	'UI:DashboardEdit:DashletProperties' => 'Műszer tulajdonságai',
+	'UI:Form:Property' => 'Tulajdonság',
+	'UI:Form:Value' => 'Érték',
+	'UI:DashletUnknown:Label' => 'Ismeretlen',
+	'UI:DashletUnknown:Description' => 'Ismeretlen műszer (talán eltávolították)',
+	'UI:DashletUnknown:RenderText:View' => 'Nem lehet megjeleníteni ezt a műszert.',
+	'UI:DashletUnknown:RenderText:Edit' => 'Nem lehet megjeleníteni ezt a műszert ("%1$s" osztály). Ellenőriztesse a rendszergazdával, hogy elérhető-e.',
+	'UI:DashletUnknown:RenderNoDataText:Edit' => 'Nincs előnézet ehhez a műszerhez ("%1$s" osztály).',
+	'UI:DashletUnknown:Prop-XMLConfiguration' => 'Konfiguráció (nyers XML)',
+	'UI:DashletProxy:Label' => 'Proxy',
+	'UI:DashletProxy:Description' => 'Proxy műszer',
+	'UI:DashletProxy:RenderNoDataText:Edit' => 'Nincs előnézet ehhez a harmadik féltől származó műszerhez ("%1$s" osztály).',
+	'UI:DashletProxy:Prop-XMLConfiguration' => 'Konfiguráció (nyers XML)',
+	'UI:DashletPlainText:Label' => 'Szöveg',
+	'UI:DashletPlainText:Description' => 'Egyszerű szöveg (nincs formázás)',
+	'UI:DashletPlainText:Prop-Text' => 'Szöveg',
+	'UI:DashletPlainText:Prop-Text:Default' => 'Ide írja a szöveget...',
+	'UI:DashletObjectList:Label' => 'Objektumlista',
+	'UI:DashletObjectList:Description' => 'Objektumlista műszer',
+	'UI:DashletObjectList:Prop-Title' => 'Cím',
+	'UI:DashletObjectList:Prop-Query' => 'Lekérdezés',
+	'UI:DashletObjectList:Prop-Menu' => 'Menü',
+	'UI:DashletGroupBy:Prop-Title' => 'Cím',
+	'UI:DashletGroupBy:Prop-Query' => 'Lekérdezés',
+	'UI:DashletGroupBy:Prop-Style' => 'Stílus',
+	'UI:DashletGroupBy:Prop-GroupBy' => 'Csoportosítás...',
+	'UI:DashletGroupBy:Prop-GroupBy:Hour' => '%1$s órája (0-23)',
+	'UI:DashletGroupBy:Prop-GroupBy:Month' => '%1$s hónapja (1 - 12)',
+	'UI:DashletGroupBy:Prop-GroupBy:DayOfWeek' => '%1$s hét napján',
+	'UI:DashletGroupBy:Prop-GroupBy:DayOfMonth' => '%1$s hónap napján',
+	'UI:DashletGroupBy:Prop-GroupBy:Select-Hour' => '%1$s (óra)',
+	'UI:DashletGroupBy:Prop-GroupBy:Select-Month' => '%1$s (hónap)',
+	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfWeek' => '%1$s (a hét napja)',
+	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfMonth' => '%1$s (a hónap napja)',
+	'UI:DashletGroupBy:MissingGroupBy' => 'Válassza ki azt a mezőt, amelyen az objektumok csoportosítva lesznek.',
+	'UI:DashletGroupByPie:Label' => 'Tortadiagram',
+	'UI:DashletGroupByPie:Description' => 'Tortadiagram',
+	'UI:DashletGroupByBars:Label' => 'Oszlopdiagram',
+	'UI:DashletGroupByBars:Description' => 'Oszlopdiagram',
+	'UI:DashletGroupByTable:Label' => 'Csoportosítás (táblánként)',
+	'UI:DashletGroupByTable:Description' => 'Lista (mezőnként csoportosítva)',
     // New in 2.5
-    'UI:DashletGroupBy:Prop-Function' => 'Kigyűjtés funkció',
-    'UI:DashletGroupBy:Prop-FunctionAttribute' => 'Funkció attribútum',
-    'UI:DashletGroupBy:Prop-OrderDirection' => 'Irány',
-    'UI:DashletGroupBy:Prop-OrderField' => 'Sorbarendezés',
-    'UI:DashletGroupBy:Prop-Limit' => 'Határérték',
-
-    'UI:DashletGroupBy:Order:asc' => 'Növekvő',
-    'UI:DashletGroupBy:Order:desc' => 'Csökkenő',
-
-    'UI:GroupBy:count' => 'Mennyiség',
-    'UI:GroupBy:count+' => 'Elemek száma',
-    'UI:GroupBy:sum' => 'Összeg',
-    'UI:GroupBy:sum+' => '%1$s összege',
-    'UI:GroupBy:avg' => 'Átlag',
-    'UI:GroupBy:avg+' => '%1$s átlaga',
-    'UI:GroupBy:min' => 'Minimum',
-    'UI:GroupBy:min+' => '%1$s minimuma',
-    'UI:GroupBy:max' => 'Maximum',
-    'UI:GroupBy:max+' => '%1$s maximuma',
+	'UI:DashletGroupBy:Prop-Function' => 'Kigyűjtés funkció',
+	'UI:DashletGroupBy:Prop-FunctionAttribute' => 'Funkció attribútum',
+	'UI:DashletGroupBy:Prop-OrderDirection' => 'Irány',
+	'UI:DashletGroupBy:Prop-OrderField' => 'Sorbarendezés',
+	'UI:DashletGroupBy:Prop-Limit' => 'Határérték',
+	'UI:DashletGroupBy:Order:asc' => 'Növekvő',
+	'UI:DashletGroupBy:Order:desc' => 'Csökkenő',
+	'UI:GroupBy:count' => 'Mennyiség',
+	'UI:GroupBy:count+' => 'Elemek száma',
+	'UI:GroupBy:sum' => 'Összeg',
+	'UI:GroupBy:sum+' => '%1$s összege',
+	'UI:GroupBy:avg' => 'Átlag',
+	'UI:GroupBy:avg+' => '%1$s átlaga',
+	'UI:GroupBy:min' => 'Minimum',
+	'UI:GroupBy:min+' => '%1$s minimuma',
+	'UI:GroupBy:max' => 'Maximum',
+	'UI:GroupBy:max+' => '%1$s maximuma',
     // ---
-
-    'UI:DashletHeaderStatic:Label' => 'Fejléc',
-    'UI:DashletHeaderStatic:Description' => 'Megjelenít egy vízszintes elválasztót',
-    'UI:DashletHeaderStatic:Prop-Title' => 'Cím',
-    'UI:DashletHeaderStatic:Prop-Title:Default' => 'Kapcsolattartók',
-    'UI:DashletHeaderStatic:Prop-Icon' => 'Ikon',
-
-    'UI:DashletHeaderDynamic:Label' => 'Fejléc statisztikákkal',
-    'UI:DashletHeaderDynamic:Description' => 'Fejléc statisztikákkal (csoportosítva...)',
-    'UI:DashletHeaderDynamic:Prop-Title' => 'Cím',
-    'UI:DashletHeaderDynamic:Prop-Title:Default' => 'Kapcsolattartók',
-    'UI:DashletHeaderDynamic:Prop-Icon' => 'Ikon',
-    'UI:DashletHeaderDynamic:Prop-Subtitle' => 'Alcím',
-    'UI:DashletHeaderDynamic:Prop-Subtitle:Default' => 'Kapcsolattartók',
-    'UI:DashletHeaderDynamic:Prop-Query' => 'Lekérdezés',
-    'UI:DashletHeaderDynamic:Prop-GroupBy' => 'Csoportosítva',
-    'UI:DashletHeaderDynamic:Prop-Values' => 'Értékek',
-
-    'UI:DashletBadge:Label' => 'Jelvény',
-    'UI:DashletBadge:Description' => 'Objektum ikon új/keresés',
-    'UI:DashletBadge:Prop-Class' => 'Osztály',
-
-    'DayOfWeek-Sunday' => 'Vasárnap',
-    'DayOfWeek-Monday' => 'Hétfő',
-    'DayOfWeek-Tuesday' => 'Kedd',
-    'DayOfWeek-Wednesday' => 'Szerda',
-    'DayOfWeek-Thursday' => 'Csütörtök',
-    'DayOfWeek-Friday' => 'Péntek',
-    'DayOfWeek-Saturday' => 'Szombat',
-    'Month-01' => 'Január',
-    'Month-02' => 'Február',
-    'Month-03' => 'Március',
-    'Month-04' => 'Április',
-    'Month-05' => 'Május',
-    'Month-06' => 'Június',
-    'Month-07' => 'Július',
-    'Month-08' => 'Augusztus',
-    'Month-09' => 'Szeptember',
-    'Month-10' => 'Október',
-    'Month-11' => 'November',
-    'Month-12' => 'December',
-
+	'UI:DashletHeaderStatic:Label' => 'Fejléc',
+	'UI:DashletHeaderStatic:Description' => 'Megjelenít egy vízszintes elválasztót',
+	'UI:DashletHeaderStatic:Prop-Title' => 'Cím',
+	'UI:DashletHeaderStatic:Prop-Title:Default' => 'Kapcsolattartók',
+	'UI:DashletHeaderStatic:Prop-Icon' => 'Ikon',
+	'UI:DashletHeaderDynamic:Label' => 'Fejléc statisztikákkal',
+	'UI:DashletHeaderDynamic:Description' => 'Fejléc statisztikákkal (csoportosítva...)',
+	'UI:DashletHeaderDynamic:Prop-Title' => 'Cím',
+	'UI:DashletHeaderDynamic:Prop-Title:Default' => 'Kapcsolattartók',
+	'UI:DashletHeaderDynamic:Prop-Icon' => 'Ikon',
+	'UI:DashletHeaderDynamic:Prop-Subtitle' => 'Alcím',
+	'UI:DashletHeaderDynamic:Prop-Subtitle:Default' => 'Kapcsolattartók',
+	'UI:DashletHeaderDynamic:Prop-Query' => 'Lekérdezés',
+	'UI:DashletHeaderDynamic:Prop-GroupBy' => 'Csoportosítva',
+	'UI:DashletHeaderDynamic:Prop-Values' => 'Értékek',
+	'UI:DashletBadge:Label' => 'Jelvény',
+	'UI:DashletBadge:Description' => 'Objektum ikon új/keresés',
+	'UI:DashletBadge:Prop-Class' => 'Osztály',
+	'DayOfWeek-Sunday' => 'Vasárnap',
+	'DayOfWeek-Monday' => 'Hétfő',
+	'DayOfWeek-Tuesday' => 'Kedd',
+	'DayOfWeek-Wednesday' => 'Szerda',
+	'DayOfWeek-Thursday' => 'Csütörtök',
+	'DayOfWeek-Friday' => 'Péntek',
+	'DayOfWeek-Saturday' => 'Szombat',
+	'Month-01' => 'Január',
+	'Month-02' => 'Február',
+	'Month-03' => 'Március',
+	'Month-04' => 'Április',
+	'Month-05' => 'Május',
+	'Month-06' => 'Június',
+	'Month-07' => 'Július',
+	'Month-08' => 'Augusztus',
+	'Month-09' => 'Szeptember',
+	'Month-10' => 'Október',
+	'Month-11' => 'November',
+	'Month-12' => 'December',
     // Short version for the DatePicker
-    'DayOfWeek-Sunday-Min' => 'Va',
-    'DayOfWeek-Monday-Min' => 'Hé',
-    'DayOfWeek-Tuesday-Min' => 'Ke',
-    'DayOfWeek-Wednesday-Min' => 'Sze',
-    'DayOfWeek-Thursday-Min' => 'Cs',
-    'DayOfWeek-Friday-Min' => 'Pé',
-    'DayOfWeek-Saturday-Min' => 'Szo',
-    'Month-01-Short' => 'Jan',
-    'Month-02-Short' => 'Feb',
-    'Month-03-Short' => 'Már',
-    'Month-04-Short' => 'Ápr',
-    'Month-05-Short' => 'Máj',
-    'Month-06-Short' => 'Jún',
-    'Month-07-Short' => 'Júl',
-    'Month-08-Short' => 'Aug',
-    'Month-09-Short' => 'Szep',
-    'Month-10-Short' => 'Okt',
-    'Month-11-Short' => 'Nov',
-    'Month-12-Short' => 'Dec',
-    'Calendar-FirstDayOfWeek' => '1',// 0 = Vasárnap, 1 = Hétfő, stb...
-
-    'UI:Menu:ShortcutList' => 'Gyorsgomb létrehozása...',
-    'UI:ShortcutRenameDlg:Title' => 'Gyorsgomb átnevezése',
-    'UI:ShortcutListDlg:Title' => 'Gyorsgomb létrehozása a listához',
-    'UI:ShortcutDelete:Confirm' => 'Hagyja jóvá a gyorsgomb(ok) törlését.',
-    'Menu:MyShortcuts' => 'Saját gyorsgombok',// Duplicated into itop-welcome-itil (will be removed from here...)
-    'Class:Shortcut' => 'Gyorsgomb',
-    'Class:Shortcut+' => '~~',
-    'Class:Shortcut/Attribute:name' => 'Név',
-    'Class:Shortcut/Attribute:name+' => '',
-    'Class:ShortcutOQL' => 'Keresési eredmények gyorsgombja',
-    'Class:ShortcutOQL+' => '',
-    'Class:ShortcutOQL/Attribute:oql' => 'Lekérdezés',
-    'Class:ShortcutOQL/Attribute:oql+' => 'A keresendő objektumok listáját meghatározó OQL',
-    'Class:ShortcutOQL/Attribute:auto_reload' => 'Automatikus frissítés',
-    'Class:ShortcutOQL/Attribute:auto_reload/Value:none' => 'Letiltva',
-    'Class:ShortcutOQL/Attribute:auto_reload/Value:custom' => 'Egyéni érték',
-    'Class:ShortcutOQL/Attribute:auto_reload_sec' => 'Automatikus frissítés időköz (mp)',
-    'Class:ShortcutOQL/Attribute:auto_reload_sec/tip' => 'A minimum %1$d mp',
-
-    'UI:FillAllMandatoryFields' => 'Töltsön ki minden kötelező mezőt',
-    'UI:ValueMustBeSet' => 'Adjon meg egy értéket',
-    'UI:ValueMustBeChanged' => 'Változtassa meg az értéket',
-    'UI:ValueInvalidFormat' => 'Érvénytelen formátum',
-
-    'UI:CSVImportConfirmTitle' => 'Hagyja jóvá a műveletet',
-    'UI:CSVImportConfirmMessage' => 'Biztos ezt akarja tenni?',
-    'UI:CSVImportError_items' => 'Hibák: %1$d',
-    'UI:CSVImportCreated_items' => 'Létrehozva: %1$d',
-    'UI:CSVImportModified_items' => 'Módosítva: %1$d',
-    'UI:CSVImportUnchanged_items' => 'Változatlan: %1$d',
-    'UI:CSVImport:DateAndTimeFormats' => 'Dátum és időformátum',
-    'UI:CSVImport:DefaultDateTimeFormat_Format_Example' => 'Alapértelmezett formátum: %1$s (pl. %2$s)',
-    'UI:CSVImport:CustomDateTimeFormat' => 'Egyéni formátum: %1$s',
-    'UI:CSVImport:CustomDateTimeFormatTooltip' => 'Elérhető alakok:<table>
+	'DayOfWeek-Sunday-Min' => 'Va',
+	'DayOfWeek-Monday-Min' => 'Hé',
+	'DayOfWeek-Tuesday-Min' => 'Ke',
+	'DayOfWeek-Wednesday-Min' => 'Sze',
+	'DayOfWeek-Thursday-Min' => 'Cs',
+	'DayOfWeek-Friday-Min' => 'Pé',
+	'DayOfWeek-Saturday-Min' => 'Szo',
+	'Month-01-Short' => 'Jan',
+	'Month-02-Short' => 'Feb',
+	'Month-03-Short' => 'Már',
+	'Month-04-Short' => 'Ápr',
+	'Month-05-Short' => 'Máj',
+	'Month-06-Short' => 'Jún',
+	'Month-07-Short' => 'Júl',
+	'Month-08-Short' => 'Aug',
+	'Month-09-Short' => 'Szep',
+	'Month-10-Short' => 'Okt',
+	'Month-11-Short' => 'Nov',
+	'Month-12-Short' => 'Dec',
+	'Calendar-FirstDayOfWeek' => '1',
+    // 0 = Vasárnap, 1 = Hétfő, stb...
+	'UI:Menu:ShortcutList' => 'Gyorsgomb létrehozása...',
+	'UI:Menu:FilterList' => 'Display list with search criteria~~',
+	'UI:ShortcutRenameDlg:Title' => 'Gyorsgomb átnevezése',
+	'UI:ShortcutListDlg:Title' => 'Gyorsgomb létrehozása a listához',
+	'UI:ShortcutDelete:Confirm' => 'Hagyja jóvá a gyorsgomb(ok) törlését.',
+	'Class:Shortcut' => 'Gyorsgomb',
+	'Class:Shortcut+' => '~~',
+	'Class:Shortcut/Attribute:name' => 'Név',
+	'Class:Shortcut/Attribute:name+' => '',
+	'Class:ShortcutOQL' => 'Keresési eredmények gyorsgombja',
+	'Class:ShortcutOQL+' => '',
+	'Class:ShortcutOQL/Attribute:oql' => 'Lekérdezés',
+	'Class:ShortcutOQL/Attribute:oql+' => 'A keresendő objektumok listáját meghatározó OQL',
+	'Class:ShortcutOQL/Attribute:auto_reload' => 'Automatikus frissítés',
+	'Class:ShortcutOQL/Attribute:auto_reload/Value:none' => 'Letiltva',
+	'Class:ShortcutOQL/Attribute:auto_reload/Value:custom' => 'Egyéni érték',
+	'Class:ShortcutOQL/Attribute:auto_reload_sec' => 'Automatikus frissítés időköz (mp)',
+	'Class:ShortcutOQL/Attribute:auto_reload_sec/tip' => 'A minimum %1$d mp',
+	'UI:FillAllMandatoryFields' => 'Töltsön ki minden kötelező mezőt',
+	'UI:ValueMustBeSet' => 'Adjon meg egy értéket',
+	'UI:ValueMustBeChanged' => 'Változtassa meg az értéket',
+	'UI:ValueInvalidFormat' => 'Érvénytelen formátum',
+	'UI:CSVImportConfirmTitle' => 'Hagyja jóvá a műveletet',
+	'UI:CSVImportConfirmMessage' => 'Biztos ezt akarja tenni?',
+	'UI:CSVImportError_items' => 'Hibák: %1$d',
+	'UI:CSVImportCreated_items' => 'Létrehozva: %1$d',
+	'UI:CSVImportModified_items' => 'Módosítva: %1$d',
+	'UI:CSVImportUnchanged_items' => 'Változatlan: %1$d',
+	'UI:CSVImport:DateAndTimeFormats' => 'Dátum és időformátum',
+	'UI:CSVImport:DefaultDateTimeFormat_Format_Example' => 'Alapértelmezett formátum: %1$s (pl. %2$s)',
+	'UI:CSVImport:CustomDateTimeFormat' => 'Egyéni formátum: %1$s',
+	'UI:CSVImport:CustomDateTimeFormatTooltip' => 'Elérhető alakok:<table>
 <tr><td>Y</td><td>év (4 számjegy, pl. 2016)</td></tr>
 <tr><td>y</td><td>year (2 számjegy, pl. 16 2016-hoz)</td></tr>
 <tr><td>m</td><td>month (2 számjegy, pl. 01..12)</td></tr>
@@ -1417,261 +1432,233 @@ A művelet eseményindítóhoz rendelésekor kap egy sorszámot , amely meghatá
 <tr><td>i</td><td>minutes (2 számjegy, pl. 00..59)</td></tr>
 <tr><td>s</td><td>seconds (2 számjegy, pl. 00..59)</td></tr>
 </table>',
-
-    'UI:Button:Remove' => 'Eltávolítás',
-    'UI:AddAnExisting_Class' => '%1$s típusú objektum hozzáadása...',
-    'UI:SelectionOf_Class' => '%1$s típusú objektum választéka',
-
-    'UI:AboutBox' => ''.ITOP_APPLICATION_SHORT.' névjegye ...',
-    'UI:About:Title' => ''.ITOP_APPLICATION_SHORT.' névjegye',
-    'UI:About:DataModel' => 'Adatmodell',
-    'UI:About:Support' => 'Támogatás',
-    'UI:About:Licenses' => 'Licencek',
-    'UI:About:InstallationOptions' => 'Telepítési beállítások',
-    'UI:About:ManualExtensionSource' => 'Bővítmény',
-    'UI:About:Extension_Version' => 'Verzió: %1$s',
-    'UI:About:RemoteExtensionSource' => 'Adat',
-
-    'UI:DisconnectedDlgMessage' => 'Megszakadt a kapcsolat. Az alkalmazás további használatához újra azonosítania kell magát.',
-    'UI:DisconnectedDlgTitle' => 'Figyelem!',
-    'UI:LoginAgain' => 'Újra-bejelentkezés',
-    'UI:StayOnThePage' => 'Maradjon ezen az oldalon',
-
-    'ExcelExporter:ExportMenu' => 'Excel exportálás...',
-    'ExcelExporter:ExportDialogTitle' => 'Excel exportálás',
-    'ExcelExporter:ExportButton' => 'Exportálás',
-    'ExcelExporter:DownloadButton' => '%1$s letöltése',
-    'ExcelExporter:RetrievingData' => 'Adat lekérése...',
-    'ExcelExporter:BuildingExcelFile' => 'Excel fájl felépítése...',
-    'ExcelExporter:Done' => 'Kész.',
-    'ExcelExport:AutoDownload' => 'Indítsa el a letöltést ha végzett az exportálással',
-    'ExcelExport:PreparingExport' => 'Előkészítés az exportáláshoz...',
-    'ExcelExport:Statistics' => 'Statisztikák',
-    'portal:legacy_portal' => 'Végfelhasználói Portál',
-    'portal:backoffice' => ITOP_APPLICATION_SHORT.' Adminisztrációs felület',
-
-    'UI:CurrentObjectIsLockedBy_User' => 'Az objektum zárolva van, mivel jelenleg %1$s módosítja.',
-    'UI:CurrentObjectIsLockedBy_User_Explanation' => 'Az objektumot jelenleg %1$s módosítja. Az Ön módosításait nem lehet elküldeni, mivel azok felülíródnának.',
-    'UI:CurrentObjectIsSoftLockedBy_User' => 'Az objektumot jelenleg %1$s módosítja. A módosítások befejezése után elküldheti a módosításokat.',
-    'UI:CurrentObjectLockExpired' => 'Az objektum egyidejű módosítását megakadályozó zárolás lejárt..',
-    'UI:CurrentObjectLockExpired_Explanation' => 'Az objektum egyidejű módosítását megakadályozó zárolás lejárt. Többé nem küldheti el módosítását, mivel más felhasználók már módosíthatják ezt az objektumot.',
-    'UI:ConcurrentLockKilled' => 'A jelenlegi objektum módosítását megakadályozó zárolás törlődött.',
-    'UI:Menu:KillConcurrentLock' => 'Az egyidejű módosítási zár megszüntetése !',
-
-    'UI:Menu:ExportPDF' => 'Exportálás PDF-be...',
-    'UI:Menu:PrintableVersion' => 'Nyomtatóbarát verzió',
-
-    'UI:BrowseInlineImages' => 'Képek tallózása...',
-    'UI:UploadInlineImageLegend' => 'Új kép feltöltése',
-    'UI:SelectInlineImageToUpload' => 'Válasszon egy képet',
-    'UI:AvailableInlineImagesLegend' => 'Elérhető képek',
-    'UI:NoInlineImage' => 'A szerveren nincs elérhető kép. Használja a fenti "Tallózás" gombot egy kép kiválasztásához a számítógépéről, és töltse fel a szerverre.',
-
-    'UI:ToggleFullScreen' => 'Maximalizálás / Minimalizálás',
-    'UI:Button:ResetImage' => 'Az előző kép visszaállítása',
-    'UI:Button:RemoveImage' => 'Kép eltávolítása',
-    'UI:Button:UploadImage' => 'Kép feltöltése a merevlemezről',
-    'UI:UploadNotSupportedInThisMode' => 'A képek vagy fájlok módosítása ebben az üzemmódban nem támogatott.',
-
-    'UI:Button:RemoveDocument' => 'Dokumentum törlése',
-
+	'UI:Button:Remove' => 'Eltávolítás',
+	'UI:AddAnExisting_Class' => '%1$s típusú objektum hozzáadása...',
+	'UI:SelectionOf_Class' => '%1$s típusú objektum választéka',
+	'UI:AboutBox' => ''.ITOP_APPLICATION_SHORT.' névjegye ...',
+	'UI:About:Title' => ''.ITOP_APPLICATION_SHORT.' névjegye',
+	'UI:About:DataModel' => 'Adatmodell',
+	'UI:About:Support' => 'Támogatás',
+	'UI:About:Licenses' => 'Licencek',
+	'UI:About:InstallationOptions' => 'Telepítési beállítások',
+	'UI:About:ManualExtensionSource' => 'Bővítmény',
+	'UI:About:Extension_Version' => 'Verzió: %1$s',
+	'UI:About:RemoteExtensionSource' => 'Adat',
+	'UI:DisconnectedDlgMessage' => 'Megszakadt a kapcsolat. Az alkalmazás további használatához újra azonosítania kell magát.',
+	'UI:DisconnectedDlgTitle' => 'Figyelem!',
+	'UI:LoginAgain' => 'Újra-bejelentkezés',
+	'UI:StayOnThePage' => 'Maradjon ezen az oldalon',
+	'ExcelExporter:ExportMenu' => 'Excel exportálás...',
+	'ExcelExporter:ExportDialogTitle' => 'Excel exportálás',
+	'ExcelExporter:ExportButton' => 'Exportálás',
+	'ExcelExporter:DownloadButton' => '%1$s letöltése',
+	'ExcelExporter:RetrievingData' => 'Adat lekérése...',
+	'ExcelExporter:BuildingExcelFile' => 'Excel fájl felépítése...',
+	'ExcelExporter:Done' => 'Kész.',
+	'ExcelExport:AutoDownload' => 'Indítsa el a letöltést ha végzett az exportálással',
+	'ExcelExport:PreparingExport' => 'Előkészítés az exportáláshoz...',
+	'ExcelExport:Statistics' => 'Statisztikák',
+	'portal:legacy_portal' => 'Végfelhasználói Portál',
+	'portal:backoffice' => ITOP_APPLICATION_SHORT.' Adminisztrációs felület',
+	'UI:CurrentObjectIsLockedBy_User' => 'Az objektum zárolva van, mivel jelenleg %1$s módosítja.',
+	'UI:CurrentObjectIsLockedBy_User_Explanation' => 'Az objektumot jelenleg %1$s módosítja. Az Ön módosításait nem lehet elküldeni, mivel azok felülíródnának.',
+	'UI:CurrentObjectIsSoftLockedBy_User' => 'Az objektumot jelenleg %1$s módosítja. A módosítások befejezése után elküldheti a módosításokat.',
+	'UI:CurrentObjectLockExpired' => 'Az objektum egyidejű módosítását megakadályozó zárolás lejárt..',
+	'UI:CurrentObjectLockExpired_Explanation' => 'Az objektum egyidejű módosítását megakadályozó zárolás lejárt. Többé nem küldheti el módosítását, mivel más felhasználók már módosíthatják ezt az objektumot.',
+	'UI:ConcurrentLockKilled' => 'A jelenlegi objektum módosítását megakadályozó zárolás törlődött.',
+	'UI:Menu:KillConcurrentLock' => 'Az egyidejű módosítási zár megszüntetése !',
+	'UI:Menu:ExportPDF' => 'Exportálás PDF-be...',
+	'UI:Menu:PrintableVersion' => 'Nyomtatóbarát verzió',
+	'UI:BrowseInlineImages' => 'Képek tallózása...',
+	'UI:UploadInlineImageLegend' => 'Új kép feltöltése',
+	'UI:SelectInlineImageToUpload' => 'Válasszon egy képet',
+	'UI:AvailableInlineImagesLegend' => 'Elérhető képek',
+	'UI:NoInlineImage' => 'A szerveren nincs elérhető kép. Használja a fenti "Tallózás" gombot egy kép kiválasztásához a számítógépéről, és töltse fel a szerverre.',
+	'UI:ToggleFullScreen' => 'Maximalizálás / Minimalizálás',
+	'UI:Button:ResetImage' => 'Az előző kép visszaállítása',
+	'UI:Button:RemoveImage' => 'Kép eltávolítása',
+	'UI:Button:UploadImage' => 'Kép feltöltése a merevlemezről',
+	'UI:UploadNotSupportedInThisMode' => 'A képek vagy fájlok módosítása ebben az üzemmódban nem támogatott.',
+	'UI:Button:RemoveDocument' => 'Dokumentum törlése',
     // Search form
-    'UI:Search:Toggle' => 'Minimalizál / Kiterjeszt',
-    'UI:Search:AutoSubmit:DisabledHint' => 'Az automatikus beküldés le van tiltva ebben az osztályban',
-    'UI:Search:Obsolescence:DisabledHint' => 'Az Ön beállításai alapján az elavult adatok el vannak rejtve.',
-    'UI:Search:NoAutoSubmit:ExplainText' => 'Adjon meg néhány feltételt a keresőmezőben, vagy kattintson a keresés gombra az objektumok megtekintéséhez.',
-    'UI:Search:Criterion:MoreMenu:AddCriteria' => 'Adjon meg egy feltételt',
+	'UI:Search:Toggle' => 'Minimalizál / Kiterjeszt',
+	'UI:Search:AutoSubmit:DisabledHint' => 'Az automatikus beküldés le van tiltva ebben az osztályban',
+	'UI:Search:Obsolescence:DisabledHint' => 'Az Ön beállításai alapján az elavult adatok el vannak rejtve.',
+	'UI:Search:NoAutoSubmit:ExplainText' => 'Adjon meg néhány feltételt a keresőmezőben, vagy kattintson a keresés gombra az objektumok megtekintéséhez.',
+	'UI:Search:Criterion:MoreMenu:AddCriteria' => 'Adjon meg egy feltételt',
     // - Add new criteria button
-    'UI:Search:AddCriteria:List:RecentlyUsed:Title' => 'Legutóbb használt',
-    'UI:Search:AddCriteria:List:MostPopular:Title' => 'Legnépszerűbb',
-    'UI:Search:AddCriteria:List:Others:Title' => 'Egyebek',
-    'UI:Search:AddCriteria:List:RecentlyUsed:Placeholder' => 'Még egyik sem',
-
+	'UI:Search:AddCriteria:List:RecentlyUsed:Title' => 'Legutóbb használt',
+	'UI:Search:AddCriteria:List:MostPopular:Title' => 'Legnépszerűbb',
+	'UI:Search:AddCriteria:List:Others:Title' => 'Egyebek',
+	'UI:Search:AddCriteria:List:RecentlyUsed:Placeholder' => 'Még egyik sem',
     // - Criteria header actions
-    'UI:Search:Criteria:Toggle' => 'Minimalizál / Kiterjeszt',
-    'UI:Search:Criteria:Remove' => 'Eltávolítás',
-    'UI:Search:Criteria:Locked' => 'Zárolva',
-
+	'UI:Search:Criteria:Toggle' => 'Minimalizál / Kiterjeszt',
+	'UI:Search:Criteria:Remove' => 'Eltávolítás',
+	'UI:Search:Criteria:Locked' => 'Zárolva',
     // - Criteria titles
     //   - Default widget
-    'UI:Search:Criteria:Title:Default:Any' => '%1$s: bármely',
-    'UI:Search:Criteria:Title:Default:Empty' => '%1$s üres',
-    'UI:Search:Criteria:Title:Default:NotEmpty' => '%1$s nem üres',
-    'UI:Search:Criteria:Title:Default:Equals' => '%1$s egyenlő %2$s -vel',
-    'UI:Search:Criteria:Title:Default:Contains' => '%1$s tartalmazza %2$s -t',
-    'UI:Search:Criteria:Title:Default:StartsWith' => '%1$s kezdődik %2$s -vel',
-    'UI:Search:Criteria:Title:Default:EndsWith' => '%1$s végződik %2$s -vel',
-    'UI:Search:Criteria:Title:Default:RegExp' => '%1$s egyezik %2$s -vel',
-    'UI:Search:Criteria:Title:Default:GreaterThan' => '%1$s > %2$s',
-    'UI:Search:Criteria:Title:Default:GreaterThanOrEquals' => '%1$s >= %2$s',
-    'UI:Search:Criteria:Title:Default:LessThan' => '%1$s < %2$s',
-    'UI:Search:Criteria:Title:Default:LessThanOrEquals' => '%1$s <= %2$s',
-    'UI:Search:Criteria:Title:Default:Different' => '%1$s ≠ %2$s',
-    'UI:Search:Criteria:Title:Default:Between' => '%1$s [%2$s] között',
-    'UI:Search:Criteria:Title:Default:BetweenDates' => '%1$s [%2$s]',
-    'UI:Search:Criteria:Title:Default:BetweenDates:All' => '%1$s: Bármely',
-    'UI:Search:Criteria:Title:Default:BetweenDates:From' => '%1$s -től %2$s -ig',
-    'UI:Search:Criteria:Title:Default:BetweenDates:Until' => '%1$s amíg %2$s',
-    'UI:Search:Criteria:Title:Default:Between:All' => '%1$s: bármely',
-    'UI:Search:Criteria:Title:Default:Between:From' => '%1$s a %2$s -ból',
-    'UI:Search:Criteria:Title:Default:Between:Until' => '%1$s egészen %2$s -ig',
+	'UI:Search:Criteria:Title:Default:Any' => '%1$s: bármely',
+	'UI:Search:Criteria:Title:Default:Empty' => '%1$s üres',
+	'UI:Search:Criteria:Title:Default:NotEmpty' => '%1$s nem üres',
+	'UI:Search:Criteria:Title:Default:Equals' => '%1$s egyenlő %2$s -vel',
+	'UI:Search:Criteria:Title:Default:Contains' => '%1$s tartalmazza %2$s -t',
+	'UI:Search:Criteria:Title:Default:StartsWith' => '%1$s kezdődik %2$s -vel',
+	'UI:Search:Criteria:Title:Default:EndsWith' => '%1$s végződik %2$s -vel',
+	'UI:Search:Criteria:Title:Default:RegExp' => '%1$s egyezik %2$s -vel',
+	'UI:Search:Criteria:Title:Default:GreaterThan' => '%1$s > %2$s',
+	'UI:Search:Criteria:Title:Default:GreaterThanOrEquals' => '%1$s >= %2$s',
+	'UI:Search:Criteria:Title:Default:LessThan' => '%1$s < %2$s',
+	'UI:Search:Criteria:Title:Default:LessThanOrEquals' => '%1$s <= %2$s',
+	'UI:Search:Criteria:Title:Default:Different' => '%1$s ≠ %2$s',
+	'UI:Search:Criteria:Title:Default:Between' => '%1$s [%2$s] között',
+	'UI:Search:Criteria:Title:Default:BetweenDates' => '%1$s [%2$s]',
+	'UI:Search:Criteria:Title:Default:BetweenDates:All' => '%1$s: Bármely',
+	'UI:Search:Criteria:Title:Default:BetweenDates:From' => '%1$s -től %2$s -ig',
+	'UI:Search:Criteria:Title:Default:BetweenDates:Until' => '%1$s amíg %2$s',
+	'UI:Search:Criteria:Title:Default:Between:All' => '%1$s: bármely',
+	'UI:Search:Criteria:Title:Default:Between:From' => '%1$s a %2$s -ból',
+	'UI:Search:Criteria:Title:Default:Between:Until' => '%1$s egészen %2$s -ig',
     //   - Numeric widget
     //   None yet
     //   - DateTime widget
-    'UI:Search:Criteria:Title:DateTime:Between' => '%2$s <= 1$s <= %3$s',
+	'UI:Search:Criteria:Title:DateTime:Between' => '%2$s <= 1$s <= %3$s',
     //   - Enum widget
-    'UI:Search:Criteria:Title:Enum:In' => '%1$s: %2$s',
-    'UI:Search:Criteria:Title:Enum:In:Many' => '%1$s: %2$s és %3$s másik',
-    'UI:Search:Criteria:Title:Enum:In:All' => '%1$s: bármely',
+	'UI:Search:Criteria:Title:Enum:In' => '%1$s: %2$s',
+	'UI:Search:Criteria:Title:Enum:In:Many' => '%1$s: %2$s és %3$s másik',
+	'UI:Search:Criteria:Title:Enum:In:All' => '%1$s: bármely',
     //   - TagSet widget
-    'UI:Search:Criteria:Title:TagSet:Matches' => '%1$s: %2$s',
+	'UI:Search:Criteria:Title:TagSet:Matches' => '%1$s: %2$s',
     //   - External key widget
-    'UI:Search:Criteria:Title:ExternalKey:Empty' => '%1$s meghatározva',
-    'UI:Search:Criteria:Title:ExternalKey:NotEmpty' => '%1$s nincs meghatározva',
-    'UI:Search:Criteria:Title:ExternalKey:Equals' => '%1$s %2$s',
-    'UI:Search:Criteria:Title:ExternalKey:In' => '%1$s: %2$s',
-    'UI:Search:Criteria:Title:ExternalKey:In:Many' => '%1$s: %2$s és %3$s másik',
-    'UI:Search:Criteria:Title:ExternalKey:In:All' => '%1$s: bármely',
+	'UI:Search:Criteria:Title:ExternalKey:Empty' => '%1$s meghatározva',
+	'UI:Search:Criteria:Title:ExternalKey:NotEmpty' => '%1$s nincs meghatározva',
+	'UI:Search:Criteria:Title:ExternalKey:Equals' => '%1$s %2$s',
+	'UI:Search:Criteria:Title:ExternalKey:In' => '%1$s: %2$s',
+	'UI:Search:Criteria:Title:ExternalKey:In:Many' => '%1$s: %2$s és %3$s másik',
+	'UI:Search:Criteria:Title:ExternalKey:In:All' => '%1$s: bármely',
     //   - Hierarchical key widget
-    'UI:Search:Criteria:Title:HierarchicalKey:Empty' => '%1$s meghatározva',
-    'UI:Search:Criteria:Title:HierarchicalKey:NotEmpty' => '%1$s nincs meghatározva',
-    'UI:Search:Criteria:Title:HierarchicalKey:Equals' => '%1$s %2$s',
-    'UI:Search:Criteria:Title:HierarchicalKey:In' => '%1$s: %2$s',
-    'UI:Search:Criteria:Title:HierarchicalKey:In:Many' => '%1$s: %2$s és %3$s másik',
-    'UI:Search:Criteria:Title:HierarchicalKey:In:All' => '%1$s: bármely',
-
+	'UI:Search:Criteria:Title:HierarchicalKey:Empty' => '%1$s meghatározva',
+	'UI:Search:Criteria:Title:HierarchicalKey:NotEmpty' => '%1$s nincs meghatározva',
+	'UI:Search:Criteria:Title:HierarchicalKey:Equals' => '%1$s %2$s',
+	'UI:Search:Criteria:Title:HierarchicalKey:In' => '%1$s: %2$s',
+	'UI:Search:Criteria:Title:HierarchicalKey:In:Many' => '%1$s: %2$s és %3$s másik',
+	'UI:Search:Criteria:Title:HierarchicalKey:In:All' => '%1$s: bármely',
     // - Criteria operators
     //   - Default widget
-    'UI:Search:Criteria:Operator:Default:Empty' => 'Üres',
-    'UI:Search:Criteria:Operator:Default:NotEmpty' => 'Nem üres',
-    'UI:Search:Criteria:Operator:Default:Equals' => 'Egyenlő',
-    'UI:Search:Criteria:Operator:Default:Between' => 'Közötte',
+	'UI:Search:Criteria:Operator:Default:Empty' => 'Üres',
+	'UI:Search:Criteria:Operator:Default:NotEmpty' => 'Nem üres',
+	'UI:Search:Criteria:Operator:Default:Equals' => 'Egyenlő',
+	'UI:Search:Criteria:Operator:Default:Between' => 'Közötte',
     //   - String widget
-    'UI:Search:Criteria:Operator:String:Contains' => 'Tartalmazza',
-    'UI:Search:Criteria:Operator:String:StartsWith' => 'Kezdődik',
-    'UI:Search:Criteria:Operator:String:EndsWith' => 'Végződik',
-    'UI:Search:Criteria:Operator:String:RegExp' => 'Reguláris kifejezés',
+	'UI:Search:Criteria:Operator:String:Contains' => 'Tartalmaz',
+	'UI:Search:Criteria:Operator:String:StartsWith' => 'Kezdődik',
+	'UI:Search:Criteria:Operator:String:EndsWith' => 'Végződik',
+	'UI:Search:Criteria:Operator:String:RegExp' => 'Regul. kifejezés',
     //   - Numeric widget
-    'UI:Search:Criteria:Operator:Numeric:Equals' => 'Egyenlő',// => '=',
-    'UI:Search:Criteria:Operator:Numeric:GreaterThan' => 'Nagyobb',// => '>',
-    'UI:Search:Criteria:Operator:Numeric:GreaterThanOrEquals' => 'Nagyobb / egyenlő',// > '>=',
-    'UI:Search:Criteria:Operator:Numeric:LessThan' => 'Kisebb',// => '<',
-    'UI:Search:Criteria:Operator:Numeric:LessThanOrEquals' => 'Kisebb / egyenlő',// > '<=',
-    'UI:Search:Criteria:Operator:Numeric:Different' => 'Különböző',// => '≠',
+	'UI:Search:Criteria:Operator:Numeric:Equals' => 'Egyenlő',
+    // => '=',
+	'UI:Search:Criteria:Operator:Numeric:GreaterThan' => 'Nagyobb',
+    // => '>',
+	'UI:Search:Criteria:Operator:Numeric:GreaterThanOrEquals' => 'Nagyobb / egyenlő',
+    // > '>=',
+	'UI:Search:Criteria:Operator:Numeric:LessThan' => 'Kisebb',
+    // => '<',
+	'UI:Search:Criteria:Operator:Numeric:LessThanOrEquals' => 'Kisebb / egyenlő',
+    // > '<=',
+	'UI:Search:Criteria:Operator:Numeric:Different' => 'Különböző',
+    // => '≠',
     //   - Tag Set Widget
-    'UI:Search:Criteria:Operator:TagSet:Matches' => 'Egyezik',
-
+	'UI:Search:Criteria:Operator:TagSet:Matches' => 'Egyezik',
     // - Other translations
-    'UI:Search:Value:Filter:Placeholder' => 'Szűrő...',
-    'UI:Search:Value:Search:Placeholder' => 'Keresés...',
-    'UI:Search:Value:Autocomplete:StartTyping' => 'Kezdje el beírni a lehetséges értékeket',
-    'UI:Search:Value:Autocomplete:Wait' => 'Várjon...',
-    'UI:Search:Value:Autocomplete:NoResult' => 'Nincs eredmény',
-    'UI:Search:Value:Toggler:CheckAllNone' => 'Mindet / egyiket sem ellenőrzi',
-    'UI:Search:Value:Toggler:CheckAllNoneFiltered' => 'Mind / egyik sem látható',
-
+	'UI:Search:Value:Filter:Placeholder' => 'Szűrő...',
+	'UI:Search:Value:Search:Placeholder' => 'Keresés...',
+	'UI:Search:Value:Autocomplete:StartTyping' => 'Kezdje el beírni a lehetséges értékeket',
+	'UI:Search:Value:Autocomplete:Wait' => 'Várjon...',
+	'UI:Search:Value:Autocomplete:NoResult' => 'Nincs eredmény',
+	'UI:Search:Value:Toggler:CheckAllNone' => 'Mindet / egyiket sem ellenőrzi',
+	'UI:Search:Value:Toggler:CheckAllNoneFiltered' => 'Mind / egyik sem látható',
     // - Widget other translations
-    'UI:Search:Criteria:Numeric:From' => 'Kezdés',
-    'UI:Search:Criteria:Numeric:Until' => 'Amíg',
-    'UI:Search:Criteria:Numeric:PlaceholderFrom' => 'Bármely',
-    'UI:Search:Criteria:Numeric:PlaceholderUntil' => 'Bármely',
-    'UI:Search:Criteria:DateTime:From' => 'Kezdés',
-    'UI:Search:Criteria:DateTime:FromTime' => 'Kezdés',
-    'UI:Search:Criteria:DateTime:Until' => 'amíg',
-    'UI:Search:Criteria:DateTime:UntilTime' => 'amíg',
-    'UI:Search:Criteria:DateTime:PlaceholderFrom' => 'Bármely dátum',
-    'UI:Search:Criteria:DateTime:PlaceholderFromTime' => 'Bármely dátum',
-    'UI:Search:Criteria:DateTime:PlaceholderUntil' => 'Bármely dátum',
-    'UI:Search:Criteria:DateTime:PlaceholderUntilTime' => 'Bármely dátum',
-    'UI:Search:Criteria:HierarchicalKey:ChildrenIncluded:Hint' => 'A kijelölt objektumok gyermekei is szerepelnek.',
-
-    'UI:Search:Criteria:Raw:Filtered' => 'Szűrt',
-    'UI:Search:Criteria:Raw:FilteredOn' => '%1$s által szűrve',
-
-    'UI:StateChanged' => 'Megváltozott állapot',
+	'UI:Search:Criteria:Numeric:From' => 'Kezdés',
+	'UI:Search:Criteria:Numeric:Until' => 'Amíg',
+	'UI:Search:Criteria:Numeric:PlaceholderFrom' => 'Bármely',
+	'UI:Search:Criteria:Numeric:PlaceholderUntil' => 'Bármely',
+	'UI:Search:Criteria:DateTime:From' => 'Kezdés',
+	'UI:Search:Criteria:DateTime:FromTime' => 'Kezdés',
+	'UI:Search:Criteria:DateTime:Until' => 'amíg',
+	'UI:Search:Criteria:DateTime:UntilTime' => 'amíg',
+	'UI:Search:Criteria:DateTime:PlaceholderFrom' => 'Bármely dátum',
+	'UI:Search:Criteria:DateTime:PlaceholderFromTime' => 'Bármely dátum',
+	'UI:Search:Criteria:DateTime:PlaceholderUntil' => 'Bármely dátum',
+	'UI:Search:Criteria:DateTime:PlaceholderUntilTime' => 'Bármely dátum',
+	'UI:Search:Criteria:HierarchicalKey:ChildrenIncluded:Hint' => 'A kijelölt objektumok gyermekei is szerepelnek.',
+	'UI:Search:Criteria:Raw:Filtered' => 'Szűrt',
+	'UI:Search:Criteria:Raw:FilteredOn' => '%1$s által szűrve',
+	'UI:StateChanged' => 'Megváltozott állapot',
 ));
 
 //
 // Expression to Natural language
 //
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Expression:Operator:AND' => ' ÉS ',
-    'Expression:Operator:OR' => ' VAGY ',
-    'Expression:Operator:=' => ': ',
-
-    'Expression:Unit:Short:DAY' => 'n',
-    'Expression:Unit:Short:WEEK' => 'w',
-    'Expression:Unit:Short:MONTH' => 'h',
-    'Expression:Unit:Short:YEAR' => 'é',
-
-    'Expression:Unit:Long:DAY' => 'nap',
-    'Expression:Unit:Long:HOUR' => 'óra',
-    'Expression:Unit:Long:MINUTE' => 'perc',
-
-    'Expression:Verb:NOW' => 'most',
-    'Expression:Verb:ISNULL' => ': meghatározatlan',
+	'Expression:Operator:AND' => ' ÉS ',
+	'Expression:Operator:OR' => ' VAGY ',
+	'Expression:Operator:=' => ': ',
+	'Expression:Unit:Short:DAY' => 'n',
+	'Expression:Unit:Short:WEEK' => 'w',
+	'Expression:Unit:Short:MONTH' => 'h',
+	'Expression:Unit:Short:YEAR' => 'é',
+	'Expression:Unit:Long:DAY' => 'nap',
+	'Expression:Unit:Long:HOUR' => 'óra',
+	'Expression:Unit:Long:MINUTE' => 'perc',
+	'Expression:Verb:NOW' => 'most',
+	'Expression:Verb:ISNULL' => ': meghatározatlan',
 ));
 
 //
 // iTop Newsroom menu
 //
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'UI:Newsroom:NoNewMessage' => 'Nincs új üzenet',
-    'UI:Newsroom:XNewMessage' => '%1$s új üzenet',
-    'UI:Newsroom:MarkAllAsRead' => 'Üzenetek jelölése olvasottként',
-    'UI:Newsroom:ViewAllMessages' => 'Összes üzenet megjelenítése',
-    'UI:Newsroom:Preferences' => 'Hírfolyam beállítások',
-    'UI:Newsroom:ConfigurationLink' => 'Konfiguráció',
-    'UI:Newsroom:ResetCache' => 'Gyorstár ürítése',
-    'UI:Newsroom:DisplayMessagesFor_Provider' => '%1$s üzeneteinek mutatása',
-    'UI:Newsroom:DisplayAtMost_X_Messages' => 'Mutasson %1$s üzenetet a %2$s menüben.',
+	'UI:Newsroom:NoNewMessage' => 'Nincs új üzenet',
+	'UI:Newsroom:XNewMessage' => '%1$s új üzenet',
+	'UI:Newsroom:MarkAllAsRead' => 'Üzenetek jelölése olvasottként',
+	'UI:Newsroom:ViewAllMessages' => 'Összes üzenet megjelenítése',
+	'UI:Newsroom:Preferences' => 'Hírfolyam beállítások',
+	'UI:Newsroom:ConfigurationLink' => 'Konfiguráció',
+	'UI:Newsroom:ResetCache' => 'Gyorstár ürítése',
+	'UI:Newsroom:DisplayMessagesFor_Provider' => '%1$s üzeneteinek megjelenítése',
+	'UI:Newsroom:DisplayAtMost_X_Messages' => 'Mutasson %1$s üzenetet a %2$s menüben.',
 ));
 
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'Menu:DataSources' => 'Szinkronizációs adatforrások',
-    'Menu:DataSources+' => '',
-    'Menu:WelcomeMenu' => 'Kezdőoldal',
-    'Menu:WelcomeMenu+' => '',
-    'Menu:WelcomeMenuPage' => 'Áttekintő',
-    'Menu:WelcomeMenuPage+' => '',
-    'Menu:AdminTools' => 'Adminisztrációs eszközök',
-    'Menu:AdminTools+' => '',
-    'Menu:AdminTools?' => 'Az eszközök csak az adminisztrátori profilhoz rendelt felhasználók számára elérhetők.',
-    'Menu:DataModelMenu' => 'Adatmodell',
-    'Menu:DataModelMenu+' => '',
-    'Menu:ExportMenu' => 'Exportálás',
-    'Menu:ExportMenu+' => '',
-    'Menu:NotificationsMenu' => 'Értesítések',
-    'Menu:NotificationsMenu+' => '',
-    'Menu:AuditCategories' => 'Audit-kategóriák',
-    'Menu:AuditCategories+' => '',
-    'Menu:Notifications:Title' => 'Audit-kategóriák',
-    'Menu:RunQueriesMenu'         => 'Lekérdezés futtatás',
-    'Menu:RunQueriesMenu+'        => '',
-    'Menu:QueryMenu'              => 'Lekérdezés-gyűjtemény',
-    'Menu:QueryMenu+'             => 'Lekérdezés-gyűjtemény',
-    'Menu:UniversalSearchMenu'    => 'Univerzális keresés',
-    'Menu:UniversalSearchMenu+'   => '',
-    'Menu:UserManagementMenu'     => 'Felhasználókezelés',
-    'Menu:UserManagementMenu+'    => '',
-    'Menu:ProfilesMenu'           => 'Profilok',
-    'Menu:ProfilesMenu+'          => '',
-    'Menu:ProfilesMenu:Title'     => 'Profilok',
-    'Menu:UserAccountsMenu'       => 'Felhasználói fiókok',
-    'Menu:UserAccountsMenu+'      => '',
-    'Menu:UserAccountsMenu:Title' => 'Felhasználói fiókok',
-    'Menu:MyShortcuts'            => 'Saját gyorsgombok',
-    'Menu:UserManagement'         => 'Felhasználókezelés',
-    'Menu:Queries'                => 'Lekérdezések',
-    'Menu:ConfigurationTools'     => 'Konfiguráció',
+	'Menu:DataSources' => 'Szinkronizációs adatforrások',
+	'Menu:DataSources+' => '',
+	'Menu:AuditCategories' => 'Audit kategóriák',
+	'Menu:AuditCategories+' => '',
+	'Menu:Notifications:Title' => 'Audit kategóriák',
+	'Menu:AuditCategories:Title' => 'Audit configuration~~',
+	'Menu:RunQueriesMenu' => 'Lekérdezés futtatás',
+	'Menu:RunQueriesMenu+' => '',
+	'Menu:QueryMenu' => 'Lekérdezés gyűjtemény',
+	'Menu:QueryMenu+' => 'Lekérdezések gyűjteménye',
+	'Menu:UniversalSearchMenu' => 'Univerzális keresés',
+	'Menu:UniversalSearchMenu+' => '',
+	'Menu:UserManagementMenu' => 'Felhasználókezelés',
+	'Menu:UserManagementMenu+' => '',
+	'Menu:ProfilesMenu' => 'Profilok',
+	'Menu:ProfilesMenu+' => '',
+	'Menu:ProfilesMenu:Title' => 'Profilok',
+	'Menu:UserAccountsMenu' => 'Felhasználói fiókok',
+	'Menu:UserAccountsMenu+' => '',
+	'Menu:UserAccountsMenu:Title' => 'Felhasználói fiókok',
+	'Menu:UserManagement' => 'Felhasználókezelés',
+	'Menu:Queries' => 'Lekérdezések',
+	'Menu:ConfigurationTools' => 'Konfiguráció'
 ));
-
 // Additional language entries not present in English dict
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-    'UI:Toggle:StandardDashboard' => 'Standard',
-    'UI:Toggle:CustomDashboard'   => 'Egyéni',
-    'UI:Display_X_ItemsPerPage'   => '%1$s elem megjelenítése oldalanként',
-    'UI:Dashboard:Edit'           => 'Oldal szerkesztése...',
-    'UI:Dashboard:Revert'         => 'Visszaállítás az eredeti verzióra...',
+	'UI:Toggle:StandardDashboard' => 'Standard',
+	'UI:Toggle:CustomDashboard' => 'Egyéni',
+	'UI:Display_X_ItemsPerPage' => '%1$s elem megjelenítése oldalanként',
+	'UI:Dashboard:Edit' => 'Oldal szerkesztése...',
+	'UI:Dashboard:Revert' => 'Visszaállítás az eredeti verzióra...'
 ));
diff --git a/dictionaries/it.dictionary.itop.core.php b/dictionaries/it.dictionary.itop.core.php
index 20297cf35d..fdf7d4098e 100644
--- a/dictionaries/it.dictionary.itop.core.php
+++ b/dictionaries/it.dictionary.itop.core.php
@@ -23,57 +23,42 @@
  */
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Core:DeletedObjectLabel' => '%1s (deleted)~~',
-	'Core:DeletedObjectTip'   => 'The object has been deleted on %1$s (%2$s)~~',
-
+	'Core:DeletedObjectTip' => 'The object has been deleted on %1$s (%2$s)~~',
 	'Core:UnknownObjectLabel' => 'Object not found (class: %1$s, id: %2$d)~~',
-	'Core:UnknownObjectTip'   => 'The object could not be found. It may have been deleted some time ago and the log has been purged since.~~',
-
+	'Core:UnknownObjectTip' => 'The object could not be found. It may have been deleted some time ago and the log has been purged since.~~',
 	'Core:UniquenessDefaultError' => 'Uniqueness rule \'%1$s\' in error~~',
-	'Core:CheckConsistencyError'  => 'Consistency rules not followed: %1$s~~',
-	'Core:CheckValueError'        => 'Unexpected value for attribute \'%1$s\' (%2$s) : %3$s~~',
-
-	'Core:AttributeLinkedSet'  => 'Array di oggetti',
+	'Core:CheckConsistencyError' => 'Consistency rules not followed: %1$s~~',
+	'Core:CheckValueError' => 'Unexpected value for attribute \'%1$s\' (%2$s) : %3$s~~',
+	'Core:AttributeLinkedSet' => 'Array di oggetti',
 	'Core:AttributeLinkedSet+' => 'Ogni tipo di oggetto della stessa classe o sottoclasse',
-
 	'Core:AttributeLinkedSetDuplicatesFound' => 'Duplicates in the \'%1$s\' field : %2$s~~',
-
-	'Core:AttributeDashboard'  => 'Dashboard~~',
+	'Core:AttributeDashboard' => 'Dashboard~~',
 	'Core:AttributeDashboard+' => '',
-
-	'Core:AttributePhoneNumber'  => 'Phone number~~',
+	'Core:AttributePhoneNumber' => 'Phone number~~',
 	'Core:AttributePhoneNumber+' => '',
-
 	'Core:AttributeObsolescenceDate' => 'Obsolescence date~~',
 	'Core:AttributeObsolescenceDate+' => '',
-
 	'Core:AttributeTagSet' => 'List of tags~~',
 	'Core:AttributeTagSet+' => '',
 	'Core:AttributeSet:placeholder' => 'click to add~~',
 	'Core:AttributeClassAttCodeSet:ItemLabel:AttributeFromClass' => '%1$s (%2$s)~~',
 	'Core:AttributeClassAttCodeSet:ItemLabel:AttributeFromOneChildClass' => '%1$s (%2$s from %3$s)~~',
 	'Core:AttributeClassAttCodeSet:ItemLabel:AttributeFromSeveralChildClasses' => '%1$s (%2$s from child classes)~~',
-
 	'Core:AttributeCaseLog' => 'Log~~',
 	'Core:AttributeCaseLog+' => '',
-
 	'Core:AttributeMetaEnum' => 'Computed enum~~',
 	'Core:AttributeMetaEnum+' => '',
-
 	'Core:AttributeLinkedSetIndirect' => 'Array di oggetti (N-N)',
 	'Core:AttributeLinkedSetIndirect+' => 'ogni tipo di oggetti [sottoclasse] della stessa classe',
-
 	'Core:AttributeInteger' => 'Integer',
 	'Core:AttributeInteger+' => 'Valore numerico (non può essere negativo)',
-
 	'Core:AttributeDecimal' => 'Decimal',
 	'Core:AttributeDecimal+' => 'valore decimale (non può essere negativo)',
-
 	'Core:AttributeBoolean' => 'Booleano',
 	'Core:AttributeBoolean+' => '',
 	'Core:AttributeBoolean/Value:null' => '',
 	'Core:AttributeBoolean/Value:yes' => 'Yes~~',
 	'Core:AttributeBoolean/Value:no' => 'No~~',
-
 	'Core:AttributeArchiveFlag' => 'Archive flag~~',
 	'Core:AttributeArchiveFlag/Value:yes' => 'Yes~~',
 	'Core:AttributeArchiveFlag/Value:yes+' => 'This object is visible only in archive mode~~',
@@ -82,7 +67,6 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Core:AttributeArchiveFlag/Label+' => '',
 	'Core:AttributeArchiveDate/Label' => 'Archive date~~',
 	'Core:AttributeArchiveDate/Label+' => '',
-
 	'Core:AttributeObsolescenceFlag' => 'Obsolescence flag~~',
 	'Core:AttributeObsolescenceFlag/Value:yes' => 'Yes~~',
 	'Core:AttributeObsolescenceFlag/Value:yes+' => 'This object is excluded from the impact analysis, and hidden from search results~~',
@@ -91,54 +75,38 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Core:AttributeObsolescenceFlag/Label+' => 'Computed dynamically on other attributes~~',
 	'Core:AttributeObsolescenceDate/Label' => 'Obsolescence date~~',
 	'Core:AttributeObsolescenceDate/Label+' => 'Approximative date at which the object has been considered obsolete~~',
-
 	'Core:AttributeString' => 'Stringa',
 	'Core:AttributeString+' => 'Stringa alfanumerica',
-
 	'Core:AttributeClass' => 'Classe',
 	'Core:AttributeClass+' => '',
-
 	'Core:AttributeApplicationLanguage' => 'Lingua Utente',
 	'Core:AttributeApplicationLanguage+' => 'Lingua e Paese (EN US)',
-
 	'Core:AttributeFinalClass' => 'Classe (auto)',
 	'Core:AttributeFinalClass+' => 'Classe reale dell\'oggetto (automaticamente creata dal core)',
-
 	'Core:AttributePassword' => 'Password',
 	'Core:AttributePassword+' => 'Password per un dispositivo',
-
 	'Core:AttributeEncryptedString' => 'Stringa criptata',
 	'Core:AttributeEncryptedString+' => 'Stringa cripta con una chiave locale',
 	'Core:AttributeEncryptUnknownLibrary' => 'Encryption library specified (%1$s) unknown~~',
 	'Core:AttributeEncryptFailedToDecrypt' => '** decryption error **~~',
-
 	'Core:AttributeText' => 'Testo',
 	'Core:AttributeText+' => 'Stringa di caratteri multilinea',
-
 	'Core:AttributeHTML' => 'HTML',
 	'Core:AttributeHTML+' => 'Stringa HTML',
-
 	'Core:AttributeEmailAddress' => 'Indirizzo Email',
 	'Core:AttributeEmailAddress+' => '',
-
 	'Core:AttributeIPAddress' => 'Indirizzo IP',
 	'Core:AttributeIPAddress+' => '',
-
 	'Core:AttributeOQL' => 'OQL',
 	'Core:AttributeOQL+' => 'Espressione Object Query Langage',
-
 	'Core:AttributeEnum' => 'Enum',
 	'Core:AttributeEnum+' => 'Lista di stringe alfanumeriche predefinite',
-
 	'Core:AttributeTemplateString' => 'Stringa Template',
 	'Core:AttributeTemplateString+' => 'Segnaposto contenente stringhe',
-
 	'Core:AttributeTemplateText' => 'Testo Template',
 	'Core:AttributeTemplateText+' => 'Segnaposto contenente testo',
-
 	'Core:AttributeTemplateHTML' => 'HTML Template',
 	'Core:AttributeTemplateHTML+' => 'Segnaposto contenente HTML',
-
 	'Core:AttributeDateTime' => 'Data/ora',
 	'Core:AttributeDateTime+' => 'Data e ora (anno-mese-giorno hh:mm:ss)',
 	'Core:AttributeDateTime?SmartSearch' => '
@@ -156,7 +124,6 @@ Operatori:<br/>
 <p>
 Se \'oraè omessa, di default è 00:00:00
 </p>',
-
 	'Core:AttributeDate' => 'Data',
 	'Core:AttributeDate+' => 'Data (anno-mese-giorno)',
 	'Core:AttributeDate?SmartSearch' => '
@@ -171,43 +138,30 @@ Operatori:<br/>
 	<b>&lt;</b><em>data</em><br/>
 	<b>[</b><em>data</em>,<em>data</em><b>]</b>
 </p>',
-
 	'Core:AttributeDeadline' => 'Scadenza',
 	'Core:AttributeDeadline+' => 'Data visualizza relativa al tempo attuale',
-
 	'Core:AttributeExternalKey' => 'Chiave esterna',
 	'Core:AttributeExternalKey+' => 'Chiave esterna (o straniera)',
-
 	'Core:AttributeHierarchicalKey' => 'Hierarchical Key~~',
 	'Core:AttributeHierarchicalKey+' => 'External (or foreign) key to the parent~~',
-
 	'Core:AttributeExternalField' => 'Campo esterno',
 	'Core:AttributeExternalField+' => 'Campo mappato con una chiave esterna',
-
 	'Core:AttributeURL' => 'URL',
 	'Core:AttributeURL+' => 'URL assoluto o relativo, come una stringa di testo',
-
 	'Core:AttributeBlob' => 'Blob',
 	'Core:AttributeBlob+' => 'Ogni contenuto binario (documento)',
-
 	'Core:AttributeOneWayPassword' => 'Password a senso unico',
 	'Core:AttributeOneWayPassword+' => 'Password criptata (hashed) a senso unico',
-
 	'Core:AttributeTable' => 'Tabella',
 	'Core:AttributeTable+' => 'Array indicizzato a due dimensioni',
-
 	'Core:AttributePropertySet' => 'Proprietà',
 	'Core:AttributePropertySet+' => 'Elenco delle proprietà non tipizzati (nome and valore)',
-
 	'Core:AttributeFriendlyName' => 'Friendly name',
 	'Core:AttributeFriendlyName+' => 'Attributo creato automaticamente, il nome descrittivo viene calcolato dopo diversi attributi',
-
 	'Core:FriendlyName-Label' => 'Nome',
 	'Core:FriendlyName-Description' => 'Friendly name',
-
 	'Core:AttributeTag' => 'Tags~~',
 	'Core:AttributeTag+' => '',
-	
 	'Core:Context=REST/JSON' => 'REST~~',
 	'Core:Context=Synchro' => 'Synchro~~',
 	'Core:Context=Setup' => 'Setup~~',
@@ -485,6 +439,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:Action' => 'Azione personalizzata',
 	'Class:Action+' => 'Azione definita dall\'utente',
+	'Class:Action/ComplementaryName' => '%1$s: %2$s~~',
 	'Class:Action/Attribute:name' => 'Nome',
 	'Class:Action/Attribute:name+' => '',
 	'Class:Action/Attribute:description' => 'Descrizione',
@@ -552,6 +507,22 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:ActionEmail/Attribute:importance/Value:normal+' => '',
 	'Class:ActionEmail/Attribute:importance/Value:high' => 'alta',
 	'Class:ActionEmail/Attribute:importance/Value:high+' => '',
+	'Class:ActionEmail/Attribute:language' => 'Language~~',
+	'Class:ActionEmail/Attribute:language+' => 'Language to use for placeholders ($xxx$) inside the message (state, importance, priority, etc)~~',
+	'Class:ActionEmail/Attribute:html_template' => 'HTML template~~',
+	'Class:ActionEmail/Attribute:html_template+' => 'Optional HTML template wrapping around the content of the \'Body\' attribute below, useful for tailored email layouts (in the template, content of the \'Body\' attribute will replace the $content$ placeholder)~~',
+	'Class:ActionEmail/Attribute:ignore_notify' => 'Ignore the Notify flag~~',
+	'Class:ActionEmail/Attribute:ignore_notify+' => 'If set to \'Yes\' the \'Notify\' flag on Contacts has no effect.~~',
+	'Class:ActionEmail/Attribute:ignore_notify/Value:no' => 'No~~',
+	'Class:ActionEmail/Attribute:ignore_notify/Value:yes' => 'Yes~~',
+	'ActionEmail:main' => 'Message~~',
+	'ActionEmail:trigger' => 'Triggers~~',
+	'ActionEmail:recipients' => 'Contacts~~',
+	'ActionEmail:preview_tab' => 'Preview~~',
+	'ActionEmail:preview_tab+' => 'Preview of the eMail template~~',
+	'ActionEmail:preview_warning' => 'The actual eMail may look different in the eMail client than this preview in your browser.~~',
+	'ActionEmail:preview_more_info' => 'For more information about the CSS features supported by the different eMail clients, refer to %1$s~~',
+	'ActionEmail:content_placeholder_missing' => 'The placeholder "%1$s" was not found in the HTML template. The content of the field "%2$s" will not be included in the generated emails.~~',
 ));
 
 //
@@ -561,6 +532,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:Trigger' => 'Trigger',
 	'Class:Trigger+' => 'Gestore di eventi personalizzati',
+	'Class:Trigger/ComplementaryName' => '%1$s, %2$s~~',
 	'Class:Trigger/Attribute:description' => 'Descrizione',
 	'Class:Trigger/Attribute:description+' => 'una linea di descrizione',
 	'Class:Trigger/Attribute:action_list' => 'Azioni triggerate',
@@ -569,6 +541,8 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:Trigger/Attribute:finalclass+' => '',
 	'Class:Trigger/Attribute:context' => 'Context~~',
 	'Class:Trigger/Attribute:context+' => 'Context to allow the trigger to start~~',
+	'Class:Trigger/Attribute:complement' => 'Additional information~~',
+	'Class:Trigger/Attribute:complement+' => 'Further information as provided in english, by this trigger~~',
 ));
 
 //
@@ -664,6 +638,17 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:TriggerOnObjectMention/Attribute:mentioned_filter+' => 'Limit the list of mentioned objects which will activate the trigger. If empty, any mentioned object (of any class) will activate it.~~',
 ));
 
+//
+// Class: TriggerOnAttributeBlobDownload
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:TriggerOnAttributeBlobDownload' => 'Trigger (on object\'s document download)~~',
+	'Class:TriggerOnAttributeBlobDownload+' => 'Trigger on object\'s document field download of [a child class of] the given class~~',
+	'Class:TriggerOnAttributeBlobDownload/Attribute:target_attcodes' => 'Target fields~~',
+	'Class:TriggerOnAttributeBlobDownload/Attribute:target_attcodes+' => '~~',
+));
+
 //
 // Class: TriggerOnThresholdReached
 //
@@ -700,11 +685,13 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 // Synchro Data Source
 //
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:SynchroDataSource' => 'Sorgente sincronizzazione dati',
 	'Class:SynchroDataSource/Attribute:name' => 'Nome',
 	'Class:SynchroDataSource/Attribute:name+' => '',
 	'Class:SynchroDataSource/Attribute:description' => 'Descrizione',
 	'Class:SynchroDataSource/Attribute:status' => 'Stato',
 	'Class:SynchroDataSource/Attribute:scope_class' => 'Classe bersaglio',
+	'Class:SynchroDataSource/Attribute:scope_class+' => 'A Synchro Data Source can only populate a single '.ITOP_APPLICATION_SHORT.' class~~',
 	'Class:SynchroDataSource/Attribute:user_id' => 'Utente',
 	'Class:SynchroDataSource/Attribute:notify_contact_id' => 'Contatto a cui notificare',
 	'Class:SynchroDataSource/Attribute:notify_contact_id+' => 'Contatto a cui notificare in caso di errore ',
@@ -713,6 +700,8 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:SynchroDataSource/Attribute:url_application' => 'Collegamento ipertestuale all\'applicazione',
 	'Class:SynchroDataSource/Attribute:url_application+' => 'Collegamento ipertestuale all\'oggetto ITOP nell\'applicazione esterna con la quale QiTop è sincronizzato (se applicabile). Possibili segnaposto: $this->attribute$ e $replica->primary_key$',
 	'Class:SynchroDataSource/Attribute:reconciliation_policy' => 'Policy di riconciliazione',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy+' => '"Use the attributes": '.ITOP_APPLICATION_SHORT.' object matches replica values for each Synchro attributes flagged for Reconciliation.
+"Use primary_key": the column primary_key of the replica is expected to contain the identifier of the '.ITOP_APPLICATION_SHORT.' object~~',
 	'Class:SynchroDataSource/Attribute:full_load_periodicity' => 'Intervallo di pieno carico',
 	'Class:SynchroDataSource/Attribute:full_load_periodicity+' => 'Una ricarica completa di tutti i dati deve verificarsi almeno come specificato qui',
 	'Class:SynchroDataSource/Attribute:action_on_zero' => 'Azione su zero',
@@ -732,6 +721,33 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:SynchroDataSource/Attribute:delete_policy_retention+' => 'Quanto tempo un oggetto obsoleto è tenuto prima di essere eliminato',
 	'Class:SynchroDataSource/Attribute:database_table_name' => 'Data table~~',
 	'Class:SynchroDataSource/Attribute:database_table_name+' => 'Name of the table to store the synchronization data. If left empty, a default name will be computed.~~',
+	'Class:SynchroDataSource/Attribute:status/Value:implementation' => 'Implementazione',
+	'Class:SynchroDataSource/Attribute:status/Value:obsolete' => 'Obsoleto',
+	'Class:SynchroDataSource/Attribute:status/Value:production' => 'Produzione',
+	'Class:SynchroDataSource/Attribute:scope_restriction' => 'Campo di restrizione',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_attributes' => 'Utilizzare gli attributi',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_primary_key' => 'Utilizzare il campo della chiave primaria',
+	'Class:SynchroDataSource/Attribute:action_on_zero/Value:create' => 'Crea',
+	'Class:SynchroDataSource/Attribute:action_on_zero/Value:error' => 'Errore',
+	'Class:SynchroDataSource/Attribute:action_on_one/Value:error' => 'Errore',
+	'Class:SynchroDataSource/Attribute:action_on_one/Value:update' => 'Aggiornamento',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:create' => 'Crea',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:error' => 'Errore',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:take_first' => 'Prendi il primo (casualmente?)',
+	'Class:SynchroDataSource/Attribute:delete_policy' => 'Policy di cancellazione',
+	'Class:SynchroDataSource/Attribute:delete_policy+' => 'What to do when a replica becomes obsolete:
+"Ignore": do nothing, the associated object remains as is in iTop.
+"Delete": Delete the associated object in iTop (and the replica in the data table).
+"Update": Update the associated object as specified by the Update rules (see below).
+"Update then Delete": apply the "Update rules". When Retention Duration expires, execute a "Delete" ~~',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:delete' => 'Cancella',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:ignore' => 'Ignora',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:update' => 'Aggiorna',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:update_then_delete' => 'Aggiorna e poi Cancella',
+	'Class:SynchroDataSource/Attribute:attribute_list' => 'Lista degli attributi',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:administrators' => 'Solo Amministratore',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:everybody' => 'Tutti sono autorizzati a cancellare gli oggetti',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:nobody' => 'Nessuno',
 	'SynchroDataSource:Description' => 'Descrizione',
 	'SynchroDataSource:Reconciliation' => 'Ricerca &amp; reconciliazione',
 	'SynchroDataSource:Deletion' => 'Regole di cancellazione',
@@ -756,8 +772,10 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Core:Synchro:NeverRun' => 'Questa sincronizzazione non è mai stata eseguita. Nessun Log ancora...',
 	'Core:Synchro:SynchroEndedOn_Date' => 'L\'ultima sincronizzazione si è conclusa il %1$s.~~',
 	'Core:Synchro:SynchroRunningStartedOn_Date' => 'La sincronizzazione è iniziata il %1$s è ancora in esecuzione...~~',
-	'Menu:DataSources' => 'Sorgente di sincronizzazione dei dati', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:DataSources+' => '', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataSources' => 'Sorgente di sincronizzazione dei dati',
+    // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataSources+' => '',
+    // Duplicated into itop-welcome-itil (will be removed from here...)
 	'Core:Synchro:label_repl_ignored' => 'Ignorato(%1$s)',
 	'Core:Synchro:label_repl_disappeared' => 'Scomparso (%1$s)',
 	'Core:Synchro:label_repl_existing' => 'Esistente (%1$s)',
@@ -821,29 +839,6 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:CMDBChangeOpSetAttributeEncrypted/Attribute:prevstring' => 'Valore Precedente',
 	'Class:CMDBChangeOpSetAttributeCaseLog' => 'Log della casistica',
 	'Class:CMDBChangeOpSetAttributeCaseLog/Attribute:lastentry' => 'Ultima voce',
-	'Class:SynchroDataSource' => 'Sorgente sincronizzazione dati',
-	'Class:SynchroDataSource/Attribute:status/Value:implementation' => 'Implementazione',
-	'Class:SynchroDataSource/Attribute:status/Value:obsolete' => 'Obsoleto',
-	'Class:SynchroDataSource/Attribute:status/Value:production' => 'Produzione',
-	'Class:SynchroDataSource/Attribute:scope_restriction' => 'Campo di restrizione',
-	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_attributes' => 'Utilizzare gli attributi',
-	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_primary_key' => 'Utilizzare il campo della chiave primaria',
-	'Class:SynchroDataSource/Attribute:action_on_zero/Value:create' => 'Crea',
-	'Class:SynchroDataSource/Attribute:action_on_zero/Value:error' => 'Errore',
-	'Class:SynchroDataSource/Attribute:action_on_one/Value:error' => 'Errore',
-	'Class:SynchroDataSource/Attribute:action_on_one/Value:update' => 'Aggiornamento',
-	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:create' => 'Crea',
-	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:error' => 'Errore',
-	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:take_first' => 'Prendi il primo (casualmente?)',
-	'Class:SynchroDataSource/Attribute:delete_policy' => 'Policy di cancellazione',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:delete' => 'Cancella',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:ignore' => 'Ignora',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:update' => 'Aggiorna',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:update_then_delete' => 'Aggiorna e poi Cancella',
-	'Class:SynchroDataSource/Attribute:attribute_list' => 'Lista degli attributi',
-	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:administrators' => 'Solo Amministratore',
-	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:everybody' => 'Tutti sono autorizzati a cancellare gli oggetti',
-	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:nobody' => 'Nessuno',
 	'Class:SynchroAttribute' => 'Attributo di sincronizzazione',
 	'Class:SynchroAttribute/Attribute:sync_source_id' => 'Sorgente dati per la sincronizzazione',
 	'Class:SynchroAttribute/Attribute:attcode' => 'Codice Attributo',
@@ -904,19 +899,16 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:appUserPreferences/Attribute:preferences' => 'Prefs',
 	'Core:ExecProcess:Code1' => 'Comando errato o comando finito con errori (es. errato nome dello script)',
 	'Core:ExecProcess:Code255' => 'PHP Error (parsing, or runtime)',
-
-	// Attribute Duration
+    // Attribute Duration
 	'Core:Duration_Seconds' => '%1$ds',
 	'Core:Duration_Minutes_Seconds' => '%1$dmin %2$ds',
 	'Core:Duration_Hours_Minutes_Seconds' => '%1$dh %2$dmin %3$sec',
 	'Core:Duration_Days_Hours_Minutes_Seconds' => '%1$sg %2$dh %3$dmin %4$ds',
-
-	// Explain working time computing
+    // Explain working time computing
 	'Core:ExplainWTC:ElapsedTime' => 'Time elapsed (stored as \\"%1$s\\")~~',
 	'Core:ExplainWTC:StopWatch-TimeSpent' => 'Time spent for \\"%1$s\\"~~',
 	'Core:ExplainWTC:StopWatch-Deadline' => 'Deadline for \\"%1$s\\" at %2$d%%~~',
-
-	// Bulk export
+    // Bulk export
 	'Core:BulkExport:MissingParameter_Param' => 'Missing parameter \\"%1$s\\"~~',
 	'Core:BulkExport:InvalidParameter_Query' => 'Invalid value for the parameter \\"query\\". There is no Query Phrasebook corresponding to the id: \\"%1$s\\".~~',
 	'Core:BulkExport:ExportFormatPrompt' => 'Export format:~~',
@@ -968,20 +960,34 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Core:BulkExport:DateTimeFormatDefault_Example' => 'Default format (%1$s), e.g. %2$s~~',
 	'Core:BulkExport:DateTimeFormatCustom_Format' => 'Custom format: %1$s~~',
 	'Core:BulkExport:PDF:PageNumber' => 'Page %1$s~~',
-	'Core:DateTime:Placeholder_d' => 'GG', // Day of the month: 2 digits (with leading zero)
-	'Core:DateTime:Placeholder_j' => 'G', // Day of the month: 1 or 2 digits (without leading zero)
-	'Core:DateTime:Placeholder_m' => 'MM', // Month on 2 digits i.e. 01-12
-	'Core:DateTime:Placeholder_n' => 'M', // Month on 1 or 2 digits 1-12
-	'Core:DateTime:Placeholder_Y' => 'AAAA', // Year on 4 digits
-	'Core:DateTime:Placeholder_y' => 'AA', // Year on 2 digits
-	'Core:DateTime:Placeholder_H' => 'hh', // Hour 00..23
-	'Core:DateTime:Placeholder_h' => 'h', // Hour 01..12
-	'Core:DateTime:Placeholder_G' => 'hh', // Hour 0..23
-	'Core:DateTime:Placeholder_g' => 'h', // Hour 1..12
-	'Core:DateTime:Placeholder_a' => 'am/pm', // am/pm (lowercase)
-	'Core:DateTime:Placeholder_A' => 'AM/PM', // AM/PM (uppercase)
-	'Core:DateTime:Placeholder_i' => 'mm', // minutes, 2 digits: 00..59
-	'Core:DateTime:Placeholder_s' => 'ss', // seconds, 2 digits 00..59
+	'Core:DateTime:Placeholder_d' => 'GG',
+    // Day of the month: 2 digits (with leading zero)
+	'Core:DateTime:Placeholder_j' => 'G',
+    // Day of the month: 1 or 2 digits (without leading zero)
+	'Core:DateTime:Placeholder_m' => 'MM',
+    // Month on 2 digits i.e. 01-12
+	'Core:DateTime:Placeholder_n' => 'M',
+    // Month on 1 or 2 digits 1-12
+	'Core:DateTime:Placeholder_Y' => 'AAAA',
+    // Year on 4 digits
+	'Core:DateTime:Placeholder_y' => 'AA',
+    // Year on 2 digits
+	'Core:DateTime:Placeholder_H' => 'hh',
+    // Hour 00..23
+	'Core:DateTime:Placeholder_h' => 'h',
+    // Hour 01..12
+	'Core:DateTime:Placeholder_G' => 'hh',
+    // Hour 0..23
+	'Core:DateTime:Placeholder_g' => 'h',
+    // Hour 1..12
+	'Core:DateTime:Placeholder_a' => 'am/pm',
+    // am/pm (lowercase)
+	'Core:DateTime:Placeholder_A' => 'AM/PM',
+    // AM/PM (uppercase)
+	'Core:DateTime:Placeholder_i' => 'mm',
+    // minutes, 2 digits: 00..59
+	'Core:DateTime:Placeholder_s' => 'ss',
+    // seconds, 2 digits 00..59
 	'Core:Validator:Default' => 'Wrong format~~',
 	'Core:Validator:Mandatory' => 'Please, fill this field~~',
 	'Core:Validator:MustBeInteger' => 'Must be an integer~~',
@@ -994,7 +1000,6 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:TagSetFieldData' => '%2$s for class %1$s~~',
 	'Class:TagSetFieldData+' => '',
-
 	'Class:TagSetFieldData/Attribute:code' => 'Code~~',
 	'Class:TagSetFieldData/Attribute:code+' => 'Internal code. Must contain at least 3 alphanumeric characters~~',
 	'Class:TagSetFieldData/Attribute:label' => 'Label~~',
@@ -1004,7 +1009,6 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:TagSetFieldData/Attribute:finalclass' => 'Tag class~~',
 	'Class:TagSetFieldData/Attribute:obj_class' => 'Object class~~',
 	'Class:TagSetFieldData/Attribute:obj_attcode' => 'Field code~~',
-
 	'Core:TagSetFieldData:ErrorDeleteUsedTag' => 'Used tags cannot be deleted~~',
 	'Core:TagSetFieldData:ErrorDuplicateTagCodeOrLabel' => 'Tags codes or labels must be unique~~',
 	'Core:TagSetFieldData:ErrorTagCodeSyntax' => 'Tags code must contain between 3 and %1$d alphanumeric characters~~',
@@ -1091,8 +1095,8 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:AsyncTask/Attribute:last_error+' => '',
 	'Class:AsyncTask/Attribute:last_attempt' => 'Last attempt~~',
 	'Class:AsyncTask/Attribute:last_attempt+' => '',
-    'Class:AsyncTask:InvalidConfig_Class_Keys' => 'Invalid format for the configuration of "async_task_retries[%1$s]". Expecting an array with the following keys: %2$s~~',
-    'Class:AsyncTask:InvalidConfig_Class_InvalidKey_Keys' => 'Invalid format for the configuration of "async_task_retries[%1$s]": unexpected key "%2$s". Expecting only the following keys: %3$s~~',
+	'Class:AsyncTask:InvalidConfig_Class_Keys' => 'Invalid format for the configuration of "async_task_retries[%1$s]". Expecting an array with the following keys: %2$s~~',
+	'Class:AsyncTask:InvalidConfig_Class_InvalidKey_Keys' => 'Invalid format for the configuration of "async_task_retries[%1$s]": unexpected key "%2$s". Expecting only the following keys: %3$s~~',
 ));
 
 //
diff --git a/dictionaries/it.dictionary.itop.ui.php b/dictionaries/it.dictionary.itop.ui.php
index c7f39b7f7a..109afa6690 100644
--- a/dictionaries/it.dictionary.itop.ui.php
+++ b/dictionaries/it.dictionary.itop.ui.php
@@ -25,6 +25,12 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:AuditCategory/Attribute:definition_set+' => 'Espressione OQLche definisce l\'insieme di oggetti da controllare',
 	'Class:AuditCategory/Attribute:rules_list' => 'Regole di Audit',
 	'Class:AuditCategory/Attribute:rules_list+' => 'Regolele di audit per queste categorie',
+	'Class:AuditCategory/Attribute:ok_error_tolerance' => 'Warning threshold~~',
+	'Class:AuditCategory/Attribute:ok_error_tolerance+' => 'Percentage of invalid objects below which the result is a warning (orange)~~',
+	'Class:AuditCategory/Attribute:warning_error_tolerance' => 'Error threshold~~',
+	'Class:AuditCategory/Attribute:warning_error_tolerance+' => 'Percentage of invalid objects below which the result is in error (red)~~',
+	'Class:AuditCategory/Attribute:domains_list' => 'Domains~~',
+	'Class:AuditCategory/Attribute:domains_list+' => 'Domains which includes this category~~',
 ));
 
 //
@@ -52,7 +58,42 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:AuditRule/Attribute:category_id' => 'Categoria',
 	'Class:AuditRule/Attribute:category_id+' => 'Categoria per questa regola',
 	'Class:AuditRule/Attribute:category_name' => 'Categoria',
-	'Class:AuditRule/Attribute:category_name+' => 'Nome della categoria per questa regola',
+	'Class:AuditRule/Attribute:category_name+' => 'Nome della categoria per questa regola'
+));
+
+//
+// Class: AuditDomain
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:AuditDomain' => 'Audit Domain~~',
+	'Class:AuditDomain+' => 'Audit domains allow to group the audit categories.
+Domain usually correspond to who is responsible for checking and fixing errors~~',
+	'Class:AuditDomain/Attribute:name' => 'Name~~',
+	'Class:AuditDomain/Attribute:name+' => 'Its a segmentation of the Audit by who is in charge of fixing it or just interested~~',
+	'Class:AuditDomain/Attribute:description' => 'Description~~',
+	'Class:AuditDomain/Attribute:description+' => '~~',
+	'Class:AuditDomain/Attribute:icon' => 'Icon~~',
+	'Class:AuditDomain/Attribute:icon+' => '~~',
+	'Class:AuditDomain/Attribute:categories_list' => 'Categories~~',
+	'Class:AuditDomain/Attribute:categories_list+' => 'Related audit categories. When running the audit on a domain, all related audit categories are checked and only those.~~',
+));
+
+//
+// Class: lnkAuditCategoryToAuditDomain
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:lnkAuditCategoryToAuditDomain' => 'Link AuditCategory / AuditDomain~~',
+	'Class:lnkAuditCategoryToAuditDomain+' => '~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:category_id' => 'Category~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:category_id+' => 'Audit Category~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:category_name' => 'Category name~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:category_name+' => 'Audit category name~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:domain_id' => 'Domain~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:domain_id+' => 'Audit domain~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:domain_name' => 'Domain name~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:domain_name+' => 'Audit domain name~~',
 ));
 
 //
@@ -70,6 +111,16 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:Query/Attribute:is_template+' => 'Usable as source for recipient OQL in Notifications~~',
 	'Class:Query/Attribute:is_template/Value:yes' => 'Yes~~',
 	'Class:Query/Attribute:is_template/Value:no' => 'No~~',
+	'Class:Query/Attribute:export_count' => 'Export counter~~',
+	'Class:Query/Attribute:export_count+' => 'Counter reflecting the number of time this query has been executed~~',
+	'Class:Query/Attribute:export_last_date' => 'Last export~~',
+	'Class:Query/Attribute:export_last_date+' => 'Date and time of the last export execution~~',
+	'Class:Query/Attribute:export_last_user_id' => 'User~~',
+	'Class:Query/Attribute:export_last_user_id+' => 'The user who executed the last export~~',
+	'Class:Query/Attribute:export_last_user_contact' => 'Contact~~',
+	'Class:Query/Attribute:export_last_user_contact+' => 'The contact who executed the last export~~',
+	'Query:baseinfo' => 'General information~~',
+	'Query:exportInfo' => 'Export information~~',
 	'Class:QueryOQL/Attribute:fields' => 'Campi',
 	'Class:QueryOQL/Attribute:fields+' => 'Lista di attributi separati da virgola (o alias.attributo) per l\'esportazione',
 	'Class:QueryOQL' => 'OQL Query',
@@ -118,7 +169,6 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:User/Attribute:status+' => 'Whether the user account is enabled or disabled.~~',
 	'Class:User/Attribute:status/Value:enabled' => 'Enabled~~',
 	'Class:User/Attribute:status/Value:disabled' => 'Disabled~~',
-
 	'Class:User/Error:LoginMustBeUnique' => 'Il Login deve essere unico - "%1s" già usato',
 	'Class:User/Error:AtLeastOneProfileIsNeeded' => 'Almeno un profilo deve essere assegnato all\'utente.',
 	'Class:User/Error:ProfileNotAllowed' => 'Profile "%1$s" cannot be added it will deny the access to backoffice~~',
@@ -327,6 +377,29 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Expression:Unit:Short:YEAR' => 'y~~',
 ));
 
+//
+// Duplicated into itop-welcome-itil ( will be removed from here...)
+//
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Menu:WelcomeMenu' => 'Benveuto',
+	'Menu:WelcomeMenu+' => '',
+	'Menu:WelcomeMenuPage' => 'Benvenuto',
+	'Menu:WelcomeMenuPage+' => '',
+	'Menu:AdminTools' => 'Strumenti di amministrazione',
+	'Menu:AdminTools+' => '',
+	'Menu:AdminTools?' => 'Strumenti accessibile solo agli utenti con il profilo di amministratore',
+	'Menu:CSVImportMenu' => 'Importazione CSV',
+	'Menu:CSVImportMenu+' => '',
+	'Menu:DataModelMenu' => 'Modello dati',
+	'Menu:DataModelMenu+' => '',
+	'Menu:ExportMenu' => 'Esporta',
+	'Menu:ExportMenu+' => '',
+	'Menu:NotificationsMenu' => 'Notifiche',
+	'Menu:NotificationsMenu+' => '',
+	'Menu:MyShortcuts' => 'Le mie scorciatoie',
+	'Menu:DataAdministration' => 'Dati di amministrazione',
+	'Menu:DataAdministration+' => '',
+));
 
 //
 // String from the User Interface: menu, messages, buttons, etc...
@@ -336,12 +409,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'BooleanLabel:yes' => 'si',
 	'BooleanLabel:no' => 'no',
 	'UI:Login:Title' => ITOP_APPLICATION_SHORT.' login~~',
-	'Menu:WelcomeMenu' => 'Benveuto',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:WelcomeMenu+' => '',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:WelcomeMenuPage' => 'Benvenuto',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:WelcomeMenuPage+' => '',// Duplicated into itop-welcome-itil (will be removed from here...)
 	'UI:WelcomeMenu:Title' => 'Benveuto su '.ITOP_APPLICATION_SHORT,
-
 	'UI:WelcomeMenu:LeftBlock' => '<p>'.ITOP_APPLICATION_SHORT.' è un completo Portale Funzionale IT, Open Source.</p>
 <ul>Esso include:
 <li>Un completo CMDB (Configuration management database) per documentare e gestire l\'IT di inventario.</li>
@@ -352,7 +420,6 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 <li>Un cruscotto per ottenere rapidamente una panoramica del sistema IT.</li>
 </ul>
 <p>Tutti i moduli possono essere installati, passo dopo passo, indipendentemente l\'uno dall\'altro.</p>',
-
 	'UI:WelcomeMenu:RightBlock' => '<p>'.ITOP_APPLICATION_SHORT.' è fornitore di servizi di orientamento, che consente ai progettisti di gestire più o organizzazioni o clienti con facilità.
 <ul>>'.ITOP_APPLICATION_SHORT.', offre un set ricco di funzionalità dei processi di business che:
 <li>Migliora l\'efficacia di gestione IT</li> 
@@ -368,7 +435,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 <li>Gestire la risorsa più importante della tua IT: Documentazione.</li>
 </ul>
 </p>',
-	'UI:WelcomeMenu:Text'=> '<div>Congratulations, you landed on '.ITOP_APPLICATION.' '.ITOP_VERSION_NAME.'!</div>
+	'UI:WelcomeMenu:Text' => '<div>Congratulations, you landed on '.ITOP_APPLICATION.' '.ITOP_VERSION_NAME.'!</div>
 
 <div>This version features a brand new modern and accessible backoffice design.</div>
 
@@ -389,6 +456,7 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:Button:GlobalSearch' => 'Cerca',
 	'UI:Button:Search' => ' Cerca',
 	'UI:Button:Clear' => ' Clear ~~',
+	'UI:Button:Confirm' => ' Confirm ~~',
 	'UI:Button:SearchInHierarchy' => 'Search in hierarchy~~',
 	'UI:Button:Query' => ' Domanda',
 	'UI:Button:Ok' => 'Ok',
@@ -429,7 +497,6 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:UserPref:DoNotShowAgain' => 'Do not show again~~',
 	'UI:InputFile:NoFileSelected' => 'No File Selected~~',
 	'UI:InputFile:SelectFile' => 'Select a file~~',
-
 	'UI:SearchToggle' => 'Cerca',
 	'UI:ClickToCreateNew' => 'Crea un nuovo %1$s~~',
 	'UI:SearchFor_Class' => 'Cerca l\'oggetto %1$s',
@@ -449,7 +516,6 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:Error:CannotWriteToTmp_Dir' => 'Impossibile scrivere il file temporaneo sul disco. upload_tmp_dir = "%1$s".',
 	'UI:Error:UploadStoppedByExtension_FileName' => 'Caricamento fermato per estensione. (Nome del file originale = "%1$s").',
 	'UI:Error:UploadFailedUnknownCause_Code' => 'Il caricamento del file non riuscito, causa sconosciuta. (Codice errore = "%1$s").',
-
 	'UI:Error:1ParametersMissing' => 'Errore: il seguente parametro deve essere specificato per questa operazione: %1$s.',
 	'UI:Error:2ParametersMissing' => 'Errore: i seguenti parametri devono essere specificati per questa operazione: %1$s e %2$s.',
 	'UI:Error:3ParametersMissing' => 'Errore: i seguenti parametri devono essere specificati per questa operazione: %1$s, %2$s e %3$s.',
@@ -471,9 +537,7 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:Error:MaintenanceMode' => 'L\'applicazione è attualmente in manutenzione',
 	'UI:Error:MaintenanceTitle' => 'Maintenance~~',
 	'UI:Error:InvalidToken' => 'Error: the requested operation has already been performed (CSRF token not found)~~',
-
 	'UI:Error:SMTP:UnknownVendor' => 'OAuth SMTP provider %1$s does not exist  (email_transport_smtp.oauth.provider)~~',
-
 	'UI:GroupBy:Count' => 'Conteggio',
 	'UI:GroupBy:Count+' => '',
 	'UI:CountOfObjects' => '%1$d oggetti corrispondenti ai criteri.',
@@ -502,6 +566,7 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:Menu:OtherActions' => 'Altre Azioni',
 	'UI:Menu:Transitions' => 'Transitions~~',
 	'UI:Menu:OtherTransitions' => 'Other Transitions~~',
+	'UI:Menu:View' => 'View this object~~',
 	'UI:Menu:New' => 'Nuovo...',
 	'UI:Menu:Add' => 'Aggiungi...',
 	'UI:Menu:Manage' => 'Gestisci...',
@@ -510,6 +575,9 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:Menu:Modify' => 'Modifica...',
 	'UI:Menu:Delete' => 'Cancella...',
 	'UI:Menu:BulkDelete' => 'Cancella...',
+	'UI:Menu:BulkDelete_Class' => 'Delete %1$s objects...~~',
+	'UI:Menu:BulkDelete_Link' => 'Delete %1$s...~~',
+	'UI:Menu:BulkDelete_Remote' => 'Delete %1$s...~~',
 	'UI:UndefinedObject' => 'non definito',
 	'UI:Document:OpenInNewWindow:Download' => 'Apri in una nuova finestra: %1$s, Scarica: %2$s',
 	'UI:SplitDateTime-Date' => 'date~~',
@@ -542,7 +610,6 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:Login:ResetPassword' => 'Send now!~~',
 	'UI:Login:ResetPwdFailed' => 'Failed to send an email: %1$s~~',
 	'UI:Login:SeparatorOr' => 'O',
-
 	'UI:ResetPwd-Error-WrongLogin' => '\'%1$s\' is not a valid login~~',
 	'UI:ResetPwd-Error-NotPossible' => 'external accounts do not allow password reset.~~',
 	'UI:ResetPwd-Error-FixedPwd' => 'the account does not allow password reset.~~',
@@ -553,50 +620,49 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:ResetPwd-EmailSent' => 'Please check your email box and follow the instructions. If you receive no email, please check the login you typed.~~',
 	'UI:ResetPwd-EmailSubject' => 'Reset your '.ITOP_APPLICATION_SHORT.' password~~',
 	'UI:ResetPwd-EmailBody' => '<body><p>You have requested to reset your '.ITOP_APPLICATION_SHORT.' password.</p><p>Please follow this link (single usage) to <a href="%1$s">enter a new password</a></p>.~~',
-
 	'UI:ResetPwd-Title' => 'Reset password~~',
 	'UI:ResetPwd-Error-InvalidToken' => 'Sorry, either the password has already been reset, or you have received several emails. Please make sure that you use the link provided in the very last email received.~~',
 	'UI:ResetPwd-Error-EnterPassword' => 'Enter a new password for the account \'%1$s\'.~~',
 	'UI:ResetPwd-Ready' => 'The password has been changed.~~',
 	'UI:ResetPwd-Login' => 'Click here to login...~~',
-
-	'UI:Login:About'                               => '~~',
-	'UI:Login:ChangeYourPassword'                  => 'Cambia la tua password',
-	'UI:Login:OldPasswordPrompt'                   => 'Vecchia password',
-	'UI:Login:NewPasswordPrompt'                   => 'Nuova password',
-	'UI:Login:RetypeNewPasswordPrompt'             => 'Riscrivi la nuova password',
-	'UI:Login:IncorrectOldPassword'                => 'Errore: la vecchia password non è corretta',
-	'UI:LogOffMenu'                                => 'Log off',
+	'UI:Login:About' => '~~',
+	'UI:Login:ChangeYourPassword' => 'Cambia la tua password',
+	'UI:Login:OldPasswordPrompt' => 'Vecchia password',
+	'UI:Login:NewPasswordPrompt' => 'Nuova password',
+	'UI:Login:RetypeNewPasswordPrompt' => 'Riscrivi la nuova password',
+	'UI:Login:IncorrectOldPassword' => 'Errore: la vecchia password non è corretta',
+	'UI:LogOffMenu' => 'Log off',
 	'UI:LogOff:ThankYou' => 'Grazie per aver scelto '.ITOP_APPLICATION_SHORT,
-	'UI:LogOff:ClickHereToLoginAgain'              => 'Clicca qui per effettuare il login di nuovo...',
-	'UI:ChangePwdMenu'                             => 'Cambia Password...',
-	'UI:Login:PasswordChanged'                     => 'Password successfully set!~~',
+	'UI:LogOff:ClickHereToLoginAgain' => 'Clicca qui per effettuare il login di nuovo...',
+	'UI:ChangePwdMenu' => 'Cambia Password...',
+	'UI:Login:PasswordChanged' => 'Password successfully set!~~',
+	'UI:Login:PasswordNotChanged' => 'Error: Password is the same!~~',
 	'UI:AccessRO-All' => ITOP_APPLICATION_SHORT.' è di sola lettura',
 	'UI:AccessRO-Users' => ITOP_APPLICATION_SHORT.' è di sola lettura per gli utenti finali',
-	'UI:ApplicationEnvironment'                    => 'Application environment: %1$s~~',
-	'UI:Login:RetypePwdDoesNotMatch'               => 'Nuova password e la nuova password digitata nuovamente non corrispondono !',
+	'UI:ApplicationEnvironment' => 'Application environment: %1$s~~',
+	'UI:Login:RetypePwdDoesNotMatch' => 'Nuova password e la nuova password digitata nuovamente non corrispondono !',
 	'UI:Button:Login' => 'Entra in '.ITOP_APPLICATION_SHORT,
 	'UI:Login:Error:AccessRestricted' => 'L\'accesso a '.ITOP_APPLICATION_SHORT.' è limitato. Si prega di contattare un amministratore '.ITOP_APPLICATION_SHORT.'.',
 	'UI:Login:Error:AccessAdmin' => 'Accesso limitato alle persone che hanno privilegi di amministratore. Si prega di contattare un amministratore '.ITOP_APPLICATION_SHORT.'.',
-	'UI:Login:Error:WrongOrganizationName'         => 'Organizzazione sconosciuta',
+	'UI:Login:Error:WrongOrganizationName' => 'Organizzazione sconosciuta',
 	'UI:Login:Error:MultipleContactsHaveSameEmail' => 'Più contatti hanno la stessa e-mail',
-	'UI:Login:Error:NoValidProfiles'               => 'Nessun profilo valido fornito',
-	'UI:CSVImport:MappingSelectOne'                => '-- seleziona uno --',
-	'UI:CSVImport:MappingNotApplicable'            => '-- ignora questo campo --',
-	'UI:CSVImport:NoData'                          => 'Insieme di dati vuoto ..., si prega di fornire alcuni dati!',
-	'UI:Title:DataPreview'                         => 'Anteprima dati',
-	'UI:CSVImport:ErrorOnlyOneColumn'              => 'Errore: I dati contengono solo una colonna. Avete selezionato il carattere separatore appropriato?',
-	'UI:CSVImport:FieldName'                       => 'Campo %1$d',
-	'UI:CSVImport:DataLine1'                       => 'Dati Linea 1',
-	'UI:CSVImport:DataLine2'                       => 'Dati Linea 2',
-	'UI:CSVImport:idField'                         => 'id (Chiave Primaria)',
+	'UI:Login:Error:NoValidProfiles' => 'Nessun profilo valido fornito',
+	'UI:CSVImport:MappingSelectOne' => '-- seleziona uno --',
+	'UI:CSVImport:MappingNotApplicable' => '-- ignora questo campo --',
+	'UI:CSVImport:NoData' => 'Insieme di dati vuoto ..., si prega di fornire alcuni dati!',
+	'UI:Title:DataPreview' => 'Anteprima dati',
+	'UI:CSVImport:ErrorOnlyOneColumn' => 'Errore: I dati contengono solo una colonna. Avete selezionato il carattere separatore appropriato?',
+	'UI:CSVImport:FieldName' => 'Campo %1$d',
+	'UI:CSVImport:DataLine1' => 'Dati Linea 1',
+	'UI:CSVImport:DataLine2' => 'Dati Linea 2',
+	'UI:CSVImport:idField' => 'id (Chiave Primaria)',
 	'UI:Title:BulkImport' => ITOP_APPLICATION_SHORT.' - importazione collettiva',
-	'UI:Title:BulkImport+'                         => '',
-	'UI:Title:BulkSynchro_nbItem_ofClass_class'    => 'Sincronizzazione di %1$d oggetti della classe %2$s',
-	'UI:CSVImport:ClassesSelectOne'                => '-- seleziona uno --',
-	'UI:CSVImport:ErrorExtendedAttCode'            => 'Errore interno: "%1$s" è un codice errato, perché "%2$s" NON è una chiave esterna della classe "%3$s"',
-	'UI:CSVImport:ObjectsWillStayUnchanged'        => '%1$d oggetto(i) rimarrà invariato.',
-	'UI:CSVImport:ObjectsWillBeModified'           => '%1$d oggetto(i) sarà modificato.',
+	'UI:Title:BulkImport+' => '',
+	'UI:Title:BulkSynchro_nbItem_ofClass_class' => 'Sincronizzazione di %1$d oggetti della classe %2$s',
+	'UI:CSVImport:ClassesSelectOne' => '-- seleziona uno --',
+	'UI:CSVImport:ErrorExtendedAttCode' => 'Errore interno: "%1$s" è un codice errato, perché "%2$s" NON è una chiave esterna della classe "%3$s"',
+	'UI:CSVImport:ObjectsWillStayUnchanged' => '%1$d oggetto(i) rimarrà invariato.',
+	'UI:CSVImport:ObjectsWillBeModified' => '%1$d oggetto(i) sarà modificato.',
 	'UI:CSVImport:ObjectsWillBeAdded' => '%1$d oggetto(i) sarà aggiunto.',
 	'UI:CSVImport:ObjectsWillHaveErrors' => '%1$d oggetto(i) avranno i errori.',
 	'UI:CSVImport:ObjectsRemainedUnchanged' => '%1$d oggetto(i) è rimasto invariato.',
@@ -642,11 +708,14 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:UniversalSearchTitle' => ITOP_APPLICATION_SHORT.' - Ricerca Universale',
 	'UI:UniversalSearch:Error' => 'Errore: %1$s~~',
 	'UI:UniversalSearch:LabelSelectTheClass' => 'Seleziona la classe per la ricerca: ',
-
 	'UI:CSVReport-Value-Modified' => 'Modified~~',
 	'UI:CSVReport-Value-SetIssue' => 'invalid value for attribute~~',
 	'UI:CSVReport-Value-ChangeIssue' => '\'%1$s\' is an invalid value~~',
 	'UI:CSVReport-Value-NoMatch' => 'No match for value \'%1$s\'~~',
+	'UI:CSVReport-Value-NoMatch-PossibleValues' => 'Some possible \'%1$s\' value(s): %2$s~~',
+	'UI:CSVReport-Value-NoMatch-NoObject' => 'There are no \'%1$s\' objects~~',
+	'UI:CSVReport-Value-NoMatch-NoObject-ForCurrentUser' => 'There are no \'%1$s\' objects found with your current profile~~',
+	'UI:CSVReport-Value-NoMatch-SomeObjectNotVisibleForCurrentUser' => 'There are some \'%1$s\' objects not visible with your current profile~~',
 	'UI:CSVReport-Value-Missing' => 'Missing mandatory value~~',
 	'UI:CSVReport-Value-Ambiguous' => 'Ambiguous: found %1$s objects~~',
 	'UI:CSVReport-Row-Unchanged' => 'unchanged~~',
@@ -660,15 +729,16 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:CSVReport-Value-Issue-Readonly' => 'The attribute \'%1$s\' is read-only and cannot be modified (current value: %2$s, proposed value: %3$s)~~',
 	'UI:CSVReport-Value-Issue-Format' => 'Failed to process input: %1$s~~',
 	'UI:CSVReport-Value-Issue-NoMatch' => 'Unexpected value for attribute \'%1$s\': no match found, check spelling~~',
+	'UI:CSVReport-Value-Issue-AllowedValues' => 'Allowed \'%1$s\' value(s): %2$s~~',
 	'UI:CSVReport-Value-Issue-Unknown' => 'Unexpected value for attribute \'%1$s\': %2$s~~',
 	'UI:CSVReport-Row-Issue-Inconsistent' => 'Attributes not consistent with each others: %1$s~~',
 	'UI:CSVReport-Row-Issue-Attribute' => 'Unexpected attribute value(s)~~',
 	'UI:CSVReport-Row-Issue-MissingExtKey' => 'Could not be created, due to missing external key(s): %1$s~~',
 	'UI:CSVReport-Row-Issue-DateFormat' => 'wrong date format~~',
+	'UI:CSVReport-Row-Issue-ExpectedDateFormat' => 'Expected format: %1$s~~',
 	'UI:CSVReport-Row-Issue-Reconciliation' => 'failed to reconcile~~',
 	'UI:CSVReport-Row-Issue-Ambiguous' => 'ambiguous reconciliation~~',
 	'UI:CSVReport-Row-Issue-Internal' => 'Internal error: %1$s, %2$s~~',
-
 	'UI:CSVReport-Icon-Unchanged' => 'Unchanged~~',
 	'UI:CSVReport-Icon-Modified' => 'Modified~~',
 	'UI:CSVReport-Icon-Missing' => 'Missing~~',
@@ -683,14 +753,32 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:CSVReport-Stats-Errors' => '%1$.0f %% of the loaded objects have errors and will be ignored.~~',
 	'UI:CSVReport-Stats-Created' => '%1$.0f %% of the loaded objects will be created.~~',
 	'UI:CSVReport-Stats-Modified' => '%1$.0f %% of the loaded objects will be modified.~~',
-
 	'UI:CSVExport:AdvancedMode' => 'Advanced mode~~',
 	'UI:CSVExport:AdvancedMode+' => 'In advanced mode, several columns are added to the export: the id of the object, the id of external keys and their reconciliation attributes.~~',
 	'UI:CSVExport:LostChars' => 'Encoding issue~~',
 	'UI:CSVExport:LostChars+' => 'The downloaded file will be encoded into %1$s. '.ITOP_APPLICATION_SHORT.' has detected some characters that are not compatible with this format. Those characters will either be replaced by a substitute (e.g. accentuated chars losing the accent), or they will be discarded. You can copy/paste the data from your web browser. Alternatively, you can contact your administrator to change the encoding (See parameter \'csv_file_default_charset\').~~',
-
 	'UI:Audit:Title' => ITOP_APPLICATION_SHORT.' - CMDB Audit~~',
 	'UI:Audit:InteractiveAudit' => 'Audit Interattivo',
+	'UI:Audit:Interactive:All:Title' => 'Audit results~~',
+	'UI:Audit:Interactive:All:SubTitle' => 'Full audit: includes all rules, all categories, all domains~~',
+	'UI:Audit:Interactive:All:BreadCrumb' => 'Full audit~~',
+	'UI:Audit:Interactive:All:BreadCrumb+' => 'Audit results for all rules~~',
+	'UI:Audit:Interactive:Categories:Title' => 'Audit results for categories: %1$s~~',
+	'UI:Audit:Interactive:Categories:SubTitle' => 'Audit results for all the rules belonging to one of those %1$s categories~~',
+	'UI:Audit:Interactive:Categories:BreadCrumb' => 'Categories~~',
+	'UI:Audit:Interactive:Categories:BreadCrumb+' => 'Audit categories: %1$s~~',
+	'UI:Audit:Interactive:Domain:Title' => 'Audit results for Domain: %1$s~~',
+	'UI:Audit:Interactive:Domain:SubTitle' => 'Audit results for all the rules belonging to a category related to the domain: %1$s~~',
+	'UI:Audit:Interactive:Domain:BreadCrumb' => '%1$s~~',
+	'UI:Audit:Interactive:Domain:BreadCrumb+' => 'Audit for Domain: %1$s~~',
+	'UI:Audit:Interactive:Selection:Title' => 'Selection of an audit~~',
+	'UI:Audit:Interactive:Selection:SubTitle' => 'Select a domain to get the results limited to this domain or select "All categories" to get a full audit (can take time or even fail if too much data to audit)~~',
+	'UI:Audit:Interactive:Selection:BreadCrumb' => 'Selection~~',
+	'UI:Audit:Interactive:Selection:BreadCrumb+' => 'Selection of an Audit to run~~',
+	'UI:Audit:Interactive:Selection:BadgeAll' => 'All categories~~',
+	'UI:Audit:Interactive:Button:Back' => 'Back to the audit~~',
+	'UI:Audit:Interactive:Button:Configuration' => 'Audit configuration~~',
+	'UI:Audit:ViewRules' => 'Check the rules~~',
 	'UI:Audit:HeaderAuditRule' => 'Regole di Audit',
 	'UI:Audit:HeaderNbObjects' => '# Oggetti',
 	'UI:Audit:HeaderNbErrors' => '# Errori',
@@ -706,8 +794,6 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:Audit:Dashboard:ObjectsInError' => 'Objects in errors~~',
 	'UI:Audit:Dashboard:ObjectsValidated' => 'Objects validated~~',
 	'UI:Audit:AuditCategory:Subtitle' => '%1$s errors ouf of %2$s - %3$s%%~~',
-
-
 	'UI:RunQuery:Title' => ITOP_APPLICATION_SHORT.' - Valutazione Query OQL',
 	'UI:RunQuery:QueryExamples' => 'Esempi di Query',
 	'UI:RunQuery:QueryResults' => 'Query Results~~',
@@ -726,7 +812,7 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:RunQuery:ResultSQL' => 'Resulting SQL~~',
 	'UI:RunQuery:Error' => 'Si è verificato un errore durante l\'esecuzione della query',
 	'UI:Query:UrlForExcel' => 'URL to use for MS-Excel web queries~~',
-	'UI:Query:UrlV1' => 'The list of fields has been left unspecified. The page <em>export-V2.php</em> cannot be invoked without this information. Therefore, the URL suggested herebelow points to the legacy page: <em>export.php</em>. This legacy version of the export has the following limitation: the list of exported fields may vary depending on the output format and the data model of '.ITOP_APPLICATION_SHORT.'. Should you want to garantee that the list of exported columns will remain stable on the long run, then you must specify a value for the attribute "Fields" and use the page <em>export-V2.php</em>.~~',
+	'UI:Query:UrlV1' => 'The list of fields has been left unspecified. The page <em>export-V2.php</em> cannot be invoked without this information. Therefore, the URL suggested herebelow points to the legacy page: <em>export.php</em>. This legacy version of the export has the following limitation: the list of exported fields may vary depending on the output format and the data model of '.ITOP_APPLICATION_SHORT.'.Should you want to garantee that the list of exported columns will remain stable on the long run, then you must specify a value for the attribute "Fields" and use the page <em>export-V2.php</em>.~~',
 	'UI:Schema:Title' => ITOP_APPLICATION_SHORT.' schema degli oggetti',
 	'UI:Schema:TitleForClass' => '%1$s schema~~',
 	'UI:Schema:CategoryMenuItem' => 'Categoria <b>%1$s</b>',
@@ -746,7 +832,6 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:Schema:Label' => 'Etichetta',
 	'UI:Schema:Label+' => '',
 	'UI:Schema:Type' => 'Tipo',
-
 	'UI:Schema:Type+' => '',
 	'UI:Schema:Origin' => 'Origine',
 	'UI:Schema:Origin+' => '',
@@ -794,6 +879,16 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:Schema:DisplaySelector/Code' => 'Code~~',
 	'UI:Schema:Attribute/Filter' => 'Filter~~',
 	'UI:Schema:DefaultNullValue' => 'Default null : "%1$s"~~',
+	'UI:Schema:Events' => 'Events~~',
+	'UI:Schema:Events:Defined' => 'Defined events~~',
+	'UI:Schema:Events:NoEvent' => 'No event defined~~',
+	'UI:Schema:Events:Listeners' => 'Event listeners~~',
+	'UI:Schema:Events:NoListener' => 'No event listener~~',
+	'UI:Schema:Events:Event' => 'Event~~',
+	'UI:Schema:Events:Description' => 'Description~~',
+	'UI:Schema:Events:Listener' => 'Listener~~',
+	'UI:Schema:Events:Rank' => 'Rank~~',
+	'UI:Schema:Events:Module' => 'Module~~',
 	'UI:LinksWidget:Autocomplete+' => '',
 	'UI:Edit:SearchQuery' => 'Select a predefined query~~',
 	'UI:Edit:TestQuery' => 'Test query~~',
@@ -885,7 +980,6 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:SystemIntrusion' => 'Accesso negato. Hai cercato di eseguire un\'operazione che non ti è consentita.',
 	'UI:FatalErrorMessage' => 'Fatal error, '.ITOP_APPLICATION_SHORT.' non può continuare.',
 	'UI:Error_Details' => 'Errore: %1$s.',
-
 	'UI:PageTitle:ProfileProjections' => ITOP_APPLICATION_SHORT.' gestione degli utenti - proiezioni profilo',
 	'UI:UserManagement:Class' => 'Classe',
 	'UI:UserManagement:Class+' => '',
@@ -920,66 +1014,42 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:UserManagement:NoLifeCycleApplicable' => 'N/A',
 	'UI:UserManagement:NoLifeCycleApplicable+' => '',
 	'UI:UserManagement:GrantMatrix' => 'Grant Matrix',
-
-	'Menu:AdminTools' => 'Strumenti di amministrazione',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:AdminTools+' => '',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:AdminTools?' => 'Strumenti accessibile solo agli utenti con il profilo di amministratore',// Duplicated into itop-welcome-itil (will be removed from here...)
 	'Menu:SystemTools' => 'Sistema',
-
 	'UI:ChangeManagementMenu' => 'Gestione Cambi',
 	'UI:ChangeManagementMenu+' => '',
 	'UI:ChangeManagementMenu:Title' => 'Panoramica dei cambi',
 	'UI-ChangeManagementMenu-ChangesByType' => 'Cambi per tipo',
 	'UI-ChangeManagementMenu-ChangesByStatus' => 'Cambi per stato',
 	'UI-ChangeManagementMenu-ChangesNotYetAssigned' => 'Cambi non ancora assegnati',
-
 	'UI:ConfigurationManagementMenu' => 'Gestione Configurazione',
 	'UI:ConfigurationManagementMenu+' => '',
 	'UI:ConfigurationManagementMenu:Title' => 'Panoramica delle infrastrutture',
 	'UI-ConfigurationManagementMenu-InfraByType' => 'Oggetti infrastruttutura per tipo',
 	'UI-ConfigurationManagementMenu-InfraByStatus' => 'Oggetti infrastruttutura per stato',
-
 	'UI:ConfigMgmtMenuOverview:Title' => 'Cruscotto per Gestione configurazione',
 	'UI-ConfigMgmtMenuOverview-FunctionalCIbyStatus' => 'Configuration Items per stato',
 	'UI-ConfigMgmtMenuOverview-FunctionalCIByType' => 'Configuration Items per tipo',
-
 	'UI:RequestMgmtMenuOverview:Title' => 'Cruscotto per Gestione Richieste',
 	'UI-RequestManagementOverview-RequestByService' => 'Richieste degli utenti per servizio',
 	'UI-RequestManagementOverview-RequestByPriority' => 'Richieste degli utenti per priorità',
 	'UI-RequestManagementOverview-RequestUnassigned' => 'Richieste degli utenti non ancora assegnate ad un agente',
-
 	'UI:IncidentMgmtMenuOverview:Title' => 'Cruscotto Gestione degli Incidenti',
 	'UI-IncidentManagementOverview-IncidentByService' => 'Incidenti per servizio',
 	'UI-IncidentManagementOverview-IncidentByPriority' => 'Incidenti per  priorità',
 	'UI-IncidentManagementOverview-IncidentUnassigned' => 'Incidenti non ancora assegnati ad un agente',
-
 	'UI:ChangeMgmtMenuOverview:Title' => 'Cruscotto per Gestione dei Cambi',
 	'UI-ChangeManagementOverview-ChangeByType' => 'Cambi per tipo',
 	'UI-ChangeManagementOverview-ChangeUnassigned' => 'Cambi non ancora assegnati ad un agente',
 	'UI-ChangeManagementOverview-ChangeWithOutage' => 'Interruzioni dovute ai cambi',
-
 	'UI:ServiceMgmtMenuOverview:Title' => 'Cruscotto per Gestione dei Cambi',
 	'UI-ServiceManagementOverview-CustomerContractToRenew' => 'Contratti con i clienti da rinnovarsi in 30 giorni',
 	'UI-ServiceManagementOverview-ProviderContractToRenew' => 'Contratti con i fornitori da rinnovarsi in 30 giorni',
-
 	'UI:ContactsMenu' => 'Contatti',
 	'UI:ContactsMenu+' => '',
 	'UI:ContactsMenu:Title' => 'Contatti Panoramica',
 	'UI-ContactsMenu-ContactsByLocation' => 'Contatti per localizzazione',
 	'UI-ContactsMenu-ContactsByType' => 'Contatti per tipo',
 	'UI-ContactsMenu-ContactsByStatus' => 'Contatti per stato',
-
-	'Menu:CSVImportMenu' => 'Importazione CSV',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:CSVImportMenu+' => '',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:DataModelMenu' => 'Modello dati',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:DataModelMenu+' => '',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:ExportMenu' => 'Esporta',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:ExportMenu+' => '',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:NotificationsMenu' => 'Notifiche',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:NotificationsMenu+' => '',// Duplicated into itop-welcome-itil (will be removed from here...)
 	'UI:NotificationsMenu:Title' => 'Configurazione delle Notifiche',
 	'UI:NotificationsMenu:Help' => 'Aiuto',
 	'UI:NotificationsMenu:HelpContent' => '<p>In '.ITOP_APPLICATION_SHORT.' le notifiche sono completamente personalizzabili. Essi si basano su due serie di oggetti: <i>trigger e azioni</i>.</p>
@@ -1010,53 +1080,18 @@ Quando è associata a un trigger, ad ogni azione è assegnato un numero "ordine"
 	'UI:NotificationsMenu:Actions:ActionWebhook' => 'Webhook actions (outgoing integrations)~~',
 	'UI:NotificationsMenu:Actions:Action' => 'Other actions~~',
 	'UI:NotificationsMenu:AvailableActions' => 'Azioni disponibili',
-
 	'Menu:TagAdminMenu' => 'Tags configuration~~',
 	'Menu:TagAdminMenu+' => 'Tags values management~~',
 	'UI:TagAdminMenu:Title' => 'Tags configuration~~',
 	'UI:TagAdminMenu:NoTags' => 'No Tag field configured~~',
 	'UI:TagSetFieldData:Error' => 'Error: %1$s~~',
-
-	'Menu:AuditCategories' => 'Categorie di Audit',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:AuditCategories+' => '',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:Notifications:Title' => 'Categorie di Audit',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:RunQueriesMenu' => 'Esegui query',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:RunQueriesMenu+' => '',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:QueryMenu' => 'Rubbrica delle Query',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:QueryMenu+' => 'Rubbrica delle Query',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:DataAdministration' => 'Dati di amministrazione',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:DataAdministration+' => '',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:UniversalSearchMenu' => 'Ricerca universale',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UniversalSearchMenu+' => '',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:UserManagementMenu' => 'Gestione degli utenti',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UserManagementMenu+' => '',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:ProfilesMenu' => 'Profili',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:ProfilesMenu+' => '',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:ProfilesMenu:Title' => 'Profili',
-	// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:UserAccountsMenu' => 'Account utente',
-	// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UserAccountsMenu+' => '',
-	// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UserAccountsMenu:Title' => 'Account utente',
-	// Duplicated into itop-welcome-itil (will be removed from here...)
-
 	'UI:iTopVersion:Short' => 'Versione %1$s %2$s',
 	'UI:iTopVersion:Long' => 'Versione %1$s %2$s-%3$s costruita il %4$s',
 	'UI:PropertiesTab' => 'Proprietà',
-
 	'UI:OpenDocumentInNewWindow_' => 'Aprire~~',
 	'UI:DownloadDocument_' => 'Scaricare~~',
 	'UI:Document:NoPreview' => 'Non è disponibile un\'anteprima per questo tipo di documento',
 	'UI:Download-CSV' => 'Download %1$s~~',
-
 	'UI:DeadlineMissedBy_duration' => 'Mancati %1$s',
 	'UI:Deadline_LessThan1Min' => '< 1 min',
 	'UI:Deadline_Minutes' => '%1$d min',
@@ -1099,7 +1134,7 @@ Quando è associata a un trigger, ad ogni azione è assegnato un numero "ordine"
 	'UI:RelationTooltip:ImpactedItems_N_of_M' => '# of impacted items: %1$d / %2$d~~',
 	'UI:RelationTooltip:CriticalThreshold_N_of_M' => 'Critical threshold: %1$d / %2$d~~',
 	'Portal:Title' => 'Portale Utente '.ITOP_APPLICATION_SHORT,
-	'Portal:NoRequestMgmt' => 'Dear %1$s, you have been redirected to this page because your account is configured with the profile \'Portal user\'. Unfortunately, '.ITOP_APPLICATION_SHORT.' has not been installed with the feature \'Request Management\'. Please contact your administrator.~~',
+	'Portal:NoRequestMgmt' => 'Dear %1$s, you have been redirected to this page because your account is configured with the profile \'Portal user\'.Unfortunately, '.ITOP_APPLICATION_SHORT.' has not been installed with the feature \'Request Management\'.Please contact your administrator.~~',
 	'Portal:Refresh' => 'Ricarica',
 	'Portal:Back' => 'Indietro',
 	'Portal:WelcomeUserOrg' => 'Welcome %1$s, from %2$s',
@@ -1135,9 +1170,13 @@ Quando è associata a un trigger, ad ogni azione è assegnato un numero "ordine"
 	'Enum:Undefined' => 'Non definito',
 	'UI:DurationForm_Days_Hours_Minutes_Seconds' => '%1$s Giorni %2$s Ore %3$s Minuti %4$s Secondi',
 	'UI:ModifyAllPageTitle' => 'Modifica Tutto',
+	'UI:Modify_ObjectsOf_Class' => 'Modifying objects of class %1$s~~',
 	'UI:Modify_N_ObjectsOf_Class' => 'Modifica %1$d oggetto della classe %2$s',
 	'UI:Modify_M_ObjectsOf_Class_OutOf_N' => 'Modifica %1$d oggetto della classe %2$s fuori da %3$d~~',
 	'UI:Menu:ModifyAll' => 'Modifica...',
+	'UI:Menu:ModifyAll_Class' => 'Modify %1$s objects...~~',
+	'UI:Menu:ModifyAll_Link' => 'Modify %1$s...~~',
+	'UI:Menu:ModifyAll_Remote' => 'Modify %1$s...~~',
 	'UI:Button:ModifyAll' => 'Modifica tutto',
 	'UI:Button:PreviewModifications' => 'Anteprima Modifiche >>~~',
 	'UI:ModifiedObject' => 'Oggetto Modificato',
@@ -1197,7 +1236,6 @@ Quando è associata a un trigger, ad ogni azione è assegnato un numero "ordine"
 	'UI:PrintResolution:LetterLandscape' => 'Letter Landscape~~',
 	'UI:Toggle:SwitchToStandardDashboard' => 'Switch to standard dashboard~~',
 	'UI:Toggle:SwitchToCustomDashboard' => 'Switch to custom dashboard~~',
-
 	'UI:ConfigureThisList' => 'Configure This List...~~',
 	'UI:ListConfigurationTitle' => 'List Configuration~~',
 	'UI:ColumnsAndSortOrder' => 'Columns and sort order:~~',
@@ -1213,10 +1251,8 @@ Quando è associata a un trigger, ad ogni azione è assegnato un numero "ordine"
 	'UI:ExtField_AsRemoteField' => '%1$s (%2$s)~~',
 	'UI:Button:MoveUp' => 'Move Up~~',
 	'UI:Button:MoveDown' => 'Move Down~~',
-
 	'UI:OQL:UnknownClassAndFix' => 'Unknown class \\"%1$s\\". You may try \\"%2$s\\" instead.~~',
 	'UI:OQL:UnknownClassNoFix' => 'Unknown class \\"%1$s\\"~~',
-
 	'UI:Dashboard:EditCustom' => 'Edit custom version...~~',
 	'UI:Dashboard:CreateCustom' => 'Create a custom version...~~',
 	'UI:Dashboard:DeleteCustom' => 'Delete custom version...~~',
@@ -1227,13 +1263,10 @@ Quando è associata a un trigger, ad ogni azione è assegnato un numero "ordine"
 	'UI:ImportDashboardText' => 'Select a dashboard file to import:~~',
 	'UI:Dashboard:Actions' => 'Dashboard actions~~',
 	'UI:Dashboard:NotUpToDateUntilContainerSaved' => 'This dashboard displays information that does not include the on-going changes.~~',
-
-
 	'UI:DashletCreation:Title' => 'Create a new Dashlet~~',
 	'UI:DashletCreation:Dashboard' => 'Dashboard~~',
 	'UI:DashletCreation:DashletType' => 'Dashlet Type~~',
 	'UI:DashletCreation:EditNow' => 'Edit the Dashboard~~',
-
 	'UI:DashboardEdit:Title' => 'Dashboard Editor~~',
 	'UI:DashboardEdit:DashboardTitle' => 'Title~~',
 	'UI:DashboardEdit:AutoReload' => 'Automatic refresh~~',
@@ -1241,38 +1274,31 @@ Quando è associata a un trigger, ad ogni azione è assegnato un numero "ordine"
 	'UI:DashboardEdit:AutoReloadSec+' => 'The minimum allowed is %1$d seconds~~',
 	'UI:DashboardEdit:Revert' => 'Revert~~',
 	'UI:DashboardEdit:Apply' => 'Apply~~',
-
 	'UI:DashboardEdit:Layout' => 'Layout~~',
 	'UI:DashboardEdit:Properties' => 'Dashboard Properties~~',
 	'UI:DashboardEdit:Dashlets' => 'Available Dashlets~~',
 	'UI:DashboardEdit:DashletProperties' => 'Dashlet Properties~~',
-
 	'UI:Form:Property' => 'Property~~',
 	'UI:Form:Value' => 'Value~~',
-
 	'UI:DashletUnknown:Label' => 'Unknown~~',
 	'UI:DashletUnknown:Description' => 'Unknown dashlet (might have been uninstalled)~~',
 	'UI:DashletUnknown:RenderText:View' => 'Unable to render this dashlet.~~',
 	'UI:DashletUnknown:RenderText:Edit' => 'Unable to render this dashlet (class "%1$s"). Check with your administrator if it is still available.~~',
 	'UI:DashletUnknown:RenderNoDataText:Edit' => 'No preview available for this dashlet (class "%1$s").~~',
 	'UI:DashletUnknown:Prop-XMLConfiguration' => 'Configuration (shown as raw XML)~~',
-
 	'UI:DashletProxy:Label' => 'Proxy~~',
 	'UI:DashletProxy:Description' => 'Proxy dashlet~~',
 	'UI:DashletProxy:RenderNoDataText:Edit' => 'No preview available for this third-party dashlet (class "%1$s").~~',
 	'UI:DashletProxy:Prop-XMLConfiguration' => 'Configuration (shown as raw XML)~~',
-
 	'UI:DashletPlainText:Label' => 'Text~~',
 	'UI:DashletPlainText:Description' => 'Plain text (no formatting)~~',
 	'UI:DashletPlainText:Prop-Text' => 'Text~~',
 	'UI:DashletPlainText:Prop-Text:Default' => 'Please enter some text here...~~',
-
 	'UI:DashletObjectList:Label' => 'Object list~~',
 	'UI:DashletObjectList:Description' => 'Object list dashlet~~',
 	'UI:DashletObjectList:Prop-Title' => 'Title~~',
 	'UI:DashletObjectList:Prop-Query' => 'Query~~',
 	'UI:DashletObjectList:Prop-Menu' => 'Menu~~',
-
 	'UI:DashletGroupBy:Prop-Title' => 'Title~~',
 	'UI:DashletGroupBy:Prop-Query' => 'Query~~',
 	'UI:DashletGroupBy:Prop-Style' => 'Style~~',
@@ -1286,24 +1312,20 @@ Quando è associata a un trigger, ad ogni azione è assegnato un numero "ordine"
 	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfWeek' => '%1$s (day of week)~~',
 	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfMonth' => '%1$s (day of month)~~',
 	'UI:DashletGroupBy:MissingGroupBy' => 'Please select the field on which the objects will be grouped together~~',
-
 	'UI:DashletGroupByPie:Label' => 'Pie Chart~~',
 	'UI:DashletGroupByPie:Description' => 'Pie Chart~~',
 	'UI:DashletGroupByBars:Label' => 'Bar Chart~~',
 	'UI:DashletGroupByBars:Description' => 'Bar Chart~~',
 	'UI:DashletGroupByTable:Label' => 'Group By (table)~~',
 	'UI:DashletGroupByTable:Description' => 'List (Grouped by a field)~~',
-
-	// New in 2.5
+    // New in 2.5
 	'UI:DashletGroupBy:Prop-Function' => 'Aggregation function~~',
 	'UI:DashletGroupBy:Prop-FunctionAttribute' => 'Function attribute~~',
 	'UI:DashletGroupBy:Prop-OrderDirection' => 'Direction~~',
 	'UI:DashletGroupBy:Prop-OrderField' => 'Order by~~',
 	'UI:DashletGroupBy:Prop-Limit' => 'Limit~~',
-
 	'UI:DashletGroupBy:Order:asc' => 'Ascending~~',
 	'UI:DashletGroupBy:Order:desc' => 'Descending~~',
-
 	'UI:GroupBy:count' => 'Count~~',
 	'UI:GroupBy:count+' => 'Number of elements~~',
 	'UI:GroupBy:sum' => 'Sum~~',
@@ -1314,14 +1336,12 @@ Quando è associata a un trigger, ad ogni azione è assegnato un numero "ordine"
 	'UI:GroupBy:min+' => 'Minimum of %1$s~~',
 	'UI:GroupBy:max' => 'Maximum~~',
 	'UI:GroupBy:max+' => 'Maximum of %1$s~~',
-	// ---
-
+    // ---
 	'UI:DashletHeaderStatic:Label' => 'Header~~',
 	'UI:DashletHeaderStatic:Description' => 'Displays an horizontal separator~~',
 	'UI:DashletHeaderStatic:Prop-Title' => 'Title~~',
 	'UI:DashletHeaderStatic:Prop-Title:Default' => 'Contacts~~',
 	'UI:DashletHeaderStatic:Prop-Icon' => 'Icon~~',
-
 	'UI:DashletHeaderDynamic:Label' => 'Header with statistics~~',
 	'UI:DashletHeaderDynamic:Description' => 'Header with stats (grouped by...)~~',
 	'UI:DashletHeaderDynamic:Prop-Title' => 'Title~~',
@@ -1332,11 +1352,9 @@ Quando è associata a un trigger, ad ogni azione è assegnato un numero "ordine"
 	'UI:DashletHeaderDynamic:Prop-Query' => 'Query~~',
 	'UI:DashletHeaderDynamic:Prop-GroupBy' => 'Group by~~',
 	'UI:DashletHeaderDynamic:Prop-Values' => 'Values~~',
-
 	'UI:DashletBadge:Label' => 'Badge~~',
 	'UI:DashletBadge:Description' => 'Object Icon with new/search~~',
 	'UI:DashletBadge:Prop-Class' => 'Class~~',
-
 	'DayOfWeek-Sunday' => 'Sunday~~',
 	'DayOfWeek-Monday' => 'Monday~~',
 	'DayOfWeek-Tuesday' => 'Tuesday~~',
@@ -1356,8 +1374,7 @@ Quando è associata a un trigger, ad ogni azione è assegnato un numero "ordine"
 	'Month-10' => 'October~~',
 	'Month-11' => 'November~~',
 	'Month-12' => 'December~~',
-
-	// Short version for the DatePicker
+    // Short version for the DatePicker
 	'DayOfWeek-Sunday-Min' => 'Su~~',
 	'DayOfWeek-Monday-Min' => 'Mo~~',
 	'DayOfWeek-Tuesday-Min' => 'Tu~~',
@@ -1377,13 +1394,13 @@ Quando è associata a un trigger, ad ogni azione è assegnato un numero "ordine"
 	'Month-10-Short' => 'Oct~~',
 	'Month-11-Short' => 'Nov~~',
 	'Month-12-Short' => 'Dec~~',
-	'Calendar-FirstDayOfWeek' => '0~~',// 0 = Sunday, 1 = Monday, etc...
-
+	'Calendar-FirstDayOfWeek' => '0~~',
+    // 0 = Sunday, 1 = Monday, etc...
 	'UI:Menu:ShortcutList' => 'Create a Shortcut...~~',
+	'UI:Menu:FilterList' => 'Display list with search criteria~~',
 	'UI:ShortcutRenameDlg:Title' => 'Rename the shortcut~~',
 	'UI:ShortcutListDlg:Title' => 'Create a shortcut for the list~~',
 	'UI:ShortcutDelete:Confirm' => 'Please confirm that wou wish to delete the shortcut(s).~~',
-	'Menu:MyShortcuts' => 'Le mie scorciatoie',// Duplicated into itop-welcome-itil (will be removed from here...)
 	'Class:Shortcut' => 'Shortcut~~',
 	'Class:Shortcut+' => '~~',
 	'Class:Shortcut/Attribute:name' => 'Name~~',
@@ -1397,12 +1414,10 @@ Quando è associata a un trigger, ad ogni azione è assegnato un numero "ordine"
 	'Class:ShortcutOQL/Attribute:auto_reload/Value:custom' => 'Custom rate~~',
 	'Class:ShortcutOQL/Attribute:auto_reload_sec' => 'Automatic refresh interval (seconds)~~',
 	'Class:ShortcutOQL/Attribute:auto_reload_sec/tip' => 'The minimum allowed is %1$d seconds~~',
-
 	'UI:FillAllMandatoryFields' => 'Please fill all mandatory fields.~~',
 	'UI:ValueMustBeSet' => 'Please specify a value~~',
 	'UI:ValueMustBeChanged' => 'Please change the value~~',
 	'UI:ValueInvalidFormat' => 'Invalid format~~',
-
 	'UI:CSVImportConfirmTitle' => 'Please confirm the operation~~',
 	'UI:CSVImportConfirmMessage' => 'Are you sure you want to do this?~~',
 	'UI:CSVImportError_items' => 'Errors: %1$d~~',
@@ -1428,11 +1443,9 @@ Quando è associata a un trigger, ad ogni azione è assegnato un numero "ordine"
 <tr><td>i</td><td>minutes (2 digits, e.g. 00..59)</td></tr>
 <tr><td>s</td><td>seconds (2 digits, e.g. 00..59)</td></tr>
 </table>~~',
-
 	'UI:Button:Remove' => 'Remove~~',
 	'UI:AddAnExisting_Class' => 'Add objects of type %1$s...~~',
 	'UI:SelectionOf_Class' => 'Selection of objects of type %1$s~~',
-
 	'UI:AboutBox' => 'About '.ITOP_APPLICATION_SHORT.'...~~',
 	'UI:About:Title' => 'About '.ITOP_APPLICATION_SHORT.'~~',
 	'UI:About:DataModel' => 'Data model~~',
@@ -1442,12 +1455,10 @@ Quando è associata a un trigger, ad ogni azione è assegnato un numero "ordine"
 	'UI:About:ManualExtensionSource' => 'Extension~~',
 	'UI:About:Extension_Version' => 'Version: %1$s~~',
 	'UI:About:RemoteExtensionSource' => 'Data~~',
-
 	'UI:DisconnectedDlgMessage' => 'You are disconnected. You must identify yourself to continue using the application.~~',
 	'UI:DisconnectedDlgTitle' => 'Warning!~~',
 	'UI:LoginAgain' => 'Login again~~',
 	'UI:StayOnThePage' => 'Stay on this page~~',
-
 	'ExcelExporter:ExportMenu' => 'Excel Export...~~',
 	'ExcelExporter:ExportDialogTitle' => 'Excel Export~~',
 	'ExcelExporter:ExportButton' => 'Export~~',
@@ -1460,7 +1471,6 @@ Quando è associata a un trigger, ad ogni azione è assegnato un numero "ordine"
 	'ExcelExport:Statistics' => 'Statistics~~',
 	'portal:legacy_portal' => 'End-User Portal~~',
 	'portal:backoffice' => ITOP_APPLICATION_SHORT.' Back-Office User Interface~~',
-
 	'UI:CurrentObjectIsLockedBy_User' => 'The object is locked since it is currently being modified by %1$s.~~',
 	'UI:CurrentObjectIsLockedBy_User_Explanation' => 'The object is currently being modified by %1$s. Your modifications cannot be submitted since they would be overwritten.~~',
 	'UI:CurrentObjectIsSoftLockedBy_User' => 'The object is currently being modified by %1$s. You\'ll be able to submit your modifications once they have finished.~~',
@@ -1468,43 +1478,36 @@ Quando è associata a un trigger, ad ogni azione è assegnato un numero "ordine"
 	'UI:CurrentObjectLockExpired_Explanation' => 'The lock to prevent concurrent modifications of the object has expired. You can no longer submit your modification since other users are now allowed to modify this object.~~',
 	'UI:ConcurrentLockKilled' => 'The lock preventing modifications on the current object has been deleted.~~',
 	'UI:Menu:KillConcurrentLock' => 'Kill the Concurrent Modification Lock !~~',
-
 	'UI:Menu:ExportPDF' => 'Export as PDF...~~',
 	'UI:Menu:PrintableVersion' => 'Printer friendly version~~',
-
 	'UI:BrowseInlineImages' => 'Browse images...~~',
 	'UI:UploadInlineImageLegend' => 'Upload a new image~~',
 	'UI:SelectInlineImageToUpload' => 'Select the image to upload~~',
 	'UI:AvailableInlineImagesLegend' => 'Available images~~',
 	'UI:NoInlineImage' => 'There is no image available on the server. Use the "Browse" button above to select an image from your computer and upload it to the server.~~',
-
 	'UI:ToggleFullScreen' => 'Toggle Maximize / Minimize~~',
 	'UI:Button:ResetImage' => 'Recover the previous image~~',
 	'UI:Button:RemoveImage' => 'Remove the image~~',
 	'UI:Button:UploadImage' => 'Upload an image from the disk~~',
 	'UI:UploadNotSupportedInThisMode' => 'The modification of images or files is not supported in this mode.~~',
-
 	'UI:Button:RemoveDocument' => 'Remove the document~~',
-
-	// Search form
+    // Search form
 	'UI:Search:Toggle' => 'Minimize / Expand~~',
 	'UI:Search:AutoSubmit:DisabledHint' => 'Auto submit has been disabled for this class~~',
 	'UI:Search:Obsolescence:DisabledHint' => 'Based on your preferences, obsolete data are hidden~~',
 	'UI:Search:NoAutoSubmit:ExplainText' => 'Add some criterion on the search box or click the search button to view the objects.~~',
 	'UI:Search:Criterion:MoreMenu:AddCriteria' => 'Add new criteria~~',
-	// - Add new criteria button
+    // - Add new criteria button
 	'UI:Search:AddCriteria:List:RecentlyUsed:Title' => 'Recently used~~',
 	'UI:Search:AddCriteria:List:MostPopular:Title' => 'Most popular~~',
 	'UI:Search:AddCriteria:List:Others:Title' => 'Others~~',
 	'UI:Search:AddCriteria:List:RecentlyUsed:Placeholder' => 'None yet.~~',
-
-	// - Criteria header actions
+    // - Criteria header actions
 	'UI:Search:Criteria:Toggle' => 'Minimize / Expand~~',
 	'UI:Search:Criteria:Remove' => 'Remove~~',
 	'UI:Search:Criteria:Locked' => 'Locked~~',
-
-	// - Criteria titles
-	//   - Default widget
+    // - Criteria titles
+    //   - Default widget
 	'UI:Search:Criteria:Title:Default:Any' => '%1$s: Any~~',
 	'UI:Search:Criteria:Title:Default:Empty' => '%1$s is empty~~',
 	'UI:Search:Criteria:Title:Default:NotEmpty' => '%1$s is not empty~~',
@@ -1526,53 +1529,57 @@ Quando è associata a un trigger, ad ogni azione è assegnato un numero "ordine"
 	'UI:Search:Criteria:Title:Default:Between:All' => '%1$s: Any~~',
 	'UI:Search:Criteria:Title:Default:Between:From' => '%1$s from %2$s~~',
 	'UI:Search:Criteria:Title:Default:Between:Until' => '%1$s up to %2$s~~',
-	//   - Numeric widget
-	//   None yet
-	//   - DateTime widget
+    //   - Numeric widget
+    //   None yet
+    //   - DateTime widget
 	'UI:Search:Criteria:Title:DateTime:Between' => '%2$s <= 1$s <= %3$s~~',
-	//   - Enum widget
+    //   - Enum widget
 	'UI:Search:Criteria:Title:Enum:In' => '%1$s: %2$s~~',
 	'UI:Search:Criteria:Title:Enum:In:Many' => '%1$s: %2$s and %3$s others~~',
 	'UI:Search:Criteria:Title:Enum:In:All' => '%1$s: Any~~',
-	//   - TagSet widget
+    //   - TagSet widget
 	'UI:Search:Criteria:Title:TagSet:Matches' => '%1$s: %2$s~~',
-	//   - External key widget
+    //   - External key widget
 	'UI:Search:Criteria:Title:ExternalKey:Empty' => '%1$s is defined~~',
 	'UI:Search:Criteria:Title:ExternalKey:NotEmpty' => '%1$s is not defined~~',
 	'UI:Search:Criteria:Title:ExternalKey:Equals' => '%1$s %2$s~~',
 	'UI:Search:Criteria:Title:ExternalKey:In' => '%1$s: %2$s~~',
 	'UI:Search:Criteria:Title:ExternalKey:In:Many' => '%1$s: %2$s and %3$s others~~',
 	'UI:Search:Criteria:Title:ExternalKey:In:All' => '%1$s: Any~~',
-	//   - Hierarchical key widget
+    //   - Hierarchical key widget
 	'UI:Search:Criteria:Title:HierarchicalKey:Empty' => '%1$s is defined~~',
 	'UI:Search:Criteria:Title:HierarchicalKey:NotEmpty' => '%1$s is not defined~~',
 	'UI:Search:Criteria:Title:HierarchicalKey:Equals' => '%1$s %2$s~~',
 	'UI:Search:Criteria:Title:HierarchicalKey:In' => '%1$s: %2$s~~',
 	'UI:Search:Criteria:Title:HierarchicalKey:In:Many' => '%1$s: %2$s and %3$s others~~',
 	'UI:Search:Criteria:Title:HierarchicalKey:In:All' => '%1$s: Any~~',
-
-	// - Criteria operators
-	//   - Default widget
+    // - Criteria operators
+    //   - Default widget
 	'UI:Search:Criteria:Operator:Default:Empty' => 'Is empty~~',
 	'UI:Search:Criteria:Operator:Default:NotEmpty' => 'Is not empty~~',
 	'UI:Search:Criteria:Operator:Default:Equals' => 'Equals~~',
 	'UI:Search:Criteria:Operator:Default:Between' => 'Between~~',
-	//   - String widget
+    //   - String widget
 	'UI:Search:Criteria:Operator:String:Contains' => 'Contains~~',
 	'UI:Search:Criteria:Operator:String:StartsWith' => 'Starts with~~',
 	'UI:Search:Criteria:Operator:String:EndsWith' => 'Ends with~~',
 	'UI:Search:Criteria:Operator:String:RegExp' => 'Regular exp.~~',
-	//   - Numeric widget
-	'UI:Search:Criteria:Operator:Numeric:Equals' => 'Equals~~',// => '=',
-	'UI:Search:Criteria:Operator:Numeric:GreaterThan' => 'Greater~~',// => '>',
-	'UI:Search:Criteria:Operator:Numeric:GreaterThanOrEquals' => 'Greater / equals~~',// > '>=',
-	'UI:Search:Criteria:Operator:Numeric:LessThan' => 'Less~~',// => '<',
-	'UI:Search:Criteria:Operator:Numeric:LessThanOrEquals' => 'Less / equals~~',// > '<=',
-	'UI:Search:Criteria:Operator:Numeric:Different' => 'Different~~',// => '≠',
-	//   - Tag Set Widget
+    //   - Numeric widget
+	'UI:Search:Criteria:Operator:Numeric:Equals' => 'Equals~~',
+    // => '=',
+	'UI:Search:Criteria:Operator:Numeric:GreaterThan' => 'Greater~~',
+    // => '>',
+	'UI:Search:Criteria:Operator:Numeric:GreaterThanOrEquals' => 'Greater / equals~~',
+    // > '>=',
+	'UI:Search:Criteria:Operator:Numeric:LessThan' => 'Less~~',
+    // => '<',
+	'UI:Search:Criteria:Operator:Numeric:LessThanOrEquals' => 'Less / equals~~',
+    // > '<=',
+	'UI:Search:Criteria:Operator:Numeric:Different' => 'Different~~',
+    // => '≠',
+    //   - Tag Set Widget
 	'UI:Search:Criteria:Operator:TagSet:Matches' => 'Matches~~',
-
-	// - Other translations
+    // - Other translations
 	'UI:Search:Value:Filter:Placeholder' => 'Filter...~~',
 	'UI:Search:Value:Search:Placeholder' => 'Search...~~',
 	'UI:Search:Value:Autocomplete:StartTyping' => 'Start typing for possible values.~~',
@@ -1580,8 +1587,7 @@ Quando è associata a un trigger, ad ogni azione è assegnato un numero "ordine"
 	'UI:Search:Value:Autocomplete:NoResult' => 'No result.~~',
 	'UI:Search:Value:Toggler:CheckAllNone' => 'Check all / none~~',
 	'UI:Search:Value:Toggler:CheckAllNoneFiltered' => 'Check all / none visibles~~',
-
-	// - Widget other translations
+    // - Widget other translations
 	'UI:Search:Criteria:Numeric:From' => 'From~~',
 	'UI:Search:Criteria:Numeric:Until' => 'To~~',
 	'UI:Search:Criteria:Numeric:PlaceholderFrom' => 'Any~~',
@@ -1595,10 +1601,8 @@ Quando è associata a un trigger, ad ogni azione è assegnato un numero "ordine"
 	'UI:Search:Criteria:DateTime:PlaceholderUntil' => 'Any date~~',
 	'UI:Search:Criteria:DateTime:PlaceholderUntilTime' => 'Any date~~',
 	'UI:Search:Criteria:HierarchicalKey:ChildrenIncluded:Hint' => 'Children of the selected objects will be included.~~',
-
 	'UI:Search:Criteria:Raw:Filtered' => 'Filtered~~',
 	'UI:Search:Criteria:Raw:FilteredOn' => 'Filtered on %1$s~~',
-
 	'UI:StateChanged' => 'State changed~~',
 ));
 
@@ -1609,16 +1613,13 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Expression:Operator:AND' => ' AND ~~',
 	'Expression:Operator:OR' => ' OR ~~',
 	'Expression:Operator:=' => ': ~~',
-
 	'Expression:Unit:Short:DAY' => 'd~~',
 	'Expression:Unit:Short:WEEK' => 'w~~',
 	'Expression:Unit:Short:MONTH' => 'm~~',
 	'Expression:Unit:Short:YEAR' => 'y~~',
-
 	'Expression:Unit:Long:DAY' => 'day(s)~~',
 	'Expression:Unit:Long:HOUR' => 'hour(s)~~',
 	'Expression:Unit:Long:MINUTE' => 'minute(s)~~',
-
 	'Expression:Verb:NOW' => 'now~~',
 	'Expression:Verb:ISNULL' => ': undefined~~',
 ));
@@ -1642,47 +1643,33 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Menu:DataSources' => 'Sorgente di sincronizzazione dei dati',
 	'Menu:DataSources+' => '',
-	'Menu:WelcomeMenu' => 'Benveuto',
-	'Menu:WelcomeMenu+' => '',
-	'Menu:WelcomeMenuPage' => 'Benvenuto',
-	'Menu:WelcomeMenuPage+' => '',
-	'Menu:AdminTools' => 'Strumenti di amministrazione',
-	'Menu:AdminTools+' => '',
-	'Menu:AdminTools?' => 'Strumenti accessibile solo agli utenti con il profilo di amministratore',
-	'Menu:DataModelMenu' => 'Modello dati',
-	'Menu:DataModelMenu+' => '',
-	'Menu:ExportMenu' => 'Esporta',
-	'Menu:ExportMenu+' => '',
-	'Menu:NotificationsMenu' => 'Notifiche',
-	'Menu:NotificationsMenu+' => '',
 	'Menu:AuditCategories' => 'Categorie di Audit',
 	'Menu:AuditCategories+' => '',
 	'Menu:Notifications:Title' => 'Categorie di Audit',
-	'Menu:RunQueriesMenu'         => 'Esegui query',
-	'Menu:RunQueriesMenu+'        => '',
-	'Menu:QueryMenu'              => 'Rubbrica delle Query',
-	'Menu:QueryMenu+'             => 'Rubbrica delle Query',
-	'Menu:UniversalSearchMenu'    => 'Ricerca universale',
-	'Menu:UniversalSearchMenu+'   => '',
-	'Menu:UserManagementMenu'     => 'Gestione degli utenti',
-	'Menu:UserManagementMenu+'    => '',
-	'Menu:ProfilesMenu'           => 'Profili',
-	'Menu:ProfilesMenu+'          => '',
-	'Menu:ProfilesMenu:Title'     => 'Profili',
-	'Menu:UserAccountsMenu'       => 'Account utente',
-	'Menu:UserAccountsMenu+'      => '',
+	'Menu:AuditCategories:Title' => 'Audit configuration~~',
+	'Menu:RunQueriesMenu' => 'Esegui query',
+	'Menu:RunQueriesMenu+' => '',
+	'Menu:QueryMenu' => 'Rubbrica delle Query',
+	'Menu:QueryMenu+' => 'Rubbrica delle Query',
+	'Menu:UniversalSearchMenu' => 'Ricerca universale',
+	'Menu:UniversalSearchMenu+' => '',
+	'Menu:UserManagementMenu' => 'Gestione degli utenti',
+	'Menu:UserManagementMenu+' => '',
+	'Menu:ProfilesMenu' => 'Profili',
+	'Menu:ProfilesMenu+' => '',
+	'Menu:ProfilesMenu:Title' => 'Profili',
+	'Menu:UserAccountsMenu' => 'Account utente',
+	'Menu:UserAccountsMenu+' => '',
 	'Menu:UserAccountsMenu:Title' => 'Account utente',
-	'Menu:MyShortcuts'            => 'Le mie scorciatoie',
-	'Menu:UserManagement'         => 'Gestione utenti',
-	'Menu:Queries'                => 'Interrogazioni',
-	'Menu:ConfigurationTools'     => 'configurazione',
+	'Menu:UserManagement' => 'Gestione utenti',
+	'Menu:Queries' => 'Interrogazioni',
+	'Menu:ConfigurationTools' => 'configurazione'
 ));
-
 // Additional language entries not present in English dict
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'UI:Toggle:StandardDashboard' => 'Standard~~',
-	'UI:Toggle:CustomDashboard'   => 'Custom~~',
-	'UI:Display_X_ItemsPerPage'   => 'Display %1$s items per page~~',
-	'UI:Dashboard:Edit'           => 'Edit This Page...~~',
-	'UI:Dashboard:Revert'         => 'Revert To Original Version...~~',
+	'UI:Toggle:CustomDashboard' => 'Custom~~',
+	'UI:Display_X_ItemsPerPage' => 'Display %1$s items per page~~',
+	'UI:Dashboard:Edit' => 'Edit This Page...~~',
+	'UI:Dashboard:Revert' => 'Revert To Original Version...~~'
 ));
diff --git a/dictionaries/ja.dictionary.itop.core.php b/dictionaries/ja.dictionary.itop.core.php
index 6c9bdb3e2e..1aa08cd388 100644
--- a/dictionaries/ja.dictionary.itop.core.php
+++ b/dictionaries/ja.dictionary.itop.core.php
@@ -21,57 +21,42 @@
  */
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Core:DeletedObjectLabel' => '%1s (削除されました)',
-	'Core:DeletedObjectTip'   => 'オブジェクトは削除されました %1$s (%2$s)',
-
+	'Core:DeletedObjectTip' => 'オブジェクトは削除されました %1$s (%2$s)',
 	'Core:UnknownObjectLabel' => 'オブジェクトは見つかりません (クラス: %1$s, id: %2$d)',
-	'Core:UnknownObjectTip'   => 'オブジェクトは見つかりません。しばらく前に削除され、その後ログが削除されたかもしれません。',
-
+	'Core:UnknownObjectTip' => 'オブジェクトは見つかりません。しばらく前に削除され、その後ログが削除されたかもしれません。',
 	'Core:UniquenessDefaultError' => 'Uniqueness rule \'%1$s\' in error~~',
-	'Core:CheckConsistencyError'  => 'Consistency rules not followed: %1$s~~',
-	'Core:CheckValueError'        => 'Unexpected value for attribute \'%1$s\' (%2$s) : %3$s~~',
-
-	'Core:AttributeLinkedSet'  => 'オブジェクト配列',
+	'Core:CheckConsistencyError' => 'Consistency rules not followed: %1$s~~',
+	'Core:CheckValueError' => 'Unexpected value for attribute \'%1$s\' (%2$s) : %3$s~~',
+	'Core:AttributeLinkedSet' => 'オブジェクト配列',
 	'Core:AttributeLinkedSet+' => '同一あるいはサブクラスに属するオブジェクト',
-
 	'Core:AttributeLinkedSetDuplicatesFound' => 'Duplicates in the \'%1$s\' field : %2$s~~',
-
-	'Core:AttributeDashboard'  => 'Dashboard~~',
+	'Core:AttributeDashboard' => 'Dashboard~~',
 	'Core:AttributeDashboard+' => '~~',
-
-	'Core:AttributePhoneNumber'  => 'Phone number~~',
+	'Core:AttributePhoneNumber' => 'Phone number~~',
 	'Core:AttributePhoneNumber+' => '~~',
-
 	'Core:AttributeObsolescenceDate' => 'Obsolescence date~~',
 	'Core:AttributeObsolescenceDate+' => '~~',
-
 	'Core:AttributeTagSet' => 'List of tags~~',
 	'Core:AttributeTagSet+' => '~~',
 	'Core:AttributeSet:placeholder' => 'click to add~~',
 	'Core:AttributeClassAttCodeSet:ItemLabel:AttributeFromClass' => '%1$s (%2$s)~~',
 	'Core:AttributeClassAttCodeSet:ItemLabel:AttributeFromOneChildClass' => '%1$s (%2$s from %3$s)~~',
 	'Core:AttributeClassAttCodeSet:ItemLabel:AttributeFromSeveralChildClasses' => '%1$s (%2$s from child classes)~~',
-
 	'Core:AttributeCaseLog' => 'Log~~',
 	'Core:AttributeCaseLog+' => '~~',
-
 	'Core:AttributeMetaEnum' => 'Computed enum~~',
 	'Core:AttributeMetaEnum+' => '~~',
-
 	'Core:AttributeLinkedSetIndirect' => 'オブジェクト配列 (N-N)',
 	'Core:AttributeLinkedSetIndirect+' => '同一クラスの任意のオブジェクト(サブクラス)',
-
 	'Core:AttributeInteger' => 'Int型',
 	'Core:AttributeInteger+' => '数値 (負数あり)',
-
 	'Core:AttributeDecimal' => 'Decimal型',
 	'Core:AttributeDecimal+' => 'Decimal値 (負数あり)',
-
 	'Core:AttributeBoolean' => 'ブール型',
 	'Core:AttributeBoolean+' => 'Bool値',
 	'Core:AttributeBoolean/Value:null' => '',
 	'Core:AttributeBoolean/Value:yes' => 'Yes~~',
 	'Core:AttributeBoolean/Value:no' => 'No~~',
-
 	'Core:AttributeArchiveFlag' => 'Archive flag~~',
 	'Core:AttributeArchiveFlag/Value:yes' => 'Yes~~',
 	'Core:AttributeArchiveFlag/Value:yes+' => 'This object is visible only in archive mode~~',
@@ -80,7 +65,6 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Core:AttributeArchiveFlag/Label+' => '',
 	'Core:AttributeArchiveDate/Label' => 'Archive date~~',
 	'Core:AttributeArchiveDate/Label+' => '',
-
 	'Core:AttributeObsolescenceFlag' => 'Obsolescence flag~~',
 	'Core:AttributeObsolescenceFlag/Value:yes' => 'Yes~~',
 	'Core:AttributeObsolescenceFlag/Value:yes+' => 'This object is excluded from the impact analysis, and hidden from search results~~',
@@ -89,54 +73,38 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Core:AttributeObsolescenceFlag/Label+' => 'Computed dynamically on other attributes~~',
 	'Core:AttributeObsolescenceDate/Label' => 'Obsolescence date~~',
 	'Core:AttributeObsolescenceDate/Label+' => 'Approximative date at which the object has been considered obsolete~~',
-
 	'Core:AttributeString' => '文字列',
 	'Core:AttributeString+' => '文字列',
-
 	'Core:AttributeClass' => 'クラス',
 	'Core:AttributeClass+' => 'クラス',
-
 	'Core:AttributeApplicationLanguage' => '使用言語',
 	'Core:AttributeApplicationLanguage+' => '言語・国別 (JA JP)',
-
 	'Core:AttributeFinalClass' => 'クラス (自動)',
 	'Core:AttributeFinalClass+' => 'オブジェクトの実クラス (コアで自動的に生成される)',
-
 	'Core:AttributePassword' => 'パスワード',
 	'Core:AttributePassword+' => '外部デバイス用パスワード',
-
 	'Core:AttributeEncryptedString' => '暗号化文字列',
 	'Core:AttributeEncryptedString+' => 'ローカルキーで暗号化された文字列',
 	'Core:AttributeEncryptUnknownLibrary' => 'Encryption library specified (%1$s) unknown~~',
 	'Core:AttributeEncryptFailedToDecrypt' => '** decryption error **~~',
-
 	'Core:AttributeText' => 'テキスト',
 	'Core:AttributeText+' => '複数行文字列',
-
 	'Core:AttributeHTML' => 'HTML',
 	'Core:AttributeHTML+' => 'HTML文字列',
-
 	'Core:AttributeEmailAddress' => 'メールアドレス',
 	'Core:AttributeEmailAddress+' => 'メールアドレス',
-
 	'Core:AttributeIPAddress' => 'IPアドレス',
 	'Core:AttributeIPAddress+' => 'IPアドレス',
-
 	'Core:AttributeOQL' => 'OQL',
 	'Core:AttributeOQL+' => 'OQL式',
-
 	'Core:AttributeEnum' => '列挙型',
 	'Core:AttributeEnum+' => 'ナンバリング済み文字列のリスト',
-
 	'Core:AttributeTemplateString' => 'テンプレート文字列',
 	'Core:AttributeTemplateString+' => 'プレースホルダを含む文字列',
-
 	'Core:AttributeTemplateText' => 'テンプレートテキスト',
 	'Core:AttributeTemplateText+' => 'プレースホルダを含むテキスト',
-
 	'Core:AttributeTemplateHTML' => 'テンプレートHTML',
 	'Core:AttributeTemplateHTML+' => 'プレースホルダを含むHTML',
-
 	'Core:AttributeDateTime' => '日付/時刻',
 	'Core:AttributeDateTime+' => '日付と時刻(年-月-日 hh:mm:ss)',
 	'Core:AttributeDateTime?SmartSearch' => '
@@ -154,7 +122,6 @@ Operators:<br/>
 <p>
 もし、時刻がなければ、規定値 00:00:00となります。
 </p>',
-
 	'Core:AttributeDate' => '日付',
 	'Core:AttributeDate+' => '日付 (年-月-日)',
 	'Core:AttributeDate?SmartSearch' => '
@@ -169,43 +136,30 @@ Operators:<br/>
 	<b>&lt;</b><em>日付</em><br/>
 	<b>[</b><em>日付</em>,<em>日付</em><b>]</b>
 </p>',
-
 	'Core:AttributeDeadline' => '締切',
 	'Core:AttributeDeadline+' => '日付, 現在時刻からの相対表示',
-
 	'Core:AttributeExternalKey' => '外部キー',
 	'Core:AttributeExternalKey+' => '外部(あるいはフォーリン)キー',
-
 	'Core:AttributeHierarchicalKey' => '階層的なキー',
 	'Core:AttributeHierarchicalKey+' => '',
-
 	'Core:AttributeExternalField' => '外部フィールド',
 	'Core:AttributeExternalField+' => '外部キーにマッピングされたフィールド',
-
 	'Core:AttributeURL' => 'URL',
 	'Core:AttributeURL+' => '絶対URLもしくは相対URLのテキスト文字列',
-
 	'Core:AttributeBlob' => 'Blob',
 	'Core:AttributeBlob+' => '任意のバイナリコンテンツ(文書)',
-
 	'Core:AttributeOneWayPassword' => '一方向パスワード',
 	'Core:AttributeOneWayPassword+' => '一方向暗号化(ハッシュ)パスワード',
-
 	'Core:AttributeTable' => 'テーブル',
 	'Core:AttributeTable+' => 'インデックス化された二次元配列',
-
 	'Core:AttributePropertySet' => 'プロパティ',
 	'Core:AttributePropertySet+' => '型づけされていないプロパティのリスト(名前とバリュー)',
-
 	'Core:AttributeFriendlyName' => 'Friendly name',
 	'Core:AttributeFriendlyName+' => '属性は自動的に作成されました； the friendly name is computed after several attributes',
-
 	'Core:FriendlyName-Label' => 'Name',
 	'Core:FriendlyName-Description' => 'Friendly name',
-
 	'Core:AttributeTag' => 'Tags~~',
 	'Core:AttributeTag+' => 'Tags~~',
-	
 	'Core:Context=REST/JSON' => 'REST~~',
 	'Core:Context=Synchro' => 'Synchro~~',
 	'Core:Context=Setup' => 'Setup~~',
@@ -483,6 +437,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:Action' => 'カスタムアクション',
 	'Class:Action+' => 'ユーザ定義アクション',
+	'Class:Action/ComplementaryName' => '%1$s: %2$s~~',
 	'Class:Action/Attribute:name' => '名前',
 	'Class:Action/Attribute:name+' => '',
 	'Class:Action/Attribute:description' => '説明',
@@ -550,6 +505,22 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:ActionEmail/Attribute:importance/Value:normal+' => '通常',
 	'Class:ActionEmail/Attribute:importance/Value:high' => '高',
 	'Class:ActionEmail/Attribute:importance/Value:high+' => '高',
+	'Class:ActionEmail/Attribute:language' => 'Language~~',
+	'Class:ActionEmail/Attribute:language+' => 'Language to use for placeholders ($xxx$) inside the message (state, importance, priority, etc)~~',
+	'Class:ActionEmail/Attribute:html_template' => 'HTML template~~',
+	'Class:ActionEmail/Attribute:html_template+' => 'Optional HTML template wrapping around the content of the \'Body\' attribute below, useful for tailored email layouts (in the template, content of the \'Body\' attribute will replace the $content$ placeholder)~~',
+	'Class:ActionEmail/Attribute:ignore_notify' => 'Ignore the Notify flag~~',
+	'Class:ActionEmail/Attribute:ignore_notify+' => 'If set to \'Yes\' the \'Notify\' flag on Contacts has no effect.~~',
+	'Class:ActionEmail/Attribute:ignore_notify/Value:no' => 'No~~',
+	'Class:ActionEmail/Attribute:ignore_notify/Value:yes' => 'Yes~~',
+	'ActionEmail:main' => 'Message~~',
+	'ActionEmail:trigger' => 'Triggers~~',
+	'ActionEmail:recipients' => 'Contacts~~',
+	'ActionEmail:preview_tab' => 'Preview~~',
+	'ActionEmail:preview_tab+' => 'Preview of the eMail template~~',
+	'ActionEmail:preview_warning' => 'The actual eMail may look different in the eMail client than this preview in your browser.~~',
+	'ActionEmail:preview_more_info' => 'For more information about the CSS features supported by the different eMail clients, refer to %1$s~~',
+	'ActionEmail:content_placeholder_missing' => 'The placeholder "%1$s" was not found in the HTML template. The content of the field "%2$s" will not be included in the generated emails.~~',
 ));
 
 //
@@ -559,6 +530,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:Trigger' => 'トリガー',
 	'Class:Trigger+' => 'カスタムイベントハンドラー',
+	'Class:Trigger/ComplementaryName' => '%1$s, %2$s~~',
 	'Class:Trigger/Attribute:description' => '説明',
 	'Class:Trigger/Attribute:description+' => '1行の説明',
 	'Class:Trigger/Attribute:action_list' => 'トリガーされたアクション',
@@ -567,6 +539,8 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:Trigger/Attribute:finalclass+' => 'タイプ',
 	'Class:Trigger/Attribute:context' => 'Context~~',
 	'Class:Trigger/Attribute:context+' => 'Context to allow the trigger to start~~',
+	'Class:Trigger/Attribute:complement' => 'Additional information~~',
+	'Class:Trigger/Attribute:complement+' => 'Further information as provided in english, by this trigger~~',
 ));
 
 //
@@ -662,6 +636,17 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:TriggerOnObjectMention/Attribute:mentioned_filter+' => 'Limit the list of mentioned objects which will activate the trigger. If empty, any mentioned object (of any class) will activate it.~~',
 ));
 
+//
+// Class: TriggerOnAttributeBlobDownload
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Class:TriggerOnAttributeBlobDownload' => 'Trigger (on object\'s document download)~~',
+	'Class:TriggerOnAttributeBlobDownload+' => 'Trigger on object\'s document field download of [a child class of] the given class~~',
+	'Class:TriggerOnAttributeBlobDownload/Attribute:target_attcodes' => 'Target fields~~',
+	'Class:TriggerOnAttributeBlobDownload/Attribute:target_attcodes+' => '~~',
+));
+
 //
 // Class: TriggerOnThresholdReached
 //
@@ -698,11 +683,13 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 // Synchro Data Source
 //
 Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Class:SynchroDataSource' => '同期データソース',
 	'Class:SynchroDataSource/Attribute:name' => '名前',
 	'Class:SynchroDataSource/Attribute:name+' => '名前',
 	'Class:SynchroDataSource/Attribute:description' => '説明',
 	'Class:SynchroDataSource/Attribute:status' => '状態',
 	'Class:SynchroDataSource/Attribute:scope_class' => 'ターゲットクラス',
+	'Class:SynchroDataSource/Attribute:scope_class+' => 'A Synchro Data Source can only populate a single '.ITOP_APPLICATION_SHORT.' class~~',
 	'Class:SynchroDataSource/Attribute:user_id' => 'ユーザ',
 	'Class:SynchroDataSource/Attribute:notify_contact_id' => '通知する連絡先',
 	'Class:SynchroDataSource/Attribute:notify_contact_id+' => 'エラーが発生した場合に通知する連絡先。',
@@ -711,6 +698,8 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:SynchroDataSource/Attribute:url_application' => 'アプリケーションのハイパーリンク',
 	'Class:SynchroDataSource/Attribute:url_application+' => ITOP_APPLICATION_SHORT.'が同期化された外部アプリケーションの'.ITOP_APPLICATION_SHORT.'オブジェクトへのハイパーリンク（該当する場合）。可能なプレースホルダ: $this->attribute$ and $replica->primary_key$',
 	'Class:SynchroDataSource/Attribute:reconciliation_policy' => '調整ポリシー',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy+' => '"Use the attributes": '.ITOP_APPLICATION_SHORT.' object matches replica values for each Synchro attributes flagged for Reconciliation.
+"Use primary_key": the column primary_key of the replica is expected to contain the identifier of the '.ITOP_APPLICATION_SHORT.' object~~',
 	'Class:SynchroDataSource/Attribute:full_load_periodicity' => '全データロードの間隔',
 	'Class:SynchroDataSource/Attribute:full_load_periodicity+' => '全データの完全な再ロードを最低ここに指定されている間隔で行う必要があります。',
 	'Class:SynchroDataSource/Attribute:action_on_zero' => '検索結果0件時のアクション',
@@ -730,6 +719,33 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:SynchroDataSource/Attribute:delete_policy_retention+' => '廃止されたオブジェクトを削除するまでに保持しておく時間',
 	'Class:SynchroDataSource/Attribute:database_table_name' => 'データテーブル',
 	'Class:SynchroDataSource/Attribute:database_table_name+' => '同期データを保存するテーブル名。 もし、空欄の場合は、規定の名前が計算されます。',
+	'Class:SynchroDataSource/Attribute:status/Value:implementation' => '実装中',
+	'Class:SynchroDataSource/Attribute:status/Value:obsolete' => '廃止済',
+	'Class:SynchroDataSource/Attribute:status/Value:production' => '稼働中',
+	'Class:SynchroDataSource/Attribute:scope_restriction' => '範囲の制限',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_attributes' => '属性を使用',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_primary_key' => '主キーフィールドを使用',
+	'Class:SynchroDataSource/Attribute:action_on_zero/Value:create' => '作成',
+	'Class:SynchroDataSource/Attribute:action_on_zero/Value:error' => 'エラー',
+	'Class:SynchroDataSource/Attribute:action_on_one/Value:error' => 'エラー',
+	'Class:SynchroDataSource/Attribute:action_on_one/Value:update' => '更新',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:create' => '作成',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:error' => 'エラー',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:take_first' => '最初を採用 (ランダム?)',
+	'Class:SynchroDataSource/Attribute:delete_policy' => '削除ポリシー',
+	'Class:SynchroDataSource/Attribute:delete_policy+' => 'What to do when a replica becomes obsolete:
+"Ignore": do nothing, the associated object remains as is in iTop.
+"Delete": Delete the associated object in iTop (and the replica in the data table).
+"Update": Update the associated object as specified by the Update rules (see below).
+"Update then Delete": apply the "Update rules". When Retention Duration expires, execute a "Delete" ~~',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:delete' => '削除',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:ignore' => '無視',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:update' => '更新',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:update_then_delete' => '更新そして削除',
+	'Class:SynchroDataSource/Attribute:attribute_list' => '属性リスト',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:administrators' => '管理者のみ',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:everybody' => '誰でもがそのようなオブジェクトを削除出来ます。',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:nobody' => '誰もない',
 	'SynchroDataSource:Description' => '説明',
 	'SynchroDataSource:Reconciliation' => '検索と調整',
 	'SynchroDataSource:Deletion' => '削除ルール',
@@ -754,8 +770,10 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Core:Synchro:NeverRun' => 'この同期は実行されたことがありません。ログはありません。',
 	'Core:Synchro:SynchroEndedOn_Date' => '最後の同期は %1$s に終了しました。',
 	'Core:Synchro:SynchroRunningStartedOn_Date' => '同期は %1$s に始まり、現在実行中です。',
-	'Menu:DataSources' => '同期データソース', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:DataSources+' => '全ての同期データソース', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataSources' => '同期データソース',
+    // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataSources+' => '全ての同期データソース',
+    // Duplicated into itop-welcome-itil (will be removed from here...)
 	'Core:Synchro:label_repl_ignored' => '無視 (%1$s)',
 	'Core:Synchro:label_repl_disappeared' => '消えた (%1$s)',
 	'Core:Synchro:label_repl_existing' => '存在 (%1$s)',
@@ -819,29 +837,6 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:CMDBChangeOpSetAttributeEncrypted/Attribute:prevstring' => '以前の値',
 	'Class:CMDBChangeOpSetAttributeCaseLog' => 'ケースログ',
 	'Class:CMDBChangeOpSetAttributeCaseLog/Attribute:lastentry' => '最後のエントリー',
-	'Class:SynchroDataSource' => '同期データソース',
-	'Class:SynchroDataSource/Attribute:status/Value:implementation' => '実装中',
-	'Class:SynchroDataSource/Attribute:status/Value:obsolete' => '廃止済',
-	'Class:SynchroDataSource/Attribute:status/Value:production' => '稼働中',
-	'Class:SynchroDataSource/Attribute:scope_restriction' => '範囲の制限',
-	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_attributes' => '属性を使用',
-	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_primary_key' => '主キーフィールドを使用',
-	'Class:SynchroDataSource/Attribute:action_on_zero/Value:create' => '作成',
-	'Class:SynchroDataSource/Attribute:action_on_zero/Value:error' => 'エラー',
-	'Class:SynchroDataSource/Attribute:action_on_one/Value:error' => 'エラー',
-	'Class:SynchroDataSource/Attribute:action_on_one/Value:update' => '更新',
-	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:create' => '作成',
-	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:error' => 'エラー',
-	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:take_first' => '最初を採用 (ランダム?)',
-	'Class:SynchroDataSource/Attribute:delete_policy' => '削除ポリシー',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:delete' => '削除',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:ignore' => '無視',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:update' => '更新',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:update_then_delete' => '更新そして削除',
-	'Class:SynchroDataSource/Attribute:attribute_list' => '属性リスト',
-	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:administrators' => '管理者のみ',
-	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:everybody' => '誰でもがそのようなオブジェクトを削除出来ます。',
-	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:nobody' => '誰もない',
 	'Class:SynchroAttribute' => '同期属性',
 	'Class:SynchroAttribute/Attribute:sync_source_id' => '同期データソース',
 	'Class:SynchroAttribute/Attribute:attcode' => '属性コード',
@@ -902,19 +897,16 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:appUserPreferences/Attribute:preferences' => 'プリファレンス',
 	'Core:ExecProcess:Code1' => '間違ったコマンドまたはエラーで終了したコマンド（例えば、間違ったスクリプト名）',
 	'Core:ExecProcess:Code255' => 'PHP エラー (parsing, or runtime)',
-
-	// Attribute Duration
+    // Attribute Duration
 	'Core:Duration_Seconds' => '%1$ds',
 	'Core:Duration_Minutes_Seconds' => '%1$d分 %2$d秒',
 	'Core:Duration_Hours_Minutes_Seconds' => '%1$d時 %2$d分 %3$d秒',
 	'Core:Duration_Days_Hours_Minutes_Seconds' => '%1$s日 %2$d時 %3$d分 %4$d秒',
-
-	// Explain working time computing
+    // Explain working time computing
 	'Core:ExplainWTC:ElapsedTime' => 'Time elapsed (stored as \\"%1$s\\")~~',
 	'Core:ExplainWTC:StopWatch-TimeSpent' => 'Time spent for \\"%1$s\\"~~',
 	'Core:ExplainWTC:StopWatch-Deadline' => 'Deadline for \\"%1$s\\" at %2$d%%~~',
-
-	// Bulk export
+    // Bulk export
 	'Core:BulkExport:MissingParameter_Param' => 'Missing parameter \\"%1$s\\"~~',
 	'Core:BulkExport:InvalidParameter_Query' => 'Invalid value for the parameter \\"query\\". There is no Query Phrasebook corresponding to the id: \\"%1$s\\".~~',
 	'Core:BulkExport:ExportFormatPrompt' => 'Export format:~~',
@@ -966,20 +958,34 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Core:BulkExport:DateTimeFormatDefault_Example' => 'Default format (%1$s), e.g. %2$s~~',
 	'Core:BulkExport:DateTimeFormatCustom_Format' => 'Custom format: %1$s~~',
 	'Core:BulkExport:PDF:PageNumber' => 'Page %1$s~~',
-	'Core:DateTime:Placeholder_d' => 'DD~~', // Day of the month: 2 digits (with leading zero)
-	'Core:DateTime:Placeholder_j' => 'D~~', // Day of the month: 1 or 2 digits (without leading zero)
-	'Core:DateTime:Placeholder_m' => 'MM~~', // Month on 2 digits i.e. 01-12
-	'Core:DateTime:Placeholder_n' => 'M~~', // Month on 1 or 2 digits 1-12
-	'Core:DateTime:Placeholder_Y' => 'YYYY~~', // Year on 4 digits
-	'Core:DateTime:Placeholder_y' => 'YY~~', // Year on 2 digits
-	'Core:DateTime:Placeholder_H' => 'hh~~', // Hour 00..23
-	'Core:DateTime:Placeholder_h' => 'h~~', // Hour 01..12
-	'Core:DateTime:Placeholder_G' => 'hh~~', // Hour 0..23
-	'Core:DateTime:Placeholder_g' => 'h~~', // Hour 1..12
-	'Core:DateTime:Placeholder_a' => 'am/pm~~', // am/pm (lowercase)
-	'Core:DateTime:Placeholder_A' => 'AM/PM~~', // AM/PM (uppercase)
-	'Core:DateTime:Placeholder_i' => 'mm~~', // minutes, 2 digits: 00..59
-	'Core:DateTime:Placeholder_s' => 'ss~~', // seconds, 2 digits 00..59
+	'Core:DateTime:Placeholder_d' => 'DD~~',
+    // Day of the month: 2 digits (with leading zero)
+	'Core:DateTime:Placeholder_j' => 'D~~',
+    // Day of the month: 1 or 2 digits (without leading zero)
+	'Core:DateTime:Placeholder_m' => 'MM~~',
+    // Month on 2 digits i.e. 01-12
+	'Core:DateTime:Placeholder_n' => 'M~~',
+    // Month on 1 or 2 digits 1-12
+	'Core:DateTime:Placeholder_Y' => 'YYYY~~',
+    // Year on 4 digits
+	'Core:DateTime:Placeholder_y' => 'YY~~',
+    // Year on 2 digits
+	'Core:DateTime:Placeholder_H' => 'hh~~',
+    // Hour 00..23
+	'Core:DateTime:Placeholder_h' => 'h~~',
+    // Hour 01..12
+	'Core:DateTime:Placeholder_G' => 'hh~~',
+    // Hour 0..23
+	'Core:DateTime:Placeholder_g' => 'h~~',
+    // Hour 1..12
+	'Core:DateTime:Placeholder_a' => 'am/pm~~',
+    // am/pm (lowercase)
+	'Core:DateTime:Placeholder_A' => 'AM/PM~~',
+    // AM/PM (uppercase)
+	'Core:DateTime:Placeholder_i' => 'mm~~',
+    // minutes, 2 digits: 00..59
+	'Core:DateTime:Placeholder_s' => 'ss~~',
+    // seconds, 2 digits 00..59
 	'Core:Validator:Default' => 'Wrong format~~',
 	'Core:Validator:Mandatory' => 'Please, fill this field~~',
 	'Core:Validator:MustBeInteger' => 'Must be an integer~~',
@@ -992,7 +998,6 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:TagSetFieldData' => '%2$s for class %1$s~~',
 	'Class:TagSetFieldData+' => '~~',
-
 	'Class:TagSetFieldData/Attribute:code' => 'Code~~',
 	'Class:TagSetFieldData/Attribute:code+' => 'Internal code. Must contain at least 3 alphanumeric characters~~',
 	'Class:TagSetFieldData/Attribute:label' => 'Label~~',
@@ -1002,7 +1007,6 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:TagSetFieldData/Attribute:finalclass' => 'Tag class~~',
 	'Class:TagSetFieldData/Attribute:obj_class' => 'Object class~~',
 	'Class:TagSetFieldData/Attribute:obj_attcode' => 'Field code~~',
-
 	'Core:TagSetFieldData:ErrorDeleteUsedTag' => 'Used tags cannot be deleted~~',
 	'Core:TagSetFieldData:ErrorDuplicateTagCodeOrLabel' => 'Tags codes or labels must be unique~~',
 	'Core:TagSetFieldData:ErrorTagCodeSyntax' => 'Tags code must contain between 3 and %1$d alphanumeric characters~~',
@@ -1089,8 +1093,8 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:AsyncTask/Attribute:last_error+' => '~~',
 	'Class:AsyncTask/Attribute:last_attempt' => 'Last attempt~~',
 	'Class:AsyncTask/Attribute:last_attempt+' => '~~',
-    'Class:AsyncTask:InvalidConfig_Class_Keys' => 'Invalid format for the configuration of "async_task_retries[%1$s]". Expecting an array with the following keys: %2$s~~',
-    'Class:AsyncTask:InvalidConfig_Class_InvalidKey_Keys' => 'Invalid format for the configuration of "async_task_retries[%1$s]": unexpected key "%2$s". Expecting only the following keys: %3$s~~',
+	'Class:AsyncTask:InvalidConfig_Class_Keys' => 'Invalid format for the configuration of "async_task_retries[%1$s]". Expecting an array with the following keys: %2$s~~',
+	'Class:AsyncTask:InvalidConfig_Class_InvalidKey_Keys' => 'Invalid format for the configuration of "async_task_retries[%1$s]": unexpected key "%2$s". Expecting only the following keys: %3$s~~',
 ));
 
 //
diff --git a/dictionaries/ja.dictionary.itop.ui.php b/dictionaries/ja.dictionary.itop.ui.php
index e6714d08e3..337a24e671 100644
--- a/dictionaries/ja.dictionary.itop.ui.php
+++ b/dictionaries/ja.dictionary.itop.ui.php
@@ -14,6 +14,12 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:AuditCategory/Attribute:definition_set+' => '監査するべきオブジェクトの集合を定義するOQL式',
 	'Class:AuditCategory/Attribute:rules_list' => '監査ルール',
 	'Class:AuditCategory/Attribute:rules_list+' => 'このカテゴリの監査ルール',
+	'Class:AuditCategory/Attribute:ok_error_tolerance' => 'Warning threshold~~',
+	'Class:AuditCategory/Attribute:ok_error_tolerance+' => 'Percentage of invalid objects below which the result is a warning (orange)~~',
+	'Class:AuditCategory/Attribute:warning_error_tolerance' => 'Error threshold~~',
+	'Class:AuditCategory/Attribute:warning_error_tolerance+' => 'Percentage of invalid objects below which the result is in error (red)~~',
+	'Class:AuditCategory/Attribute:domains_list' => 'Domains~~',
+	'Class:AuditCategory/Attribute:domains_list+' => 'Domains which includes this category~~',
 ));
 
 //
@@ -41,7 +47,42 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:AuditRule/Attribute:category_id' => 'カテゴリ',
 	'Class:AuditRule/Attribute:category_id+' => 'このルールのカテゴリ',
 	'Class:AuditRule/Attribute:category_name' => 'カテゴリ',
-	'Class:AuditRule/Attribute:category_name+' => 'このルールのカテゴリ名',
+	'Class:AuditRule/Attribute:category_name+' => 'このルールのカテゴリ名'
+));
+
+//
+// Class: AuditDomain
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Class:AuditDomain' => 'Audit Domain~~',
+	'Class:AuditDomain+' => 'Audit domains allow to group the audit categories.
+Domain usually correspond to who is responsible for checking and fixing errors~~',
+	'Class:AuditDomain/Attribute:name' => 'Name~~',
+	'Class:AuditDomain/Attribute:name+' => 'Its a segmentation of the Audit by who is in charge of fixing it or just interested~~',
+	'Class:AuditDomain/Attribute:description' => 'Description~~',
+	'Class:AuditDomain/Attribute:description+' => '~~',
+	'Class:AuditDomain/Attribute:icon' => 'Icon~~',
+	'Class:AuditDomain/Attribute:icon+' => '~~',
+	'Class:AuditDomain/Attribute:categories_list' => 'Categories~~',
+	'Class:AuditDomain/Attribute:categories_list+' => 'Related audit categories. When running the audit on a domain, all related audit categories are checked and only those.~~',
+));
+
+//
+// Class: lnkAuditCategoryToAuditDomain
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Class:lnkAuditCategoryToAuditDomain' => 'Link AuditCategory / AuditDomain~~',
+	'Class:lnkAuditCategoryToAuditDomain+' => '~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:category_id' => 'Category~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:category_id+' => 'Audit Category~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:category_name' => 'Category name~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:category_name+' => 'Audit category name~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:domain_id' => 'Domain~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:domain_id+' => 'Audit domain~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:domain_name' => 'Domain name~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:domain_name+' => 'Audit domain name~~',
 ));
 
 //
@@ -59,6 +100,16 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:Query/Attribute:is_template+' => 'Usable as source for recipient OQL in Notifications~~',
 	'Class:Query/Attribute:is_template/Value:yes' => 'Yes~~',
 	'Class:Query/Attribute:is_template/Value:no' => 'No~~',
+	'Class:Query/Attribute:export_count' => 'Export counter~~',
+	'Class:Query/Attribute:export_count+' => 'Counter reflecting the number of time this query has been executed~~',
+	'Class:Query/Attribute:export_last_date' => 'Last export~~',
+	'Class:Query/Attribute:export_last_date+' => 'Date and time of the last export execution~~',
+	'Class:Query/Attribute:export_last_user_id' => 'User~~',
+	'Class:Query/Attribute:export_last_user_id+' => 'The user who executed the last export~~',
+	'Class:Query/Attribute:export_last_user_contact' => 'Contact~~',
+	'Class:Query/Attribute:export_last_user_contact+' => 'The contact who executed the last export~~',
+	'Query:baseinfo' => 'General information~~',
+	'Query:exportInfo' => 'Export information~~',
 	'Class:QueryOQL/Attribute:fields' => 'フィールド',
 	'Class:QueryOQL/Attribute:fields+' => 'エクスポートする属性（またはエイリアス属性,alias.attribute）のコンマ区切り(CSV)リスト',
 	'Class:QueryOQL' => 'OQL クエリ',
@@ -107,7 +158,6 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:User/Attribute:status+' => 'Whether the user account is enabled or disabled.~~',
 	'Class:User/Attribute:status/Value:enabled' => 'Enabled~~',
 	'Class:User/Attribute:status/Value:disabled' => 'Disabled~~',
-
 	'Class:User/Error:LoginMustBeUnique' => 'ログイン名は一意でないといけません。- "%1s" はすでに使われています。',
 	'Class:User/Error:AtLeastOneProfileIsNeeded' => '少なくとも1件のプロフィールがこのユーザに指定されなければなりません。',
 	'Class:User/Error:ProfileNotAllowed' => 'Profile "%1$s" cannot be added it will deny the access to backoffice~~',
@@ -316,6 +366,29 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Expression:Unit:Short:YEAR' => 'y~~',
 ));
 
+//
+// Duplicated into itop-welcome-itil ( will be removed from here...)
+//
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Menu:WelcomeMenu' => 'ようこそ',
+	'Menu:WelcomeMenu+' => 'ようこそ、'.ITOP_APPLICATION_SHORT.'へ',
+	'Menu:WelcomeMenuPage' => 'ようこそ',
+	'Menu:WelcomeMenuPage+' => 'ようこそ、'.ITOP_APPLICATION_SHORT.'へ',
+	'Menu:AdminTools' => '管理ツール',
+	'Menu:AdminTools+' => '管理ツール',
+	'Menu:AdminTools?' => 'このツールは管理者プロフィールを持つユーザのみアクセスが可能です。',
+	'Menu:CSVImportMenu' => 'CSV インポート',
+	'Menu:CSVImportMenu+' => '一括作成/一括更新',
+	'Menu:DataModelMenu' => 'データモデル',
+	'Menu:DataModelMenu+' => 'データモデル概要',
+	'Menu:ExportMenu' => 'エクスポート',
+	'Menu:ExportMenu+' => '任意のクエリ結果をHTML、CSV、XMLでエクスポートする',
+	'Menu:NotificationsMenu' => '通知',
+	'Menu:NotificationsMenu+' => '通知の設定',
+	'Menu:MyShortcuts' => '私のショートカット',
+	'Menu:DataAdministration' => 'データ管理',
+	'Menu:DataAdministration+' => 'データ管理',
+));
 
 //
 // String from the User Interface: menu, messages, buttons, etc...
@@ -325,12 +398,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'BooleanLabel:yes' => 'はい',
 	'BooleanLabel:no' => 'いいえ',
 	'UI:Login:Title' => ITOP_APPLICATION_SHORT.' login~~',
-	'Menu:WelcomeMenu' => 'ようこそ',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:WelcomeMenu+' => 'ようこそ、'.ITOP_APPLICATION_SHORT.'へ',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:WelcomeMenuPage' => 'ようこそ',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:WelcomeMenuPage+' => 'ようこそ、'.ITOP_APPLICATION_SHORT.'へ',// Duplicated into itop-welcome-itil (will be removed from here...)
 	'UI:WelcomeMenu:Title' => 'ようこそ、'.ITOP_APPLICATION_SHORT.'へ',
-
 	'UI:WelcomeMenu:LeftBlock' => '<p>'.ITOP_APPLICATION_SHORT.'は、オープンソースの、完結したIT運用ポータルです。</p>
 <ul>以下を含みます。
 <li>ITインベントリを文書化し、管理するための完全なCMDB(構成管理データベース)。</li>
@@ -341,7 +409,6 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 <li>ITの概観を素早く得るためのダッシュボード。</li>
 </ul>
 <p>すべてのモジュールはお互いに独立しており、別個にセットアップが可能です。</p>',
-
 	'UI:WelcomeMenu:RightBlock' => '<p>'.ITOP_APPLICATION_SHORT.'はサービスプロバイダ志向であり、ITエンジニアが複数の顧客や組織を簡単に管理できるようになります。
 <ul>iTopは、機能豊富な下記のビジネスプロセスのセットを提供します。
 <li>IT管理の実効性の強化。</li>
@@ -357,7 +424,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 <li>ITの中でもっとも重要な財産である「文書化」の管理。</li>
 </ul>
 </p>',
-	'UI:WelcomeMenu:Text'=> '<div>Congratulations, you landed on '.ITOP_APPLICATION.' '.ITOP_VERSION_NAME.'!</div>
+	'UI:WelcomeMenu:Text' => '<div>Congratulations, you landed on '.ITOP_APPLICATION.' '.ITOP_VERSION_NAME.'!</div>
 
 <div>This version features a brand new modern and accessible backoffice design.</div>
 
@@ -378,6 +445,7 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:Button:GlobalSearch' => '検索',
 	'UI:Button:Search' => '　検索　',
 	'UI:Button:Clear' => ' Clear ~~',
+	'UI:Button:Confirm' => ' Confirm ~~',
 	'UI:Button:SearchInHierarchy' => 'Search in hierarchy~~',
 	'UI:Button:Query' => ' クエリ',
 	'UI:Button:Ok' => 'OK',
@@ -418,7 +486,6 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:UserPref:DoNotShowAgain' => 'Do not show again~~',
 	'UI:InputFile:NoFileSelected' => 'No File Selected~~',
 	'UI:InputFile:SelectFile' => 'Select a file~~',
-
 	'UI:SearchToggle' => '検索（トグル↓↑)',
 	'UI:ClickToCreateNew' => '新規 %1$s を作成~~',
 	'UI:SearchFor_Class' => '%1$s オブジェクトを検索',
@@ -438,7 +505,6 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:Error:CannotWriteToTmp_Dir' => '一時ファイルをディスクに書き込めません。upload_tmp_dir = "%1$s"',
 	'UI:Error:UploadStoppedByExtension_FileName' => 'extensionにより、アップロードを停止しました。(オリジナルのファイル名は"%1$s"です)。',
 	'UI:Error:UploadFailedUnknownCause_Code' => 'ファイルのアップロードに失敗しました。原因は不明(エラーコード: "%1$s")です。',
-
 	'UI:Error:1ParametersMissing' => 'エラー: この操作には下記のパラメータを指定する必要があります：%1$s',
 	'UI:Error:2ParametersMissing' => 'エラー：この操作には、下記のパラメータを指定する必要があります：%1$s , %2$s',
 	'UI:Error:3ParametersMissing' => 'エラー：この操作には、下記のパラメータを指定する必要があります：%1$s, %2$s, %3$s',
@@ -460,9 +526,7 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:Error:MaintenanceMode' => 'Application is currently in maintenance~~',
 	'UI:Error:MaintenanceTitle' => 'Maintenance~~',
 	'UI:Error:InvalidToken' => 'Error: the requested operation has already been performed (CSRF token not found)~~',
-
 	'UI:Error:SMTP:UnknownVendor' => 'OAuth SMTP provider %1$s does not exist  (email_transport_smtp.oauth.provider)~~',
-
 	'UI:GroupBy:Count' => 'カウント',
 	'UI:GroupBy:Count+' => '要素数',
 	'UI:CountOfObjects' => '%1$d 個のオブジェクトが条件にマッチしました。',
@@ -491,6 +555,7 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:Menu:OtherActions' => 'その他の実行',
 	'UI:Menu:Transitions' => 'Transitions~~',
 	'UI:Menu:OtherTransitions' => 'Other Transitions~~',
+	'UI:Menu:View' => 'View this object~~',
 	'UI:Menu:New' => '新規...',
 	'UI:Menu:Add' => '追加...',
 	'UI:Menu:Manage' => '管理...',
@@ -499,6 +564,9 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:Menu:Modify' => '修正...',
 	'UI:Menu:Delete' => '削除...',
 	'UI:Menu:BulkDelete' => '削除...',
+	'UI:Menu:BulkDelete_Class' => 'Delete %1$s objects...~~',
+	'UI:Menu:BulkDelete_Link' => 'Delete %1$s...~~',
+	'UI:Menu:BulkDelete_Remote' => 'Delete %1$s...~~',
 	'UI:UndefinedObject' => '未定義',
 	'UI:Document:OpenInNewWindow:Download' => '新規ウィンドウで開く: %1$s、 ダウンロード: %2$s',
 	'UI:SplitDateTime-Date' => '日付',
@@ -531,7 +599,6 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:Login:ResetPassword' => 'Send now!~~',
 	'UI:Login:ResetPwdFailed' => 'Failed to send an email: %1$s~~',
 	'UI:Login:SeparatorOr' => 'Or~~',
-
 	'UI:ResetPwd-Error-WrongLogin' => '\'%1$s\' is not a valid login~~',
 	'UI:ResetPwd-Error-NotPossible' => 'external accounts do not allow password reset.~~',
 	'UI:ResetPwd-Error-FixedPwd' => 'the account does not allow password reset.~~',
@@ -542,50 +609,49 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:ResetPwd-EmailSent' => 'Please check your email box and follow the instructions. If you receive no email, please check the login you typed.~~',
 	'UI:ResetPwd-EmailSubject' => 'Reset your iTop password~~',
 	'UI:ResetPwd-EmailBody' => '<body><p>You have requested to reset your iTop password.</p><p>Please follow this link (single usage) to <a href="%1$s">enter a new password</a></p>.~~',
-
 	'UI:ResetPwd-Title' => 'Reset password~~',
 	'UI:ResetPwd-Error-InvalidToken' => 'Sorry, either the password has already been reset, or you have received several emails. Please make sure that you use the link provided in the very last email received.~~',
 	'UI:ResetPwd-Error-EnterPassword' => 'Enter a new password for the account \'%1$s\'.~~',
 	'UI:ResetPwd-Ready' => 'The password has been changed.~~',
 	'UI:ResetPwd-Login' => 'Click here to login...~~',
-
-	'UI:Login:About'                               => '',
-	'UI:Login:ChangeYourPassword'                  => 'パスワードを変更してください',
-	'UI:Login:OldPasswordPrompt'                   => '古いパスワード',
-	'UI:Login:NewPasswordPrompt'                   => '新しいパスワード',
-	'UI:Login:RetypeNewPasswordPrompt'             => '新しいパスワードを再度入力してください。',
-	'UI:Login:IncorrectOldPassword'                => 'エラー：既存パスワードが正しくありません。',
-	'UI:LogOffMenu'                                => 'ログオフ',
-	'UI:LogOff:ThankYou'                           => ITOP_APPLICATION_SHORT.'をご利用いただき、ありがとうございます。',
-	'UI:LogOff:ClickHereToLoginAgain'              => '再度ログインするにはここをクリックしてください...',
-	'UI:ChangePwdMenu'                             => 'パスワードを変更する...',
-	'UI:Login:PasswordChanged'                     => 'パスワードは変更されました。',
-	'UI:AccessRO-All'                              => ITOP_APPLICATION_SHORT.'は参照専用です。',
-	'UI:AccessRO-Users'                            => 'エンドユーザの方は'.ITOP_APPLICATION_SHORT.'は参照専用です。',
-	'UI:ApplicationEnvironment'                    => 'アプリケーション環境: %1$s',
-	'UI:Login:RetypePwdDoesNotMatch'               => '2度入力された新しいパスワードが一致しません!',
-	'UI:Button:Login'                              => ITOP_APPLICATION_SHORT.'へ入る',
-	'UI:Login:Error:AccessRestricted'              => ITOP_APPLICATION_SHORT.'へのアクセスは制限されています。'.ITOP_APPLICATION_SHORT.'管理者に問い合わせしてください。',
-	'UI:Login:Error:AccessAdmin'                   => '管理者権限をもつユーザにアクセスが制限されています。'.ITOP_APPLICATION_SHORT.'管理者に問い合わせしてください。',
-	'UI:Login:Error:WrongOrganizationName'         => 'Unknown organization~~',
+	'UI:Login:About' => '',
+	'UI:Login:ChangeYourPassword' => 'パスワードを変更してください',
+	'UI:Login:OldPasswordPrompt' => '古いパスワード',
+	'UI:Login:NewPasswordPrompt' => '新しいパスワード',
+	'UI:Login:RetypeNewPasswordPrompt' => '新しいパスワードを再度入力してください。',
+	'UI:Login:IncorrectOldPassword' => 'エラー：既存パスワードが正しくありません。',
+	'UI:LogOffMenu' => 'ログオフ',
+	'UI:LogOff:ThankYou' => ITOP_APPLICATION_SHORT.'をご利用いただき、ありがとうございます。',
+	'UI:LogOff:ClickHereToLoginAgain' => '再度ログインするにはここをクリックしてください...',
+	'UI:ChangePwdMenu' => 'パスワードを変更する...',
+	'UI:Login:PasswordChanged' => 'パスワードは変更されました。',
+	'UI:Login:PasswordNotChanged' => 'Error: Password is the same!~~',
+	'UI:AccessRO-All' => ITOP_APPLICATION_SHORT.'は参照専用です。',
+	'UI:AccessRO-Users' => 'エンドユーザの方は'.ITOP_APPLICATION_SHORT.'は参照専用です。',
+	'UI:ApplicationEnvironment' => 'アプリケーション環境: %1$s',
+	'UI:Login:RetypePwdDoesNotMatch' => '2度入力された新しいパスワードが一致しません!',
+	'UI:Button:Login' => ITOP_APPLICATION_SHORT.'へ入る',
+	'UI:Login:Error:AccessRestricted' => ITOP_APPLICATION_SHORT.'へのアクセスは制限されています。'.ITOP_APPLICATION_SHORT.'管理者に問い合わせしてください。',
+	'UI:Login:Error:AccessAdmin' => '管理者権限をもつユーザにアクセスが制限されています。'.ITOP_APPLICATION_SHORT.'管理者に問い合わせしてください。',
+	'UI:Login:Error:WrongOrganizationName' => 'Unknown organization~~',
 	'UI:Login:Error:MultipleContactsHaveSameEmail' => 'Multiple contacts have the same e-mail~~',
-	'UI:Login:Error:NoValidProfiles'               => 'No valid profile provided~~',
-	'UI:CSVImport:MappingSelectOne'                => '-- 選択ください --',
-	'UI:CSVImport:MappingNotApplicable'            => '--このフィールドを無視する --',
-	'UI:CSVImport:NoData'                          => '空のデータセット..., データを提供してください。',
-	'UI:Title:DataPreview'                         => 'データプレビュー',
-	'UI:CSVImport:ErrorOnlyOneColumn'              => 'エラー：このデータにはカラムが1つしか含まれていません。適切なセパレータ文字を選択しましたか。',
-	'UI:CSVImport:FieldName'                       => 'フィールド %1$d',
-	'UI:CSVImport:DataLine1'                       => 'データ行 1',
-	'UI:CSVImport:DataLine2'                       => 'データ行 2',
-	'UI:CSVImport:idField'                         => 'ID (主キー)',
+	'UI:Login:Error:NoValidProfiles' => 'No valid profile provided~~',
+	'UI:CSVImport:MappingSelectOne' => '-- 選択ください --',
+	'UI:CSVImport:MappingNotApplicable' => '--このフィールドを無視する --',
+	'UI:CSVImport:NoData' => '空のデータセット..., データを提供してください。',
+	'UI:Title:DataPreview' => 'データプレビュー',
+	'UI:CSVImport:ErrorOnlyOneColumn' => 'エラー：このデータにはカラムが1つしか含まれていません。適切なセパレータ文字を選択しましたか。',
+	'UI:CSVImport:FieldName' => 'フィールド %1$d',
+	'UI:CSVImport:DataLine1' => 'データ行 1',
+	'UI:CSVImport:DataLine2' => 'データ行 2',
+	'UI:CSVImport:idField' => 'ID (主キー)',
 	'UI:Title:BulkImport' => ITOP_APPLICATION_SHORT.' - バルクインポート',
-	'UI:Title:BulkImport+'                         => 'CSV インポートウィザード',
-	'UI:Title:BulkSynchro_nbItem_ofClass_class'    => '%2$s クラスの %1$d オブジェクトを同期',
-	'UI:CSVImport:ClassesSelectOne'                => '--選択してください --',
-	'UI:CSVImport:ErrorExtendedAttCode'            => '内部エラー： "%2$s" は"%3$s"クラスの外部キーではないので、"%1$s" は誤ったコードです。',
-	'UI:CSVImport:ObjectsWillStayUnchanged'        => '%1$d オブジェクトは変更されません。',
-	'UI:CSVImport:ObjectsWillBeModified'           => '%1$d オブジェクトが修正されます。',
+	'UI:Title:BulkImport+' => 'CSV インポートウィザード',
+	'UI:Title:BulkSynchro_nbItem_ofClass_class' => '%2$s クラスの %1$d オブジェクトを同期',
+	'UI:CSVImport:ClassesSelectOne' => '--選択してください --',
+	'UI:CSVImport:ErrorExtendedAttCode' => '内部エラー： "%2$s" は"%3$s"クラスの外部キーではないので、"%1$s" は誤ったコードです。',
+	'UI:CSVImport:ObjectsWillStayUnchanged' => '%1$d オブジェクトは変更されません。',
+	'UI:CSVImport:ObjectsWillBeModified' => '%1$d オブジェクトが修正されます。',
 	'UI:CSVImport:ObjectsWillBeAdded' => '%1$d オブジェクトが追加されます。',
 	'UI:CSVImport:ObjectsWillHaveErrors' => '%1$d オブジェクトにエラーがあります。',
 	'UI:CSVImport:ObjectsRemainedUnchanged' => '%1$d オブジェクトは変更されていません。',
@@ -631,11 +697,14 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:UniversalSearchTitle' => ITOP_APPLICATION_SHORT.' - ユニバーサル検索',
 	'UI:UniversalSearch:Error' => 'エラー：%1$s',
 	'UI:UniversalSearch:LabelSelectTheClass' => '検索するクラスを選択してください。',
-
 	'UI:CSVReport-Value-Modified' => '修正済み',
 	'UI:CSVReport-Value-SetIssue' => 'invalid value for attribute~~',
 	'UI:CSVReport-Value-ChangeIssue' => '\'%1$s\' is an invalid value~~',
 	'UI:CSVReport-Value-NoMatch' => 'No match for value \'%1$s\'~~',
+	'UI:CSVReport-Value-NoMatch-PossibleValues' => 'Some possible \'%1$s\' value(s): %2$s~~',
+	'UI:CSVReport-Value-NoMatch-NoObject' => 'There are no \'%1$s\' objects~~',
+	'UI:CSVReport-Value-NoMatch-NoObject-ForCurrentUser' => 'There are no \'%1$s\' objects found with your current profile~~',
+	'UI:CSVReport-Value-NoMatch-SomeObjectNotVisibleForCurrentUser' => 'There are some \'%1$s\' objects not visible with your current profile~~',
 	'UI:CSVReport-Value-Missing' => '必須の値がありません',
 	'UI:CSVReport-Value-Ambiguous' => 'あいまいな値:  %1$s オブジェクト',
 	'UI:CSVReport-Row-Unchanged' => '未変更',
@@ -649,15 +718,16 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:CSVReport-Value-Issue-Readonly' => '属性 \'%1$s\' は、読み取り専用で、修正出来ません(現在の値: %2$s, 要求された値: %3$s)',
 	'UI:CSVReport-Value-Issue-Format' => '入力処理の失敗: %1$s',
 	'UI:CSVReport-Value-Issue-NoMatch' => '属性 \'%1$s\' への予期されない値 : マッチしません、文字列チェック',
+	'UI:CSVReport-Value-Issue-AllowedValues' => 'Allowed \'%1$s\' value(s): %2$s~~',
 	'UI:CSVReport-Value-Issue-Unknown' => '属性 \'%1$s\' への予期されない値: %2$s',
 	'UI:CSVReport-Row-Issue-Inconsistent' => '属性がお互いに整合しません: %1$s',
 	'UI:CSVReport-Row-Issue-Attribute' => '予期されない属性値',
 	'UI:CSVReport-Row-Issue-MissingExtKey' => '作成できません, 外部キーがありません: %1$s',
 	'UI:CSVReport-Row-Issue-DateFormat' => '間違ったデータフォーマット',
+	'UI:CSVReport-Row-Issue-ExpectedDateFormat' => 'Expected format: %1$s~~',
 	'UI:CSVReport-Row-Issue-Reconciliation' => '調整に失敗しました',
 	'UI:CSVReport-Row-Issue-Ambiguous' => 'あいまいな調整',
 	'UI:CSVReport-Row-Issue-Internal' => '内部エラー: %1$s, %2$s',
-
 	'UI:CSVReport-Icon-Unchanged' => '未変更',
 	'UI:CSVReport-Icon-Modified' => '修正済み',
 	'UI:CSVReport-Icon-Missing' => '不足',
@@ -672,14 +742,32 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:CSVReport-Stats-Errors' => '%1$.0f %% ロードされたオブジェクトはエラーがあり、無視されます。',
 	'UI:CSVReport-Stats-Created' => '%1$.0f %% ロードされたオブジェクトは作成されます。',
 	'UI:CSVReport-Stats-Modified' => '%1$.0f %% of ロードされたオブジェクトは修正されます。',
-
 	'UI:CSVExport:AdvancedMode' => 'アドバンスドモード',
 	'UI:CSVExport:AdvancedMode+' => 'アドバンスドモードでは、エキスポートのためにいくつかのカラムが追加されます。: オブジェクトのid, 外部キーの id ,そして調整属性。',
 	'UI:CSVExport:LostChars' => 'エンコーディングの課題',
 	'UI:CSVExport:LostChars+' => 'ダウンロードファイルは %1$s でエンコードされます. iTop はこのフォーマットと整合性のない文字を検出しました。 これらの文字は代りの文字になります。（たとえばアクセント付き文字からはアクセント記号が無くなります。または、削除されます。 Webブラウザからコピー／ペーストが出来ます。 あるいは、システム管理者にエンコードの変更を問い合わせください。 (See parameter \'csv_file_default_charset\').',
-
 	'UI:Audit:Title' => ITOP_APPLICATION_SHORT.' - CMDB 監査',
 	'UI:Audit:InteractiveAudit' => '対話型監査',
+	'UI:Audit:Interactive:All:Title' => 'Audit results~~',
+	'UI:Audit:Interactive:All:SubTitle' => 'Full audit: includes all rules, all categories, all domains~~',
+	'UI:Audit:Interactive:All:BreadCrumb' => 'Full audit~~',
+	'UI:Audit:Interactive:All:BreadCrumb+' => 'Audit results for all rules~~',
+	'UI:Audit:Interactive:Categories:Title' => 'Audit results for categories: %1$s~~',
+	'UI:Audit:Interactive:Categories:SubTitle' => 'Audit results for all the rules belonging to one of those %1$s categories~~',
+	'UI:Audit:Interactive:Categories:BreadCrumb' => 'Categories~~',
+	'UI:Audit:Interactive:Categories:BreadCrumb+' => 'Audit categories: %1$s~~',
+	'UI:Audit:Interactive:Domain:Title' => 'Audit results for Domain: %1$s~~',
+	'UI:Audit:Interactive:Domain:SubTitle' => 'Audit results for all the rules belonging to a category related to the domain: %1$s~~',
+	'UI:Audit:Interactive:Domain:BreadCrumb' => '%1$s~~',
+	'UI:Audit:Interactive:Domain:BreadCrumb+' => 'Audit for Domain: %1$s~~',
+	'UI:Audit:Interactive:Selection:Title' => 'Selection of an audit~~',
+	'UI:Audit:Interactive:Selection:SubTitle' => 'Select a domain to get the results limited to this domain or select "All categories" to get a full audit (can take time or even fail if too much data to audit)~~',
+	'UI:Audit:Interactive:Selection:BreadCrumb' => 'Selection~~',
+	'UI:Audit:Interactive:Selection:BreadCrumb+' => 'Selection of an Audit to run~~',
+	'UI:Audit:Interactive:Selection:BadgeAll' => 'All categories~~',
+	'UI:Audit:Interactive:Button:Back' => 'Back to the audit~~',
+	'UI:Audit:Interactive:Button:Configuration' => 'Audit configuration~~',
+	'UI:Audit:ViewRules' => 'Check the rules~~',
 	'UI:Audit:HeaderAuditRule' => '監査ルール',
 	'UI:Audit:HeaderNbObjects' => 'オブジェクト数',
 	'UI:Audit:HeaderNbErrors' => 'エラー数',
@@ -695,8 +783,6 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:Audit:Dashboard:ObjectsInError' => 'Objects in errors~~',
 	'UI:Audit:Dashboard:ObjectsValidated' => 'Objects validated~~',
 	'UI:Audit:AuditCategory:Subtitle' => '%1$s errors ouf of %2$s - %3$s%%~~',
-
-
 	'UI:RunQuery:Title' => ITOP_APPLICATION_SHORT.' - OQLクエリ評価',
 	'UI:RunQuery:QueryExamples' => 'クエリの例',
 	'UI:RunQuery:QueryResults' => 'Query Results~~',
@@ -715,7 +801,7 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:RunQuery:ResultSQL' => 'Resulting SQL~~',
 	'UI:RunQuery:Error' => 'An error occured while running the query~~',
 	'UI:Query:UrlForExcel' => 'MS-Excel Webクエリに使用するURL',
-	'UI:Query:UrlV1' => 'The list of fields has been left unspecified. The page <em>export-V2.php</em> cannot be invoked without this information. Therefore, the URL suggested herebelow points to the legacy page: <em>export.php</em>. This legacy version of the export has the following limitation: the list of exported fields may vary depending on the output format and the data model of '.ITOP_APPLICATION_SHORT.'. Should you want to garantee that the list of exported columns will remain stable on the long run, then you must specify a value for the attribute "Fields" and use the page <em>export-V2.php</em>.~~',
+	'UI:Query:UrlV1' => 'The list of fields has been left unspecified. The page <em>export-V2.php</em> cannot be invoked without this information. Therefore, the URL suggested herebelow points to the legacy page: <em>export.php</em>. This legacy version of the export has the following limitation: the list of exported fields may vary depending on the output format and the data model of '.ITOP_APPLICATION_SHORT.'.Should you want to garantee that the list of exported columns will remain stable on the long run, then you must specify a value for the attribute "Fields" and use the page <em>export-V2.php</em>.~~',
 	'UI:Schema:Title' => ITOP_APPLICATION_SHORT.' オブジェクトスキーマ',
 	'UI:Schema:TitleForClass' => '%1$s schema~~',
 	'UI:Schema:CategoryMenuItem' => 'カテゴリ <b>%1$s</b>',
@@ -735,7 +821,6 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:Schema:Label' => 'ラベル',
 	'UI:Schema:Label+' => '属性のラベル',
 	'UI:Schema:Type' => '型',
-
 	'UI:Schema:Type+' => '属性のデータ型',
 	'UI:Schema:Origin' => 'オリジン',
 	'UI:Schema:Origin+' => 'この属性が定義されているベースクラス',
@@ -783,6 +868,16 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:Schema:DisplaySelector/Code' => 'Code~~',
 	'UI:Schema:Attribute/Filter' => 'Filter~~',
 	'UI:Schema:DefaultNullValue' => 'Default null : "%1$s"~~',
+	'UI:Schema:Events' => 'Events~~',
+	'UI:Schema:Events:Defined' => 'Defined events~~',
+	'UI:Schema:Events:NoEvent' => 'No event defined~~',
+	'UI:Schema:Events:Listeners' => 'Event listeners~~',
+	'UI:Schema:Events:NoListener' => 'No event listener~~',
+	'UI:Schema:Events:Event' => 'Event~~',
+	'UI:Schema:Events:Description' => 'Description~~',
+	'UI:Schema:Events:Listener' => 'Listener~~',
+	'UI:Schema:Events:Rank' => 'Rank~~',
+	'UI:Schema:Events:Module' => 'Module~~',
 	'UI:LinksWidget:Autocomplete+' => '最初の3文字をタイプしてください...',
 	'UI:Edit:SearchQuery' => 'Select a predefined query~~',
 	'UI:Edit:TestQuery' => 'Test query',
@@ -874,7 +969,6 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:SystemIntrusion' => 'アクセスが拒否されました。あなたが許可されていない操作を実行しようとしています。',
 	'UI:FatalErrorMessage' => '致命的なエラー、ITOPを続行することはできません。',
 	'UI:Error_Details' => 'エラー：%1$s',
-
 	'UI:PageTitle:ProfileProjections' => ITOP_APPLICATION_SHORT.' ユーザ管理 - プロフィールプロジェクション',
 	'UI:UserManagement:Class' => 'クラス',
 	'UI:UserManagement:Class+' => 'オブジェクトのクラス',
@@ -909,66 +1003,42 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:UserManagement:NoLifeCycleApplicable' => '該当なし',
 	'UI:UserManagement:NoLifeCycleApplicable+' => 'このクラスにはライフサイクルは定義されていません。',
 	'UI:UserManagement:GrantMatrix' => '権限マトリクス',
-
-	'Menu:AdminTools' => '管理ツール',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:AdminTools+' => '管理ツール',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:AdminTools?' => 'このツールは管理者プロフィールを持つユーザのみアクセスが可能です。',// Duplicated into itop-welcome-itil (will be removed from here...)
 	'Menu:SystemTools' => 'System~~',
-
 	'UI:ChangeManagementMenu' => '変更管理',
 	'UI:ChangeManagementMenu+' => '変更管理',
 	'UI:ChangeManagementMenu:Title' => '変更管理概要',
 	'UI-ChangeManagementMenu-ChangesByType' => 'タイプ別変更',
 	'UI-ChangeManagementMenu-ChangesByStatus' => '状態別変更',
 	'UI-ChangeManagementMenu-ChangesNotYetAssigned' => 'まだ割り当てられていない変更',
-
 	'UI:ConfigurationManagementMenu' => '構成管理',
 	'UI:ConfigurationManagementMenu+' => '構成管理',
 	'UI:ConfigurationManagementMenu:Title' => 'インフラ概要',
 	'UI-ConfigurationManagementMenu-InfraByType' => 'タイプ別のインフラ',
 	'UI-ConfigurationManagementMenu-InfraByStatus' => '状態別のインフラ',
-
 	'UI:ConfigMgmtMenuOverview:Title' => '構成管理ダッシュボード',
 	'UI-ConfigMgmtMenuOverview-FunctionalCIbyStatus' => '状態別構成項目(CI)',
 	'UI-ConfigMgmtMenuOverview-FunctionalCIByType' => 'タイプ別構成項目(CI)',
-
 	'UI:RequestMgmtMenuOverview:Title' => '要求管理ダッシュボード',
 	'UI-RequestManagementOverview-RequestByService' => 'サービス別要求',
 	'UI-RequestManagementOverview-RequestByPriority' => '優先度別要求',
 	'UI-RequestManagementOverview-RequestUnassigned' => 'エージェントへ未割り当て要求',
-
 	'UI:IncidentMgmtMenuOverview:Title' => 'インシデント管理ダッシュボード',
 	'UI-IncidentManagementOverview-IncidentByService' => 'サービス別インシデント',
 	'UI-IncidentManagementOverview-IncidentByPriority' => '優先度別インシデント',
 	'UI-IncidentManagementOverview-IncidentUnassigned' => 'エージェントへ未割り当てインシデント',
-
 	'UI:ChangeMgmtMenuOverview:Title' => '変更管理ダッシュボード',
 	'UI-ChangeManagementOverview-ChangeByType' => 'タイプ別変更内容',
 	'UI-ChangeManagementOverview-ChangeUnassigned' => 'エージェントへ未割り当て変更内容',
 	'UI-ChangeManagementOverview-ChangeWithOutage' => '変更に伴う停止',
-
 	'UI:ServiceMgmtMenuOverview:Title' => 'サービス管理ダッシュボード',
 	'UI-ServiceManagementOverview-CustomerContractToRenew' => '30日以内に契約更新が必要な顧客',
 	'UI-ServiceManagementOverview-ProviderContractToRenew' => '30日以内に契約更新が必要なプロバイダ',
-
 	'UI:ContactsMenu' => '連絡先',
 	'UI:ContactsMenu+' => '連絡先',
 	'UI:ContactsMenu:Title' => '連絡先概要',
 	'UI-ContactsMenu-ContactsByLocation' => '場所別連絡先',
 	'UI-ContactsMenu-ContactsByType' => 'タイプ別連絡先',
 	'UI-ContactsMenu-ContactsByStatus' => '状態別連絡先',
-
-	'Menu:CSVImportMenu' => 'CSV インポート',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:CSVImportMenu+' => '一括作成/一括更新',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:DataModelMenu' => 'データモデル',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:DataModelMenu+' => 'データモデル概要',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:ExportMenu' => 'エクスポート',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:ExportMenu+' => '任意のクエリ結果をHTML、CSV、XMLでエクスポートする',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:NotificationsMenu' => '通知',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:NotificationsMenu+' => '通知の設定',// Duplicated into itop-welcome-itil (will be removed from here...)
 	'UI:NotificationsMenu:Title' => '通知の設定',
 	'UI:NotificationsMenu:Help' => 'ヘルプ',
 	'UI:NotificationsMenu:HelpContent' => '<p>'.ITOP_APPLICATION_SHORT.'では、通知はすべてカスタマイズが可能です。通知は<i>トリガーとアクション</i>という二つのオブジェクトがベースになっています。
@@ -999,53 +1069,18 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:NotificationsMenu:Actions:ActionWebhook' => 'Webhook actions (outgoing integrations)~~',
 	'UI:NotificationsMenu:Actions:Action' => 'Other actions~~',
 	'UI:NotificationsMenu:AvailableActions' => '利用可能アクション',
-
 	'Menu:TagAdminMenu' => 'Tags configuration~~',
 	'Menu:TagAdminMenu+' => 'Tags values management~~',
 	'UI:TagAdminMenu:Title' => 'Tags configuration~~',
 	'UI:TagAdminMenu:NoTags' => 'No Tag field configured~~',
 	'UI:TagSetFieldData:Error' => 'Error: %1$s~~',
-
-	'Menu:AuditCategories' => '監査カテゴリ',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:AuditCategories+' => '監査カテゴリ',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:Notifications:Title' => '監査カテゴリ',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:RunQueriesMenu' => 'クエリ実行',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:RunQueriesMenu+' => '任意のクエリを実行',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:QueryMenu' => 'クエリのフレーズブック',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:QueryMenu+' => 'クエリのフレーズブック',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:DataAdministration' => 'データ管理',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:DataAdministration+' => 'データ管理',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:UniversalSearchMenu' => '全検索',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UniversalSearchMenu+' => '何か...検索',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:UserManagementMenu' => 'ユーザ管理',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UserManagementMenu+' => 'ユーザ管理',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:ProfilesMenu' => 'プロフィール',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:ProfilesMenu+' => 'プロフィール',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:ProfilesMenu:Title' => 'プロフィール',
-	// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:UserAccountsMenu' => 'ユーザアカウント',
-	// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UserAccountsMenu+' => 'ユーザアカウント',
-	// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UserAccountsMenu:Title' => 'ユーザアカウント',
-	// Duplicated into itop-welcome-itil (will be removed from here...)
-
 	'UI:iTopVersion:Short' => '%1$sバージョン%2$s',
 	'UI:iTopVersion:Long' => '%1$sバージョン%2$s-%3$s ビルド%4$s',
 	'UI:PropertiesTab' => 'プロパティ',
-
 	'UI:OpenDocumentInNewWindow_' => 'Open~~',
 	'UI:DownloadDocument_' => 'Download~~',
 	'UI:Document:NoPreview' => 'このタイプの文書はプレビューできません。',
 	'UI:Download-CSV' => 'ダウンロード-CSV %1$s',
-
 	'UI:DeadlineMissedBy_duration' => '%1$s によって消去されました。',
 	'UI:Deadline_LessThan1Min' => ' < 1分',
 	'UI:Deadline_Minutes' => '%1$d 分',
@@ -1124,9 +1159,13 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'Enum:Undefined' => '未定義',
 	'UI:DurationForm_Days_Hours_Minutes_Seconds' => '%1$s 日 %2$s 時 %3$s 分 %4$s 秒',
 	'UI:ModifyAllPageTitle' => '全てを修正',
+	'UI:Modify_ObjectsOf_Class' => 'Modifying objects of class %1$s~~',
 	'UI:Modify_N_ObjectsOf_Class' => 'クラス%2$Sの%1$dオブジェクトを修正',
 	'UI:Modify_M_ObjectsOf_Class_OutOf_N' => 'クラス%2$sの%3$d中%1$dを修正',
 	'UI:Menu:ModifyAll' => '修正...',
+	'UI:Menu:ModifyAll_Class' => 'Modify %1$s objects...~~',
+	'UI:Menu:ModifyAll_Link' => 'Modify %1$s...~~',
+	'UI:Menu:ModifyAll_Remote' => 'Modify %1$s...~~',
 	'UI:Button:ModifyAll' => '全て修正',
 	'UI:Button:PreviewModifications' => '修正をプレビュー >>',
 	'UI:ModifiedObject' => '修正されたオブジェクト',
@@ -1186,7 +1225,6 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:PrintResolution:LetterLandscape' => 'Letter Landscape~~',
 	'UI:Toggle:SwitchToStandardDashboard' => 'Switch to standard dashboard~~',
 	'UI:Toggle:SwitchToCustomDashboard' => 'Switch to custom dashboard~~',
-
 	'UI:ConfigureThisList' => 'このリストを構成...',
 	'UI:ListConfigurationTitle' => 'リストコンフィギュレーション',
 	'UI:ColumnsAndSortOrder' => 'カラムと並び順:',
@@ -1202,10 +1240,8 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:ExtField_AsRemoteField' => '%1$s (%2$s)',
 	'UI:Button:MoveUp' => '上へ',
 	'UI:Button:MoveDown' => '下へ',
-
 	'UI:OQL:UnknownClassAndFix' => '未知のクラス "%1$s"。 代りに "%2$s" を試すことが出来ます。',
 	'UI:OQL:UnknownClassNoFix' => '未知のクラス "%1$s"',
-
 	'UI:Dashboard:EditCustom' => 'Edit custom version...~~',
 	'UI:Dashboard:CreateCustom' => 'Create a custom version...~~',
 	'UI:Dashboard:DeleteCustom' => 'Delete custom version...~~',
@@ -1216,13 +1252,10 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:ImportDashboardText' => 'インポートするダッシュボードファイルを選択ください。:',
 	'UI:Dashboard:Actions' => 'Dashboard actions~~',
 	'UI:Dashboard:NotUpToDateUntilContainerSaved' => 'This dashboard displays information that does not include the on-going changes.~~',
-
-
 	'UI:DashletCreation:Title' => '新しいダッシュレットを作成',
 	'UI:DashletCreation:Dashboard' => 'ダッシュボード',
 	'UI:DashletCreation:DashletType' => 'ダッシュレットタイプ',
 	'UI:DashletCreation:EditNow' => 'ダッシュレットの編集',
-
 	'UI:DashboardEdit:Title' => 'ダッシュボードエディター',
 	'UI:DashboardEdit:DashboardTitle' => '題名',
 	'UI:DashboardEdit:AutoReload' => 'Automatic refresh~~',
@@ -1230,38 +1263,31 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:DashboardEdit:AutoReloadSec+' => 'The minimum allowed is %1$d seconds~~',
 	'UI:DashboardEdit:Revert' => 'Revert~~',
 	'UI:DashboardEdit:Apply' => 'Apply~~',
-
 	'UI:DashboardEdit:Layout' => 'レイアウト',
 	'UI:DashboardEdit:Properties' => 'ダッシュボードプロパティ',
 	'UI:DashboardEdit:Dashlets' => '利用可能なダッシュレット',
 	'UI:DashboardEdit:DashletProperties' => 'ダッシュレットプロパティ',
-
 	'UI:Form:Property' => 'プロパティ',
 	'UI:Form:Value' => '値',
-
 	'UI:DashletUnknown:Label' => 'Unknown~~',
 	'UI:DashletUnknown:Description' => 'Unknown dashlet (might have been uninstalled)~~',
 	'UI:DashletUnknown:RenderText:View' => 'Unable to render this dashlet.~~',
 	'UI:DashletUnknown:RenderText:Edit' => 'Unable to render this dashlet (class "%1$s"). Check with your administrator if it is still available.~~',
 	'UI:DashletUnknown:RenderNoDataText:Edit' => 'No preview available for this dashlet (class "%1$s").~~',
 	'UI:DashletUnknown:Prop-XMLConfiguration' => 'Configuration (shown as raw XML)~~',
-
 	'UI:DashletProxy:Label' => 'Proxy~~',
 	'UI:DashletProxy:Description' => 'Proxy dashlet~~',
 	'UI:DashletProxy:RenderNoDataText:Edit' => 'No preview available for this third-party dashlet (class "%1$s").~~',
 	'UI:DashletProxy:Prop-XMLConfiguration' => 'Configuration (shown as raw XML)~~',
-
 	'UI:DashletPlainText:Label' => 'テキスト',
 	'UI:DashletPlainText:Description' => 'プレーンテキスト (フォーマットなし)',
 	'UI:DashletPlainText:Prop-Text' => 'テキスト',
 	'UI:DashletPlainText:Prop-Text:Default' => 'ここにテキストを入力ください...',
-
 	'UI:DashletObjectList:Label' => 'オブジェクトリスト',
 	'UI:DashletObjectList:Description' => 'オブジェクトリストダッシュレット',
 	'UI:DashletObjectList:Prop-Title' => '題名',
 	'UI:DashletObjectList:Prop-Query' => 'クエリ',
 	'UI:DashletObjectList:Prop-Menu' => 'メニュー',
-
 	'UI:DashletGroupBy:Prop-Title' => '題名',
 	'UI:DashletGroupBy:Prop-Query' => 'クエリ',
 	'UI:DashletGroupBy:Prop-Style' => 'スタイル',
@@ -1275,24 +1301,20 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfWeek' => '%1$s (週の日)',
 	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfMonth' => '%1$s (月の日)',
 	'UI:DashletGroupBy:MissingGroupBy' => 'グループ化されるオブジェクトのフィールドを選択ください。',
-
 	'UI:DashletGroupByPie:Label' => '円グラフ',
 	'UI:DashletGroupByPie:Description' => '円グラフ',
 	'UI:DashletGroupByBars:Label' => '棒グラフ',
 	'UI:DashletGroupByBars:Description' => '棒グラフ',
 	'UI:DashletGroupByTable:Label' => 'グループ化 (table)による',
 	'UI:DashletGroupByTable:Description' => 'リスト (フィールドでグループ化)',
-
-	// New in 2.5
+    // New in 2.5
 	'UI:DashletGroupBy:Prop-Function' => 'Aggregation function~~',
 	'UI:DashletGroupBy:Prop-FunctionAttribute' => 'Function attribute~~',
 	'UI:DashletGroupBy:Prop-OrderDirection' => 'Direction~~',
 	'UI:DashletGroupBy:Prop-OrderField' => 'Order by~~',
 	'UI:DashletGroupBy:Prop-Limit' => 'Limit~~',
-
 	'UI:DashletGroupBy:Order:asc' => 'Ascending~~',
 	'UI:DashletGroupBy:Order:desc' => 'Descending~~',
-
 	'UI:GroupBy:count' => 'Count~~',
 	'UI:GroupBy:count+' => 'Number of elements~~',
 	'UI:GroupBy:sum' => 'Sum~~',
@@ -1303,14 +1325,12 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:GroupBy:min+' => 'Minimum of %1$s~~',
 	'UI:GroupBy:max' => 'Maximum~~',
 	'UI:GroupBy:max+' => 'Maximum of %1$s~~',
-	// ---
-
+    // ---
 	'UI:DashletHeaderStatic:Label' => 'ヘッダー',
 	'UI:DashletHeaderStatic:Description' => '水平セパレータの表示',
 	'UI:DashletHeaderStatic:Prop-Title' => '題名',
 	'UI:DashletHeaderStatic:Prop-Title:Default' => '連絡先',
 	'UI:DashletHeaderStatic:Prop-Icon' => 'アイコン',
-
 	'UI:DashletHeaderDynamic:Label' => '統計付ヘッダー',
 	'UI:DashletHeaderDynamic:Description' => '状態付ヘッダー (..によるグループ化)',
 	'UI:DashletHeaderDynamic:Prop-Title' => '題名',
@@ -1321,11 +1341,9 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:DashletHeaderDynamic:Prop-Query' => 'クエリ',
 	'UI:DashletHeaderDynamic:Prop-GroupBy' => 'グループ化(Group by)',
 	'UI:DashletHeaderDynamic:Prop-Values' => '値',
-
 	'UI:DashletBadge:Label' => 'バッジ',
 	'UI:DashletBadge:Description' => '新規/検索付オブジェクトアイコン',
 	'UI:DashletBadge:Prop-Class' => 'クラス',
-
 	'DayOfWeek-Sunday' => '日',
 	'DayOfWeek-Monday' => '月',
 	'DayOfWeek-Tuesday' => '火',
@@ -1345,8 +1363,7 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'Month-10' => 'October~~',
 	'Month-11' => 'November~~',
 	'Month-12' => 'December~~',
-
-	// Short version for the DatePicker
+    // Short version for the DatePicker
 	'DayOfWeek-Sunday-Min' => 'Su~~',
 	'DayOfWeek-Monday-Min' => 'Mo~~',
 	'DayOfWeek-Tuesday-Min' => 'Tu~~',
@@ -1366,13 +1383,13 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'Month-10-Short' => 'Oct~~',
 	'Month-11-Short' => 'Nov~~',
 	'Month-12-Short' => 'Dec~~',
-	'Calendar-FirstDayOfWeek' => '0~~',// 0 = Sunday, 1 = Monday, etc...
-
+	'Calendar-FirstDayOfWeek' => '0~~',
+    // 0 = Sunday, 1 = Monday, etc...
 	'UI:Menu:ShortcutList' => 'ショートカットを作成',
+	'UI:Menu:FilterList' => 'Display list with search criteria~~',
 	'UI:ShortcutRenameDlg:Title' => 'ショートカットの名前変更',
 	'UI:ShortcutListDlg:Title' => 'このリストのショートカットを作成',
 	'UI:ShortcutDelete:Confirm' => 'このショートカットを本当に削除してもいいですか。',
-	'Menu:MyShortcuts' => '私のショートカット',// Duplicated into itop-welcome-itil (will be removed from here...)
 	'Class:Shortcut' => 'ショートカット',
 	'Class:Shortcut+' => '',
 	'Class:Shortcut/Attribute:name' => '名前',
@@ -1386,12 +1403,10 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'Class:ShortcutOQL/Attribute:auto_reload/Value:custom' => 'Custom rate~~',
 	'Class:ShortcutOQL/Attribute:auto_reload_sec' => 'Automatic refresh interval (seconds)~~',
 	'Class:ShortcutOQL/Attribute:auto_reload_sec/tip' => 'The minimum allowed is %1$d seconds~~',
-
 	'UI:FillAllMandatoryFields' => '全ての必須フィールドを入力ください。',
 	'UI:ValueMustBeSet' => 'Please specify a value~~',
 	'UI:ValueMustBeChanged' => 'Please change the value~~',
 	'UI:ValueInvalidFormat' => 'Invalid format~~',
-
 	'UI:CSVImportConfirmTitle' => 'Please confirm the operation~~',
 	'UI:CSVImportConfirmMessage' => 'Are you sure you want to do this?~~',
 	'UI:CSVImportError_items' => 'Errors: %1$d~~',
@@ -1417,11 +1432,9 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 <tr><td>i</td><td>minutes (2 digits, e.g. 00..59)</td></tr>
 <tr><td>s</td><td>seconds (2 digits, e.g. 00..59)</td></tr>
 </table>~~',
-
 	'UI:Button:Remove' => 'Remove~~',
 	'UI:AddAnExisting_Class' => 'Add objects of type %1$s...~~',
 	'UI:SelectionOf_Class' => 'Selection of objects of type %1$s~~',
-
 	'UI:AboutBox' => 'About '.ITOP_APPLICATION_SHORT.'...~~',
 	'UI:About:Title' => 'About '.ITOP_APPLICATION_SHORT.'~~',
 	'UI:About:DataModel' => 'Data model~~',
@@ -1431,12 +1444,10 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:About:ManualExtensionSource' => 'Extension~~',
 	'UI:About:Extension_Version' => 'Version: %1$s~~',
 	'UI:About:RemoteExtensionSource' => 'Data~~',
-
 	'UI:DisconnectedDlgMessage' => 'You are disconnected. You must identify yourself to continue using the application.~~',
 	'UI:DisconnectedDlgTitle' => 'Warning!~~',
 	'UI:LoginAgain' => 'Login again~~',
 	'UI:StayOnThePage' => 'Stay on this page~~',
-
 	'ExcelExporter:ExportMenu' => 'Excel Export...~~',
 	'ExcelExporter:ExportDialogTitle' => 'Excel Export~~',
 	'ExcelExporter:ExportButton' => 'Export~~',
@@ -1449,7 +1460,6 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'ExcelExport:Statistics' => 'Statistics~~',
 	'portal:legacy_portal' => 'End-User Portal~~',
 	'portal:backoffice' => ITOP_APPLICATION_SHORT.' Back-Office User Interface~~',
-
 	'UI:CurrentObjectIsLockedBy_User' => 'The object is locked since it is currently being modified by %1$s.~~',
 	'UI:CurrentObjectIsLockedBy_User_Explanation' => 'The object is currently being modified by %1$s. Your modifications cannot be submitted since they would be overwritten.~~',
 	'UI:CurrentObjectIsSoftLockedBy_User' => 'The object is currently being modified by %1$s. You\'ll be able to submit your modifications once they have finished.~~',
@@ -1457,43 +1467,36 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:CurrentObjectLockExpired_Explanation' => 'The lock to prevent concurrent modifications of the object has expired. You can no longer submit your modification since other users are now allowed to modify this object.~~',
 	'UI:ConcurrentLockKilled' => 'The lock preventing modifications on the current object has been deleted.~~',
 	'UI:Menu:KillConcurrentLock' => 'Kill the Concurrent Modification Lock !~~',
-
 	'UI:Menu:ExportPDF' => 'Export as PDF...~~',
 	'UI:Menu:PrintableVersion' => 'Printer friendly version~~',
-
 	'UI:BrowseInlineImages' => 'Browse images...~~',
 	'UI:UploadInlineImageLegend' => 'Upload a new image~~',
 	'UI:SelectInlineImageToUpload' => 'Select the image to upload~~',
 	'UI:AvailableInlineImagesLegend' => 'Available images~~',
 	'UI:NoInlineImage' => 'There is no image available on the server. Use the "Browse" button above to select an image from your computer and upload it to the server.~~',
-
 	'UI:ToggleFullScreen' => 'Toggle Maximize / Minimize~~',
 	'UI:Button:ResetImage' => 'Recover the previous image~~',
 	'UI:Button:RemoveImage' => 'Remove the image~~',
 	'UI:Button:UploadImage' => 'Upload an image from the disk~~',
 	'UI:UploadNotSupportedInThisMode' => 'The modification of images or files is not supported in this mode.~~',
-
 	'UI:Button:RemoveDocument' => 'Remove the document~~',
-
-	// Search form
+    // Search form
 	'UI:Search:Toggle' => 'Minimize / Expand~~',
 	'UI:Search:AutoSubmit:DisabledHint' => 'Auto submit has been disabled for this class~~',
 	'UI:Search:Obsolescence:DisabledHint' => 'Based on your preferences, obsolete data are hidden~~',
 	'UI:Search:NoAutoSubmit:ExplainText' => 'Add some criterion on the search box or click the search button to view the objects.~~',
 	'UI:Search:Criterion:MoreMenu:AddCriteria' => 'Add new criteria~~',
-	// - Add new criteria button
+    // - Add new criteria button
 	'UI:Search:AddCriteria:List:RecentlyUsed:Title' => 'Recently used~~',
 	'UI:Search:AddCriteria:List:MostPopular:Title' => 'Most popular~~',
 	'UI:Search:AddCriteria:List:Others:Title' => 'Others~~',
 	'UI:Search:AddCriteria:List:RecentlyUsed:Placeholder' => 'None yet.~~',
-
-	// - Criteria header actions
+    // - Criteria header actions
 	'UI:Search:Criteria:Toggle' => 'Minimize / Expand~~',
 	'UI:Search:Criteria:Remove' => 'Remove~~',
 	'UI:Search:Criteria:Locked' => 'Locked~~',
-
-	// - Criteria titles
-	//   - Default widget
+    // - Criteria titles
+    //   - Default widget
 	'UI:Search:Criteria:Title:Default:Any' => '%1$s: Any~~',
 	'UI:Search:Criteria:Title:Default:Empty' => '%1$s is empty~~',
 	'UI:Search:Criteria:Title:Default:NotEmpty' => '%1$s is not empty~~',
@@ -1515,53 +1518,57 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:Search:Criteria:Title:Default:Between:All' => '%1$s: Any~~',
 	'UI:Search:Criteria:Title:Default:Between:From' => '%1$s from %2$s~~',
 	'UI:Search:Criteria:Title:Default:Between:Until' => '%1$s up to %2$s~~',
-	//   - Numeric widget
-	//   None yet
-	//   - DateTime widget
+    //   - Numeric widget
+    //   None yet
+    //   - DateTime widget
 	'UI:Search:Criteria:Title:DateTime:Between' => '%2$s <= 1$s <= %3$s~~',
-	//   - Enum widget
+    //   - Enum widget
 	'UI:Search:Criteria:Title:Enum:In' => '%1$s: %2$s~~',
 	'UI:Search:Criteria:Title:Enum:In:Many' => '%1$s: %2$s and %3$s others~~',
 	'UI:Search:Criteria:Title:Enum:In:All' => '%1$s: Any~~',
-	//   - TagSet widget
+    //   - TagSet widget
 	'UI:Search:Criteria:Title:TagSet:Matches' => '%1$s: %2$s~~',
-	//   - External key widget
+    //   - External key widget
 	'UI:Search:Criteria:Title:ExternalKey:Empty' => '%1$s is defined~~',
 	'UI:Search:Criteria:Title:ExternalKey:NotEmpty' => '%1$s is not defined~~',
 	'UI:Search:Criteria:Title:ExternalKey:Equals' => '%1$s %2$s~~',
 	'UI:Search:Criteria:Title:ExternalKey:In' => '%1$s: %2$s~~',
 	'UI:Search:Criteria:Title:ExternalKey:In:Many' => '%1$s: %2$s and %3$s others~~',
 	'UI:Search:Criteria:Title:ExternalKey:In:All' => '%1$s: Any~~',
-	//   - Hierarchical key widget
+    //   - Hierarchical key widget
 	'UI:Search:Criteria:Title:HierarchicalKey:Empty' => '%1$s is defined~~',
 	'UI:Search:Criteria:Title:HierarchicalKey:NotEmpty' => '%1$s is not defined~~',
 	'UI:Search:Criteria:Title:HierarchicalKey:Equals' => '%1$s %2$s~~',
 	'UI:Search:Criteria:Title:HierarchicalKey:In' => '%1$s: %2$s~~',
 	'UI:Search:Criteria:Title:HierarchicalKey:In:Many' => '%1$s: %2$s and %3$s others~~',
 	'UI:Search:Criteria:Title:HierarchicalKey:In:All' => '%1$s: Any~~',
-
-	// - Criteria operators
-	//   - Default widget
+    // - Criteria operators
+    //   - Default widget
 	'UI:Search:Criteria:Operator:Default:Empty' => 'Is empty~~',
 	'UI:Search:Criteria:Operator:Default:NotEmpty' => 'Is not empty~~',
 	'UI:Search:Criteria:Operator:Default:Equals' => 'Equals~~',
 	'UI:Search:Criteria:Operator:Default:Between' => 'Between~~',
-	//   - String widget
+    //   - String widget
 	'UI:Search:Criteria:Operator:String:Contains' => 'Contains~~',
 	'UI:Search:Criteria:Operator:String:StartsWith' => 'Starts with~~',
 	'UI:Search:Criteria:Operator:String:EndsWith' => 'Ends with~~',
 	'UI:Search:Criteria:Operator:String:RegExp' => 'Regular exp.~~',
-	//   - Numeric widget
-	'UI:Search:Criteria:Operator:Numeric:Equals' => 'Equals~~',// => '=',
-	'UI:Search:Criteria:Operator:Numeric:GreaterThan' => 'Greater~~',// => '>',
-	'UI:Search:Criteria:Operator:Numeric:GreaterThanOrEquals' => 'Greater / equals~~',// > '>=',
-	'UI:Search:Criteria:Operator:Numeric:LessThan' => 'Less~~',// => '<',
-	'UI:Search:Criteria:Operator:Numeric:LessThanOrEquals' => 'Less / equals~~',// > '<=',
-	'UI:Search:Criteria:Operator:Numeric:Different' => 'Different~~',// => '≠',
-	//   - Tag Set Widget
+    //   - Numeric widget
+	'UI:Search:Criteria:Operator:Numeric:Equals' => 'Equals~~',
+    // => '=',
+	'UI:Search:Criteria:Operator:Numeric:GreaterThan' => 'Greater~~',
+    // => '>',
+	'UI:Search:Criteria:Operator:Numeric:GreaterThanOrEquals' => 'Greater / equals~~',
+    // > '>=',
+	'UI:Search:Criteria:Operator:Numeric:LessThan' => 'Less~~',
+    // => '<',
+	'UI:Search:Criteria:Operator:Numeric:LessThanOrEquals' => 'Less / equals~~',
+    // > '<=',
+	'UI:Search:Criteria:Operator:Numeric:Different' => 'Different~~',
+    // => '≠',
+    //   - Tag Set Widget
 	'UI:Search:Criteria:Operator:TagSet:Matches' => 'Matches~~',
-
-	// - Other translations
+    // - Other translations
 	'UI:Search:Value:Filter:Placeholder' => 'Filter...~~',
 	'UI:Search:Value:Search:Placeholder' => 'Search...~~',
 	'UI:Search:Value:Autocomplete:StartTyping' => 'Start typing for possible values.~~',
@@ -1569,8 +1576,7 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:Search:Value:Autocomplete:NoResult' => 'No result.~~',
 	'UI:Search:Value:Toggler:CheckAllNone' => 'Check all / none~~',
 	'UI:Search:Value:Toggler:CheckAllNoneFiltered' => 'Check all / none visibles~~',
-
-	// - Widget other translations
+    // - Widget other translations
 	'UI:Search:Criteria:Numeric:From' => 'From~~',
 	'UI:Search:Criteria:Numeric:Until' => 'To~~',
 	'UI:Search:Criteria:Numeric:PlaceholderFrom' => 'Any~~',
@@ -1584,10 +1590,8 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:Search:Criteria:DateTime:PlaceholderUntil' => 'Any date~~',
 	'UI:Search:Criteria:DateTime:PlaceholderUntilTime' => 'Any date~~',
 	'UI:Search:Criteria:HierarchicalKey:ChildrenIncluded:Hint' => 'Children of the selected objects will be included.~~',
-
 	'UI:Search:Criteria:Raw:Filtered' => 'Filtered~~',
 	'UI:Search:Criteria:Raw:FilteredOn' => 'Filtered on %1$s~~',
-
 	'UI:StateChanged' => 'State changed~~',
 ));
 
@@ -1598,16 +1602,13 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Expression:Operator:AND' => ' AND ~~',
 	'Expression:Operator:OR' => ' OR ~~',
 	'Expression:Operator:=' => ': ~~',
-
 	'Expression:Unit:Short:DAY' => 'd~~',
 	'Expression:Unit:Short:WEEK' => 'w~~',
 	'Expression:Unit:Short:MONTH' => 'm~~',
 	'Expression:Unit:Short:YEAR' => 'y~~',
-
 	'Expression:Unit:Long:DAY' => 'day(s)~~',
 	'Expression:Unit:Long:HOUR' => 'hour(s)~~',
 	'Expression:Unit:Long:MINUTE' => 'minute(s)~~',
-
 	'Expression:Verb:NOW' => 'now~~',
 	'Expression:Verb:ISNULL' => ': undefined~~',
 ));
@@ -1631,46 +1632,32 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Menu:DataSources' => '同期データソース',
 	'Menu:DataSources+' => '全ての同期データソース',
-	'Menu:WelcomeMenu' => 'ようこそ',
-	'Menu:WelcomeMenu+' => 'ようこそ、'.ITOP_APPLICATION_SHORT.'へ',
-	'Menu:WelcomeMenuPage' => 'ようこそ',
-	'Menu:WelcomeMenuPage+' => 'ようこそ、'.ITOP_APPLICATION_SHORT.'へ',
-	'Menu:AdminTools' => '管理ツール',
-	'Menu:AdminTools+' => '管理ツール',
-	'Menu:AdminTools?' => 'このツールは管理者プロフィールを持つユーザのみアクセスが可能です。',
-	'Menu:DataModelMenu' => 'データモデル',
-	'Menu:DataModelMenu+' => 'データモデル概要',
-	'Menu:ExportMenu' => 'エクスポート',
-	'Menu:ExportMenu+' => '任意のクエリ結果をHTML、CSV、XMLでエクスポートする',
-	'Menu:NotificationsMenu' => '通知',
-	'Menu:NotificationsMenu+' => '通知の設定',
 	'Menu:AuditCategories' => '監査カテゴリ',
 	'Menu:AuditCategories+' => '監査カテゴリ',
 	'Menu:Notifications:Title' => '監査カテゴリ',
-	'Menu:RunQueriesMenu'         => 'クエリ実行',
-	'Menu:RunQueriesMenu+'        => '任意のクエリを実行',
-	'Menu:QueryMenu'              => 'クエリのフレーズブック',
-	'Menu:QueryMenu+'             => 'クエリのフレーズブック',
-	'Menu:UniversalSearchMenu'    => '全検索',
-	'Menu:UniversalSearchMenu+'   => '何か...検索',
-	'Menu:UserManagementMenu'     => 'ユーザ管理',
-	'Menu:UserManagementMenu+'    => 'ユーザ管理',
-	'Menu:ProfilesMenu'           => 'プロフィール',
-	'Menu:ProfilesMenu+'          => 'プロフィール',
-	'Menu:ProfilesMenu:Title'     => 'プロフィール',
-	'Menu:UserAccountsMenu'       => 'ユーザアカウント',
-	'Menu:UserAccountsMenu+'      => 'ユーザアカウント',
+	'Menu:AuditCategories:Title' => 'Audit configuration~~',
+	'Menu:RunQueriesMenu' => 'クエリ実行',
+	'Menu:RunQueriesMenu+' => '任意のクエリを実行',
+	'Menu:QueryMenu' => 'クエリのフレーズブック',
+	'Menu:QueryMenu+' => 'クエリのフレーズブック',
+	'Menu:UniversalSearchMenu' => '全検索',
+	'Menu:UniversalSearchMenu+' => '何か...検索',
+	'Menu:UserManagementMenu' => 'ユーザ管理',
+	'Menu:UserManagementMenu+' => 'ユーザ管理',
+	'Menu:ProfilesMenu' => 'プロフィール',
+	'Menu:ProfilesMenu+' => 'プロフィール',
+	'Menu:ProfilesMenu:Title' => 'プロフィール',
+	'Menu:UserAccountsMenu' => 'ユーザアカウント',
+	'Menu:UserAccountsMenu+' => 'ユーザアカウント',
 	'Menu:UserAccountsMenu:Title' => 'ユーザアカウント',
-	'Menu:MyShortcuts'            => '私のショートカット',
-	'Menu:UserManagement'         => 'User Management~~',
-	'Menu:Queries'                => 'Queries~~',
-	'Menu:ConfigurationTools'     => 'Configuration~~',
+	'Menu:UserManagement' => 'User Management~~',
+	'Menu:Queries' => 'Queries~~',
+	'Menu:ConfigurationTools' => 'Configuration~~'
 ));
-
 // Additional language entries not present in English dict
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'UI:Toggle:StandardDashboard' => 'Standard~~',
-	'UI:Toggle:CustomDashboard'   => 'Custom~~',
-	'UI:Dashboard:Edit'           => 'このページを編集...',
-	'UI:Dashboard:Revert'         => '元のバージョンに戻す...',
+	'UI:Toggle:CustomDashboard' => 'Custom~~',
+	'UI:Dashboard:Edit' => 'このページを編集...',
+	'UI:Dashboard:Revert' => '元のバージョンに戻す...'
 ));
diff --git a/dictionaries/nl.dictionary.itop.core.php b/dictionaries/nl.dictionary.itop.core.php
index 1492350ddd..f2a3a2f99d 100644
--- a/dictionaries/nl.dictionary.itop.core.php
+++ b/dictionaries/nl.dictionary.itop.core.php
@@ -29,57 +29,42 @@
  */
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Core:DeletedObjectLabel' => '%1s (verwijderd)',
-	'Core:DeletedObjectTip'   => 'Het object is verwijderd op %1$s (%2$s)',
-
+	'Core:DeletedObjectTip' => 'Het object is verwijderd op %1$s (%2$s)',
 	'Core:UnknownObjectLabel' => 'Object niet gevonden (klasse: %1$s, id: %2$d)',
-	'Core:UnknownObjectTip'   => 'Object kon niet worden gevonden. Het kan al eerder verwijderd zijn waardoor ook de historiek al gewist is.',
-
+	'Core:UnknownObjectTip' => 'Object kon niet worden gevonden. Het kan al eerder verwijderd zijn waardoor ook de historiek al gewist is.',
 	'Core:UniquenessDefaultError' => 'De regel \'%1$s\' die unieke waardes afdwingt, blokkeert deze actie',
-	'Core:CheckConsistencyError'  => 'Consistency rules not followed: %1$s~~',
-	'Core:CheckValueError'        => 'Unexpected value for attribute \'%1$s\' (%2$s) : %3$s~~',
-
-	'Core:AttributeLinkedSet'  => 'Reeks van objecten',
+	'Core:CheckConsistencyError' => 'Consistency rules not followed: %1$s~~',
+	'Core:CheckValueError' => 'Unexpected value for attribute \'%1$s\' (%2$s) : %3$s~~',
+	'Core:AttributeLinkedSet' => 'Reeks van objecten',
 	'Core:AttributeLinkedSet+' => 'Elke soort objecten van dezelfde klasse of subklasse',
-
 	'Core:AttributeLinkedSetDuplicatesFound' => 'Dubbele records in het \'%1$s\' veld : %2$s',
-
-	'Core:AttributeDashboard'  => 'Dashboard',
+	'Core:AttributeDashboard' => 'Dashboard',
 	'Core:AttributeDashboard+' => '',
-
-	'Core:AttributePhoneNumber'  => 'Telefoonnummer',
+	'Core:AttributePhoneNumber' => 'Telefoonnummer',
 	'Core:AttributePhoneNumber+' => '',
-
 	'Core:AttributeObsolescenceDate' => 'Buiten gebruik sinds',
 	'Core:AttributeObsolescenceDate+' => 'Tijdstip sinds wanneer dit object buiten gebruik is',
-
 	'Core:AttributeTagSet' => 'Lijst van tags',
 	'Core:AttributeTagSet+' => '',
 	'Core:AttributeSet:placeholder' => 'klik om toe te voegen',
 	'Core:AttributeClassAttCodeSet:ItemLabel:AttributeFromClass' => '%1$s (%2$s)',
 	'Core:AttributeClassAttCodeSet:ItemLabel:AttributeFromOneChildClass' => '%1$s (%2$s van %3$s)',
 	'Core:AttributeClassAttCodeSet:ItemLabel:AttributeFromSeveralChildClasses' => '%1$s (%2$s van subklasses)',
-
 	'Core:AttributeCaseLog' => 'Log',
 	'Core:AttributeCaseLog+' => '',
-
 	'Core:AttributeMetaEnum' => 'Afgeleide oplijsting',
 	'Core:AttributeMetaEnum+' => '',
-
 	'Core:AttributeLinkedSetIndirect' => 'Reeks van objecten (N-N)',
 	'Core:AttributeLinkedSetIndirect+' => 'Elke soort objecten (subklasse) van dezelfde klasse',
-
 	'Core:AttributeInteger' => 'Integer',
 	'Core:AttributeInteger+' => 'Numerieke waarde (kan negatief zijn)',
-
 	'Core:AttributeDecimal' => 'Decimaal',
 	'Core:AttributeDecimal+' => 'Decimale waarde (kan negatief zijn)',
-
 	'Core:AttributeBoolean' => 'Booleaanse (Ja/Nee) waarde',
 	'Core:AttributeBoolean+' => 'Booleaanse (Ja/Nee) waarde',
 	'Core:AttributeBoolean/Value:null' => '',
 	'Core:AttributeBoolean/Value:yes' => 'Ja',
 	'Core:AttributeBoolean/Value:no' => 'Nee',
-
 	'Core:AttributeArchiveFlag' => 'Gearchiveerd',
 	'Core:AttributeArchiveFlag/Value:yes' => 'Ja',
 	'Core:AttributeArchiveFlag/Value:yes+' => 'Dit object is enkel zichtbaar in Archief-mode',
@@ -88,7 +73,6 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Core:AttributeArchiveFlag/Label+' => '',
 	'Core:AttributeArchiveDate/Label' => 'Gearchiveerd op',
 	'Core:AttributeArchiveDate/Label+' => '',
-
 	'Core:AttributeObsolescenceFlag' => 'Buiten dienst',
 	'Core:AttributeObsolescenceFlag/Value:yes' => 'Ja',
 	'Core:AttributeObsolescenceFlag/Value:yes+' => 'Dit object is uitgesloten bij impactanalyses en verborgen in zoekresultaten.',
@@ -97,54 +81,38 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Core:AttributeObsolescenceFlag/Label+' => 'Automatisch toegepast op andere attributen',
 	'Core:AttributeObsolescenceDate/Label' => 'Buiten dienst sinds',
 	'Core:AttributeObsolescenceDate/Label+' => 'Datum bij benadering waarop het object als buiten dienst beschouwd werd',
-
 	'Core:AttributeString' => 'Tekstregel',
 	'Core:AttributeString+' => 'Alfanumerieke tekstregel',
-
 	'Core:AttributeClass' => 'Klasse',
 	'Core:AttributeClass+' => '',
-
 	'Core:AttributeApplicationLanguage' => 'Taal van de gebruiker',
 	'Core:AttributeApplicationLanguage+' => 'Taal en land (EN US)',
-
 	'Core:AttributeFinalClass' => 'Klasse (auto)',
 	'Core:AttributeFinalClass+' => 'Echte klasse van het object (automatisch aangemaakt bij de kern)',
-
 	'Core:AttributePassword' => 'Wachtwoord',
 	'Core:AttributePassword+' => 'Wachtwoord van een extern apparaat',
-
 	'Core:AttributeEncryptedString' => 'Versleutelde tekstregel',
 	'Core:AttributeEncryptedString+' => 'Tekstregel versleuteld met een lokale sleutel (key)',
 	'Core:AttributeEncryptUnknownLibrary' => 'De encryptie-bibliotheek (%1$s) is onbekend',
 	'Core:AttributeEncryptFailedToDecrypt' => '** fout bij decryptie **',
-
 	'Core:AttributeText' => 'Tekstvak',
 	'Core:AttributeText+' => 'Meerdere regels tekst',
-
 	'Core:AttributeHTML' => 'HTML',
 	'Core:AttributeHTML+' => 'HTML-code',
-
 	'Core:AttributeEmailAddress' => 'E-mailadres',
 	'Core:AttributeEmailAddress+' => '',
-
 	'Core:AttributeIPAddress' => 'IP-adres',
 	'Core:AttributeIPAddress+' => '',
-
 	'Core:AttributeOQL' => 'OQL',
 	'Core:AttributeOQL+' => 'Object Query Language-expressie',
-
 	'Core:AttributeEnum' => 'Oplijsting',
 	'Core:AttributeEnum+' => 'Lijst van voorgedefineerde alfanumerieke waardes',
-
 	'Core:AttributeTemplateString' => 'Sjabloon tekstregel',
 	'Core:AttributeTemplateString+' => 'String die de plaatshouders bevat',
-
 	'Core:AttributeTemplateText' => 'Sjabloon tekstvak',
 	'Core:AttributeTemplateText+' => 'Tekst die de plaatshouders bevat',
-
 	'Core:AttributeTemplateHTML' => 'Sjabloon HTML',
 	'Core:AttributeTemplateHTML+' => 'HTML die de plaatshouders bevat',
-
 	'Core:AttributeDateTime' => 'Datum/tijd',
 	'Core:AttributeDateTime+' => 'Datum en tijd (jaar-maand-dag hh:mm:ss)',
 	'Core:AttributeDateTime?SmartSearch' => '
@@ -162,7 +130,6 @@ Operators:<br/>
 <p>
 Hier wordt standaard \'00:00:00\' van gemaakt als er geen tijd wordt opgegeven.
 </p>',
-
 	'Core:AttributeDate' => 'Datum',
 	'Core:AttributeDate+' => 'Datum (jaar-maand-dag)',
 	'Core:AttributeDate?SmartSearch' => '
@@ -177,43 +144,30 @@ Operators:<br/>
 	<b>&lt;</b><em>date</em><br/>
 	<b>[</b><em>date</em>,<em>date</em><b>]</b>
 </p>',
-
 	'Core:AttributeDeadline' => 'Deadline',
 	'Core:AttributeDeadline+' => 'Datum, relatief weergegeven ten opzichte van het huidige tijdstip',
-
 	'Core:AttributeExternalKey' => 'Externe sleutel (key)',
 	'Core:AttributeExternalKey+' => '',
-
 	'Core:AttributeHierarchicalKey' => 'Hiërarchische sleutel (key)',
 	'Core:AttributeHierarchicalKey+' => 'Externe sleutel naar het hoofdobject',
-
 	'Core:AttributeExternalField' => 'Extern veld',
 	'Core:AttributeExternalField+' => 'Veld dat verwijst naar een externe sleutel (key)',
-
 	'Core:AttributeURL' => 'URL',
 	'Core:AttributeURL+' => 'Absolute of relatieve URL als een tekstregel',
-
 	'Core:AttributeBlob' => 'Blob',
 	'Core:AttributeBlob+' => 'Alle binaire inhoud (document)',
-
 	'Core:AttributeOneWayPassword' => 'Wachtwoord',
 	'Core:AttributeOneWayPassword+' => 'Gehasht wachtwoord (decryptie niet mogelijk)',
-
 	'Core:AttributeTable' => 'Tabel',
 	'Core:AttributeTable+' => 'Geïndexeerde reeks met twee dimensies',
-
 	'Core:AttributePropertySet' => 'Eigenschappen',
 	'Core:AttributePropertySet+' => 'Lijst van ongeschreven eigenschappen (naam en waarde)',
-
 	'Core:AttributeFriendlyName' => 'Herkenbare naam',
 	'Core:AttributeFriendlyName+' => 'Automatisch aangemaakt attribuut. De herkenbare naam is gebaseerd op verschillende attributen van het object.',
-
 	'Core:FriendlyName-Label' => 'Herkenbare naam',
 	'Core:FriendlyName-Description' => 'Herkenbare naam',
-
 	'Core:AttributeTag' => 'Tags',
 	'Core:AttributeTag+' => '',
-	
 	'Core:Context=REST/JSON' => 'REST',
 	'Core:Context=Synchro' => 'Synchro',
 	'Core:Context=Setup' => 'Setup',
@@ -491,6 +445,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:Action' => 'Actie',
 	'Class:Action+' => 'Door gebruiker gedefinieerde actie',
+	'Class:Action/ComplementaryName' => '%1$s: %2$s~~',
 	'Class:Action/Attribute:name' => 'Naam',
 	'Class:Action/Attribute:name+' => '',
 	'Class:Action/Attribute:description' => 'Beschrijving',
@@ -558,6 +513,22 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:ActionEmail/Attribute:importance/Value:normal+' => '',
 	'Class:ActionEmail/Attribute:importance/Value:high' => 'Hoog',
 	'Class:ActionEmail/Attribute:importance/Value:high+' => '',
+	'Class:ActionEmail/Attribute:language' => 'Language~~',
+	'Class:ActionEmail/Attribute:language+' => 'Language to use for placeholders ($xxx$) inside the message (state, importance, priority, etc)~~',
+	'Class:ActionEmail/Attribute:html_template' => 'HTML template~~',
+	'Class:ActionEmail/Attribute:html_template+' => 'Optional HTML template wrapping around the content of the \'Body\' attribute below, useful for tailored email layouts (in the template, content of the \'Body\' attribute will replace the $content$ placeholder)~~',
+	'Class:ActionEmail/Attribute:ignore_notify' => 'Ignore the Notify flag~~',
+	'Class:ActionEmail/Attribute:ignore_notify+' => 'If set to \'Yes\' the \'Notify\' flag on Contacts has no effect.~~',
+	'Class:ActionEmail/Attribute:ignore_notify/Value:no' => 'No~~',
+	'Class:ActionEmail/Attribute:ignore_notify/Value:yes' => 'Yes~~',
+	'ActionEmail:main' => 'Message~~',
+	'ActionEmail:trigger' => 'Triggers~~',
+	'ActionEmail:recipients' => 'Contacts~~',
+	'ActionEmail:preview_tab' => 'Preview~~',
+	'ActionEmail:preview_tab+' => 'Preview of the eMail template~~',
+	'ActionEmail:preview_warning' => 'The actual eMail may look different in the eMail client than this preview in your browser.~~',
+	'ActionEmail:preview_more_info' => 'For more information about the CSS features supported by the different eMail clients, refer to %1$s~~',
+	'ActionEmail:content_placeholder_missing' => 'The placeholder "%1$s" was not found in the HTML template. The content of the field "%2$s" will not be included in the generated emails.~~',
 ));
 
 //
@@ -567,6 +538,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:Trigger' => 'Trigger',
 	'Class:Trigger+' => 'Aanleiding tot het uitvoeren van een actie',
+	'Class:Trigger/ComplementaryName' => '%1$s, %2$s~~',
 	'Class:Trigger/Attribute:description' => 'Beschrijving',
 	'Class:Trigger/Attribute:description+' => 'Beschrijving in één regel',
 	'Class:Trigger/Attribute:action_list' => 'Getriggerde acties',
@@ -575,6 +547,8 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:Trigger/Attribute:finalclass+' => '',
 	'Class:Trigger/Attribute:context' => 'Context',
 	'Class:Trigger/Attribute:context+' => 'In welke context de trigger uitgevoerd kan worden',
+	'Class:Trigger/Attribute:complement' => 'Additional information~~',
+	'Class:Trigger/Attribute:complement+' => 'Further information as provided in english, by this trigger~~',
 ));
 
 //
@@ -670,6 +644,17 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:TriggerOnObjectMention/Attribute:mentioned_filter+' => 'Beperk de lijst van vermelde objecten die de trigger zullen activeren. Indien leeg, zullen alle objecten (van eender welke klasse) de trigger activeren.',
 ));
 
+//
+// Class: TriggerOnAttributeBlobDownload
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:TriggerOnAttributeBlobDownload' => 'Trigger (on object\'s document download)~~',
+	'Class:TriggerOnAttributeBlobDownload+' => 'Trigger on object\'s document field download of [a child class of] the given class~~',
+	'Class:TriggerOnAttributeBlobDownload/Attribute:target_attcodes' => 'Target fields~~',
+	'Class:TriggerOnAttributeBlobDownload/Attribute:target_attcodes+' => '~~',
+));
+
 //
 // Class: TriggerOnThresholdReached
 //
@@ -706,11 +691,13 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 // Synchro Data Source
 //
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:SynchroDataSource' => 'Synchronisatie-databron',
 	'Class:SynchroDataSource/Attribute:name' => 'Naam',
 	'Class:SynchroDataSource/Attribute:name+' => '',
 	'Class:SynchroDataSource/Attribute:description' => 'Beschrijving',
 	'Class:SynchroDataSource/Attribute:status' => 'Status',
 	'Class:SynchroDataSource/Attribute:scope_class' => 'Doelklasse',
+	'Class:SynchroDataSource/Attribute:scope_class+' => 'A Synchro Data Source can only populate a single '.ITOP_APPLICATION_SHORT.' class~~',
 	'Class:SynchroDataSource/Attribute:user_id' => 'Gebruiker',
 	'Class:SynchroDataSource/Attribute:notify_contact_id' => 'Verwittig dit contact',
 	'Class:SynchroDataSource/Attribute:notify_contact_id+' => '',
@@ -719,6 +706,8 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:SynchroDataSource/Attribute:url_application' => 'Applicatie (hyperlink)',
 	'Class:SynchroDataSource/Attribute:url_application+' => 'Hyperlink naar de externe applicatie waarmee wordt gesynchroniseerd (indien van toepassing). Beschikbare plaatshouders: $this->attribute$ and $replica->primary_key$',
 	'Class:SynchroDataSource/Attribute:reconciliation_policy' => 'Reconciliation-beleid',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy+' => '"Use the attributes": '.ITOP_APPLICATION_SHORT.' object matches replica values for each Synchro attributes flagged for Reconciliation.
+"Use primary_key": the column primary_key of the replica is expected to contain the identifier of the '.ITOP_APPLICATION_SHORT.' object~~',
 	'Class:SynchroDataSource/Attribute:full_load_periodicity' => 'Vernieuwingsinterval',
 	'Class:SynchroDataSource/Attribute:full_load_periodicity+' => 'Het volledige herladen van alle data moet minstens om deze tijd gebeuren.',
 	'Class:SynchroDataSource/Attribute:action_on_zero' => 'Actie bij nul',
@@ -738,6 +727,33 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:SynchroDataSource/Attribute:delete_policy_retention+' => 'Hoe lang een overbodig object wordt bewaard voordat het wordt verwijderd',
 	'Class:SynchroDataSource/Attribute:database_table_name' => 'Datatabel',
 	'Class:SynchroDataSource/Attribute:database_table_name+' => 'Naam van de tabel waarin de gesynchroniseerde data wordt opgeslagen. Als deze wordt leeggelaten, dan zal een standaard naam worden opgegeven.',
+	'Class:SynchroDataSource/Attribute:status/Value:implementation' => 'Implementatie',
+	'Class:SynchroDataSource/Attribute:status/Value:obsolete' => 'Overbodig',
+	'Class:SynchroDataSource/Attribute:status/Value:production' => 'Productie',
+	'Class:SynchroDataSource/Attribute:scope_restriction' => 'Scope-beperking',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_attributes' => 'Gebruik de attributen',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_primary_key' => 'Gebruik het veld primary_key (primaire sleutel)',
+	'Class:SynchroDataSource/Attribute:action_on_zero/Value:create' => 'Maak aan',
+	'Class:SynchroDataSource/Attribute:action_on_zero/Value:error' => 'Fout',
+	'Class:SynchroDataSource/Attribute:action_on_one/Value:error' => 'Fout',
+	'Class:SynchroDataSource/Attribute:action_on_one/Value:update' => 'Update',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:create' => 'Maak aan',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:error' => 'Fout',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:take_first' => 'Neem de eerste (willekeurig?)',
+	'Class:SynchroDataSource/Attribute:delete_policy' => 'Verwijder Policy',
+	'Class:SynchroDataSource/Attribute:delete_policy+' => 'What to do when a replica becomes obsolete:
+"Ignore": do nothing, the associated object remains as is in iTop.
+"Delete": Delete the associated object in iTop (and the replica in the data table).
+"Update": Update the associated object as specified by the Update rules (see below).
+"Update then Delete": apply the "Update rules". When Retention Duration expires, execute a "Delete" ~~',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:delete' => 'Verwijder',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:ignore' => 'Negeer',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:update' => 'Update',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:update_then_delete' => 'Update en dan verwijderen',
+	'Class:SynchroDataSource/Attribute:attribute_list' => 'Lijst van attributen',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:administrators' => 'Alleen administrators',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:everybody' => 'Iedereen mag deze objecten verwijderen',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:nobody' => 'Niemand',
 	'SynchroDataSource:Description' => 'Beschrijving',
 	'SynchroDataSource:Reconciliation' => 'Zoeken &amp; reconciliation',
 	'SynchroDataSource:Deletion' => 'Regels voor het verwijderen',
@@ -762,8 +778,10 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Core:Synchro:NeverRun' => 'Deze synchro heeft nog niet gelopen. Er is nog geen log.',
 	'Core:Synchro:SynchroEndedOn_Date' => 'De laatste synchronisatie eindigde op %1$s.',
 	'Core:Synchro:SynchroRunningStartedOn_Date' => 'De synchronisatie is gestart op %1$s en is nog bezig...',
-	'Menu:DataSources' => 'Synchronisatie Databronnen', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:DataSources+' => 'Alle gesynchroniseerde Databronnen', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataSources' => 'Synchronisatie Databronnen',
+    // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataSources+' => 'Alle gesynchroniseerde Databronnen',
+    // Duplicated into itop-welcome-itil (will be removed from here...)
 	'Core:Synchro:label_repl_ignored' => 'Genegeerd (%1$s)',
 	'Core:Synchro:label_repl_disappeared' => 'Verdwenen (%1$s)',
 	'Core:Synchro:label_repl_existing' => 'Bestaand (%1$s)',
@@ -827,29 +845,6 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:CMDBChangeOpSetAttributeEncrypted/Attribute:prevstring' => 'Vorige waarde',
 	'Class:CMDBChangeOpSetAttributeCaseLog' => 'Case Log',
 	'Class:CMDBChangeOpSetAttributeCaseLog/Attribute:lastentry' => 'Meest recente invoer',
-	'Class:SynchroDataSource' => 'Synchronisatie-databron',
-	'Class:SynchroDataSource/Attribute:status/Value:implementation' => 'Implementatie',
-	'Class:SynchroDataSource/Attribute:status/Value:obsolete' => 'Overbodig',
-	'Class:SynchroDataSource/Attribute:status/Value:production' => 'Productie',
-	'Class:SynchroDataSource/Attribute:scope_restriction' => 'Scope-beperking',
-	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_attributes' => 'Gebruik de attributen',
-	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_primary_key' => 'Gebruik het veld primary_key (primaire sleutel)',
-	'Class:SynchroDataSource/Attribute:action_on_zero/Value:create' => 'Maak aan',
-	'Class:SynchroDataSource/Attribute:action_on_zero/Value:error' => 'Fout',
-	'Class:SynchroDataSource/Attribute:action_on_one/Value:error' => 'Fout',
-	'Class:SynchroDataSource/Attribute:action_on_one/Value:update' => 'Update',
-	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:create' => 'Maak aan',
-	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:error' => 'Fout',
-	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:take_first' => 'Neem de eerste (willekeurig?)',
-	'Class:SynchroDataSource/Attribute:delete_policy' => 'Verwijder Policy',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:delete' => 'Verwijder',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:ignore' => 'Negeer',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:update' => 'Update',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:update_then_delete' => 'Update en dan verwijderen',
-	'Class:SynchroDataSource/Attribute:attribute_list' => 'Lijst van attributen',
-	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:administrators' => 'Alleen administrators',
-	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:everybody' => 'Iedereen mag deze objecten verwijderen',
-	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:nobody' => 'Niemand',
 	'Class:SynchroAttribute' => 'Synchro Attribuut',
 	'Class:SynchroAttribute/Attribute:sync_source_id' => 'Synchronisatie-databron',
 	'Class:SynchroAttribute/Attribute:attcode' => 'Attribuutcode',
@@ -910,19 +905,16 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:appUserPreferences/Attribute:preferences' => 'Voorkeuren',
 	'Core:ExecProcess:Code1' => 'Verkeerde commando of commando beëindigd met fouten (bijvoorbeeld verkeerde scriptnaam)',
 	'Core:ExecProcess:Code255' => 'PHP Error (parsing, of runtime)',
-
-	// Attribute Duration
+    // Attribute Duration
 	'Core:Duration_Seconds' => '%1$ds',
 	'Core:Duration_Minutes_Seconds' => '%1$dmin %2$ds',
 	'Core:Duration_Hours_Minutes_Seconds' => '%1$dh %2$dmin %3$ds',
 	'Core:Duration_Days_Hours_Minutes_Seconds' => '%1$sd %2$dh %3$dmin %4$ds',
-
-	// Explain working time computing
+    // Explain working time computing
 	'Core:ExplainWTC:ElapsedTime' => 'Tijd voorbij (opgeslagen als "%1$s")',
 	'Core:ExplainWTC:StopWatch-TimeSpent' => 'Tijd gespendeerd voor "%1$s"',
 	'Core:ExplainWTC:StopWatch-Deadline' => 'Deadline voor "%1$s" at %2$d%%',
-
-	// Bulk export
+    // Bulk export
 	'Core:BulkExport:MissingParameter_Param' => 'Ontbrekende parameter "%1$s"',
 	'Core:BulkExport:InvalidParameter_Query' => 'Ongeldige waarde voor de parameter "query". Er is geen Query Phrasebook die overeenkomt met id: "%1$s".',
 	'Core:BulkExport:ExportFormatPrompt' => 'Export-formaat:',
@@ -974,20 +966,34 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Core:BulkExport:DateTimeFormatDefault_Example' => 'Standaardformaat (%1$s), bv. %2$s',
 	'Core:BulkExport:DateTimeFormatCustom_Format' => 'Aangepast formaat: %1$s',
 	'Core:BulkExport:PDF:PageNumber' => 'Pagina %1$s',
-	'Core:DateTime:Placeholder_d' => 'DD', // Day of the month: 2 digits (with leading zero)
-	'Core:DateTime:Placeholder_j' => 'D', // Day of the month: 1 or 2 digits (without leading zero)
-	'Core:DateTime:Placeholder_m' => 'MM', // Month on 2 digits i.e. 01-12
-	'Core:DateTime:Placeholder_n' => 'M', // Month on 1 or 2 digits 1-12
-	'Core:DateTime:Placeholder_Y' => 'YYYY', // Year on 4 digits
-	'Core:DateTime:Placeholder_y' => 'YY', // Year on 2 digits
-	'Core:DateTime:Placeholder_H' => 'hh', // Hour 00..23
-	'Core:DateTime:Placeholder_h' => 'h', // Hour 01..12
-	'Core:DateTime:Placeholder_G' => 'hh', // Hour 0..23
-	'Core:DateTime:Placeholder_g' => 'h', // Hour 1..12
-	'Core:DateTime:Placeholder_a' => 'am/pm', // am/pm (lowercase)
-	'Core:DateTime:Placeholder_A' => 'AM/PM', // AM/PM (uppercase)
-	'Core:DateTime:Placeholder_i' => 'mm', // minutes, 2 digits: 00..59
-	'Core:DateTime:Placeholder_s' => 'ss', // seconds, 2 digits 00..59
+	'Core:DateTime:Placeholder_d' => 'DD',
+    // Day of the month: 2 digits (with leading zero)
+	'Core:DateTime:Placeholder_j' => 'D',
+    // Day of the month: 1 or 2 digits (without leading zero)
+	'Core:DateTime:Placeholder_m' => 'MM',
+    // Month on 2 digits i.e. 01-12
+	'Core:DateTime:Placeholder_n' => 'M',
+    // Month on 1 or 2 digits 1-12
+	'Core:DateTime:Placeholder_Y' => 'YYYY',
+    // Year on 4 digits
+	'Core:DateTime:Placeholder_y' => 'YY',
+    // Year on 2 digits
+	'Core:DateTime:Placeholder_H' => 'hh',
+    // Hour 00..23
+	'Core:DateTime:Placeholder_h' => 'h',
+    // Hour 01..12
+	'Core:DateTime:Placeholder_G' => 'hh',
+    // Hour 0..23
+	'Core:DateTime:Placeholder_g' => 'h',
+    // Hour 1..12
+	'Core:DateTime:Placeholder_a' => 'am/pm',
+    // am/pm (lowercase)
+	'Core:DateTime:Placeholder_A' => 'AM/PM',
+    // AM/PM (uppercase)
+	'Core:DateTime:Placeholder_i' => 'mm',
+    // minutes, 2 digits: 00..59
+	'Core:DateTime:Placeholder_s' => 'ss',
+    // seconds, 2 digits 00..59
 	'Core:Validator:Default' => 'Verkeerd formaat',
 	'Core:Validator:Mandatory' => 'Gelieve dit veld in te vullen',
 	'Core:Validator:MustBeInteger' => 'Dit moet een integer (geheel getal) zijn',
@@ -1000,7 +1006,6 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:TagSetFieldData' => '%2$s voor klasse %1$s',
 	'Class:TagSetFieldData+' => '',
-
 	'Class:TagSetFieldData/Attribute:code' => 'Code',
 	'Class:TagSetFieldData/Attribute:code+' => 'Interne code. Moet minstens 3 alfanumerieke tekens bevatten.',
 	'Class:TagSetFieldData/Attribute:label' => 'Label',
@@ -1010,7 +1015,6 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:TagSetFieldData/Attribute:finalclass' => 'Tagklasse',
 	'Class:TagSetFieldData/Attribute:obj_class' => 'Objectklasse',
 	'Class:TagSetFieldData/Attribute:obj_attcode' => 'Veldcode',
-
 	'Core:TagSetFieldData:ErrorDeleteUsedTag' => 'Tags in gebruik kunnen niet verwijderd worden',
 	'Core:TagSetFieldData:ErrorDuplicateTagCodeOrLabel' => 'Codes en labels voor tags moeten uniek zijn.',
 	'Core:TagSetFieldData:ErrorTagCodeSyntax' => 'Codes voor tags bestaan uit 3 tot %1$d alfanumerieke tekens, startend met een letter.',
@@ -1097,8 +1101,8 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:AsyncTask/Attribute:last_error+' => '',
 	'Class:AsyncTask/Attribute:last_attempt' => 'Laatste poging',
 	'Class:AsyncTask/Attribute:last_attempt+' => '',
-  'Class:AsyncTask:InvalidConfig_Class_Keys' => 'Ongeldig formaat bij de configuratie van "async_tasks_retries[%1$s]". Er wordt een Array verwacht met de volgende sleutels: %2$s',
-  'Class:AsyncTask:InvalidConfig_Class_InvalidKey_Keys' => 'Ongeldig formaat bij de configuratie van "async_tasks_retries[%1$s]": onverwachte sleutel "%2$s". Enkel deze sleutels worden verwacht: %3$s',
+	'Class:AsyncTask:InvalidConfig_Class_Keys' => 'Ongeldig formaat bij de configuratie van "async_tasks_retries[%1$s]". Er wordt een Array verwacht met de volgende sleutels: %2$s',
+	'Class:AsyncTask:InvalidConfig_Class_InvalidKey_Keys' => 'Ongeldig formaat bij de configuratie van "async_tasks_retries[%1$s]": onverwachte sleutel "%2$s". Enkel deze sleutels worden verwacht: %3$s',
 ));
 
 //
diff --git a/dictionaries/nl.dictionary.itop.ui.php b/dictionaries/nl.dictionary.itop.ui.php
index 9b1b85be44..ec816e6b16 100644
--- a/dictionaries/nl.dictionary.itop.ui.php
+++ b/dictionaries/nl.dictionary.itop.ui.php
@@ -25,6 +25,12 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:AuditCategory/Attribute:definition_set+' => 'OQL-expressie die de set van objecten naar audit definieert',
 	'Class:AuditCategory/Attribute:rules_list' => 'Auditregels',
 	'Class:AuditCategory/Attribute:rules_list+' => 'Auditregels voor deze categorie',
+	'Class:AuditCategory/Attribute:ok_error_tolerance' => 'Warning threshold~~',
+	'Class:AuditCategory/Attribute:ok_error_tolerance+' => 'Percentage of invalid objects below which the result is a warning (orange)~~',
+	'Class:AuditCategory/Attribute:warning_error_tolerance' => 'Error threshold~~',
+	'Class:AuditCategory/Attribute:warning_error_tolerance+' => 'Percentage of invalid objects below which the result is in error (red)~~',
+	'Class:AuditCategory/Attribute:domains_list' => 'Domains~~',
+	'Class:AuditCategory/Attribute:domains_list+' => 'Domains which includes this category~~',
 ));
 
 //
@@ -52,7 +58,42 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:AuditRule/Attribute:category_id' => 'Categorie',
 	'Class:AuditRule/Attribute:category_id+' => 'De categorie voor deze regel',
 	'Class:AuditRule/Attribute:category_name' => 'Categorie',
-	'Class:AuditRule/Attribute:category_name+' => 'Naam van de categorie voor deze regel',
+	'Class:AuditRule/Attribute:category_name+' => 'Naam van de categorie voor deze regel'
+));
+
+//
+// Class: AuditDomain
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:AuditDomain' => 'Audit Domain~~',
+	'Class:AuditDomain+' => 'Audit domains allow to group the audit categories.
+Domain usually correspond to who is responsible for checking and fixing errors~~',
+	'Class:AuditDomain/Attribute:name' => 'Name~~',
+	'Class:AuditDomain/Attribute:name+' => 'Its a segmentation of the Audit by who is in charge of fixing it or just interested~~',
+	'Class:AuditDomain/Attribute:description' => 'Description~~',
+	'Class:AuditDomain/Attribute:description+' => '~~',
+	'Class:AuditDomain/Attribute:icon' => 'Icon~~',
+	'Class:AuditDomain/Attribute:icon+' => '~~',
+	'Class:AuditDomain/Attribute:categories_list' => 'Categories~~',
+	'Class:AuditDomain/Attribute:categories_list+' => 'Related audit categories. When running the audit on a domain, all related audit categories are checked and only those.~~',
+));
+
+//
+// Class: lnkAuditCategoryToAuditDomain
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:lnkAuditCategoryToAuditDomain' => 'Link AuditCategory / AuditDomain~~',
+	'Class:lnkAuditCategoryToAuditDomain+' => '~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:category_id' => 'Category~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:category_id+' => 'Audit Category~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:category_name' => 'Category name~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:category_name+' => 'Audit category name~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:domain_id' => 'Domain~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:domain_id+' => 'Audit domain~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:domain_name' => 'Domain name~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:domain_name+' => 'Audit domain name~~',
 ));
 
 //
@@ -70,6 +111,16 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:Query/Attribute:is_template+' => 'Bruikbaar als bron voor bestemming OQL-notificaties',
 	'Class:Query/Attribute:is_template/Value:yes' => 'Ja',
 	'Class:Query/Attribute:is_template/Value:no' => 'Nee',
+	'Class:Query/Attribute:export_count' => 'Export counter~~',
+	'Class:Query/Attribute:export_count+' => 'Counter reflecting the number of time this query has been executed~~',
+	'Class:Query/Attribute:export_last_date' => 'Last export~~',
+	'Class:Query/Attribute:export_last_date+' => 'Date and time of the last export execution~~',
+	'Class:Query/Attribute:export_last_user_id' => 'User~~',
+	'Class:Query/Attribute:export_last_user_id+' => 'The user who executed the last export~~',
+	'Class:Query/Attribute:export_last_user_contact' => 'Contact~~',
+	'Class:Query/Attribute:export_last_user_contact+' => 'The contact who executed the last export~~',
+	'Query:baseinfo' => 'General information~~',
+	'Query:exportInfo' => 'Export information~~',
 	'Class:QueryOQL/Attribute:fields' => 'Velden',
 	'Class:QueryOQL/Attribute:fields+' => 'Kommagescheiden lijst van attributen (of alias.attribuut) om te exporteren',
 	'Class:QueryOQL' => 'OQL-query',
@@ -118,7 +169,6 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:User/Attribute:status+' => 'De gebruikersaccount kan in- of uitgeschakeld zijn.',
 	'Class:User/Attribute:status/Value:enabled' => 'Ingeschakeld',
 	'Class:User/Attribute:status/Value:disabled' => 'Uitgeschakeld',
-
 	'Class:User/Error:LoginMustBeUnique' => 'Login moet uniek zijn - "%1s" is al in gebruik',
 	'Class:User/Error:AtLeastOneProfileIsNeeded' => 'Minstens één profiel moet toegewezen zijn aan deze gebruiker',
 	'Class:User/Error:ProfileNotAllowed' => 'Profiel "%1$s" kan niet toegevoegd worden omdat het de toegang tot de backoffice zou ontzeggen.',
@@ -327,6 +377,29 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Expression:Unit:Short:YEAR' => 'j',
 ));
 
+//
+// Duplicated into itop-welcome-itil ( will be removed from here...)
+//
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Menu:WelcomeMenu' => 'Welkom',
+	'Menu:WelcomeMenu+' => 'Welkom in '.ITOP_APPLICATION_SHORT,
+	'Menu:WelcomeMenuPage' => 'Welkom',
+	'Menu:WelcomeMenuPage+' => 'Welkom in '.ITOP_APPLICATION_SHORT,
+	'Menu:AdminTools' => 'Admintools',
+	'Menu:AdminTools+' => 'Beheertools',
+	'Menu:AdminTools?' => 'Tools die enkel toegankelijk zijn voor gebruikers met een administratorprofiel.',
+	'Menu:CSVImportMenu' => 'CSV import',
+	'Menu:CSVImportMenu+' => 'In bulk aanmaken of aanpassen van objecten',
+	'Menu:DataModelMenu' => 'Datamodel',
+	'Menu:DataModelMenu+' => 'Overzicht van het datamodel',
+	'Menu:ExportMenu' => 'Export',
+	'Menu:ExportMenu+' => 'Exporteer de resultaten van query\'s als HTML, CSV of XML',
+	'Menu:NotificationsMenu' => 'Meldingen',
+	'Menu:NotificationsMenu+' => 'Configuratie van de meldingen',
+	'Menu:MyShortcuts' => 'Mijn snelkoppelingen',
+	'Menu:DataAdministration' => 'Databeheer',
+	'Menu:DataAdministration+' => 'Databeheer',
+));
 
 //
 // String from the User Interface: menu, messages, buttons, etc...
@@ -336,12 +409,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'BooleanLabel:yes' => 'Ja',
 	'BooleanLabel:no' => 'Nee',
 	'UI:Login:Title' => 'Aanmelden in '.ITOP_APPLICATION_SHORT,
-	'Menu:WelcomeMenu' => 'Welkom',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:WelcomeMenu+' => 'Welkom in '.ITOP_APPLICATION_SHORT, // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:WelcomeMenuPage' => 'Welkom',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:WelcomeMenuPage+' => 'Welkom in '.ITOP_APPLICATION_SHORT, // Duplicated into itop-welcome-itil (will be removed from here...)
 	'UI:WelcomeMenu:Title' => 'Welkom in '.ITOP_APPLICATION_SHORT,
-
 	'UI:WelcomeMenu:LeftBlock' => '<p>'.ITOP_APPLICATION_SHORT.' is een compleet en open source portaal voor IT-operaties.</p>
 <ul>Op maat van jouw IT-omgeving:
 <li>Complete CMDB (Configuration Management Database) voor het documenteren en beheren van de IT-inventaris.</li>
@@ -352,7 +420,6 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 <li>Dashboards om snel een overzicht te krijgen.</li>
 </ul>
 <p>Alle modules kunnen volledig onafhankelijk van elkaar worden opgezet, stap voor stap.</p>',
-
 	'UI:WelcomeMenu:RightBlock' => '<p>'.ITOP_APPLICATION_SHORT.' is gericht op serviceproviders. Het zorgt ervoor dat IT-engineers gemakkelijk meerdere klanten of organisaties kunnen beheren.
 <ul>'.ITOP_APPLICATION_SHORT.' zorgt dankzij een uitgebreide set van bedrijfsprocessen voor een reeks voordelen:
 <li>De efficientië van het IT-management versterkt.</li> 
@@ -368,7 +435,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 <li>Het beheren van het belangrijkste middel: documentatie.</li>
 </ul>
 </p>',
-	'UI:WelcomeMenu:Text'=>  '<div>Proficiat, je werkt nu met '.ITOP_APPLICATION.' '.ITOP_VERSION_NAME.'!</div>
+	'UI:WelcomeMenu:Text' => '<div>Proficiat, je werkt nu met '.ITOP_APPLICATION.' '.ITOP_VERSION_NAME.'!</div>
 
 <div>Deze versie heeft een volledig nieuw, modern en toegankelijk uiterlijk.</div>
 
@@ -389,6 +456,7 @@ We hopen dat je even hard van deze versie geniet als dat we zelf ervan hebben ge
 	'UI:Button:GlobalSearch' => 'Zoek',
 	'UI:Button:Search' => ' Zoek ',
 	'UI:Button:Clear' => ' Wis ',
+	'UI:Button:Confirm' => ' Confirm ~~',
 	'UI:Button:SearchInHierarchy' => ' Zoek in hiërarchie ',
 	'UI:Button:Query' => ' Query ',
 	'UI:Button:Ok' => 'Ok',
@@ -429,7 +497,6 @@ We hopen dat je even hard van deze versie geniet als dat we zelf ervan hebben ge
 	'UI:UserPref:DoNotShowAgain' => 'Niet meer opnieuw tonen',
 	'UI:InputFile:NoFileSelected' => 'Geen bestand geselecteerd',
 	'UI:InputFile:SelectFile' => 'Selecteer een bestand',
-
 	'UI:SearchToggle' => 'Zoek',
 	'UI:ClickToCreateNew' => 'Maak een %1$s aan',
 	'UI:SearchFor_Class' => 'Zoek naar %1$s objecten',
@@ -449,7 +516,6 @@ We hopen dat je even hard van deze versie geniet als dat we zelf ervan hebben ge
 	'UI:Error:CannotWriteToTmp_Dir' => 'Niet mogelijk om het tijdelijke bestand naar een tijdelijke map weg te schrijven. upload_tmp_dir = "%1$s".',
 	'UI:Error:UploadStoppedByExtension_FileName' => 'Upload gestopt door bestandsextensie. (Oorspronkelijke bestandsnaam = "%1$s").',
 	'UI:Error:UploadFailedUnknownCause_Code' => 'Uploaden van bestand mislukt, oorzaak onbekend. (Foutcode = "%1$s").',
-
 	'UI:Error:1ParametersMissing' => 'Fout: de volgende parameter moet worden opgegeven voor deze actie: %1$s.',
 	'UI:Error:2ParametersMissing' => 'Fout: de volgende parameters moeten worden opgegeven voor deze actie: %1$s and %2$s.',
 	'UI:Error:3ParametersMissing' => 'Fout: de volgende parameters moeten worden opgegeven voor deze actie: %1$s, %2$s and %3$s.',
@@ -471,9 +537,7 @@ We hopen dat je even hard van deze versie geniet als dat we zelf ervan hebben ge
 	'UI:Error:MaintenanceMode' => 'Toepassing is momenteel in onderhoud',
 	'UI:Error:MaintenanceTitle' => 'Onderhoud',
 	'UI:Error:InvalidToken' => 'Fout: de gevraagde bewerking werd al uitgevoerd (CSRF token niet gevonden)',
-
 	'UI:Error:SMTP:UnknownVendor' => 'OAuth SMTP provider %1$s does not exist  (email_transport_smtp.oauth.provider)~~',
-
 	'UI:GroupBy:Count' => 'Aantal',
 	'UI:GroupBy:Count+' => 'Aantal objecten',
 	'UI:CountOfObjects' => '%1$d objecten voldoen aan de criteria.',
@@ -502,6 +566,7 @@ We hopen dat je even hard van deze versie geniet als dat we zelf ervan hebben ge
 	'UI:Menu:OtherActions' => 'Andere acties',
 	'UI:Menu:Transitions' => 'Overgangen',
 	'UI:Menu:OtherTransitions' => 'Andere overgangen',
+	'UI:Menu:View' => 'View this object~~',
 	'UI:Menu:New' => 'Nieuw...',
 	'UI:Menu:Add' => 'Voeg toe...',
 	'UI:Menu:Manage' => 'Beheer...',
@@ -510,6 +575,9 @@ We hopen dat je even hard van deze versie geniet als dat we zelf ervan hebben ge
 	'UI:Menu:Modify' => 'Bewerk...',
 	'UI:Menu:Delete' => 'Verwijder...',
 	'UI:Menu:BulkDelete' => 'Verwijder...',
+	'UI:Menu:BulkDelete_Class' => 'Delete %1$s objects...~~',
+	'UI:Menu:BulkDelete_Link' => 'Delete %1$s...~~',
+	'UI:Menu:BulkDelete_Remote' => 'Delete %1$s...~~',
 	'UI:UndefinedObject' => 'Ongedefinieerd',
 	'UI:Document:OpenInNewWindow:Download' => 'Open in nieuw venster: %1$s, Download: %2$s',
 	'UI:SplitDateTime-Date' => 'datum',
@@ -542,7 +610,6 @@ We hopen dat je even hard van deze versie geniet als dat we zelf ervan hebben ge
 	'UI:Login:ResetPassword' => 'Stuur nu!',
 	'UI:Login:ResetPwdFailed' => 'E-mail sturen mislukt: %1$s',
 	'UI:Login:SeparatorOr' => 'Of',
-
 	'UI:ResetPwd-Error-WrongLogin' => '"%1$s" is geen geldige login',
 	'UI:ResetPwd-Error-NotPossible' => 'Het wachtwoord van externe accounts kan niet gereset worden.',
 	'UI:ResetPwd-Error-FixedPwd' => 'Deze account staat het resetten van het wachtwoord niet toe.',
@@ -553,50 +620,49 @@ We hopen dat je even hard van deze versie geniet als dat we zelf ervan hebben ge
 	'UI:ResetPwd-EmailSent' => 'Kijk in jouw mailbox (eventueel bij ongewenste mail) en volg de instructies...',
 	'UI:ResetPwd-EmailSubject' => 'Reset jouw '.ITOP_APPLICATION_SHORT.'-wachtwoord',
 	'UI:ResetPwd-EmailBody' => '<body><p>Je hebt een reset van jouw '.ITOP_APPLICATION_SHORT.'-wachtwoord aangevraagd.</p><p>Klik op deze link (eenmalig te gebruiken) om <a href="%1$s">een nieuw wachtwoord in te voeren</a></p>.',
-
 	'UI:ResetPwd-Title' => 'Reset wachtwoord',
 	'UI:ResetPwd-Error-InvalidToken' => 'Sorry. Jouw wachtwoord is al gereset, of je hebt al meerdere e-mails ontvangen. Zorg ervoor dat je de link in de laatst ontvangen e-mail gebruikt.',
 	'UI:ResetPwd-Error-EnterPassword' => 'Voer het nieuwe wachtwoord voor de account "%1$s" in.',
 	'UI:ResetPwd-Ready' => 'Het wachtwoord is veranderd',
 	'UI:ResetPwd-Login' => 'Klik hier om in te loggen',
-
-	'UI:Login:About'                               => ITOP_APPLICATION,
-	'UI:Login:ChangeYourPassword'                  => 'Verander jouw wachtwoord',
-	'UI:Login:OldPasswordPrompt'                   => 'Oud wachtwoord',
-	'UI:Login:NewPasswordPrompt'                   => 'Nieuw wachtwoord',
-	'UI:Login:RetypeNewPasswordPrompt'             => 'Herhaal nieuwe wachtwoord',
-	'UI:Login:IncorrectOldPassword'                => 'Fout: het oude wachtwoord is incorrect',
-	'UI:LogOffMenu'                                => 'Log uit',
-	'UI:LogOff:ThankYou'                           => 'Bedankt voor het gebruiken van '.ITOP_APPLICATION,
-	'UI:LogOff:ClickHereToLoginAgain'              => 'Klik hier om in te loggen',
-	'UI:ChangePwdMenu'                             => 'Verander wachtwoord',
-	'UI:Login:PasswordChanged'                     => 'Wachtwoord met succes aangepast',
-	'UI:AccessRO-All'                              => ITOP_APPLICATION.' is alleen-lezen',
-	'UI:AccessRO-Users'                            => ITOP_APPLICATION.' is alleen-lezen voor eindgebruikers',
-	'UI:ApplicationEnvironment'                    => 'Omgeving van de applicatie: %1$s',
-	'UI:Login:RetypePwdDoesNotMatch'               => 'Het nieuwe wachtwoord en de herhaling van het nieuwe wachtwoord komen niet overeen',
-	'UI:Button:Login'                              => 'Ga naar '.ITOP_APPLICATION,
-	'UI:Login:Error:AccessRestricted'              => 'Geen toegang tot '.ITOP_APPLICATION_SHORT.'. Neem contact op met een '.ITOP_APPLICATION_SHORT.'-beheerder.',
-	'UI:Login:Error:AccessAdmin'                   => 'Alleen toegankelijk voor mensen met beheerdersrechten. Neem contact op met een '.ITOP_APPLICATION_SHORT.'-beheerder',
-	'UI:Login:Error:WrongOrganizationName'         => 'Onbekende organisatie',
+	'UI:Login:About' => ITOP_APPLICATION,
+	'UI:Login:ChangeYourPassword' => 'Verander jouw wachtwoord',
+	'UI:Login:OldPasswordPrompt' => 'Oud wachtwoord',
+	'UI:Login:NewPasswordPrompt' => 'Nieuw wachtwoord',
+	'UI:Login:RetypeNewPasswordPrompt' => 'Herhaal nieuwe wachtwoord',
+	'UI:Login:IncorrectOldPassword' => 'Fout: het oude wachtwoord is incorrect',
+	'UI:LogOffMenu' => 'Log uit',
+	'UI:LogOff:ThankYou' => 'Bedankt voor het gebruiken van '.ITOP_APPLICATION,
+	'UI:LogOff:ClickHereToLoginAgain' => 'Klik hier om in te loggen',
+	'UI:ChangePwdMenu' => 'Verander wachtwoord',
+	'UI:Login:PasswordChanged' => 'Wachtwoord met succes aangepast',
+	'UI:Login:PasswordNotChanged' => 'Error: Password is the same!~~',
+	'UI:AccessRO-All' => ITOP_APPLICATION.' is alleen-lezen',
+	'UI:AccessRO-Users' => ITOP_APPLICATION.' is alleen-lezen voor eindgebruikers',
+	'UI:ApplicationEnvironment' => 'Omgeving van de applicatie: %1$s',
+	'UI:Login:RetypePwdDoesNotMatch' => 'Het nieuwe wachtwoord en de herhaling van het nieuwe wachtwoord komen niet overeen',
+	'UI:Button:Login' => 'Ga naar '.ITOP_APPLICATION,
+	'UI:Login:Error:AccessRestricted' => 'Geen toegang tot '.ITOP_APPLICATION_SHORT.'.Neem contact op met een '.ITOP_APPLICATION_SHORT.'-beheerder.',
+	'UI:Login:Error:AccessAdmin' => 'Alleen toegankelijk voor mensen met beheerdersrechten. Neem contact op met een '.ITOP_APPLICATION_SHORT.'-beheerder',
+	'UI:Login:Error:WrongOrganizationName' => 'Onbekende organisatie',
 	'UI:Login:Error:MultipleContactsHaveSameEmail' => 'Meerdere contacten hebben hetzelfde e-mailadres',
-	'UI:Login:Error:NoValidProfiles'               => 'Geen geldig profiel opgegeven',
-	'UI:CSVImport:MappingSelectOne'                => '-- Selecteer --',
-	'UI:CSVImport:MappingNotApplicable'            => '-- Negeer dit veld --',
-	'UI:CSVImport:NoData'                          => 'Lege dataset..., voeg data toe',
-	'UI:Title:DataPreview'                         => 'Datavoorbeeld',
-	'UI:CSVImport:ErrorOnlyOneColumn'              => 'Fout: De data bevat slechts één kolom. Is het juiste scheidingsteken geselecteerd?',
-	'UI:CSVImport:FieldName'                       => 'Veld %1$d',
-	'UI:CSVImport:DataLine1'                       => 'Dataregel 1',
-	'UI:CSVImport:DataLine2'                       => 'Dataregel 2',
-	'UI:CSVImport:idField'                         => 'id (Primaire sleutel (key))',
-	'UI:Title:BulkImport'                          => ITOP_APPLICATION_SHORT.' - Bulk import',
-	'UI:Title:BulkImport+'                         => 'CSV Import Wizard',
-	'UI:Title:BulkSynchro_nbItem_ofClass_class'    => 'Synchronisatie van %1$d objecten van klasse "%2$s"',
-	'UI:CSVImport:ClassesSelectOne'                => '-- selecteer een --',
-	'UI:CSVImport:ErrorExtendedAttCode'            => 'Interne fout: "%1$s" is een incorrecte code omdat "%2$s" geen externe sleutel (key) van klasse "%3$s" is',
-	'UI:CSVImport:ObjectsWillStayUnchanged'        => '%1$d objecten(s) zullen onveranderd blijven.',
-	'UI:CSVImport:ObjectsWillBeModified'           => '%1$d objecten(s) zullen worden aangepast.',
+	'UI:Login:Error:NoValidProfiles' => 'Geen geldig profiel opgegeven',
+	'UI:CSVImport:MappingSelectOne' => '-- Selecteer --',
+	'UI:CSVImport:MappingNotApplicable' => '-- Negeer dit veld --',
+	'UI:CSVImport:NoData' => 'Lege dataset..., voeg data toe',
+	'UI:Title:DataPreview' => 'Datavoorbeeld',
+	'UI:CSVImport:ErrorOnlyOneColumn' => 'Fout: De data bevat slechts één kolom. Is het juiste scheidingsteken geselecteerd?',
+	'UI:CSVImport:FieldName' => 'Veld %1$d',
+	'UI:CSVImport:DataLine1' => 'Dataregel 1',
+	'UI:CSVImport:DataLine2' => 'Dataregel 2',
+	'UI:CSVImport:idField' => 'id (Primaire sleutel (key))',
+	'UI:Title:BulkImport' => ITOP_APPLICATION_SHORT.' - Bulk import',
+	'UI:Title:BulkImport+' => 'CSV Import Wizard',
+	'UI:Title:BulkSynchro_nbItem_ofClass_class' => 'Synchronisatie van %1$d objecten van klasse "%2$s"',
+	'UI:CSVImport:ClassesSelectOne' => '-- selecteer een --',
+	'UI:CSVImport:ErrorExtendedAttCode' => 'Interne fout: "%1$s" is een incorrecte code omdat "%2$s" geen externe sleutel (key) van klasse "%3$s" is',
+	'UI:CSVImport:ObjectsWillStayUnchanged' => '%1$d objecten(s) zullen onveranderd blijven.',
+	'UI:CSVImport:ObjectsWillBeModified' => '%1$d objecten(s) zullen worden aangepast.',
 	'UI:CSVImport:ObjectsWillBeAdded' => '%1$d objecten(s) zullen worden toegevoegd.',
 	'UI:CSVImport:ObjectsWillHaveErrors' => '%1$d objecten(s) zullen fouten bevatten.',
 	'UI:CSVImport:ObjectsRemainedUnchanged' => '%1$d objecten(s) zijn onveranderd gebleven.',
@@ -642,11 +708,14 @@ We hopen dat je even hard van deze versie geniet als dat we zelf ervan hebben ge
 	'UI:UniversalSearchTitle' => ITOP_APPLICATION_SHORT.' - Universele zoekopdracht',
 	'UI:UniversalSearch:Error' => 'Fout: %1$s',
 	'UI:UniversalSearch:LabelSelectTheClass' => 'Selecteer de klasse om te zoeken: ',
-
 	'UI:CSVReport-Value-Modified' => 'Aangepast',
 	'UI:CSVReport-Value-SetIssue' => 'invalid value for attribute~~',
 	'UI:CSVReport-Value-ChangeIssue' => '\'%1$s\' is an invalid value~~',
 	'UI:CSVReport-Value-NoMatch' => 'No match for value \'%1$s\'~~',
+	'UI:CSVReport-Value-NoMatch-PossibleValues' => 'Some possible \'%1$s\' value(s): %2$s~~',
+	'UI:CSVReport-Value-NoMatch-NoObject' => 'There are no \'%1$s\' objects~~',
+	'UI:CSVReport-Value-NoMatch-NoObject-ForCurrentUser' => 'There are no \'%1$s\' objects found with your current profile~~',
+	'UI:CSVReport-Value-NoMatch-SomeObjectNotVisibleForCurrentUser' => 'There are some \'%1$s\' objects not visible with your current profile~~',
 	'UI:CSVReport-Value-Missing' => 'Ontbrekende verplichte waarde',
 	'UI:CSVReport-Value-Ambiguous' => 'Onduidelijk: gevonden %1$s objecten',
 	'UI:CSVReport-Row-Unchanged' => 'onveranderd',
@@ -660,15 +729,16 @@ We hopen dat je even hard van deze versie geniet als dat we zelf ervan hebben ge
 	'UI:CSVReport-Value-Issue-Readonly' => 'Het attribuut \'%1$s\' is alleen-lezen en kan niet worden aangepast (huidige waarde: %2$s,voorgestelde waarde: %3$s)',
 	'UI:CSVReport-Value-Issue-Format' => 'Input %1$s verwerken mislukt',
 	'UI:CSVReport-Value-Issue-NoMatch' => 'Onverwachte waarde voor attribuut \'%1$s\': geen match gevonden, controleer spelling',
+	'UI:CSVReport-Value-Issue-AllowedValues' => 'Allowed \'%1$s\' value(s): %2$s~~',
 	'UI:CSVReport-Value-Issue-Unknown' => 'Onverwachte waarde voor attribuut \'%1$s\': %2$s',
 	'UI:CSVReport-Row-Issue-Inconsistent' => 'Attributen komen niet met elkaar overeeen: %1$s',
 	'UI:CSVReport-Row-Issue-Attribute' => 'Onverwachte attribuutwaarden',
 	'UI:CSVReport-Row-Issue-MissingExtKey' => 'Kon niet worden aangemaakt door het ontbreken van externe code(s): %1$s',
 	'UI:CSVReport-Row-Issue-DateFormat' => 'Verkeerde datumformaat',
+	'UI:CSVReport-Row-Issue-ExpectedDateFormat' => 'Expected format: %1$s~~',
 	'UI:CSVReport-Row-Issue-Reconciliation' => 'Verbeteren mislukt',
 	'UI:CSVReport-Row-Issue-Ambiguous' => 'Onduidelijke verbetering',
 	'UI:CSVReport-Row-Issue-Internal' => 'Interne fout: %1$s, %2$s',
-
 	'UI:CSVReport-Icon-Unchanged' => 'Onveranderd',
 	'UI:CSVReport-Icon-Modified' => 'Aangepast',
 	'UI:CSVReport-Icon-Missing' => 'Ontbrekend',
@@ -683,14 +753,32 @@ We hopen dat je even hard van deze versie geniet als dat we zelf ervan hebben ge
 	'UI:CSVReport-Stats-Errors' => '%1$.0f %% van de geladen objecten bevatten fouten en zullen worden genegeerd',
 	'UI:CSVReport-Stats-Created' => '%1$.0f %% van de geladen objecten zullen worden gemaakt',
 	'UI:CSVReport-Stats-Modified' => '%1$.0f %% zullen worden aangepast.',
-
 	'UI:CSVExport:AdvancedMode' => 'Geavanceerde mode',
 	'UI:CSVExport:AdvancedMode+' => 'In geavanceerde mode worden verscheidene kolommen toegevoegd aan de export: id van het object, id van de externe codes en hun reconciliation-attributen.',
 	'UI:CSVExport:LostChars' => 'Tekstcoderingsprobleem',
 	'UI:CSVExport:LostChars+' => 'Het gedownloade bestand zal worden gecodeerd in %1$s. '.ITOP_APPLICATION_SHORT.' heeft een aantal karakters gedetecteerd die niet compatibel zijn met dit formaat. Deze karakters zullen worden vervangen door een ander karakter (bijvoorbeeld karakters met accent kunnen het accent verliezen), of ze zullen worden verwijderd. Je kan data kopiëren en plakken van jouw webbrowser. Ook kan je de beheerder contacteren om de codes te veranderen (Zie parameter \'csv_file_default_charset\').',
-
 	'UI:Audit:Title' => ITOP_APPLICATION_SHORT.' - CMDB Audit',
 	'UI:Audit:InteractiveAudit' => 'Interactieve Audit',
+	'UI:Audit:Interactive:All:Title' => 'Audit results~~',
+	'UI:Audit:Interactive:All:SubTitle' => 'Full audit: includes all rules, all categories, all domains~~',
+	'UI:Audit:Interactive:All:BreadCrumb' => 'Full audit~~',
+	'UI:Audit:Interactive:All:BreadCrumb+' => 'Audit results for all rules~~',
+	'UI:Audit:Interactive:Categories:Title' => 'Audit results for categories: %1$s~~',
+	'UI:Audit:Interactive:Categories:SubTitle' => 'Audit results for all the rules belonging to one of those %1$s categories~~',
+	'UI:Audit:Interactive:Categories:BreadCrumb' => 'Categories~~',
+	'UI:Audit:Interactive:Categories:BreadCrumb+' => 'Audit categories: %1$s~~',
+	'UI:Audit:Interactive:Domain:Title' => 'Audit results for Domain: %1$s~~',
+	'UI:Audit:Interactive:Domain:SubTitle' => 'Audit results for all the rules belonging to a category related to the domain: %1$s~~',
+	'UI:Audit:Interactive:Domain:BreadCrumb' => '%1$s~~',
+	'UI:Audit:Interactive:Domain:BreadCrumb+' => 'Audit for Domain: %1$s~~',
+	'UI:Audit:Interactive:Selection:Title' => 'Selection of an audit~~',
+	'UI:Audit:Interactive:Selection:SubTitle' => 'Select a domain to get the results limited to this domain or select "All categories" to get a full audit (can take time or even fail if too much data to audit)~~',
+	'UI:Audit:Interactive:Selection:BreadCrumb' => 'Selection~~',
+	'UI:Audit:Interactive:Selection:BreadCrumb+' => 'Selection of an Audit to run~~',
+	'UI:Audit:Interactive:Selection:BadgeAll' => 'All categories~~',
+	'UI:Audit:Interactive:Button:Back' => 'Back to the audit~~',
+	'UI:Audit:Interactive:Button:Configuration' => 'Audit configuration~~',
+	'UI:Audit:ViewRules' => 'Check the rules~~',
 	'UI:Audit:HeaderAuditRule' => 'Auditregel',
 	'UI:Audit:HeaderNbObjects' => '# objecten',
 	'UI:Audit:HeaderNbErrors' => '# fouten',
@@ -706,8 +794,6 @@ We hopen dat je even hard van deze versie geniet als dat we zelf ervan hebben ge
 	'UI:Audit:Dashboard:ObjectsInError' => 'Foutieve objecten',
 	'UI:Audit:Dashboard:ObjectsValidated' => 'Gevalideerde objecten',
 	'UI:Audit:AuditCategory:Subtitle' => '%1$s fouten van de %2$s - %3$s%%',
-
-
 	'UI:RunQuery:Title' => ITOP_APPLICATION_SHORT.' - Evaluatie van OQL-query',
 	'UI:RunQuery:QueryExamples' => 'Voorbeelden van query\'s',
 	'UI:RunQuery:QueryResults' => 'Query-resultaten',
@@ -726,7 +812,7 @@ We hopen dat je even hard van deze versie geniet als dat we zelf ervan hebben ge
 	'UI:RunQuery:ResultSQL' => 'Resulterende SQL',
 	'UI:RunQuery:Error' => 'Er trad een fout op tijdens het uitvoeren van deze query',
 	'UI:Query:UrlForExcel' => 'URL om te gebruiken voor MS Excel-webquery\'s',
-	'UI:Query:UrlV1' => 'De lijst van velden is leeg gelaten. De pagina <em>export-V2.php</em> kan niet aangeroepen worden zonder deze informatie.Daarom verwijst de onderstaande link naar de oude export-pagina: <em>export.php</em>. Deze verouderde versie heeft enkele beperkingen: de lijst van geëxporteerde velden kan verschillen afhankelijk van het gekozen export-formaat en het datamodel van '.ITOP_APPLICATION_SHORT.'. Als je wil dat de lijst van geëxporteerde kolommen hetzelfde blijft over lange tijd, dan moet je een waarde opgeven voor het attribuut "Velden" en de pagina <em>export-V2.php</em> gebruiken.',
+	'UI:Query:UrlV1' => 'De lijst van velden is leeg gelaten. De pagina <em>export-V2.php</em> kan niet aangeroepen worden zonder deze informatie.Daarom verwijst de onderstaande link naar de oude export-pagina: <em>export.php</em>. Deze verouderde versie heeft enkele beperkingen: de lijst van geëxporteerde velden kan verschillen afhankelijk van het gekozen export-formaat en het datamodel van '.ITOP_APPLICATION_SHORT.'.Als je wil dat de lijst van geëxporteerde kolommen hetzelfde blijft over lange tijd, dan moet je een waarde opgeven voor het attribuut "Velden" en de pagina <em>export-V2.php</em> gebruiken.',
 	'UI:Schema:Title' => ITOP_APPLICATION_SHORT.' objecten-schema',
 	'UI:Schema:TitleForClass' => '%1$s schema',
 	'UI:Schema:CategoryMenuItem' => 'Categorie <b>%1$s</b>',
@@ -746,7 +832,6 @@ We hopen dat je even hard van deze versie geniet als dat we zelf ervan hebben ge
 	'UI:Schema:Label' => 'Label',
 	'UI:Schema:Label+' => 'Label van het attribuut',
 	'UI:Schema:Type' => 'Type',
-
 	'UI:Schema:Type+' => 'Datatype van het attribuut',
 	'UI:Schema:Origin' => 'Oorsprong',
 	'UI:Schema:Origin+' => 'De basisklasse waarin dit attribuut is gedefinieerd',
@@ -794,6 +879,16 @@ We hopen dat je even hard van deze versie geniet als dat we zelf ervan hebben ge
 	'UI:Schema:DisplaySelector/Code' => 'Code',
 	'UI:Schema:Attribute/Filter' => 'Filter',
 	'UI:Schema:DefaultNullValue' => 'Standaardwaarde null : "%1$s"',
+	'UI:Schema:Events' => 'Events~~',
+	'UI:Schema:Events:Defined' => 'Defined events~~',
+	'UI:Schema:Events:NoEvent' => 'No event defined~~',
+	'UI:Schema:Events:Listeners' => 'Event listeners~~',
+	'UI:Schema:Events:NoListener' => 'No event listener~~',
+	'UI:Schema:Events:Event' => 'Event~~',
+	'UI:Schema:Events:Description' => 'Description~~',
+	'UI:Schema:Events:Listener' => 'Listener~~',
+	'UI:Schema:Events:Rank' => 'Rank~~',
+	'UI:Schema:Events:Module' => 'Module~~',
 	'UI:LinksWidget:Autocomplete+' => 'Typ de eerste 3 karakters...',
 	'UI:Edit:SearchQuery' => 'Kies een vooraf gedefinieerde query',
 	'UI:Edit:TestQuery' => 'Test query',
@@ -885,7 +980,6 @@ We hopen dat je even hard van deze versie geniet als dat we zelf ervan hebben ge
 	'UI:SystemIntrusion' => 'Toegang geweigerd. Je hebt een actie aangevraagd waarvoor je niet gemachtigd bent.',
 	'UI:FatalErrorMessage' => 'Fatale fout, '.ITOP_APPLICATION_SHORT.' kan niet doorgaan.',
 	'UI:Error_Details' => 'Fout: %1$s.',
-
 	'UI:PageTitle:ProfileProjections' => ITOP_APPLICATION_SHORT.' gebruikersbeheer - profiel-projecties',
 	'UI:UserManagement:Class' => 'Klasse',
 	'UI:UserManagement:Class+' => 'Klasse van objecten',
@@ -920,66 +1014,42 @@ We hopen dat je even hard van deze versie geniet als dat we zelf ervan hebben ge
 	'UI:UserManagement:NoLifeCycleApplicable' => 'Niet beschikbaar',
 	'UI:UserManagement:NoLifeCycleApplicable+' => 'Er is geen levenscyclus gedefinieerd voor deze klasse',
 	'UI:UserManagement:GrantMatrix' => 'Rechtenmatrix',
-
-	'Menu:AdminTools' => 'Admintools',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:AdminTools+' => 'Beheertools',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:AdminTools?' => 'Tools die enkel toegankelijk zijn voor gebruikers met een administratorprofiel.',// Duplicated into itop-welcome-itil (will be removed from here...)
 	'Menu:SystemTools' => 'Systeem',
-
 	'UI:ChangeManagementMenu' => 'Change Management',
 	'UI:ChangeManagementMenu+' => 'Change Management',
 	'UI:ChangeManagementMenu:Title' => 'Overzicht changes',
 	'UI-ChangeManagementMenu-ChangesByType' => 'Changes aan de hand van soort',
 	'UI-ChangeManagementMenu-ChangesByStatus' => 'Changes aan de hand van soort status',
 	'UI-ChangeManagementMenu-ChangesNotYetAssigned' => 'Nog niet toegewezen Changes',
-
 	'UI:ConfigurationManagementMenu' => 'Configuratie Management',
 	'UI:ConfigurationManagementMenu+' => 'Configuratie Management',
 	'UI:ConfigurationManagementMenu:Title' => 'Infrastructuuroverzicht',
 	'UI-ConfigurationManagementMenu-InfraByType' => 'Objecten van de infrastructuur aan de hand van soort',
 	'UI-ConfigurationManagementMenu-InfraByStatus' => 'Objecten van de infrastructuur aan de hand van status',
-
 	'UI:ConfigMgmtMenuOverview:Title' => 'Dashboard voor Configuratie Management',
 	'UI-ConfigMgmtMenuOverview-FunctionalCIbyStatus' => 'Configuratie-items aan de hand van status',
 	'UI-ConfigMgmtMenuOverview-FunctionalCIByType' => 'Configuratie-items aan de hand van soort',
-
 	'UI:RequestMgmtMenuOverview:Title' => 'Dashboard voor Request Management',
 	'UI-RequestManagementOverview-RequestByService' => 'Gebruikersaanvragen aan de hand van service',
 	'UI-RequestManagementOverview-RequestByPriority' => 'Gebruikersaanvragen aan de hand van prioriteit',
 	'UI-RequestManagementOverview-RequestUnassigned' => 'Nog niet toegewezen gebruikersaanvragen',
-
 	'UI:IncidentMgmtMenuOverview:Title' => 'Dashboard voor Incident Management',
 	'UI-IncidentManagementOverview-IncidentByService' => 'Incidenten aan de hand van service',
 	'UI-IncidentManagementOverview-IncidentByPriority' => 'Incidenten aan de hand van prioriteit',
 	'UI-IncidentManagementOverview-IncidentUnassigned' => 'Nog niet toegewezen incidenten',
-
 	'UI:ChangeMgmtMenuOverview:Title' => 'Dashboard voor Change Management',
 	'UI-ChangeManagementOverview-ChangeByType' => 'Changes aan de hand van soort',
 	'UI-ChangeManagementOverview-ChangeUnassigned' => 'Nog niet toegewezen Changes',
 	'UI-ChangeManagementOverview-ChangeWithOutage' => 'Outages door changes',
-
 	'UI:ServiceMgmtMenuOverview:Title' => 'Dashboard voor Service Management',
 	'UI-ServiceManagementOverview-CustomerContractToRenew' => 'Klantencontracten die binnen 30 dagen vernieuwd moeten worden',
 	'UI-ServiceManagementOverview-ProviderContractToRenew' => 'Providercontracten die binnen 30 dagen vernieuwd moeten worden',
-
 	'UI:ContactsMenu' => 'Contacten',
 	'UI:ContactsMenu+' => 'Contacten',
 	'UI:ContactsMenu:Title' => 'Overzicht van contacten',
 	'UI-ContactsMenu-ContactsByLocation' => 'Contacten aan de hand van locatie',
 	'UI-ContactsMenu-ContactsByType' => 'Contacten aan de hand van soort',
 	'UI-ContactsMenu-ContactsByStatus' => 'Contacten aan de hand van status',
-
-	'Menu:CSVImportMenu' => 'CSV import',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:CSVImportMenu+' => 'In bulk aanmaken of aanpassen van objecten',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:DataModelMenu' => 'Datamodel',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:DataModelMenu+' => 'Overzicht van het datamodel',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:ExportMenu' => 'Export',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:ExportMenu+' => 'Exporteer de resultaten van query\'s als HTML, CSV of XML',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:NotificationsMenu' => 'Meldingen',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:NotificationsMenu+' => 'Configuratie van de meldingen',// Duplicated into itop-welcome-itil (will be removed from here...)
 	'UI:NotificationsMenu:Title' => 'Configuratie van Meldingen',
 	'UI:NotificationsMenu:Help' => 'Help',
 	'UI:NotificationsMenu:HelpContent' => '<p>In '.ITOP_APPLICATION_SHORT.' zijn de meldingen volledig aan te passen. Ze zijn gebaseerd op twee sets van objecten: <i>triggers and actions</i>.</p>
@@ -1013,53 +1083,18 @@ Bij die koppeling wordt aan elke actie een volgorde-nummer gegeven. Dit bepaalt
 	'UI:NotificationsMenu:Actions:ActionWebhook' => 'Webhook acties (uitgaande integraties)',
 	'UI:NotificationsMenu:Actions:Action' => 'Andere acties',
 	'UI:NotificationsMenu:AvailableActions' => 'Beschikbare acties',
-
 	'Menu:TagAdminMenu' => 'Tags-configuratie',
 	'Menu:TagAdminMenu+' => 'Beheer de tags',
 	'UI:TagAdminMenu:Title' => 'Tags-configuratie',
 	'UI:TagAdminMenu:NoTags' => 'Geen tags geconfigureerd',
 	'UI:TagSetFieldData:Error' => 'Fout: %1$s',
-
-	'Menu:AuditCategories' => 'Auditcategorieën',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:AuditCategories+' => 'Auditcategorieën',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:Notifications:Title' => 'Auditcategorieën',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:RunQueriesMenu' => 'Query\'s uitvoeren',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:RunQueriesMenu+' => 'Voer een query uit',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:QueryMenu' => 'Favoriete query\'s',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:QueryMenu+' => 'Favoriete query\'s',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:DataAdministration' => 'Databeheer',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:DataAdministration+' => 'Databeheer',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:UniversalSearchMenu' => 'Globale zoekopdracht',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UniversalSearchMenu+' => 'Zoek in alle data...',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:UserManagementMenu' => 'Gebruikersbeheer',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UserManagementMenu+' => 'Gebruikersbeheer',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:ProfilesMenu' => 'Profielen',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:ProfilesMenu+' => 'Profielen',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:ProfilesMenu:Title' => 'Profielen',
-	// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:UserAccountsMenu' => 'Gebruikersaccounts',
-	// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UserAccountsMenu+' => 'Gebruikersaccounts',
-	// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UserAccountsMenu:Title' => 'Gebruikersaccounts',
-	// Duplicated into itop-welcome-itil (will be removed from here...)
-
 	'UI:iTopVersion:Short' => '%1$s versie %2$s',
 	'UI:iTopVersion:Long' => '%1$s versie %2$s-%3$s uitgegeven op %4$s',
 	'UI:PropertiesTab' => 'Eigenschappen',
-
 	'UI:OpenDocumentInNewWindow_' => 'Open',
 	'UI:DownloadDocument_' => 'Download',
 	'UI:Document:NoPreview' => 'Er is geen voorbeeld beschikbaar voor dit soort document',
 	'UI:Download-CSV' => 'Download %1$s',
-
 	'UI:DeadlineMissedBy_duration' => 'Gemist op %1$s',
 	'UI:Deadline_LessThan1Min' => '< 1 min',
 	'UI:Deadline_Minutes' => '%1$d min',
@@ -1138,9 +1173,13 @@ Bij die koppeling wordt aan elke actie een volgorde-nummer gegeven. Dit bepaalt
 	'Enum:Undefined' => 'Ongedefinieerd',
 	'UI:DurationForm_Days_Hours_Minutes_Seconds' => '%1$s dagen %2$s uren %3$s minuten %4$s seconden',
 	'UI:ModifyAllPageTitle' => 'Bewerk alles',
+	'UI:Modify_ObjectsOf_Class' => 'Modifying objects of class %1$s~~',
 	'UI:Modify_N_ObjectsOf_Class' => 'Bezig met het aanpassen van %1$d objecten van klasse %2$s',
 	'UI:Modify_M_ObjectsOf_Class_OutOf_N' => 'Bezig met het aanpassen van %1$d objecten van klasse %2$s van de %3$d',
 	'UI:Menu:ModifyAll' => 'Bewerk...',
+	'UI:Menu:ModifyAll_Class' => 'Modify %1$s objects...~~',
+	'UI:Menu:ModifyAll_Link' => 'Modify %1$s...~~',
+	'UI:Menu:ModifyAll_Remote' => 'Modify %1$s...~~',
 	'UI:Button:ModifyAll' => 'Bewerk alles',
 	'UI:Button:PreviewModifications' => 'Voorbeeld van de bewerkingen >>',
 	'UI:ModifiedObject' => 'Object is aangepast',
@@ -1200,7 +1239,6 @@ Bij die koppeling wordt aan elke actie een volgorde-nummer gegeven. Dit bepaalt
 	'UI:PrintResolution:LetterLandscape' => 'Letter Landschap',
 	'UI:Toggle:SwitchToStandardDashboard' => 'Schakel over naar het standaard dashboard',
 	'UI:Toggle:SwitchToCustomDashboard' => 'Schakel over naar aangepast dashboard',
-
 	'UI:ConfigureThisList' => 'Configureer deze lijst...',
 	'UI:ListConfigurationTitle' => 'Configuratie van lijst',
 	'UI:ColumnsAndSortOrder' => 'Kolommen en sorteervolgorde:',
@@ -1216,10 +1254,8 @@ Bij die koppeling wordt aan elke actie een volgorde-nummer gegeven. Dit bepaalt
 	'UI:ExtField_AsRemoteField' => '%1$s (%2$s)',
 	'UI:Button:MoveUp' => 'Ga omhoog',
 	'UI:Button:MoveDown' => 'Ga omlaag',
-
 	'UI:OQL:UnknownClassAndFix' => 'Onbekende klasse "%1$s". Je zou "%2$s" kunnen proberen.',
 	'UI:OQL:UnknownClassNoFix' => 'Onbekende klasse "%1$s"',
-
 	'UI:Dashboard:EditCustom' => 'Bewerk aangepaste versie...',
 	'UI:Dashboard:CreateCustom' => 'Maak aangepaste versie...',
 	'UI:Dashboard:DeleteCustom' => 'Verwijder aangepaste versie...',
@@ -1230,13 +1266,10 @@ Bij die koppeling wordt aan elke actie een volgorde-nummer gegeven. Dit bepaalt
 	'UI:ImportDashboardText' => 'Selecteer een bestand van het dashboard om te importeren:',
 	'UI:Dashboard:Actions' => 'Dashboard acties',
 	'UI:Dashboard:NotUpToDateUntilContainerSaved' => 'Dit dashboard toont informatie die nog geen rekening houdt met de wijzigingen die nu gemaakt worden.',
-
-
 	'UI:DashletCreation:Title' => 'Maak een nieuwe Dashlet aan',
 	'UI:DashletCreation:Dashboard' => 'Dashboard',
 	'UI:DashletCreation:DashletType' => 'Soort dashlet',
 	'UI:DashletCreation:EditNow' => 'Bewerk het dashboard',
-
 	'UI:DashboardEdit:Title' => 'Dashboard editor',
 	'UI:DashboardEdit:DashboardTitle' => 'Titel',
 	'UI:DashboardEdit:AutoReload' => 'Automatisch vernieuwen',
@@ -1244,38 +1277,31 @@ Bij die koppeling wordt aan elke actie een volgorde-nummer gegeven. Dit bepaalt
 	'UI:DashboardEdit:AutoReloadSec+' => 'Het toegestane minimum is 5 seconden',
 	'UI:DashboardEdit:Revert' => 'Herstel',
 	'UI:DashboardEdit:Apply' => 'Opslaan',
-
 	'UI:DashboardEdit:Layout' => 'Layout',
 	'UI:DashboardEdit:Properties' => 'Eigenschappen van dashboard',
 	'UI:DashboardEdit:Dashlets' => 'Beschikbare Dashlets',
 	'UI:DashboardEdit:DashletProperties' => 'Eigenschappen van dashlet',
-
 	'UI:Form:Property' => 'Eigenschap',
 	'UI:Form:Value' => 'Waarde',
-
 	'UI:DashletUnknown:Label' => 'Onbekend',
 	'UI:DashletUnknown:Description' => 'Onbekende dashlet (mogelijk verwijderd)',
 	'UI:DashletUnknown:RenderText:View' => 'Kan deze dashlet niet weergeven.',
 	'UI:DashletUnknown:RenderText:Edit' => 'Kan deze dashlet niet weergeven (klasse "%1$s"). Controleer bij je '.ITOP_APPLICATION_SHORT.'-beheerder of dit nog beschikbaar is.',
 	'UI:DashletUnknown:RenderNoDataText:Edit' => 'Geen voorbeeld mogelijk van deze dashlet (klasse "%1$s").',
 	'UI:DashletUnknown:Prop-XMLConfiguration' => 'Configuratie (getoond als ruwe XML)',
-
 	'UI:DashletProxy:Label' => 'Proxy',
 	'UI:DashletProxy:Description' => 'Proxy dashlet',
 	'UI:DashletProxy:RenderNoDataText:Edit' => 'Geen voorbeeld mogelijk van deze dashlet van een derde partij (klasse "%1$s").',
 	'UI:DashletProxy:Prop-XMLConfiguration' => 'Configuratie (getoond als ruwe XML)',
-
 	'UI:DashletPlainText:Label' => 'Tekst',
 	'UI:DashletPlainText:Description' => 'Gewone tekst (niet geformatteerd)',
 	'UI:DashletPlainText:Prop-Text' => 'Tekst',
 	'UI:DashletPlainText:Prop-Text:Default' => 'Voeg hier wat tekst toe...',
-
 	'UI:DashletObjectList:Label' => 'Objectlijst',
 	'UI:DashletObjectList:Description' => 'Objectlijst dashlet',
 	'UI:DashletObjectList:Prop-Title' => 'Titel',
 	'UI:DashletObjectList:Prop-Query' => 'Query',
 	'UI:DashletObjectList:Prop-Menu' => 'Menu',
-
 	'UI:DashletGroupBy:Prop-Title' => 'Titel',
 	'UI:DashletGroupBy:Prop-Query' => 'Query',
 	'UI:DashletGroupBy:Prop-Style' => 'Stijl',
@@ -1289,24 +1315,20 @@ Bij die koppeling wordt aan elke actie een volgorde-nummer gegeven. Dit bepaalt
 	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfWeek' => '%1$s (dag van de week)',
 	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfMonth' => '%1$s (dag van de maand)',
 	'UI:DashletGroupBy:MissingGroupBy' => 'Selecteer het veld waarop de objecten gegroepeerd moeten worden',
-
 	'UI:DashletGroupByPie:Label' => 'Cirkeldiagram',
 	'UI:DashletGroupByPie:Description' => 'Cirkeldiagram',
 	'UI:DashletGroupByBars:Label' => 'Staafdiagram',
 	'UI:DashletGroupByBars:Description' => 'Staafdiagram',
 	'UI:DashletGroupByTable:Label' => 'Groepeer aan de hand van (tabel)',
 	'UI:DashletGroupByTable:Description' => 'Lijst (Gegroepeerd aan de hand van een veld)',
-
-	// New in 2.5
+    // New in 2.5
 	'UI:DashletGroupBy:Prop-Function' => 'Groepeerfunctie',
 	'UI:DashletGroupBy:Prop-FunctionAttribute' => 'Functie-attribuut',
 	'UI:DashletGroupBy:Prop-OrderDirection' => 'Volgorde',
 	'UI:DashletGroupBy:Prop-OrderField' => 'Sorteren op',
 	'UI:DashletGroupBy:Prop-Limit' => 'Limiet',
-
 	'UI:DashletGroupBy:Order:asc' => 'Oplopend',
 	'UI:DashletGroupBy:Order:desc' => 'Aflopend',
-
 	'UI:GroupBy:count' => 'Aantal',
 	'UI:GroupBy:count+' => 'Aantal items',
 	'UI:GroupBy:sum' => 'Som',
@@ -1317,14 +1339,12 @@ Bij die koppeling wordt aan elke actie een volgorde-nummer gegeven. Dit bepaalt
 	'UI:GroupBy:min+' => 'Minimum van %1$s',
 	'UI:GroupBy:max' => 'Maximum',
 	'UI:GroupBy:max+' => 'Maximum van %1$s',
-	// ---
-
+    // ---
 	'UI:DashletHeaderStatic:Label' => 'Kolom',
 	'UI:DashletHeaderStatic:Description' => 'Geeft een horizontale separator weer',
 	'UI:DashletHeaderStatic:Prop-Title' => 'Titel',
 	'UI:DashletHeaderStatic:Prop-Title:Default' => 'Contacten',
 	'UI:DashletHeaderStatic:Prop-Icon' => 'Icoon',
-
 	'UI:DashletHeaderDynamic:Label' => 'Kolom met gegevens',
 	'UI:DashletHeaderDynamic:Description' => 'Kolom met statistieken (gegroepeerd aan de hand van...)',
 	'UI:DashletHeaderDynamic:Prop-Title' => 'Titel',
@@ -1335,11 +1355,9 @@ Bij die koppeling wordt aan elke actie een volgorde-nummer gegeven. Dit bepaalt
 	'UI:DashletHeaderDynamic:Prop-Query' => 'Query',
 	'UI:DashletHeaderDynamic:Prop-GroupBy' => 'Gegroepeerd aan de hand van',
 	'UI:DashletHeaderDynamic:Prop-Values' => 'Waarden',
-
 	'UI:DashletBadge:Label' => 'Badge',
 	'UI:DashletBadge:Description' => 'Object Icoon met nieuw/zoek naar',
 	'UI:DashletBadge:Prop-Class' => 'Klasse',
-
 	'DayOfWeek-Sunday' => 'Zondag',
 	'DayOfWeek-Monday' => 'Maandag',
 	'DayOfWeek-Tuesday' => 'Dinsdag',
@@ -1359,8 +1377,7 @@ Bij die koppeling wordt aan elke actie een volgorde-nummer gegeven. Dit bepaalt
 	'Month-10' => 'Oktober',
 	'Month-11' => 'November',
 	'Month-12' => 'December',
-
-	// Short version for the DatePicker
+    // Short version for the DatePicker
 	'DayOfWeek-Sunday-Min' => 'Zo',
 	'DayOfWeek-Monday-Min' => 'Ma',
 	'DayOfWeek-Tuesday-Min' => 'Di',
@@ -1380,13 +1397,13 @@ Bij die koppeling wordt aan elke actie een volgorde-nummer gegeven. Dit bepaalt
 	'Month-10-Short' => 'Okt',
 	'Month-11-Short' => 'Nov',
 	'Month-12-Short' => 'Dec',
-	'Calendar-FirstDayOfWeek' => '0',// 0 = Sunday, 1 = Monday, etc...
-
+	'Calendar-FirstDayOfWeek' => '0',
+    // 0 = Sunday, 1 = Monday, etc...
 	'UI:Menu:ShortcutList' => 'Maak een snelkoppeling aan...',
+	'UI:Menu:FilterList' => 'Display list with search criteria~~',
 	'UI:ShortcutRenameDlg:Title' => 'Hernoem de snelkoppeling',
 	'UI:ShortcutListDlg:Title' => 'Maak een snelkoppeling voor de lijst aan',
 	'UI:ShortcutDelete:Confirm' => 'Bevestig dat je de snelkoppeling(en) wil verwijderen.',
-	'Menu:MyShortcuts' => 'Mijn snelkoppelingen',// Duplicated into itop-welcome-itil (will be removed from here...)
 	'Class:Shortcut' => 'Snelkoppelingen',
 	'Class:Shortcut+' => '',
 	'Class:Shortcut/Attribute:name' => 'Naam',
@@ -1400,12 +1417,10 @@ Bij die koppeling wordt aan elke actie een volgorde-nummer gegeven. Dit bepaalt
 	'Class:ShortcutOQL/Attribute:auto_reload/Value:custom' => 'Aangepast interval',
 	'Class:ShortcutOQL/Attribute:auto_reload_sec' => 'Interval van het automatisch vernieuwen (seconden)',
 	'Class:ShortcutOQL/Attribute:auto_reload_sec/tip' => 'De minimale waarde is %1$d seconden',
-
 	'UI:FillAllMandatoryFields' => 'Vul de verplichte velden in.',
 	'UI:ValueMustBeSet' => 'Gelieve een waarde op te geven',
 	'UI:ValueMustBeChanged' => 'Gelieve de waarde te veranderen',
 	'UI:ValueInvalidFormat' => 'Ongeldig formaat',
-
 	'UI:CSVImportConfirmTitle' => 'Bevestig de actie',
 	'UI:CSVImportConfirmMessage' => 'Weet je zeker dat je dit wilt doen?',
 	'UI:CSVImportError_items' => 'Fouten: %1$d',
@@ -1431,11 +1446,9 @@ Bij die koppeling wordt aan elke actie een volgorde-nummer gegeven. Dit bepaalt
 	<tr><td>i</td><td>minuten (2 cijfers, bv. 00..59)</td></tr>
 	<tr><td>s</td><td>secondn (2 cijfers, bv. 00..59)</td></tr>
 	</table>',
-
 	'UI:Button:Remove' => 'Verwijder',
 	'UI:AddAnExisting_Class' => 'Voeg objecten van type %1$s toe...',
 	'UI:SelectionOf_Class' => 'Selectie van objecten van type %1$s',
-
 	'UI:AboutBox' => 'Over '.ITOP_APPLICATION_SHORT.'...',
 	'UI:About:Title' => 'Over '.ITOP_APPLICATION_SHORT,
 	'UI:About:DataModel' => 'Datamodel',
@@ -1445,12 +1458,10 @@ Bij die koppeling wordt aan elke actie een volgorde-nummer gegeven. Dit bepaalt
 	'UI:About:ManualExtensionSource' => 'Extensie',
 	'UI:About:Extension_Version' => 'Versie: %1$s',
 	'UI:About:RemoteExtensionSource' => 'Data',
-
 	'UI:DisconnectedDlgMessage' => 'Je bent afgemeld. Je moet je opnieuw aanmelden om de toepassing verder te gebruiken.',
 	'UI:DisconnectedDlgTitle' => 'Waarschuwing!',
 	'UI:LoginAgain' => 'Opnieuw aanmelden',
 	'UI:StayOnThePage' => 'Blijf op deze pagina',
-
 	'ExcelExporter:ExportMenu' => 'Exporteer naar Excel',
 	'ExcelExporter:ExportDialogTitle' => 'Exporteer als Excel-bestand',
 	'ExcelExporter:ExportButton' => 'Exporteer',
@@ -1463,7 +1474,6 @@ Bij die koppeling wordt aan elke actie een volgorde-nummer gegeven. Dit bepaalt
 	'ExcelExport:Statistics' => 'Statistieken',
 	'portal:legacy_portal' => 'Portaal voor eindgebruikers',
 	'portal:backoffice' => ITOP_APPLICATION_SHORT.' Back-Office User Interface',
-
 	'UI:CurrentObjectIsLockedBy_User' => 'Het object is vergrendeld omdat het momenteel aangepast wordt door %1$s.',
 	'UI:CurrentObjectIsLockedBy_User_Explanation' => 'Het object wordt aangepast door %1$s. Jouw wijzigingen kunnen niet opgeslagen worden omdat ze een conflict kunnen veroorzaken.',
 	'UI:CurrentObjectIsSoftLockedBy_User' => 'Het object wordt aangepast door %1$s. Je kan je wijzigingen doorvoeren wanneer men klaar is.',
@@ -1471,43 +1481,36 @@ Bij die koppeling wordt aan elke actie een volgorde-nummer gegeven. Dit bepaalt
 	'UI:CurrentObjectLockExpired_Explanation' => 'De vergrendeling om gelijktijdige wijzigingen te voorkomen, is opgeheven. Je kan je wijzigingen niet meer opslaan aangezien andere gebruikers ondertussen dit object kunnen aanpassen.',
 	'UI:ConcurrentLockKilled' => 'De vergrendeling voor gelijktijdige gebruikers is opgeheven.',
 	'UI:Menu:KillConcurrentLock' => 'Verwijder de vergrendeling voor gelijktijdige gebruikers!',
-
 	'UI:Menu:ExportPDF' => 'Exporteer als PDF...',
 	'UI:Menu:PrintableVersion' => 'Printvriendelijke versie',
-
 	'UI:BrowseInlineImages' => 'Afbeeldingen doorbladeren...',
 	'UI:UploadInlineImageLegend' => 'Voeg een afbeelding toe',
 	'UI:SelectInlineImageToUpload' => 'Selecteer een afbeelding om te uploaden',
 	'UI:AvailableInlineImagesLegend' => 'Beschikbare afbeeldingen',
 	'UI:NoInlineImage' => 'Er is geen afbeelding beschikbaar op de server. Gebruik de "Afbeeldingen doorbladeren..." knop hierboven om een afbeelding te kiezen op je toestel.',
-
 	'UI:ToggleFullScreen' => 'Minimaliseren / Maximaliseren',
 	'UI:Button:ResetImage' => 'Vorige afbeelding herstellen',
 	'UI:Button:RemoveImage' => 'Afbeelding verwijderen',
 	'UI:Button:UploadImage' => 'Afbeelding uploaden',
 	'UI:UploadNotSupportedInThisMode' => 'Het aanpassen van afbeeldingen of bestanden wordt niet ondersteund in deze mode.',
-
 	'UI:Button:RemoveDocument' => 'Document verwijderen',
-
-	// Search form
+    // Search form
 	'UI:Search:Toggle' => 'Inklappen / uitklappen',
 	'UI:Search:AutoSubmit:DisabledHint' => 'Direct zoeken werd uitgeschakeld voor deze klasse.',
 	'UI:Search:Obsolescence:DisabledHint' => 'Door jouw voorkeuren worden objecten met status "buiten dienst" verborgen',
 	'UI:Search:NoAutoSubmit:ExplainText' => 'Voeg enkele criteria toe in het zoekveld of klik op de zoekknop om objecten te zien.',
 	'UI:Search:Criterion:MoreMenu:AddCriteria' => 'Voeg nieuw criterium toe',
-	// - Add new criteria button
+    // - Add new criteria button
 	'UI:Search:AddCriteria:List:RecentlyUsed:Title' => 'Recent gebruikt',
 	'UI:Search:AddCriteria:List:MostPopular:Title' => 'Meest populair',
 	'UI:Search:AddCriteria:List:Others:Title' => 'Andere',
 	'UI:Search:AddCriteria:List:RecentlyUsed:Placeholder' => 'Nog geen.',
-
-	// - Criteria header actions
+    // - Criteria header actions
 	'UI:Search:Criteria:Toggle' => 'Klap in / uit',
 	'UI:Search:Criteria:Remove' => 'Verwijder',
 	'UI:Search:Criteria:Locked' => 'Vergrendeld',
-
-	// - Criteria titles
-	//   - Default widget
+    // - Criteria titles
+    //   - Default widget
 	'UI:Search:Criteria:Title:Default:Any' => '%1$s: alle',
 	'UI:Search:Criteria:Title:Default:Empty' => '%1$s is leeg',
 	'UI:Search:Criteria:Title:Default:NotEmpty' => '%1$s is niet leeg',
@@ -1529,53 +1532,57 @@ Bij die koppeling wordt aan elke actie een volgorde-nummer gegeven. Dit bepaalt
 	'UI:Search:Criteria:Title:Default:Between:All' => '%1$s: Any',
 	'UI:Search:Criteria:Title:Default:Between:From' => '%1$s from %2$s',
 	'UI:Search:Criteria:Title:Default:Between:Until' => '%1$s up to %2$s',
-	//   - Numeric widget
-	//   None yet
-	//   - DateTime widget
+    //   - Numeric widget
+    //   None yet
+    //   - DateTime widget
 	'UI:Search:Criteria:Title:DateTime:Between' => '%2$s <= 1$s <= %3$s',
-	//   - Enum widget
+    //   - Enum widget
 	'UI:Search:Criteria:Title:Enum:In' => '%1$s: %2$s',
 	'UI:Search:Criteria:Title:Enum:In:Many' => '%1$s: %2$s en %3$s andere',
 	'UI:Search:Criteria:Title:Enum:In:All' => '%1$s: Alle',
-	//   - TagSet widget
+    //   - TagSet widget
 	'UI:Search:Criteria:Title:TagSet:Matches' => '%1$s: %2$s',
-	//   - External key widget
+    //   - External key widget
 	'UI:Search:Criteria:Title:ExternalKey:Empty' => '%1$s is gedefinieerd',
 	'UI:Search:Criteria:Title:ExternalKey:NotEmpty' => '%1$s is niet gedefinieerd',
 	'UI:Search:Criteria:Title:ExternalKey:Equals' => '%1$s %2$s',
 	'UI:Search:Criteria:Title:ExternalKey:In' => '%1$s: %2$s',
 	'UI:Search:Criteria:Title:ExternalKey:In:Many' => '%1$s: %2$s en %3$s andere',
 	'UI:Search:Criteria:Title:ExternalKey:In:All' => '%1$s: Alle',
-	//   - Hierarchical key widget
+    //   - Hierarchical key widget
 	'UI:Search:Criteria:Title:HierarchicalKey:Empty' => '%1$s is gedefinieerd',
 	'UI:Search:Criteria:Title:HierarchicalKey:NotEmpty' => '%1$s is niet gedefinieerd',
 	'UI:Search:Criteria:Title:HierarchicalKey:Equals' => '%1$s %2$s',
 	'UI:Search:Criteria:Title:HierarchicalKey:In' => '%1$s: %2$s',
 	'UI:Search:Criteria:Title:HierarchicalKey:In:Many' => '%1$s: %2$s en %3$s andere',
 	'UI:Search:Criteria:Title:HierarchicalKey:In:All' => '%1$s: Alle',
-
-	// - Criteria operators
-	//   - Default widget
+    // - Criteria operators
+    //   - Default widget
 	'UI:Search:Criteria:Operator:Default:Empty' => 'Is leeg',
 	'UI:Search:Criteria:Operator:Default:NotEmpty' => 'Is niet leeg',
 	'UI:Search:Criteria:Operator:Default:Equals' => 'Gelijk aan',
 	'UI:Search:Criteria:Operator:Default:Between' => 'Tussen',
-	//   - String widget
+    //   - String widget
 	'UI:Search:Criteria:Operator:String:Contains' => 'Bevat',
 	'UI:Search:Criteria:Operator:String:StartsWith' => 'Begint met',
 	'UI:Search:Criteria:Operator:String:EndsWith' => 'Eindigt in',
 	'UI:Search:Criteria:Operator:String:RegExp' => 'Regex ',
-	//   - Numeric widget
-	'UI:Search:Criteria:Operator:Numeric:Equals' => 'Gelijk aan',// => '=',
-	'UI:Search:Criteria:Operator:Numeric:GreaterThan' => 'Groter',// => '>',
-	'UI:Search:Criteria:Operator:Numeric:GreaterThanOrEquals' => 'Groter of gelijk aan',// > '>=',
-	'UI:Search:Criteria:Operator:Numeric:LessThan' => 'Kleiner',// => '<',
-	'UI:Search:Criteria:Operator:Numeric:LessThanOrEquals' => 'Kleiner of gelijk aan',// > '<=',
-	'UI:Search:Criteria:Operator:Numeric:Different' => 'Verschillend van',// => '≠',
-	//   - Tag Set Widget
+    //   - Numeric widget
+	'UI:Search:Criteria:Operator:Numeric:Equals' => 'Gelijk aan',
+    // => '=',
+	'UI:Search:Criteria:Operator:Numeric:GreaterThan' => 'Groter',
+    // => '>',
+	'UI:Search:Criteria:Operator:Numeric:GreaterThanOrEquals' => 'Groter of gelijk aan',
+    // > '>=',
+	'UI:Search:Criteria:Operator:Numeric:LessThan' => 'Kleiner',
+    // => '<',
+	'UI:Search:Criteria:Operator:Numeric:LessThanOrEquals' => 'Kleiner of gelijk aan',
+    // > '<=',
+	'UI:Search:Criteria:Operator:Numeric:Different' => 'Verschillend van',
+    // => '≠',
+    //   - Tag Set Widget
 	'UI:Search:Criteria:Operator:TagSet:Matches' => 'Bevat',
-
-	// - Other translations
+    // - Other translations
 	'UI:Search:Value:Filter:Placeholder' => 'Filter...',
 	'UI:Search:Value:Search:Placeholder' => 'Zoek...',
 	'UI:Search:Value:Autocomplete:StartTyping' => 'Begin te typen om mogelijke waarden te zien.',
@@ -1583,8 +1590,7 @@ Bij die koppeling wordt aan elke actie een volgorde-nummer gegeven. Dit bepaalt
 	'UI:Search:Value:Autocomplete:NoResult' => 'Geen resultaten.',
 	'UI:Search:Value:Toggler:CheckAllNone' => 'Alles aan-/uitvinken',
 	'UI:Search:Value:Toggler:CheckAllNoneFiltered' => 'Alle zichtbare aan-/uitvinken',
-
-	// - Widget other translations
+    // - Widget other translations
 	'UI:Search:Criteria:Numeric:From' => 'Vanaf',
 	'UI:Search:Criteria:Numeric:Until' => 'Tot',
 	'UI:Search:Criteria:Numeric:PlaceholderFrom' => 'Alle',
@@ -1598,10 +1604,8 @@ Bij die koppeling wordt aan elke actie een volgorde-nummer gegeven. Dit bepaalt
 	'UI:Search:Criteria:DateTime:PlaceholderUntil' => 'Elk tijdstip',
 	'UI:Search:Criteria:DateTime:PlaceholderUntilTime' => 'Elk tijdstip',
 	'UI:Search:Criteria:HierarchicalKey:ChildrenIncluded:Hint' => 'Sub-objecten van geselecteerde objecten zullen mee opgenomen worden.',
-
 	'UI:Search:Criteria:Raw:Filtered' => 'Gefilterd',
 	'UI:Search:Criteria:Raw:FilteredOn' => 'Gefiltered op %1$s',
-
 	'UI:StateChanged' => 'Status veranderd',
 ));
 
@@ -1612,16 +1616,13 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Expression:Operator:AND' => ' EN ',
 	'Expression:Operator:OR' => ' OF ',
 	'Expression:Operator:=' => ': ',
-
 	'Expression:Unit:Short:DAY' => 'd',
 	'Expression:Unit:Short:WEEK' => 'w',
 	'Expression:Unit:Short:MONTH' => 'm',
 	'Expression:Unit:Short:YEAR' => 'j',
-
 	'Expression:Unit:Long:DAY' => 'dag(en)',
 	'Expression:Unit:Long:HOUR' => 'ure(n)',
 	'Expression:Unit:Long:MINUTE' => 'minute(n)',
-
 	'Expression:Verb:NOW' => 'nu',
 	'Expression:Verb:ISNULL' => ': ongedefinieerd (NULL)',
 ));
@@ -1645,46 +1646,32 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Menu:DataSources' => 'Synchronisatie-databronnen',
 	'Menu:DataSources+' => 'Alle Synchronisatie-databronnen',
-	'Menu:WelcomeMenu' => 'Welkom',
-	'Menu:WelcomeMenu+' => 'Welkom in '.ITOP_APPLICATION_SHORT,
-	'Menu:WelcomeMenuPage' => 'Welkom',
-	'Menu:WelcomeMenuPage+' => 'Welkom in '.ITOP_APPLICATION_SHORT,
-	'Menu:AdminTools' => 'Admintools',
-	'Menu:AdminTools+' => 'Beheertools',
-	'Menu:AdminTools?' => 'Tools die enkel toegankelijk zijn voor gebruikers met een administratorprofiel.',
-	'Menu:DataModelMenu' => 'Datamodel',
-	'Menu:DataModelMenu+' => 'Overzicht van het datamodel',
-	'Menu:ExportMenu' => 'Export',
-	'Menu:ExportMenu+' => 'Exporteer de resultaten van query\'s als HTML, CSV of XML',
-	'Menu:NotificationsMenu' => 'Meldingen',
-	'Menu:NotificationsMenu+' => 'Configuratie van de meldingen',
 	'Menu:AuditCategories' => 'Auditcategorieën',
 	'Menu:AuditCategories+' => 'Auditcategorieën',
 	'Menu:Notifications:Title' => 'Auditcategorieën',
-	'Menu:RunQueriesMenu'         => 'Query\'s uitvoeren',
-	'Menu:RunQueriesMenu+'        => 'Voer een query uit',
-	'Menu:QueryMenu'              => 'Voorgedefinieerde query\'s',
-	'Menu:QueryMenu+'             => 'Voorgedefinieerde query\'s',
-	'Menu:UniversalSearchMenu'    => 'Globale zoekopdracht',
-	'Menu:UniversalSearchMenu+'   => 'Zoek in alle data...',
-	'Menu:UserManagementMenu'     => 'Gebruikersbeheer',
-	'Menu:UserManagementMenu+'    => 'Gebruikersbeheer',
-	'Menu:ProfilesMenu'           => 'Profielen',
-	'Menu:ProfilesMenu+'          => 'Profielen',
-	'Menu:ProfilesMenu:Title'     => 'Profielen',
-	'Menu:UserAccountsMenu'       => 'Gebruikersaccounts',
-	'Menu:UserAccountsMenu+'      => 'Gebruikersaccounts',
+	'Menu:AuditCategories:Title' => 'Audit configuration~~',
+	'Menu:RunQueriesMenu' => 'Query\'s uitvoeren',
+	'Menu:RunQueriesMenu+' => 'Voer een query uit',
+	'Menu:QueryMenu' => 'Voorgedefinieerde query\'s',
+	'Menu:QueryMenu+' => 'Voorgedefinieerde query\'s',
+	'Menu:UniversalSearchMenu' => 'Globale zoekopdracht',
+	'Menu:UniversalSearchMenu+' => 'Zoek in alle data...',
+	'Menu:UserManagementMenu' => 'Gebruikersbeheer',
+	'Menu:UserManagementMenu+' => 'Gebruikersbeheer',
+	'Menu:ProfilesMenu' => 'Profielen',
+	'Menu:ProfilesMenu+' => 'Profielen',
+	'Menu:ProfilesMenu:Title' => 'Profielen',
+	'Menu:UserAccountsMenu' => 'Gebruikersaccounts',
+	'Menu:UserAccountsMenu+' => 'Gebruikersaccounts',
 	'Menu:UserAccountsMenu:Title' => 'Gebruikersaccounts',
-	'Menu:MyShortcuts'            => 'Mijn snelkoppelingen',
-	'Menu:UserManagement'         => 'Gebruikersbeheer',
-	'Menu:Queries'                => 'Query\'s',
-	'Menu:ConfigurationTools'     => 'Configuratie',
+	'Menu:UserManagement' => 'Gebruikersbeheer',
+	'Menu:Queries' => 'Query\'s',
+	'Menu:ConfigurationTools' => 'Configuratie'
 ));
-
 // Additional language entries not present in English dict
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'UI:Toggle:StandardDashboard' => 'Standaard',
-	'UI:Toggle:CustomDashboard'   => 'Aangepast',
-	'UI:Dashboard:Edit'           => 'Bewerk deze pagina...',
-	'UI:Dashboard:Revert'         => 'Herstel de originele versie...',
+	'UI:Toggle:CustomDashboard' => 'Aangepast',
+	'UI:Dashboard:Edit' => 'Bewerk deze pagina...',
+	'UI:Dashboard:Revert' => 'Herstel de originele versie...'
 ));
diff --git a/dictionaries/pl.dictionary.itop.core.php b/dictionaries/pl.dictionary.itop.core.php
index b8b99e4181..026713c53a 100644
--- a/dictionaries/pl.dictionary.itop.core.php
+++ b/dictionaries/pl.dictionary.itop.core.php
@@ -22,57 +22,42 @@
  */
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Core:DeletedObjectLabel' => '%1s (usunięto)',
-	'Core:DeletedObjectTip'   => 'Obiekt został usunięty w dniu %1$s (%2$s)',
-
+	'Core:DeletedObjectTip' => 'Obiekt został usunięty w dniu %1$s (%2$s)',
 	'Core:UnknownObjectLabel' => 'Nie znaleziono obiektu (klasa: %1$s, id: %2$d)',
-	'Core:UnknownObjectTip'   => 'Nie można znaleźć obiektu. Być może został usunięty jakiś czas temu, a od tego czasu dziennik został wyczyszczony.',
-
+	'Core:UnknownObjectTip' => 'Nie można znaleźć obiektu. Być może został usunięty jakiś czas temu, a od tego czasu dziennik został wyczyszczony.',
 	'Core:UniquenessDefaultError' => 'Błąd zasady niepowtarzalności \'%1$s\'',
-	'Core:CheckConsistencyError'  => 'Nie przestrzegano zasad spójności: %1$s',
-	'Core:CheckValueError'        => 'Nieoczekiwana wartość atrybutu \'%1$s\' (%2$s) : %3$s',
-
-	'Core:AttributeLinkedSet'  => 'Tablica obiektów',
+	'Core:CheckConsistencyError' => 'Nie przestrzegano zasad spójności: %1$s',
+	'Core:CheckValueError' => 'Nieoczekiwana wartość atrybutu \'%1$s\' (%2$s) : %3$s',
+	'Core:AttributeLinkedSet' => 'Tablica obiektów',
 	'Core:AttributeLinkedSet+' => 'Wszelkiego rodzaju obiekty tej samej klasy lub podklasy',
-
 	'Core:AttributeLinkedSetDuplicatesFound' => 'Duplikaty w polu \'%1$s\' : %2$s',
-
-	'Core:AttributeDashboard'  => 'Pulpit',
+	'Core:AttributeDashboard' => 'Pulpit',
 	'Core:AttributeDashboard+' => '',
-
-	'Core:AttributePhoneNumber'  => 'Numer telefonu',
+	'Core:AttributePhoneNumber' => 'Numer telefonu',
 	'Core:AttributePhoneNumber+' => '',
-
 	'Core:AttributeObsolescenceDate' => 'Data utraty ważności',
 	'Core:AttributeObsolescenceDate+' => '',
-
 	'Core:AttributeTagSet' => 'Lista tagów',
 	'Core:AttributeTagSet+' => '',
 	'Core:AttributeSet:placeholder' => 'kliknij, aby dodać',
 	'Core:AttributeClassAttCodeSet:ItemLabel:AttributeFromClass' => '%1$s (%2$s)',
 	'Core:AttributeClassAttCodeSet:ItemLabel:AttributeFromOneChildClass' => '%1$s (%2$s od %3$s)',
 	'Core:AttributeClassAttCodeSet:ItemLabel:AttributeFromSeveralChildClasses' => '%1$s (%2$s z klas podrzędnych)',
-
 	'Core:AttributeCaseLog' => 'Log',
 	'Core:AttributeCaseLog+' => '',
-
 	'Core:AttributeMetaEnum' => 'Obliczone wyliczenie',
 	'Core:AttributeMetaEnum+' => '',
-
 	'Core:AttributeLinkedSetIndirect' => 'Tablica obiektów (N-N)',
 	'Core:AttributeLinkedSetIndirect+' => 'Dowolny rodzaj obiektów [podklasa] tej samej klasy',
-
 	'Core:AttributeInteger' => 'Liczba całkowita',
 	'Core:AttributeInteger+' => 'Wartość liczbowa (może być ujemna)',
-
 	'Core:AttributeDecimal' => 'Wartość dziesiętna',
 	'Core:AttributeDecimal+' => 'Wartość dziesiętna (może być ujemna)',
-
 	'Core:AttributeBoolean' => 'Wartość logiczna',
 	'Core:AttributeBoolean+' => '',
 	'Core:AttributeBoolean/Value:null' => '',
 	'Core:AttributeBoolean/Value:yes' => 'Tak',
 	'Core:AttributeBoolean/Value:no' => 'Nie',
-
 	'Core:AttributeArchiveFlag' => 'Flaga archiwum',
 	'Core:AttributeArchiveFlag/Value:yes' => 'Tak',
 	'Core:AttributeArchiveFlag/Value:yes+' => 'Ten obiekt jest widoczny tylko w trybie archiwum',
@@ -81,7 +66,6 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Core:AttributeArchiveFlag/Label+' => '',
 	'Core:AttributeArchiveDate/Label' => 'Data archiwizacji',
 	'Core:AttributeArchiveDate/Label+' => '',
-
 	'Core:AttributeObsolescenceFlag' => 'Flaga utraty ważności',
 	'Core:AttributeObsolescenceFlag/Value:yes' => 'Tak',
 	'Core:AttributeObsolescenceFlag/Value:yes+' => 'Ten obiekt jest wykluczony z analizy wpływu i ukryty w wynikach wyszukiwania',
@@ -90,54 +74,38 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Core:AttributeObsolescenceFlag/Label+' => 'Obliczane dynamicznie na innych atrybutach',
 	'Core:AttributeObsolescenceDate/Label' => 'Data utraty ważności',
 	'Core:AttributeObsolescenceDate/Label+' => 'Przybliżona data, w której obiekt został uznany za wycofany',
-
 	'Core:AttributeString' => 'Ciąg',
 	'Core:AttributeString+' => 'Ciąg alfanumeryczny',
-
 	'Core:AttributeClass' => 'Klasa',
 	'Core:AttributeClass+' => '',
-
 	'Core:AttributeApplicationLanguage' => 'Język użutkownika',
 	'Core:AttributeApplicationLanguage+' => 'Język i kraj (EN US)',
-
 	'Core:AttributeFinalClass' => 'Klasa (auto)',
 	'Core:AttributeFinalClass+' => 'Prawdziwa klasa obiektu (automatycznie tworzona)',
-
 	'Core:AttributePassword' => 'Hasło',
 	'Core:AttributePassword+' => 'Hasło urządzenia zewnętrznego',
-
 	'Core:AttributeEncryptedString' => 'Zaszyfrowany ciąg',
 	'Core:AttributeEncryptedString+' => 'Łańcuch zaszyfrowany kluczem lokalnym',
 	'Core:AttributeEncryptUnknownLibrary' => 'Określono nieznaną bibliotekę szyfrowania (%1$s)',
 	'Core:AttributeEncryptFailedToDecrypt' => '** Błąd deszyfrowania **',
-
 	'Core:AttributeText' => 'Tekst',
 	'Core:AttributeText+' => 'Wielowierszowy ciąg znaków',
-
 	'Core:AttributeHTML' => 'HTML',
 	'Core:AttributeHTML+' => 'Ciąg HTML',
-
 	'Core:AttributeEmailAddress' => 'Adres e-mail',
 	'Core:AttributeEmailAddress+' => '',
-
 	'Core:AttributeIPAddress' => 'Adres IP',
 	'Core:AttributeIPAddress+' => '',
-
 	'Core:AttributeOQL' => 'OQL',
 	'Core:AttributeOQL+' => 'Język wyrażeń zapytania obiektowego OQL',
-
 	'Core:AttributeEnum' => 'Typ wyliczeniowy',
 	'Core:AttributeEnum+' => 'Lista predefiniowanych ciągów alfanumerycznych',
-
 	'Core:AttributeTemplateString' => 'Ciąg szablonu',
 	'Core:AttributeTemplateString+' => 'Ciąg zawierający symbole zastępcze',
-
 	'Core:AttributeTemplateText' => 'Tekst szablonu',
 	'Core:AttributeTemplateText+' => 'Tekst zawierający symbole zastępcze',
-
 	'Core:AttributeTemplateHTML' => 'Szablon HTML',
 	'Core:AttributeTemplateHTML+' => 'HTML zawierający symbole zastępcze',
-
 	'Core:AttributeDateTime' => 'Data/czas',
 	'Core:AttributeDateTime+' => 'Data i czas (rok-miesiąc-dzień gg:mm:ss)',
 	'Core:AttributeDateTime?SmartSearch' => '
@@ -155,7 +123,6 @@ Operatory:<br/>
 <p>
 Jeśli czas zostanie pominięty, domyślnie to 00:00:00
 </p>',
-
 	'Core:AttributeDate' => 'Data',
 	'Core:AttributeDate+' => 'Data (rok-miesiąc-dzień)',
 	'Core:AttributeDate?SmartSearch' => '
@@ -170,43 +137,30 @@ Operatory:<br/>
 	<b>&lt;</b><em>data</em><br/>
 	<b>[</b><em>data</em>,<em>data</em><b>]</b>
 </p>',
-
 	'Core:AttributeDeadline' => 'Ostateczny termin',
 	'Core:AttributeDeadline+' => 'Data wyświetlana w stosunku do aktualnego czasu',
-
 	'Core:AttributeExternalKey' => 'Klucz zewnętrzny',
 	'Core:AttributeExternalKey+' => 'Klucz zewnętrzny (lub obcy)',
-
 	'Core:AttributeHierarchicalKey' => 'Klucz hierarchiczny',
 	'Core:AttributeHierarchicalKey+' => 'Klucz zewnętrzny (lub obcy) do rodzica',
-
 	'Core:AttributeExternalField' => 'Pole zewnętrzne',
 	'Core:AttributeExternalField+' => 'Pole mapowane na klucz zewnętrzny',
-
 	'Core:AttributeURL' => 'URL',
 	'Core:AttributeURL+' => 'Bezwzględny lub względny adres URL jako ciąg tekstowy',
-
 	'Core:AttributeBlob' => 'Blob',
 	'Core:AttributeBlob+' => 'Dowolna zawartość binarna (dokument)',
-
 	'Core:AttributeOneWayPassword' => 'Hasło jednokierunkowe',
 	'Core:AttributeOneWayPassword+' => 'Hasło zaszyfrowane (mieszane) w jedną stronę',
-
 	'Core:AttributeTable' => 'Tabela',
 	'Core:AttributeTable+' => 'Tablica indeksowana mająca dwa wymiary',
-
 	'Core:AttributePropertySet' => 'Właściwości',
 	'Core:AttributePropertySet+' => 'Lista nietypowych właściwości (nazwa i wartość)',
-
 	'Core:AttributeFriendlyName' => 'Przyjazna nazwa',
 	'Core:AttributeFriendlyName+' => 'Atrybut tworzony automatycznie; przyjazna nazwa jest obliczana po kilku atrybutach',
-
 	'Core:FriendlyName-Label' => 'Pełna nazwa',
 	'Core:FriendlyName-Description' => 'Pełna nazwa',
-
 	'Core:AttributeTag' => 'Tagi',
 	'Core:AttributeTag+' => '',
-	
 	'Core:Context=REST/JSON' => 'REST',
 	'Core:Context=Synchro' => 'Synchronizacja',
 	'Core:Context=Setup' => 'Instalacja',
@@ -484,6 +438,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:Action' => 'Działanie własne',
 	'Class:Action+' => 'Działanie zdefiniowane przez użytkownika',
+	'Class:Action/ComplementaryName' => '%1$s: %2$s~~',
 	'Class:Action/Attribute:name' => 'Nazwa',
 	'Class:Action/Attribute:name+' => '',
 	'Class:Action/Attribute:description' => 'Opis',
@@ -551,6 +506,22 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:ActionEmail/Attribute:importance/Value:normal+' => '',
 	'Class:ActionEmail/Attribute:importance/Value:high' => 'wysoka',
 	'Class:ActionEmail/Attribute:importance/Value:high+' => '',
+	'Class:ActionEmail/Attribute:language' => 'Language~~',
+	'Class:ActionEmail/Attribute:language+' => 'Language to use for placeholders ($xxx$) inside the message (state, importance, priority, etc)~~',
+	'Class:ActionEmail/Attribute:html_template' => 'HTML template~~',
+	'Class:ActionEmail/Attribute:html_template+' => 'Optional HTML template wrapping around the content of the \'Body\' attribute below, useful for tailored email layouts (in the template, content of the \'Body\' attribute will replace the $content$ placeholder)~~',
+	'Class:ActionEmail/Attribute:ignore_notify' => 'Ignore the Notify flag~~',
+	'Class:ActionEmail/Attribute:ignore_notify+' => 'If set to \'Yes\' the \'Notify\' flag on Contacts has no effect.~~',
+	'Class:ActionEmail/Attribute:ignore_notify/Value:no' => 'No~~',
+	'Class:ActionEmail/Attribute:ignore_notify/Value:yes' => 'Yes~~',
+	'ActionEmail:main' => 'Message~~',
+	'ActionEmail:trigger' => 'Triggers~~',
+	'ActionEmail:recipients' => 'Contacts~~',
+	'ActionEmail:preview_tab' => 'Preview~~',
+	'ActionEmail:preview_tab+' => 'Preview of the eMail template~~',
+	'ActionEmail:preview_warning' => 'The actual eMail may look different in the eMail client than this preview in your browser.~~',
+	'ActionEmail:preview_more_info' => 'For more information about the CSS features supported by the different eMail clients, refer to %1$s~~',
+	'ActionEmail:content_placeholder_missing' => 'The placeholder "%1$s" was not found in the HTML template. The content of the field "%2$s" will not be included in the generated emails.~~',
 ));
 
 //
@@ -560,6 +531,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:Trigger' => 'Wyzwalacz',
 	'Class:Trigger+' => 'Niestandardowa obsługa zdarzeń',
+	'Class:Trigger/ComplementaryName' => '%1$s, %2$s~~',
 	'Class:Trigger/Attribute:description' => 'Opis',
 	'Class:Trigger/Attribute:description+' => 'jedna linia opisu',
 	'Class:Trigger/Attribute:action_list' => 'Działania wyzwalacza',
@@ -568,6 +540,8 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:Trigger/Attribute:finalclass+' => 'Nazwa ostatniej klasy',
 	'Class:Trigger/Attribute:context' => 'Kontekst',
 	'Class:Trigger/Attribute:context+' => 'Kontekst umożliwiający uruchomienie wyzwalacza',
+	'Class:Trigger/Attribute:complement' => 'Additional information~~',
+	'Class:Trigger/Attribute:complement+' => 'Further information as provided in english, by this trigger~~',
 ));
 
 //
@@ -663,6 +637,17 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:TriggerOnObjectMention/Attribute:mentioned_filter+' => 'Ogranicz listę wymienionych obiektów, które aktywują wyzwalacz. Jeśli jest pusty, dowolny wspomniany obiekt (dowolnej klasy) aktywuje go.',
 ));
 
+//
+// Class: TriggerOnAttributeBlobDownload
+//
+
+Dict::Add('PL PL', 'Polish', 'Polski', array(
+	'Class:TriggerOnAttributeBlobDownload' => 'Trigger (on object\'s document download)~~',
+	'Class:TriggerOnAttributeBlobDownload+' => 'Trigger on object\'s document field download of [a child class of] the given class~~',
+	'Class:TriggerOnAttributeBlobDownload/Attribute:target_attcodes' => 'Target fields~~',
+	'Class:TriggerOnAttributeBlobDownload/Attribute:target_attcodes+' => '~~',
+));
+
 //
 // Class: TriggerOnThresholdReached
 //
@@ -699,11 +684,13 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 // Synchro Data Source
 //
 Dict::Add('PL PL', 'Polish', 'Polski', array(
+	'Class:SynchroDataSource' => 'Źródło danych synchronizacji',
 	'Class:SynchroDataSource/Attribute:name' => 'Nazwa',
 	'Class:SynchroDataSource/Attribute:name+' => '',
 	'Class:SynchroDataSource/Attribute:description' => 'Opis',
 	'Class:SynchroDataSource/Attribute:status' => 'Status',
 	'Class:SynchroDataSource/Attribute:scope_class' => 'Klasa docelowa',
+	'Class:SynchroDataSource/Attribute:scope_class+' => 'A Synchro Data Source can only populate a single '.ITOP_APPLICATION_SHORT.' class~~',
 	'Class:SynchroDataSource/Attribute:user_id' => 'Użytkownik',
 	'Class:SynchroDataSource/Attribute:notify_contact_id' => 'Kontakt do powiadomienia',
 	'Class:SynchroDataSource/Attribute:notify_contact_id+' => 'Kontakt do powiadomienia w przypadku błędu',
@@ -712,6 +699,8 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:SynchroDataSource/Attribute:url_application' => 'Hiperłącze do aplikacji',
 	'Class:SynchroDataSource/Attribute:url_application+' => 'Hiperłącze do obiektu '.ITOP_APPLICATION_SHORT.' w zewnętrznej aplikacji, z którą '.ITOP_APPLICATION_SHORT.' jest zsynchronizowany (jeśli dotyczy). Możliwe symbole zastępcze: $this->attribute$ i $replica->primary_key$',
 	'Class:SynchroDataSource/Attribute:reconciliation_policy' => 'Polityka uzgadniania',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy+' => '"Use the attributes": '.ITOP_APPLICATION_SHORT.' object matches replica values for each Synchro attributes flagged for Reconciliation.
+"Use primary_key": the column primary_key of the replica is expected to contain the identifier of the '.ITOP_APPLICATION_SHORT.' object~~',
 	'Class:SynchroDataSource/Attribute:full_load_periodicity' => 'Pełen interwał ładowania',
 	'Class:SynchroDataSource/Attribute:full_load_periodicity+' => 'Całkowite przeładowanie wszystkich danych musi następować co najmniej tak często, jak określono w tym miejscu',
 	'Class:SynchroDataSource/Attribute:action_on_zero' => 'Działanie dla zera',
@@ -731,6 +720,33 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:SynchroDataSource/Attribute:delete_policy_retention+' => 'Czas przechowywania wycofanego obiektu przed usunięciem',
 	'Class:SynchroDataSource/Attribute:database_table_name' => 'Tabela danych',
 	'Class:SynchroDataSource/Attribute:database_table_name+' => 'Nazwa tabeli do przechowywania danych synchronizacji. Jeśli pozostanie puste, zostanie obliczona nazwa domyślna.',
+	'Class:SynchroDataSource/Attribute:status/Value:implementation' => 'Wdrażane',
+	'Class:SynchroDataSource/Attribute:status/Value:obsolete' => 'Wycofane',
+	'Class:SynchroDataSource/Attribute:status/Value:production' => 'Użytkowane',
+	'Class:SynchroDataSource/Attribute:scope_restriction' => 'Ograniczenie zakresu',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_attributes' => 'Użycie atrybutów',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_primary_key' => 'Użycie pola primary_key',
+	'Class:SynchroDataSource/Attribute:action_on_zero/Value:create' => 'Utwórz',
+	'Class:SynchroDataSource/Attribute:action_on_zero/Value:error' => 'Błąd',
+	'Class:SynchroDataSource/Attribute:action_on_one/Value:error' => 'Błąd',
+	'Class:SynchroDataSource/Attribute:action_on_one/Value:update' => 'Zmień',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:create' => 'Utwórz',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:error' => 'Błąd',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:take_first' => 'Weź pierwszy (losowy?)',
+	'Class:SynchroDataSource/Attribute:delete_policy' => 'Zasada usuwania',
+	'Class:SynchroDataSource/Attribute:delete_policy+' => 'What to do when a replica becomes obsolete:
+"Ignore": do nothing, the associated object remains as is in iTop.
+"Delete": Delete the associated object in iTop (and the replica in the data table).
+"Update": Update the associated object as specified by the Update rules (see below).
+"Update then Delete": apply the "Update rules". When Retention Duration expires, execute a "Delete" ~~',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:delete' => 'Usuń',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:ignore' => 'Ignoruj',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:update' => 'Zmień',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:update_then_delete' => 'Zaktualizuj, a potem Usuń',
+	'Class:SynchroDataSource/Attribute:attribute_list' => 'Lista atrybutów',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:administrators' => 'Tylko administratorzy',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:everybody' => 'Każdy mógże usunąć te obiekty',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:nobody' => 'Nikt',
 	'SynchroDataSource:Description' => 'Opis',
 	'SynchroDataSource:Reconciliation' => 'Wyszukiwanie &amp; uzgodnione',
 	'SynchroDataSource:Deletion' => 'Zasady usuwania',
@@ -755,8 +771,10 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Core:Synchro:NeverRun' => 'Synchronizacja nigdy nie został uruchomiona. Nie ma jeszcze dziennika.',
 	'Core:Synchro:SynchroEndedOn_Date' => 'Ostatnia synchronizacja zakończyła się w dniu %1$s.',
 	'Core:Synchro:SynchroRunningStartedOn_Date' => 'Synchronizacja rozpoczęta w dniu %1$s nadal działa...',
-	'Menu:DataSources' => 'Źródła danych synchronizacji', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:DataSources+' => 'Wszystkie źródła danych synchronizacji', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataSources' => 'Źródła danych synchronizacji',
+    // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataSources+' => 'Wszystkie źródła danych synchronizacji',
+    // Duplicated into itop-welcome-itil (will be removed from here...)
 	'Core:Synchro:label_repl_ignored' => 'Zignorowano (%1$s)',
 	'Core:Synchro:label_repl_disappeared' => 'Zaginięte (%1$s)',
 	'Core:Synchro:label_repl_existing' => 'Istniejące (%1$s)',
@@ -820,29 +838,6 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:CMDBChangeOpSetAttributeEncrypted/Attribute:prevstring' => 'Poprzednia wartość',
 	'Class:CMDBChangeOpSetAttributeCaseLog' => 'Dziennik przypadku',
 	'Class:CMDBChangeOpSetAttributeCaseLog/Attribute:lastentry' => 'Ostatni wpis',
-	'Class:SynchroDataSource' => 'Źródło danych synchronizacji',
-	'Class:SynchroDataSource/Attribute:status/Value:implementation' => 'Wdrażane',
-	'Class:SynchroDataSource/Attribute:status/Value:obsolete' => 'Wycofane',
-	'Class:SynchroDataSource/Attribute:status/Value:production' => 'Użytkowane',
-	'Class:SynchroDataSource/Attribute:scope_restriction' => 'Ograniczenie zakresu',
-	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_attributes' => 'Użycie atrybutów',
-	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_primary_key' => 'Użycie pola primary_key',
-	'Class:SynchroDataSource/Attribute:action_on_zero/Value:create' => 'Utwórz',
-	'Class:SynchroDataSource/Attribute:action_on_zero/Value:error' => 'Błąd',
-	'Class:SynchroDataSource/Attribute:action_on_one/Value:error' => 'Błąd',
-	'Class:SynchroDataSource/Attribute:action_on_one/Value:update' => 'Zmień',
-	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:create' => 'Utwórz',
-	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:error' => 'Błąd',
-	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:take_first' => 'Weź pierwszy (losowy?)',
-	'Class:SynchroDataSource/Attribute:delete_policy' => 'Zasada usuwania',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:delete' => 'Usuń',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:ignore' => 'Ignoruj',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:update' => 'Zmień',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:update_then_delete' => 'Zaktualizuj, a potem Usuń',
-	'Class:SynchroDataSource/Attribute:attribute_list' => 'Lista atrybutów',
-	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:administrators' => 'Tylko administratorzy',
-	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:everybody' => 'Każdy mógże usunąć te obiekty',
-	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:nobody' => 'Nikt',
 	'Class:SynchroAttribute' => 'Atrybut synchronizacji',
 	'Class:SynchroAttribute/Attribute:sync_source_id' => 'Źródło danych synchronizacji',
 	'Class:SynchroAttribute/Attribute:attcode' => 'Kod atrybutu',
@@ -903,19 +898,16 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:appUserPreferences/Attribute:preferences' => 'Preferencje',
 	'Core:ExecProcess:Code1' => 'Niewłaściwe polecenie lub polecenie zakończone błędami (np. zła nazwa skryptu)',
 	'Core:ExecProcess:Code255' => 'Błąd PHP (parsowanie lub środowisko uruchomieniowe)',
-
-	// Attribute Duration
+    // Attribute Duration
 	'Core:Duration_Seconds' => '%1$ds',
 	'Core:Duration_Minutes_Seconds' => '%1$dmin %2$ds',
 	'Core:Duration_Hours_Minutes_Seconds' => '%1$dh %2$dmin %3$ds',
 	'Core:Duration_Days_Hours_Minutes_Seconds' => '%1$sd %2$dh %3$dmin %4$ds',
-
-	// Explain working time computing
+    // Explain working time computing
 	'Core:ExplainWTC:ElapsedTime' => 'Czas, który upłynął (przechowywany jako "%1$s")',
 	'Core:ExplainWTC:StopWatch-TimeSpent' => 'Czas spędzony dla "%1$s"',
 	'Core:ExplainWTC:StopWatch-Deadline' => 'Ostateczny termin dla "%1$s" w %2$d%%',
-
-	// Bulk export
+    // Bulk export
 	'Core:BulkExport:MissingParameter_Param' => 'Brak parametru "%1$s"',
 	'Core:BulkExport:InvalidParameter_Query' => 'Nieprawidłowa wartość parametru "query". Nie ma słownika zapytań odpowiadającego identyfikatorowi: "%1$s".',
 	'Core:BulkExport:ExportFormatPrompt' => 'Format eksportu:',
@@ -967,20 +959,34 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Core:BulkExport:DateTimeFormatDefault_Example' => 'Domyślny format (%1$s), np. %2$s',
 	'Core:BulkExport:DateTimeFormatCustom_Format' => 'Własny format: %1$s',
 	'Core:BulkExport:PDF:PageNumber' => 'Strona %1$s',
-	'Core:DateTime:Placeholder_d' => 'DD', // Day of the month: 2 digits (with leading zero)
-	'Core:DateTime:Placeholder_j' => 'D', // Day of the month: 1 or 2 digits (without leading zero)
-	'Core:DateTime:Placeholder_m' => 'MM', // Month on 2 digits i.e. 01-12
-	'Core:DateTime:Placeholder_n' => 'M', // Month on 1 or 2 digits 1-12
-	'Core:DateTime:Placeholder_Y' => 'YYYY', // Year on 4 digits
-	'Core:DateTime:Placeholder_y' => 'YY', // Year on 2 digits
-	'Core:DateTime:Placeholder_H' => 'hh', // Hour 00..23
-	'Core:DateTime:Placeholder_h' => 'h', // Hour 01..12
-	'Core:DateTime:Placeholder_G' => 'hh', // Hour 0..23
-	'Core:DateTime:Placeholder_g' => 'h', // Hour 1..12
-	'Core:DateTime:Placeholder_a' => 'am/pm', // am/pm (lowercase)
-	'Core:DateTime:Placeholder_A' => 'AM/PM', // AM/PM (uppercase)
-	'Core:DateTime:Placeholder_i' => 'mm', // minutes, 2 digits: 00..59
-	'Core:DateTime:Placeholder_s' => 'ss', // seconds, 2 digits 00..59
+	'Core:DateTime:Placeholder_d' => 'DD',
+    // Day of the month: 2 digits (with leading zero)
+	'Core:DateTime:Placeholder_j' => 'D',
+    // Day of the month: 1 or 2 digits (without leading zero)
+	'Core:DateTime:Placeholder_m' => 'MM',
+    // Month on 2 digits i.e. 01-12
+	'Core:DateTime:Placeholder_n' => 'M',
+    // Month on 1 or 2 digits 1-12
+	'Core:DateTime:Placeholder_Y' => 'YYYY',
+    // Year on 4 digits
+	'Core:DateTime:Placeholder_y' => 'YY',
+    // Year on 2 digits
+	'Core:DateTime:Placeholder_H' => 'hh',
+    // Hour 00..23
+	'Core:DateTime:Placeholder_h' => 'h',
+    // Hour 01..12
+	'Core:DateTime:Placeholder_G' => 'hh',
+    // Hour 0..23
+	'Core:DateTime:Placeholder_g' => 'h',
+    // Hour 1..12
+	'Core:DateTime:Placeholder_a' => 'am/pm',
+    // am/pm (lowercase)
+	'Core:DateTime:Placeholder_A' => 'AM/PM',
+    // AM/PM (uppercase)
+	'Core:DateTime:Placeholder_i' => 'mm',
+    // minutes, 2 digits: 00..59
+	'Core:DateTime:Placeholder_s' => 'ss',
+    // seconds, 2 digits 00..59
 	'Core:Validator:Default' => 'Zły format',
 	'Core:Validator:Mandatory' => 'Proszę wypełnić to pole',
 	'Core:Validator:MustBeInteger' => 'Musi być liczbą całkowitą',
@@ -993,7 +999,6 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:TagSetFieldData' => '%2$s dla klasy %1$s',
 	'Class:TagSetFieldData+' => '',
-
 	'Class:TagSetFieldData/Attribute:code' => 'Kod',
 	'Class:TagSetFieldData/Attribute:code+' => 'Kod wewnętrzny. Musi zawierać co najmniej 3 znaki alfanumeryczne',
 	'Class:TagSetFieldData/Attribute:label' => 'Etykieta',
@@ -1003,7 +1008,6 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:TagSetFieldData/Attribute:finalclass' => 'Klasa Tagu',
 	'Class:TagSetFieldData/Attribute:obj_class' => 'Klasa obiektu',
 	'Class:TagSetFieldData/Attribute:obj_attcode' => 'Kod pola',
-
 	'Core:TagSetFieldData:ErrorDeleteUsedTag' => 'Nie można usunąć używanych tagów',
 	'Core:TagSetFieldData:ErrorDuplicateTagCodeOrLabel' => 'Kody tagów lub etykiety muszą być unikalne',
 	'Core:TagSetFieldData:ErrorTagCodeSyntax' => 'Kod tagu musi zawierać od 3 do %1$d znaków alfanumerycznych, zaczynając od litery.',
@@ -1090,8 +1094,8 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:AsyncTask/Attribute:last_error+' => '',
 	'Class:AsyncTask/Attribute:last_attempt' => 'Ostatnia próba',
 	'Class:AsyncTask/Attribute:last_attempt+' => '',
-    'Class:AsyncTask:InvalidConfig_Class_Keys' => 'Nieprawidłowy format konfiguracji "async_task_retries[%1$s]". Oczekuje się tablicy z następującymi kluczami: %2$s',
-    'Class:AsyncTask:InvalidConfig_Class_InvalidKey_Keys' => 'Nieprawidłowy format konfiguracji "async_task_retries[%1$s]": nieoczekiwany klucz "%2$s". Oczekuje się tylko następujących kluczy: %3$s',
+	'Class:AsyncTask:InvalidConfig_Class_Keys' => 'Nieprawidłowy format konfiguracji "async_task_retries[%1$s]". Oczekuje się tablicy z następującymi kluczami: %2$s',
+	'Class:AsyncTask:InvalidConfig_Class_InvalidKey_Keys' => 'Nieprawidłowy format konfiguracji "async_task_retries[%1$s]": nieoczekiwany klucz "%2$s". Oczekuje się tylko następujących kluczy: %3$s',
 ));
 
 //
diff --git a/dictionaries/pl.dictionary.itop.ui.php b/dictionaries/pl.dictionary.itop.ui.php
index f572cda3f1..aa5228b67e 100644
--- a/dictionaries/pl.dictionary.itop.ui.php
+++ b/dictionaries/pl.dictionary.itop.ui.php
@@ -25,6 +25,12 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:AuditCategory/Attribute:definition_set+' => 'Wyrażenie OQL definiujące zbiór obiektów do audytu',
 	'Class:AuditCategory/Attribute:rules_list' => 'Zasady audytu',
 	'Class:AuditCategory/Attribute:rules_list+' => 'Zasady audytu dla kategorii',
+	'Class:AuditCategory/Attribute:ok_error_tolerance' => 'Warning threshold~~',
+	'Class:AuditCategory/Attribute:ok_error_tolerance+' => 'Percentage of invalid objects below which the result is a warning (orange)~~',
+	'Class:AuditCategory/Attribute:warning_error_tolerance' => 'Error threshold~~',
+	'Class:AuditCategory/Attribute:warning_error_tolerance+' => 'Percentage of invalid objects below which the result is in error (red)~~',
+	'Class:AuditCategory/Attribute:domains_list' => 'Domains~~',
+	'Class:AuditCategory/Attribute:domains_list+' => 'Domains which includes this category~~',
 ));
 
 //
@@ -52,7 +58,42 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:AuditRule/Attribute:category_id' => 'Kategoria',
 	'Class:AuditRule/Attribute:category_id+' => 'Kategoria dla reguły',
 	'Class:AuditRule/Attribute:category_name' => 'Kategoria',
-	'Class:AuditRule/Attribute:category_name+' => 'Nazwa kategorii dla reguły',
+	'Class:AuditRule/Attribute:category_name+' => 'Nazwa kategorii dla reguły'
+));
+
+//
+// Class: AuditDomain
+//
+
+Dict::Add('PL PL', 'Polish', 'Polski', array(
+	'Class:AuditDomain' => 'Audit Domain~~',
+	'Class:AuditDomain+' => 'Audit domains allow to group the audit categories.
+Domain usually correspond to who is responsible for checking and fixing errors~~',
+	'Class:AuditDomain/Attribute:name' => 'Name~~',
+	'Class:AuditDomain/Attribute:name+' => 'Its a segmentation of the Audit by who is in charge of fixing it or just interested~~',
+	'Class:AuditDomain/Attribute:description' => 'Description~~',
+	'Class:AuditDomain/Attribute:description+' => '~~',
+	'Class:AuditDomain/Attribute:icon' => 'Icon~~',
+	'Class:AuditDomain/Attribute:icon+' => '~~',
+	'Class:AuditDomain/Attribute:categories_list' => 'Categories~~',
+	'Class:AuditDomain/Attribute:categories_list+' => 'Related audit categories. When running the audit on a domain, all related audit categories are checked and only those.~~',
+));
+
+//
+// Class: lnkAuditCategoryToAuditDomain
+//
+
+Dict::Add('PL PL', 'Polish', 'Polski', array(
+	'Class:lnkAuditCategoryToAuditDomain' => 'Link AuditCategory / AuditDomain~~',
+	'Class:lnkAuditCategoryToAuditDomain+' => '~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:category_id' => 'Category~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:category_id+' => 'Audit Category~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:category_name' => 'Category name~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:category_name+' => 'Audit category name~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:domain_id' => 'Domain~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:domain_id+' => 'Audit domain~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:domain_name' => 'Domain name~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:domain_name+' => 'Audit domain name~~',
 ));
 
 //
@@ -70,6 +111,16 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:Query/Attribute:is_template+' => 'Może służyć jako źródło OQL odbiorcy w powiadomieniach',
 	'Class:Query/Attribute:is_template/Value:yes' => 'Tak',
 	'Class:Query/Attribute:is_template/Value:no' => 'Nie',
+	'Class:Query/Attribute:export_count' => 'Export counter~~',
+	'Class:Query/Attribute:export_count+' => 'Counter reflecting the number of time this query has been executed~~',
+	'Class:Query/Attribute:export_last_date' => 'Last export~~',
+	'Class:Query/Attribute:export_last_date+' => 'Date and time of the last export execution~~',
+	'Class:Query/Attribute:export_last_user_id' => 'User~~',
+	'Class:Query/Attribute:export_last_user_id+' => 'The user who executed the last export~~',
+	'Class:Query/Attribute:export_last_user_contact' => 'Contact~~',
+	'Class:Query/Attribute:export_last_user_contact+' => 'The contact who executed the last export~~',
+	'Query:baseinfo' => 'General information~~',
+	'Query:exportInfo' => 'Export information~~',
 	'Class:QueryOQL/Attribute:fields' => 'Pola',
 	'Class:QueryOQL/Attribute:fields+' => 'Rozdzielana przecinkami lista atrybutów (lub alias.attribute) do wyeksportowania',
 	'Class:QueryOQL' => 'Zapytanie OQL',
@@ -118,10 +169,8 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:User/Attribute:status+' => 'Czy konto użytkownika jest włączone czy wyłączone.',
 	'Class:User/Attribute:status/Value:enabled' => 'Włączone',
 	'Class:User/Attribute:status/Value:disabled' => 'Wyłączone',
-
 	'Class:User/Error:LoginMustBeUnique' => 'Login musi być unikatowy - "%1s" jest już używany.',
 	'Class:User/Error:AtLeastOneProfileIsNeeded' => 'Do użytkownika musi być przypisany co najmniej jeden profil.',
-
 	'Class:User/Error:ProfileNotAllowed' => 'Nie można dodać profilu "%1$s" nie ma on dostępu do zaplecza',
 	'Class:User/Error:StatusChangeIsNotAllowed' => 'Zmiana statusu nie jest dozwolona dla własnego użytkownika',
 	'Class:User/Error:AllowedOrgsMustContainUserOrg' => 'Dozwolone organizacje muszą zawierać organizację użytkownika',
@@ -323,11 +372,34 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 //
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Expression:Unit:Short:DAY' => 'd',
-	'Expression:Unit:Short:WEEK' => 't',
+	'Expression:Unit:Short:WEEK' => 'w',
 	'Expression:Unit:Short:MONTH' => 'm',
-	'Expression:Unit:Short:YEAR' => 'r',
+	'Expression:Unit:Short:YEAR' => 'y',
 ));
 
+//
+// Duplicated into itop-welcome-itil ( will be removed from here...)
+//
+Dict::Add('PL PL', 'Polish', 'Polski', array(
+	'Menu:WelcomeMenu' => 'Witaj',
+	'Menu:WelcomeMenu+' => 'Witaj w '.ITOP_APPLICATION_SHORT,
+	'Menu:WelcomeMenuPage' => 'Witaj',
+	'Menu:WelcomeMenuPage+' => 'Witaj w '.ITOP_APPLICATION_SHORT,
+	'Menu:AdminTools' => 'Administracja',
+	'Menu:AdminTools+' => 'Narzędzia administracyjne',
+	'Menu:AdminTools?' => 'Narzędzia dostępne tylko dla użytkowników posiadających profil administratora',
+	'Menu:CSVImportMenu' => 'Import CSV',
+	'Menu:CSVImportMenu+' => 'Zbiorcze tworzenie lub aktualizacja',
+	'Menu:DataModelMenu' => 'Model danych',
+	'Menu:DataModelMenu+' => 'Omówienie modelu danych',
+	'Menu:ExportMenu' => 'Eksport',
+	'Menu:ExportMenu+' => 'Eksportuj wyniki dowolnego zapytania w formacie HTML, CSV lub XML',
+	'Menu:NotificationsMenu' => 'Powiadomienia',
+	'Menu:NotificationsMenu+' => 'Konfiguracja powiadomień',
+	'Menu:MyShortcuts' => 'Moje skróty',
+	'Menu:DataAdministration' => 'Administracja danymi',
+	'Menu:DataAdministration+' => 'Administracja danymi',
+));
 
 //
 // String from the User Interface: menu, messages, buttons, etc...
@@ -337,12 +409,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'BooleanLabel:yes' => 'tak',
 	'BooleanLabel:no' => 'nie',
 	'UI:Login:Title' => ITOP_APPLICATION_SHORT.' login',
-	'Menu:WelcomeMenu' => 'Witaj',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:WelcomeMenu+' => 'Witaj w '.ITOP_APPLICATION_SHORT, // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:WelcomeMenuPage' => 'Witaj',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:WelcomeMenuPage+' => 'Witaj w '.ITOP_APPLICATION_SHORT, // Duplicated into itop-welcome-itil (will be removed from here...)
 	'UI:WelcomeMenu:Title' => 'Witaj w '.ITOP_APPLICATION_SHORT,
-
 	'UI:WelcomeMenu:LeftBlock' => '<p>'.ITOP_APPLICATION_SHORT.' to kompletny portal operacyjny OpenSource IT.</p>
 <ul>Obejmuje:
 <li>Kompletna baza danych CMDB (baza danych zarządzania konfiguracją) do dokumentowania inwentaryzacji IT i zarządzania nią.</li>
@@ -353,7 +420,6 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 <li>Pulpity nawigacyjne, aby szybko uzyskać przegląd swojego IT.</li>
 </ul>
 <p>Wszystkie moduły można ustawiać krok po kroku niezależnie od siebie.</p>',
-
 	'UI:WelcomeMenu:RightBlock' => '<p>'.ITOP_APPLICATION_SHORT.' jest zorientowany na usługodawcę, umożliwia inżynierom IT łatwe zarządzanie wieloma klientami lub organizacjami.
 <ul>'.ITOP_APPLICATION_SHORT.', dostarcza bogaty w funkcje zestaw procesów biznesowych:
 <li>Zwiększa efektywność zarządzania IT</li> 
@@ -369,7 +435,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 <li>Zarządzaj najważniejszym zasobem swojego IT: dokumentacją.</li>
 </ul>
 </p>',
-	'UI:WelcomeMenu:Text'=> '<div>Gratulacje, wylądowałeś na '.ITOP_APPLICATION.' '.ITOP_VERSION_NAME.'!</div>
+	'UI:WelcomeMenu:Text' => '<div>Gratulacje, wylądowałeś na '.ITOP_APPLICATION.' '.ITOP_VERSION_NAME.'!</div>
 
 <div>Ta wersja ma zupełnie nowy, bardziej nowoczesny i dostępny projekt zaplecza.</div>
 
@@ -390,7 +456,8 @@ Mamy nadzieję, że spodoba ci się ta wersja tak samo, jak nam się podobało j
 	'UI:Button:GlobalSearch' => 'Szukaj',
 	'UI:Button:Search' => ' Szukaj ',
 	'UI:Button:Clear' => ' Wyczyść ',
-	'UI:Button:SearchInHierarchy' =>  ' Szukaj w hierarchii ',
+	'UI:Button:Confirm' => ' Confirm ~~',
+	'UI:Button:SearchInHierarchy' => ' Szukaj w hierarchii ',
 	'UI:Button:Query' => ' Zapytanie ',
 	'UI:Button:Ok' => 'Ok',
 	'UI:Button:Save' => 'Zapisz',
@@ -430,7 +497,6 @@ Mamy nadzieję, że spodoba ci się ta wersja tak samo, jak nam się podobało j
 	'UI:UserPref:DoNotShowAgain' => 'Nie pokazuj ponownie',
 	'UI:InputFile:NoFileSelected' => 'Nie wybrano pliku',
 	'UI:InputFile:SelectFile' => 'Wybierz plik',
-
 	'UI:SearchToggle' => 'Szukaj',
 	'UI:ClickToCreateNew' => 'Utwórz %1$s',
 	'UI:SearchFor_Class' => 'Szukaj obiektów %1$s',
@@ -450,7 +516,6 @@ Mamy nadzieję, że spodoba ci się ta wersja tak samo, jak nam się podobało j
 	'UI:Error:CannotWriteToTmp_Dir' => 'Nie można zapisać pliku tymczasowego na dysku. upload_tmp_dir = "%1$s".',
 	'UI:Error:UploadStoppedByExtension_FileName' => 'Przesyłanie zatrzymane przez rozszerzenie. (Oryginalna nazwa pliku = "%1$s").',
 	'UI:Error:UploadFailedUnknownCause_Code' => 'Przesyłanie pliku nie powiodło się, nieznana przyczyna. (Kod błędu = "%1$s").',
-
 	'UI:Error:1ParametersMissing' => 'Błąd: dla tej operacji należy określić następujący parametr: %1$s.',
 	'UI:Error:2ParametersMissing' => 'Błąd: dla tej operacji należy określić następujące parametry: %1$s i %2$s.',
 	'UI:Error:3ParametersMissing' => 'Błąd: dla tej operacji należy określić następujące parametry: %1$s, %2$s i %3$s.',
@@ -472,7 +537,7 @@ Mamy nadzieję, że spodoba ci się ta wersja tak samo, jak nam się podobało j
 	'UI:Error:MaintenanceMode' => 'Aplikacja jest obecnie w trakcie konserwacji',
 	'UI:Error:MaintenanceTitle' => 'Konserwacja',
 	'UI:Error:InvalidToken' => 'Błąd: żądana operacja została już wykonana (nie znaleziono tokena CSRF)',
-
+	'UI:Error:SMTP:UnknownVendor' => 'OAuth SMTP provider %1$s does not exist  (email_transport_smtp.oauth.provider)~~',
 	'UI:GroupBy:Count' => 'Licznik',
 	'UI:GroupBy:Count+' => 'Liczba elementów',
 	'UI:CountOfObjects' => '%1$d obiektów spełniających kryteria.',
@@ -501,6 +566,7 @@ Mamy nadzieję, że spodoba ci się ta wersja tak samo, jak nam się podobało j
 	'UI:Menu:OtherActions' => 'Inne działania',
 	'UI:Menu:Transitions' => 'Przejścia',
 	'UI:Menu:OtherTransitions' => 'Inne przejścia',
+	'UI:Menu:View' => 'View this object~~',
 	'UI:Menu:New' => 'Nowy...',
 	'UI:Menu:Add' => 'Dodaj...',
 	'UI:Menu:Manage' => 'Zarządzaj...',
@@ -509,6 +575,9 @@ Mamy nadzieję, że spodoba ci się ta wersja tak samo, jak nam się podobało j
 	'UI:Menu:Modify' => 'Zmień...',
 	'UI:Menu:Delete' => 'Usuń...',
 	'UI:Menu:BulkDelete' => 'Usuń...',
+	'UI:Menu:BulkDelete_Class' => 'Delete %1$s objects...~~',
+	'UI:Menu:BulkDelete_Link' => 'Delete %1$s...~~',
+	'UI:Menu:BulkDelete_Remote' => 'Delete %1$s...~~',
 	'UI:UndefinedObject' => 'nieokreślony',
 	'UI:Document:OpenInNewWindow:Download' => 'Otwórz w nowym oknie: %1$s, Pobierz: %2$s',
 	'UI:SplitDateTime-Date' => 'data',
@@ -541,7 +610,6 @@ Mamy nadzieję, że spodoba ci się ta wersja tak samo, jak nam się podobało j
 	'UI:Login:ResetPassword' => 'Wyślij !',
 	'UI:Login:ResetPwdFailed' => 'Nie udało się wysłać e-maila: %1$s',
 	'UI:Login:SeparatorOr' => 'Lub',
-
 	'UI:ResetPwd-Error-WrongLogin' => '\'%1$s\'nie jest prawidłowym loginem',
 	'UI:ResetPwd-Error-NotPossible' => 'konta zewnętrzne nie pozwalają na resetowanie hasła.',
 	'UI:ResetPwd-Error-FixedPwd' => 'konto nie pozwala na resetowanie hasła.',
@@ -552,50 +620,49 @@ Mamy nadzieję, że spodoba ci się ta wersja tak samo, jak nam się podobało j
 	'UI:ResetPwd-EmailSent' => 'Sprawdź swoją skrzynkę e-mail i postępuj zgodnie z instrukcjami. Jeśli nie otrzymasz wiadomości e-mail, sprawdź wpisany login.',
 	'UI:ResetPwd-EmailSubject' => 'Reset hasła '.ITOP_APPLICATION_SHORT,
 	'UI:ResetPwd-EmailBody' => '<body><p>Poprosiłeś o zresetowanie hasła '.ITOP_APPLICATION_SHORT.'.</p><p>Proszę skorzystać z tego linku (jednorazowe użycie), <a href="%1$s">wpisz nowe hasło</a></p>.',
-
 	'UI:ResetPwd-Title' => 'Zresetuj hasło',
 	'UI:ResetPwd-Error-InvalidToken' => 'Przepraszamy, albo hasło zostało już zresetowane, albo otrzymałeś kilka e-maili. Upewnij się, że używasz linku podanego w ostatniej otrzymanej wiadomości e-mail.',
 	'UI:ResetPwd-Error-EnterPassword' => 'Wprowadź nowe hasło do konta \'%1$s\'.',
 	'UI:ResetPwd-Ready' => 'Hasło zostało zmienione.',
 	'UI:ResetPwd-Login' => 'Kliknij tutaj aby się zalogować...',
-
 	'UI:Login:About' => ITOP_APPLICATION.' Obsługiwane przez Combodo',
-	'UI:Login:ChangeYourPassword'                  => 'Zmień swoje hasło',
-	'UI:Login:OldPasswordPrompt'                   => 'Stare hasło',
-	'UI:Login:NewPasswordPrompt'                   => 'Nowe hasło',
-	'UI:Login:RetypeNewPasswordPrompt'             => 'Powtórz nowe hasło',
-	'UI:Login:IncorrectOldPassword'                => 'Błąd: stare hasło jest nieprawidłowe',
-	'UI:LogOffMenu'                                => 'Wyloguj',
+	'UI:Login:ChangeYourPassword' => 'Zmień swoje hasło',
+	'UI:Login:OldPasswordPrompt' => 'Stare hasło',
+	'UI:Login:NewPasswordPrompt' => 'Nowe hasło',
+	'UI:Login:RetypeNewPasswordPrompt' => 'Powtórz nowe hasło',
+	'UI:Login:IncorrectOldPassword' => 'Błąd: stare hasło jest nieprawidłowe',
+	'UI:LogOffMenu' => 'Wyloguj',
 	'UI:LogOff:ThankYou' => 'Dziękujemy za użycie '.ITOP_APPLICATION,
-	'UI:LogOff:ClickHereToLoginAgain'              => 'Kliknij tutaj, aby zalogować się ponownie...',
-	'UI:ChangePwdMenu'                             => 'Zmień hasło...',
-	'UI:Login:PasswordChanged'                     => 'Hasło ustawione pomyślnie!',
+	'UI:LogOff:ClickHereToLoginAgain' => 'Kliknij tutaj, aby zalogować się ponownie...',
+	'UI:ChangePwdMenu' => 'Zmień hasło...',
+	'UI:Login:PasswordChanged' => 'Hasło ustawione pomyślnie!',
+	'UI:Login:PasswordNotChanged' => 'Error: Password is the same!~~',
 	'UI:AccessRO-All' => ITOP_APPLICATION.' jest tylko do odczytu',
 	'UI:AccessRO-Users' => ITOP_APPLICATION.' jest tylko do odczytu dla użytkowników końcowych',
-	'UI:ApplicationEnvironment'                    => 'Środowisko aplikacji: %1$s',
-	'UI:Login:RetypePwdDoesNotMatch'               => 'Nowe hasło i powtórzone nowe hasło nie pasują!',
+	'UI:ApplicationEnvironment' => 'Środowisko aplikacji: %1$s',
+	'UI:Login:RetypePwdDoesNotMatch' => 'Nowe hasło i powtórzone nowe hasło nie pasują!',
 	'UI:Button:Login' => 'Wejdź do '.ITOP_APPLICATION,
 	'UI:Login:Error:AccessRestricted' => ITOP_APPLICATION_SHORT.' dostęp jest ograniczony. Prosimy o kontakt z administratorem '.ITOP_APPLICATION_SHORT.'.',
 	'UI:Login:Error:AccessAdmin' => 'Dostęp ograniczony do osób z uprawnieniami administratora. Prosimy o kontakt z administratorem '.ITOP_APPLICATION_SHORT.'.',
-	'UI:Login:Error:WrongOrganizationName'         => 'Nieznana organizacja',
+	'UI:Login:Error:WrongOrganizationName' => 'Nieznana organizacja',
 	'UI:Login:Error:MultipleContactsHaveSameEmail' => 'Wiele kontaktów ma ten sam adres e-mail',
-	'UI:Login:Error:NoValidProfiles'               => 'Nie podano prawidłowego profilu',
-	'UI:CSVImport:MappingSelectOne'                => '-- wybierz jeden --',
-	'UI:CSVImport:MappingNotApplicable'            => '-- zignoruj to pole --',
-	'UI:CSVImport:NoData'                          => 'Pusty zestaw danych ... proszę podać dane!',
-	'UI:Title:DataPreview'                         => 'Podgląd danych',
-	'UI:CSVImport:ErrorOnlyOneColumn'              => 'Błąd: dane zawierają tylko jedną kolumnę. Czy wybrałeś odpowiedni znak separatora?',
-	'UI:CSVImport:FieldName'                       => 'Pole %1$d',
-	'UI:CSVImport:DataLine1'                       => 'Linia danych 1',
-	'UI:CSVImport:DataLine2'                       => 'Linia danych 2',
-	'UI:CSVImport:idField'                         => 'id (Klucz podstawowy)',
+	'UI:Login:Error:NoValidProfiles' => 'Nie podano prawidłowego profilu',
+	'UI:CSVImport:MappingSelectOne' => '-- wybierz jeden --',
+	'UI:CSVImport:MappingNotApplicable' => '-- zignoruj to pole --',
+	'UI:CSVImport:NoData' => 'Pusty zestaw danych ... proszę podać dane!',
+	'UI:Title:DataPreview' => 'Podgląd danych',
+	'UI:CSVImport:ErrorOnlyOneColumn' => 'Błąd: dane zawierają tylko jedną kolumnę. Czy wybrałeś odpowiedni znak separatora?',
+	'UI:CSVImport:FieldName' => 'Pole %1$d',
+	'UI:CSVImport:DataLine1' => 'Linia danych 1',
+	'UI:CSVImport:DataLine2' => 'Linia danych 2',
+	'UI:CSVImport:idField' => 'id (Klucz podstawowy)',
 	'UI:Title:BulkImport' => ITOP_APPLICATION_SHORT.' - Import zbiorczy',
-	'UI:Title:BulkImport+'                         => 'Kreator importu CSV',
-	'UI:Title:BulkSynchro_nbItem_ofClass_class'    => 'Synchronizacja %1$d pbiektów klasy %2$s',
-	'UI:CSVImport:ClassesSelectOne'                => '-- wybierz jeden --',
-	'UI:CSVImport:ErrorExtendedAttCode'            => 'Błąd wewnętrzny: "%1$s" to nieprawidłowy kod, ponieważ "%2$s" NIE jest zewnętrznym kluczem klasy "%3$s"',
-	'UI:CSVImport:ObjectsWillStayUnchanged'        => '%1$d obiekt(y) pozostaną niezmienione.',
-	'UI:CSVImport:ObjectsWillBeModified'           => '%1$d obiekt(y) zostaną zmodyfikowane.',
+	'UI:Title:BulkImport+' => 'Kreator importu CSV',
+	'UI:Title:BulkSynchro_nbItem_ofClass_class' => 'Synchronizacja %1$d pbiektów klasy %2$s',
+	'UI:CSVImport:ClassesSelectOne' => '-- wybierz jeden --',
+	'UI:CSVImport:ErrorExtendedAttCode' => 'Błąd wewnętrzny: "%1$s" to nieprawidłowy kod, ponieważ "%2$s" NIE jest zewnętrznym kluczem klasy "%3$s"',
+	'UI:CSVImport:ObjectsWillStayUnchanged' => '%1$d obiekt(y) pozostaną niezmienione.',
+	'UI:CSVImport:ObjectsWillBeModified' => '%1$d obiekt(y) zostaną zmodyfikowane.',
 	'UI:CSVImport:ObjectsWillBeAdded' => '%1$d obiekt(y) zostaną dodane.',
 	'UI:CSVImport:ObjectsWillHaveErrors' => '%1$d obiekt(y) będą miały błędy.',
 	'UI:CSVImport:ObjectsRemainedUnchanged' => '%1$d obiekt(y) pozostały niezmienione.',
@@ -641,11 +708,14 @@ Mamy nadzieję, że spodoba ci się ta wersja tak samo, jak nam się podobało j
 	'UI:UniversalSearchTitle' => ITOP_APPLICATION_SHORT.' - Wyszukiwanie uniwersalne',
 	'UI:UniversalSearch:Error' => 'Błąd: %1$s',
 	'UI:UniversalSearch:LabelSelectTheClass' => 'Wybierz klasę do przeszukania: ',
-
 	'UI:CSVReport-Value-Modified' => 'Zmodyfikowano',
 	'UI:CSVReport-Value-SetIssue' => 'Nie można było zmienić',
 	'UI:CSVReport-Value-ChangeIssue' => 'Nie można zmienić na %1$s',
 	'UI:CSVReport-Value-NoMatch' => 'Nie pasuje - powód: %1$s',
+	'UI:CSVReport-Value-NoMatch-PossibleValues' => 'Some possible \'%1$s\' value(s): %2$s~~',
+	'UI:CSVReport-Value-NoMatch-NoObject' => 'There are no \'%1$s\' objects~~',
+	'UI:CSVReport-Value-NoMatch-NoObject-ForCurrentUser' => 'There are no \'%1$s\' objects found with your current profile~~',
+	'UI:CSVReport-Value-NoMatch-SomeObjectNotVisibleForCurrentUser' => 'There are some \'%1$s\' objects not visible with your current profile~~',
 	'UI:CSVReport-Value-Missing' => 'Brak wymaganej wartości',
 	'UI:CSVReport-Value-Ambiguous' => 'Uwaga: znaleziono %1$s obiektów',
 	'UI:CSVReport-Row-Unchanged' => 'niezmieniony',
@@ -659,15 +729,16 @@ Mamy nadzieję, że spodoba ci się ta wersja tak samo, jak nam się podobało j
 	'UI:CSVReport-Value-Issue-Readonly' => 'Atrybut \'%1$s\' jest tylko do odczytu i nie można go modyfikować (bieżąca wartość: %2$s, proponowana wartość: %3$s)',
 	'UI:CSVReport-Value-Issue-Format' => 'Nie udało się przetworzyć danych wejściowych: %1$s',
 	'UI:CSVReport-Value-Issue-NoMatch' => 'Nieoczekiwana wartość atrybutu \'%1$s\': nie znaleziono dopasowania, sprawdź pisownię',
+	'UI:CSVReport-Value-Issue-AllowedValues' => 'Allowed \'%1$s\' value(s): %2$s~~',
 	'UI:CSVReport-Value-Issue-Unknown' => 'Nieoczekiwana wartość atrybutu \'%1$s\': %2$s',
 	'UI:CSVReport-Row-Issue-Inconsistent' => 'Atrybuty nie są ze sobą spójne: %1$s',
 	'UI:CSVReport-Row-Issue-Attribute' => 'Nieoczekiwane wartość(ci) atrybutu',
 	'UI:CSVReport-Row-Issue-MissingExtKey' => 'Nie można utworzyć z powodu braku kluczy zewnętrznych: %1$s',
 	'UI:CSVReport-Row-Issue-DateFormat' => 'zły format daty',
+	'UI:CSVReport-Row-Issue-ExpectedDateFormat' => 'Expected format: %1$s~~',
 	'UI:CSVReport-Row-Issue-Reconciliation' => 'nie udało się uzgodnić',
 	'UI:CSVReport-Row-Issue-Ambiguous' => 'niejednoznaczne uzgodnienie',
 	'UI:CSVReport-Row-Issue-Internal' => 'Błąd wewnętrzny: %1$s, %2$s',
-
 	'UI:CSVReport-Icon-Unchanged' => 'Niezmieniony',
 	'UI:CSVReport-Icon-Modified' => 'Zmodyfikowano',
 	'UI:CSVReport-Icon-Missing' => 'Brakujący',
@@ -682,14 +753,32 @@ Mamy nadzieję, że spodoba ci się ta wersja tak samo, jak nam się podobało j
 	'UI:CSVReport-Stats-Errors' => '%1$.0f %% załadowanych obiektów zawiera błędy i zostanie zignorowanych.',
 	'UI:CSVReport-Stats-Created' => '%1$.0f %% załadowanych obiektów zostanie utworzonych.',
 	'UI:CSVReport-Stats-Modified' => '%1$.0f %% załadowanych obiektów zostanie zmodyfikowanych.',
-
 	'UI:CSVExport:AdvancedMode' => 'Tryb zaawansowany',
 	'UI:CSVExport:AdvancedMode+' => 'W trybie zaawansowanym do eksportu dodawanych jest kilka kolumn: id obiektu, id kluczy zewnętrznych i ich atrybuty uzgadniania.',
 	'UI:CSVExport:LostChars' => 'Problem z kodowaniem',
 	'UI:CSVExport:LostChars+' => 'Pobrany plik zostanie zakodowany w formacie %1$s. '.ITOP_APPLICATION_SHORT.' wykrył znaki, które nie są zgodne z tym formatem. Znaki te zostaną albo zastąpione substytutem (np. zaakcentowane znaki tracące akcent), albo zostaną odrzucone. Możesz skopiować / wkleić dane z przeglądarki internetowej. Alternatywnie możesz skontaktować się z administratorem w celu zmiany kodowania (patrz parametr \'csv_file_default_charset\').',
-
 	'UI:Audit:Title' => ITOP_APPLICATION_SHORT.' - Audyt CMDB',
 	'UI:Audit:InteractiveAudit' => 'Audyt interaktywny',
+	'UI:Audit:Interactive:All:Title' => 'Audit results~~',
+	'UI:Audit:Interactive:All:SubTitle' => 'Full audit: includes all rules, all categories, all domains~~',
+	'UI:Audit:Interactive:All:BreadCrumb' => 'Full audit~~',
+	'UI:Audit:Interactive:All:BreadCrumb+' => 'Audit results for all rules~~',
+	'UI:Audit:Interactive:Categories:Title' => 'Audit results for categories: %1$s~~',
+	'UI:Audit:Interactive:Categories:SubTitle' => 'Audit results for all the rules belonging to one of those %1$s categories~~',
+	'UI:Audit:Interactive:Categories:BreadCrumb' => 'Categories~~',
+	'UI:Audit:Interactive:Categories:BreadCrumb+' => 'Audit categories: %1$s~~',
+	'UI:Audit:Interactive:Domain:Title' => 'Audit results for Domain: %1$s~~',
+	'UI:Audit:Interactive:Domain:SubTitle' => 'Audit results for all the rules belonging to a category related to the domain: %1$s~~',
+	'UI:Audit:Interactive:Domain:BreadCrumb' => '%1$s~~',
+	'UI:Audit:Interactive:Domain:BreadCrumb+' => 'Audit for Domain: %1$s~~',
+	'UI:Audit:Interactive:Selection:Title' => 'Selection of an audit~~',
+	'UI:Audit:Interactive:Selection:SubTitle' => 'Select a domain to get the results limited to this domain or select "All categories" to get a full audit (can take time or even fail if too much data to audit)~~',
+	'UI:Audit:Interactive:Selection:BreadCrumb' => 'Selection~~',
+	'UI:Audit:Interactive:Selection:BreadCrumb+' => 'Selection of an Audit to run~~',
+	'UI:Audit:Interactive:Selection:BadgeAll' => 'All categories~~',
+	'UI:Audit:Interactive:Button:Back' => 'Back to the audit~~',
+	'UI:Audit:Interactive:Button:Configuration' => 'Audit configuration~~',
+	'UI:Audit:ViewRules' => 'Check the rules~~',
 	'UI:Audit:HeaderAuditRule' => 'Reguła audytu',
 	'UI:Audit:HeaderNbObjects' => '# Obiekty',
 	'UI:Audit:HeaderNbErrors' => '# Błędy',
@@ -705,8 +794,6 @@ Mamy nadzieję, że spodoba ci się ta wersja tak samo, jak nam się podobało j
 	'UI:Audit:Dashboard:ObjectsInError' => 'Obiekty z błędami',
 	'UI:Audit:Dashboard:ObjectsValidated' => 'Obiekty sprawdzone',
 	'UI:Audit:AuditCategory:Subtitle' => '%1$s błędów z %2$s - %3$s%%',
-
-
 	'UI:RunQuery:Title' => ITOP_APPLICATION_SHORT.' - Wykonywanie zapytań OQL',
 	'UI:RunQuery:QueryExamples' => 'Przykłady zapytań',
 	'UI:RunQuery:QueryResults' => 'Wyniki zapytań',
@@ -745,7 +832,6 @@ Mamy nadzieję, że spodoba ci się ta wersja tak samo, jak nam się podobało j
 	'UI:Schema:Label' => 'Etykieta',
 	'UI:Schema:Label+' => 'Etykieta atrybutu',
 	'UI:Schema:Type' => 'Typ',
-
 	'UI:Schema:Type+' => 'Typ danych atrybutu',
 	'UI:Schema:Origin' => 'Pochodzenie',
 	'UI:Schema:Origin+' => 'Klasa bazowa, w której zdefiniowano ten atrybut',
@@ -793,6 +879,16 @@ Mamy nadzieję, że spodoba ci się ta wersja tak samo, jak nam się podobało j
 	'UI:Schema:DisplaySelector/Code' => 'Kod',
 	'UI:Schema:Attribute/Filter' => 'Filtr',
 	'UI:Schema:DefaultNullValue' => 'Domyślnie pusty (null) : "%1$s"',
+	'UI:Schema:Events' => 'Events~~',
+	'UI:Schema:Events:Defined' => 'Defined events~~',
+	'UI:Schema:Events:NoEvent' => 'No event defined~~',
+	'UI:Schema:Events:Listeners' => 'Event listeners~~',
+	'UI:Schema:Events:NoListener' => 'No event listener~~',
+	'UI:Schema:Events:Event' => 'Event~~',
+	'UI:Schema:Events:Description' => 'Description~~',
+	'UI:Schema:Events:Listener' => 'Listener~~',
+	'UI:Schema:Events:Rank' => 'Rank~~',
+	'UI:Schema:Events:Module' => 'Module~~',
 	'UI:LinksWidget:Autocomplete+' => 'Wpisz pierwsze 3 znaki...',
 	'UI:Edit:SearchQuery' => 'Wybierz wstępnie zdefiniowane zapytanie',
 	'UI:Edit:TestQuery' => 'Zapytanie testowe',
@@ -866,9 +962,9 @@ Mamy nadzieję, że spodoba ci się ta wersja tak samo, jak nam się podobało j
 	'UI:Search:Count_ObjectsOf_Class_Found' => 'znaleziono obiektów %1$d klasy %2$s.',
 	'UI:Search:NoObjectFound' => 'Nie znaleziono obiektu.',
 	'UI:ModificationPageTitle_Object_Class' => ITOP_APPLICATION_SHORT.' - %1$s - %2$s zmiana',
-	'UI:ModificationTitle_Class_Object' => 'Zmiana %1$s: <span class=\"hilite\">%2$s</span>',
+	'UI:ModificationTitle_Class_Object' => 'Zmiana %1$s: <span class=\\"hilite\\">%2$s</span>',
 	'UI:ClonePageTitle_Object_Class' => ITOP_APPLICATION_SHORT.' - Klonuj %1$s - %2$s zmianę',
-	'UI:CloneTitle_Class_Object' => 'Klonuje %1$s: <span class=\"hilite\">%2$s</span>',
+	'UI:CloneTitle_Class_Object' => 'Klonuje %1$s: <span class=\\"hilite\\">%2$s</span>',
 	'UI:CreationPageTitle_Class' => ITOP_APPLICATION_SHORT.' - Tworzenie %1$s ',
 	'UI:CreationTitle_Class' => 'Tworzenie %1$s',
 	'UI:SelectTheTypeOf_Class_ToCreate' => 'Wybierz typ %1$s do utworzenia:',
@@ -884,7 +980,6 @@ Mamy nadzieję, że spodoba ci się ta wersja tak samo, jak nam się podobało j
 	'UI:SystemIntrusion' => 'Brak dostępu. Zażądałeś operacji, która nie jest dla Ciebie dozwolona.',
 	'UI:FatalErrorMessage' => 'Błąd krytyczny, '.ITOP_APPLICATION_SHORT.' nie może kontynuować.',
 	'UI:Error_Details' => 'Błąd: %1$s.',
-
 	'UI:PageTitle:ProfileProjections' => ITOP_APPLICATION_SHORT.' zarządzanie użytkownikami - projekcje profili',
 	'UI:UserManagement:Class' => 'Klasa',
 	'UI:UserManagement:Class+' => 'Klasa obiektów',
@@ -919,66 +1014,42 @@ Mamy nadzieję, że spodoba ci się ta wersja tak samo, jak nam się podobało j
 	'UI:UserManagement:NoLifeCycleApplicable' => 'Nie dotyczy',
 	'UI:UserManagement:NoLifeCycleApplicable+' => 'Dla tej klasy nie zdefiniowano żadnego cyklu życia',
 	'UI:UserManagement:GrantMatrix' => 'Matryca uprawnień',
-
-	'Menu:AdminTools' => 'Administracja',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:AdminTools+' => 'Narzędzia administracyjne',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:AdminTools?' => 'Narzędzia dostępne tylko dla użytkowników posiadających profil administratora',// Duplicated into itop-welcome-itil (will be removed from here...)
 	'Menu:SystemTools' => 'System',
-
 	'UI:ChangeManagementMenu' => 'Zarządzanie zmianami',
 	'UI:ChangeManagementMenu+' => 'Zarządzanie zmianami',
 	'UI:ChangeManagementMenu:Title' => 'Przegląd zmian',
 	'UI-ChangeManagementMenu-ChangesByType' => 'Zmiany według typu',
 	'UI-ChangeManagementMenu-ChangesByStatus' => 'Zmiany według statusu',
 	'UI-ChangeManagementMenu-ChangesNotYetAssigned' => 'Zmiany jeszcze nie przypisane',
-
 	'UI:ConfigurationManagementMenu' => 'Zarządzanie konfiguracją',
 	'UI:ConfigurationManagementMenu+' => 'Zarządzanie konfiguracją',
 	'UI:ConfigurationManagementMenu:Title' => 'Przegląd infrastruktury',
 	'UI-ConfigurationManagementMenu-InfraByType' => 'Obiekty infrastruktury według typu',
 	'UI-ConfigurationManagementMenu-InfraByStatus' => 'Obiekty infrastruktury według statusu',
-
 	'UI:ConfigMgmtMenuOverview:Title' => 'Pulpit zarządzania konfiguracją',
 	'UI-ConfigMgmtMenuOverview-FunctionalCIbyStatus' => 'Elementy konfiguracji według statusu',
 	'UI-ConfigMgmtMenuOverview-FunctionalCIByType' => 'Elementy konfiguracji według typu',
-
 	'UI:RequestMgmtMenuOverview:Title' => 'Pulpit zarządzania zgłoszeniami',
 	'UI-RequestManagementOverview-RequestByService' => 'Zgłoszenia użytkowników według usług',
 	'UI-RequestManagementOverview-RequestByPriority' => 'Zgłoszenia użytkowników według priorytetu',
 	'UI-RequestManagementOverview-RequestUnassigned' => 'Zgłoszenia użytkownika nie przypisane agentowi',
-
 	'UI:IncidentMgmtMenuOverview:Title' => 'Pulpit zarządzania incydentami',
 	'UI-IncidentManagementOverview-IncidentByService' => 'Incydenty według usług',
 	'UI-IncidentManagementOverview-IncidentByPriority' => 'Incydenty według priorytetu',
 	'UI-IncidentManagementOverview-IncidentUnassigned' => 'Incydenty nie przypisane agentowi',
-
 	'UI:ChangeMgmtMenuOverview:Title' => 'Pulpit zarządzania zmianami',
 	'UI-ChangeManagementOverview-ChangeByType' => 'Zmiany według typu',
 	'UI-ChangeManagementOverview-ChangeUnassigned' => 'Zmiany nie przypisane agentowi',
 	'UI-ChangeManagementOverview-ChangeWithOutage' => 'Przerwy spowodowane zmianami',
-
 	'UI:ServiceMgmtMenuOverview:Title' => 'Pulpit zarządzania usługami',
 	'UI-ServiceManagementOverview-CustomerContractToRenew' => 'Umowy z klientami do odnowienia za 30 dni',
 	'UI-ServiceManagementOverview-ProviderContractToRenew' => 'Umowy z dostawcami do odnowienia za 30 dni',
-
 	'UI:ContactsMenu' => 'Kontakty',
 	'UI:ContactsMenu+' => 'Kontakty',
 	'UI:ContactsMenu:Title' => 'Przegląd kontaktów',
 	'UI-ContactsMenu-ContactsByLocation' => 'Kontakty według lokalizacji',
 	'UI-ContactsMenu-ContactsByType' => 'Kontakty według typu',
 	'UI-ContactsMenu-ContactsByStatus' => 'Kontakty według statusu',
-
-	'Menu:CSVImportMenu' => 'Import CSV',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:CSVImportMenu+' => 'Zbiorcze tworzenie lub aktualizacja',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:DataModelMenu' => 'Model danych',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:DataModelMenu+' => 'Omówienie modelu danych',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:ExportMenu' => 'Eksport',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:ExportMenu+' => 'Eksportuj wyniki dowolnego zapytania w formacie HTML, CSV lub XML',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:NotificationsMenu' => 'Powiadomienia',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:NotificationsMenu+' => 'Konfiguracja powiadomień',// Duplicated into itop-welcome-itil (will be removed from here...)
 	'UI:NotificationsMenu:Title' => 'Konfiguracja Powiadomienia',
 	'UI:NotificationsMenu:Help' => 'Pomoc',
 	'UI:NotificationsMenu:HelpContent' => '<p>W '.ITOP_APPLICATION_SHORT.' powiadomienia są w pełni konfigurowalne. Opierają się na dwóch zestawach obiektów: <i> wyzwalaczach i działaniach </i>.</p>
@@ -1009,53 +1080,18 @@ W przypadku powiązania z wyzwalaczem, każde działanie otrzymuje numer "porzą
 	'UI:NotificationsMenu:Actions:ActionWebhook' => 'Działania webhook (integracje wychodzące)',
 	'UI:NotificationsMenu:Actions:Action' => 'Inne działania',
 	'UI:NotificationsMenu:AvailableActions' => 'Dostępne działania',
-
 	'Menu:TagAdminMenu' => 'Konfiguracja tagów',
 	'Menu:TagAdminMenu+' => 'Zarządzanie wartościami tagów',
 	'UI:TagAdminMenu:Title' => 'Konfiguracja tagów',
 	'UI:TagAdminMenu:NoTags' => 'Nie skonfigurowano pola tagu',
 	'UI:TagSetFieldData:Error' => 'Błąd: %1$s',
-
-	'Menu:AuditCategories' => 'Kategorie audytu',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:AuditCategories+' => 'Kategorie audytu',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:Notifications:Title' => 'Kategorie audytu',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:RunQueriesMenu' => 'Uruchom zapytania', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:RunQueriesMenu+' => 'Uruchom dowolne zapytanie',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:QueryMenu' => 'Słownik zapytań',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:QueryMenu+' => 'Słownik zapytań',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:DataAdministration' => 'Administracja danymi',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:DataAdministration+' => 'Administracja danymi',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:UniversalSearchMenu' => 'Wyszukiwanie uniwersalne',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UniversalSearchMenu+' => 'Szukaj wszystkiego...', // Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:UserManagementMenu' => 'Zarządzanie użytkownikami',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UserManagementMenu+' => 'Zarządzanie użytkownikami', // Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:ProfilesMenu' => 'Profile',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:ProfilesMenu+' => 'Profile',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:ProfilesMenu:Title' => 'Profile',
-	// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:UserAccountsMenu' => 'Konta użytkowników',
-	// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UserAccountsMenu+' => 'Konta użytkowników',
-	// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UserAccountsMenu:Title' => 'Konta użytkowników',
-	// Duplicated into itop-welcome-itil (will be removed from here...)
-
 	'UI:iTopVersion:Short' => '%1$s wersja %2$s',
 	'UI:iTopVersion:Long' => '%1$s wersja %2$s-%3$s zbudowana na %4$s',
 	'UI:PropertiesTab' => 'Właściwości',
-
 	'UI:OpenDocumentInNewWindow_' => 'Otwórz',
 	'UI:DownloadDocument_' => 'Pobierz',
 	'UI:Document:NoPreview' => 'Brak podglądu tego typu dokumentu',
 	'UI:Download-CSV' => 'Pobierz %1$s',
-
 	'UI:DeadlineMissedBy_duration' => 'Nieodebrane przez %1$s',
 	'UI:Deadline_LessThan1Min' => '< 1 min',
 	'UI:Deadline_Minutes' => '%1$d min',
@@ -1098,7 +1134,7 @@ W przypadku powiązania z wyzwalaczem, każde działanie otrzymuje numer "porzą
 	'UI:RelationTooltip:ImpactedItems_N_of_M' => '# dotkniętych elementów: %1$d / %2$d',
 	'UI:RelationTooltip:CriticalThreshold_N_of_M' => 'Krytyczny próg: %1$d / %2$d',
 	'Portal:Title' => ITOP_APPLICATION_SHORT.' portal użytkownika',
-	'Portal:NoRequestMgmt' => 'Drogi %1$s, zostałeś przekierowany na tę stronę, ponieważ Twoje konto jest skonfigurowane z profilem \'Portal użytkownika\'. Niestety, '.ITOP_APPLICATION_SHORT.' nie został zainstalowany z funkcją \'Zarządzanie zgłoszeniami\'. Skontaktuj się z administratorem.',
+	'Portal:NoRequestMgmt' => 'Drogi %1$s, zostałeś przekierowany na tę stronę, ponieważ Twoje konto jest skonfigurowane z profilem \'Portal użytkownika\'.Niestety, '.ITOP_APPLICATION_SHORT.' nie został zainstalowany z funkcją \'Zarządzanie zgłoszeniami\'.Skontaktuj się z administratorem.',
 	'Portal:Refresh' => 'Odśwież',
 	'Portal:Back' => 'Wstecz',
 	'Portal:WelcomeUserOrg' => 'Witaj %1$s, z %2$s',
@@ -1134,9 +1170,13 @@ W przypadku powiązania z wyzwalaczem, każde działanie otrzymuje numer "porzą
 	'Enum:Undefined' => 'Nieokreślony',
 	'UI:DurationForm_Days_Hours_Minutes_Seconds' => '%1$s d %2$s g %3$s min %4$s s',
 	'UI:ModifyAllPageTitle' => 'Zmień wszystko',
+	'UI:Modify_ObjectsOf_Class' => 'Modifying objects of class %1$s~~',
 	'UI:Modify_N_ObjectsOf_Class' => 'Zmiana obiektów %1$d klasy %2$s',
 	'UI:Modify_M_ObjectsOf_Class_OutOf_N' => 'Zmiana obiektów %1$d klasy %2$s poza %3$d',
 	'UI:Menu:ModifyAll' => 'Zmień...',
+	'UI:Menu:ModifyAll_Class' => 'Modify %1$s objects...~~',
+	'UI:Menu:ModifyAll_Link' => 'Modify %1$s...~~',
+	'UI:Menu:ModifyAll_Remote' => 'Modify %1$s...~~',
 	'UI:Button:ModifyAll' => 'Zmień wszystko',
 	'UI:Button:PreviewModifications' => 'Podgląd zmian >>',
 	'UI:ModifiedObject' => 'Obiekt zmieniony',
@@ -1196,7 +1236,6 @@ W przypadku powiązania z wyzwalaczem, każde działanie otrzymuje numer "porzą
 	'UI:PrintResolution:LetterLandscape' => 'Letter krajobraz',
 	'UI:Toggle:SwitchToStandardDashboard' => 'Przełącz na standardowy pulpit nawigacyjny',
 	'UI:Toggle:SwitchToCustomDashboard' => 'Przełącz na własny pulpit nawigacyjny',
-
 	'UI:ConfigureThisList' => 'Skonfiguruj listę...',
 	'UI:ListConfigurationTitle' => 'Konfiguracja listy',
 	'UI:ColumnsAndSortOrder' => 'Kolumny i porządek sortowania:',
@@ -1212,10 +1251,8 @@ W przypadku powiązania z wyzwalaczem, każde działanie otrzymuje numer "porzą
 	'UI:ExtField_AsRemoteField' => '%1$s (%2$s)',
 	'UI:Button:MoveUp' => 'Wyżej',
 	'UI:Button:MoveDown' => 'Niżej',
-
 	'UI:OQL:UnknownClassAndFix' => 'Nieznana klasa "%1$s". Możesz spróbować "%2$s" w zamian.',
 	'UI:OQL:UnknownClassNoFix' => 'Nieznana klasa "%1$s"',
-
 	'UI:Dashboard:EditCustom' => 'Edytuj własną wersję...',
 	'UI:Dashboard:CreateCustom' => 'Utwórz wersję...',
 	'UI:Dashboard:DeleteCustom' => 'Usuń własną wersję...',
@@ -1226,13 +1263,10 @@ W przypadku powiązania z wyzwalaczem, każde działanie otrzymuje numer "porzą
 	'UI:ImportDashboardText' => 'Wybierz plik pulpitu do zaimportowania:',
 	'UI:Dashboard:Actions' => 'Działania na pulpicie',
 	'UI:Dashboard:NotUpToDateUntilContainerSaved' => 'Ten pulpit nawigacyjny wyświetla informacje, które nie obejmują bieżących zmian.',
-
-
 	'UI:DashletCreation:Title' => 'Utwórz nową wtyczkę',
 	'UI:DashletCreation:Dashboard' => 'Pulpit',
 	'UI:DashletCreation:DashletType' => 'Typ wtyczki',
 	'UI:DashletCreation:EditNow' => 'Edytuj pulpit',
-
 	'UI:DashboardEdit:Title' => 'Edytor pulpitu',
 	'UI:DashboardEdit:DashboardTitle' => 'Tytuł',
 	'UI:DashboardEdit:AutoReload' => 'Automatyczne odświeżanie',
@@ -1240,38 +1274,31 @@ W przypadku powiązania z wyzwalaczem, każde działanie otrzymuje numer "porzą
 	'UI:DashboardEdit:AutoReloadSec+' => 'Dopuszczalne minimum %1$d sekund',
 	'UI:DashboardEdit:Revert' => 'Odwróć',
 	'UI:DashboardEdit:Apply' => 'Zastosuj',
-
 	'UI:DashboardEdit:Layout' => 'Układ',
 	'UI:DashboardEdit:Properties' => 'Właściwości pulpitu',
 	'UI:DashboardEdit:Dashlets' => 'Dostępne wtyczki',
 	'UI:DashboardEdit:DashletProperties' => 'Właściwości wtyczki',
-
 	'UI:Form:Property' => 'Właściwość',
 	'UI:Form:Value' => 'Wartość',
-
 	'UI:DashletUnknown:Label' => 'Nieznana',
 	'UI:DashletUnknown:Description' => 'Nieznana wtyczka (mogła zostać odinstalowana)',
 	'UI:DashletUnknown:RenderText:View' => 'Nie można wyrenderować wtyczki.',
 	'UI:DashletUnknown:RenderText:Edit' => 'Nie można wyrenderować wtyczki (klasa "%1$s"). Skontaktuj się z administratorem, jeśli jest nadal dostępny.',
 	'UI:DashletUnknown:RenderNoDataText:Edit' => 'Brak podglądu dla wtyczki (klasa "%1$s").',
 	'UI:DashletUnknown:Prop-XMLConfiguration' => 'Konfiguracja (pokazana jako nieprzetworzony XML)',
-
 	'UI:DashletProxy:Label' => 'Proxy',
 	'UI:DashletProxy:Description' => 'Wtyczka Proxy',
 	'UI:DashletProxy:RenderNoDataText:Edit' => 'Brak podglądu wtyczki innej firmy (klasa "%1$s").',
 	'UI:DashletProxy:Prop-XMLConfiguration' => 'Konfiguracja (pokazana jako nieprzetworzony XML)',
-
 	'UI:DashletPlainText:Label' => 'Tekst',
 	'UI:DashletPlainText:Description' => 'Zwykły tekst (bez formatowania)',
 	'UI:DashletPlainText:Prop-Text' => 'Tekst',
 	'UI:DashletPlainText:Prop-Text:Default' => 'Proszę tu wpisać tekst...',
-
 	'UI:DashletObjectList:Label' => 'Lista obiektów',
 	'UI:DashletObjectList:Description' => 'Wtyczka listy obiektów',
 	'UI:DashletObjectList:Prop-Title' => 'Tytuł',
 	'UI:DashletObjectList:Prop-Query' => 'Zapytanie',
 	'UI:DashletObjectList:Prop-Menu' => 'Menu',
-
 	'UI:DashletGroupBy:Prop-Title' => 'Tytuł',
 	'UI:DashletGroupBy:Prop-Query' => 'Zapytanie',
 	'UI:DashletGroupBy:Prop-Style' => 'Styl',
@@ -1285,24 +1312,20 @@ W przypadku powiązania z wyzwalaczem, każde działanie otrzymuje numer "porzą
 	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfWeek' => '%1$s (dzień tygodnia)',
 	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfMonth' => '%1$s (dzień miesiąca)',
 	'UI:DashletGroupBy:MissingGroupBy' => 'Proszę wybrać pole, po którym będą grupowane obiekty',
-
 	'UI:DashletGroupByPie:Label' => 'Wykres kołowy',
 	'UI:DashletGroupByPie:Description' => 'Wykres kołowy',
 	'UI:DashletGroupByBars:Label' => 'Wykres słupkowy',
 	'UI:DashletGroupByBars:Description' => 'Wykres słupkowy',
 	'UI:DashletGroupByTable:Label' => 'Grupuj według (tabela)',
 	'UI:DashletGroupByTable:Description' => 'Lista (pogrupowana według pola)',
-
-	// New in 2.5
+    // New in 2.5
 	'UI:DashletGroupBy:Prop-Function' => 'Funkcja agregacji',
 	'UI:DashletGroupBy:Prop-FunctionAttribute' => 'Atrybut funkcji',
 	'UI:DashletGroupBy:Prop-OrderDirection' => 'Kierunek',
 	'UI:DashletGroupBy:Prop-OrderField' => 'Sortuj po',
 	'UI:DashletGroupBy:Prop-Limit' => 'Limit',
-
 	'UI:DashletGroupBy:Order:asc' => 'Rosnąco',
 	'UI:DashletGroupBy:Order:desc' => 'Malejąco',
-
 	'UI:GroupBy:count' => 'Liczba',
 	'UI:GroupBy:count+' => 'Liczba elementów',
 	'UI:GroupBy:sum' => 'Suma',
@@ -1313,14 +1336,12 @@ W przypadku powiązania z wyzwalaczem, każde działanie otrzymuje numer "porzą
 	'UI:GroupBy:min+' => 'Minimum %1$s',
 	'UI:GroupBy:max' => 'Maksimum',
 	'UI:GroupBy:max+' => 'Maksimum %1$s',
-	// ---
-
+    // ---
 	'UI:DashletHeaderStatic:Label' => 'Nagłówek',
 	'UI:DashletHeaderStatic:Description' => 'Wyświetla separator poziomy',
 	'UI:DashletHeaderStatic:Prop-Title' => 'Tytuł',
 	'UI:DashletHeaderStatic:Prop-Title:Default' => 'Kontakty',
 	'UI:DashletHeaderStatic:Prop-Icon' => 'Ikona',
-
 	'UI:DashletHeaderDynamic:Label' => 'Nagłówek ze statystykami',
 	'UI:DashletHeaderDynamic:Description' => 'Nagłówek ze statystykami (pogrupowane według ...)',
 	'UI:DashletHeaderDynamic:Prop-Title' => 'Tytuł',
@@ -1331,11 +1352,9 @@ W przypadku powiązania z wyzwalaczem, każde działanie otrzymuje numer "porzą
 	'UI:DashletHeaderDynamic:Prop-Query' => 'Zapytanie',
 	'UI:DashletHeaderDynamic:Prop-GroupBy' => 'Grupuj według',
 	'UI:DashletHeaderDynamic:Prop-Values' => 'Wartości',
-
 	'UI:DashletBadge:Label' => 'Symbol',
 	'UI:DashletBadge:Description' => 'Ikona obiektu z nowym / wyszukiwaniem',
 	'UI:DashletBadge:Prop-Class' => 'Klasa',
-
 	'DayOfWeek-Sunday' => 'Niedziela',
 	'DayOfWeek-Monday' => 'Poniedziałek',
 	'DayOfWeek-Tuesday' => 'Wtorek',
@@ -1355,8 +1374,7 @@ W przypadku powiązania z wyzwalaczem, każde działanie otrzymuje numer "porzą
 	'Month-10' => 'Październik',
 	'Month-11' => 'Listopad',
 	'Month-12' => 'Grudzień',
-
-	// Short version for the DatePicker
+    // Short version for the DatePicker
 	'DayOfWeek-Sunday-Min' => 'Ni',
 	'DayOfWeek-Monday-Min' => 'Po',
 	'DayOfWeek-Tuesday-Min' => 'Wt',
@@ -1376,13 +1394,13 @@ W przypadku powiązania z wyzwalaczem, każde działanie otrzymuje numer "porzą
 	'Month-10-Short' => 'Paź',
 	'Month-11-Short' => 'Lis',
 	'Month-12-Short' => 'Gru',
-	'Calendar-FirstDayOfWeek' => '1',// 0 = Sunday, 1 = Monday, etc...
-
+	'Calendar-FirstDayOfWeek' => '1',
+    // 0 = Sunday, 1 = Monday, etc...
 	'UI:Menu:ShortcutList' => 'Utwórz skrót...',
+	'UI:Menu:FilterList' => 'Display list with search criteria~~',
 	'UI:ShortcutRenameDlg:Title' => 'Zmień nazwę skrótu',
 	'UI:ShortcutListDlg:Title' => 'Utwórz skrót do listy',
 	'UI:ShortcutDelete:Confirm' => 'Potwierdź, że chcesz usunąć skrót(y).',
-	'Menu:MyShortcuts' => 'Moje skróty',// Duplicated into itop-welcome-itil (will be removed from here...)
 	'Class:Shortcut' => 'Skrót',
 	'Class:Shortcut+' => '',
 	'Class:Shortcut/Attribute:name' => 'Nazwa',
@@ -1396,12 +1414,10 @@ W przypadku powiązania z wyzwalaczem, każde działanie otrzymuje numer "porzą
 	'Class:ShortcutOQL/Attribute:auto_reload/Value:custom' => 'Własne',
 	'Class:ShortcutOQL/Attribute:auto_reload_sec' => 'Automatyczne odświeżanie (sekundy)',
 	'Class:ShortcutOQL/Attribute:auto_reload_sec/tip' => 'Dopuszczalne minimum %1$d sekund',
-
 	'UI:FillAllMandatoryFields' => 'Proszę wypełnić wszystkie wymagane pola.',
 	'UI:ValueMustBeSet' => 'Podaj wartość',
 	'UI:ValueMustBeChanged' => 'Zmień wartość',
 	'UI:ValueInvalidFormat' => 'Niepoprawny format',
-
 	'UI:CSVImportConfirmTitle' => 'Potwierdź operację',
 	'UI:CSVImportConfirmMessage' => 'Czy na pewno chcesz to zrobić?',
 	'UI:CSVImportError_items' => 'Błędy: %1$d',
@@ -1427,11 +1443,9 @@ W przypadku powiązania z wyzwalaczem, każde działanie otrzymuje numer "porzą
 <tr><td>i</td><td>minuty (2 cyfry, np. 00..59)</td></tr>
 <tr><td>s</td><td>sekundy (2 cyfry, np. 00..59)</td></tr>
 </table>',
-
 	'UI:Button:Remove' => 'Usuń',
 	'UI:AddAnExisting_Class' => 'Dodaj obiekty typu %1$s...',
 	'UI:SelectionOf_Class' => 'Wybór obiektów typu %1$s',
-
 	'UI:AboutBox' => 'O '.ITOP_APPLICATION_SHORT.'...',
 	'UI:About:Title' => 'O '.ITOP_APPLICATION_SHORT,
 	'UI:About:DataModel' => 'Model danych',
@@ -1441,12 +1455,10 @@ W przypadku powiązania z wyzwalaczem, każde działanie otrzymuje numer "porzą
 	'UI:About:ManualExtensionSource' => 'Rozbudowa',
 	'UI:About:Extension_Version' => 'Wersja: %1$s',
 	'UI:About:RemoteExtensionSource' => 'Dane',
-
 	'UI:DisconnectedDlgMessage' => 'Jesteś rozłączony. Aby kontynuować korzystanie z aplikacji, musisz się zidentyfikować.',
 	'UI:DisconnectedDlgTitle' => 'Uwaga!',
 	'UI:LoginAgain' => 'Zaloguj się ponownie',
 	'UI:StayOnThePage' => 'Zostań na tej stronie',
-
 	'ExcelExporter:ExportMenu' => 'Eksport do Excela...',
 	'ExcelExporter:ExportDialogTitle' => 'Eksport do Excela',
 	'ExcelExporter:ExportButton' => 'Eksport',
@@ -1459,7 +1471,6 @@ W przypadku powiązania z wyzwalaczem, każde działanie otrzymuje numer "porzą
 	'ExcelExport:Statistics' => 'Statystyka',
 	'portal:legacy_portal' => 'Portal użytkownika',
 	'portal:backoffice' => ITOP_APPLICATION_SHORT.' Interfejs użytkownika biurowego',
-
 	'UI:CurrentObjectIsLockedBy_User' => 'Obiekt jest zablokowany, ponieważ jest obecnie modyfikowany przez %1$s.',
 	'UI:CurrentObjectIsLockedBy_User_Explanation' => 'Obiekt jest obecnie modyfikowany przez %1$s. Twoje modyfikacje nie mogą zostać przesłane, ponieważ zostałyby nadpisane.',
 	'UI:CurrentObjectIsSoftLockedBy_User' => 'Obiekt jest obecnie modyfikowany przez %1$s. Będziesz mógł przesłać swoje modyfikacje, gdy zostanie on zwolniony.',
@@ -1467,43 +1478,36 @@ W przypadku powiązania z wyzwalaczem, każde działanie otrzymuje numer "porzą
 	'UI:CurrentObjectLockExpired_Explanation' => 'Blokada zapobiegająca jednoczesnym modyfikacjom obiektu wygasła. Nie możesz już przesłać swojej modyfikacji, ponieważ inni użytkownicy mogą teraz modyfikować ten obiekt.',
 	'UI:ConcurrentLockKilled' => 'Usunięto blokadę uniemożliwiającą modyfikacje bieżącego obiektu.',
 	'UI:Menu:KillConcurrentLock' => 'Ubij blokadę jednoczesnej modyfikacji !',
-
 	'UI:Menu:ExportPDF' => 'Eksport jako PDF...',
 	'UI:Menu:PrintableVersion' => 'Wersja do druku',
-
 	'UI:BrowseInlineImages' => 'Przeglądaj obrazy...',
 	'UI:UploadInlineImageLegend' => 'Prześlij nowy obraz',
 	'UI:SelectInlineImageToUpload' => 'Wybierz obraz do przesłania',
 	'UI:AvailableInlineImagesLegend' => 'Dostępne obrazy',
 	'UI:NoInlineImage' => 'Na serwerze nie ma obrazu. Użyj przycisku "Przeglądaj" powyżej, aby wybrać obraz ze swojego komputera i przesłać go na serwer.',
-
 	'UI:ToggleFullScreen' => 'Przełącz Maksymalizuj / Minimalizuj',
 	'UI:Button:ResetImage' => 'Odzyskaj poprzedni obraz',
 	'UI:Button:RemoveImage' => 'Usuń obraz',
 	'UI:Button:UploadImage' => 'Prześlij obraz z dysku',
 	'UI:UploadNotSupportedInThisMode' => 'Modyfikacja obrazów lub plików nie jest obsługiwana w tym trybie.',
-
 	'UI:Button:RemoveDocument' => 'Usuń dokument',
-
-	// Search form
+    // Search form
 	'UI:Search:Toggle' => 'Zwiń / Rozwiń',
 	'UI:Search:AutoSubmit:DisabledHint' => 'Automatyczne przesyłanie zostało wyłączone dla tej klasy',
 	'UI:Search:Obsolescence:DisabledHint' => 'W oparciu o Twoje preferencje wycofane dane są ukrywane',
 	'UI:Search:NoAutoSubmit:ExplainText' => 'Dodaj jakieś kryterium w polu wyszukiwania lub kliknij przycisk wyszukiwania, aby wyświetlić obiekty.',
 	'UI:Search:Criterion:MoreMenu:AddCriteria' => 'Dodaj nowe kryteria',
-	// - Add new criteria button
+    // - Add new criteria button
 	'UI:Search:AddCriteria:List:RecentlyUsed:Title' => 'Ostatnio używane',
 	'UI:Search:AddCriteria:List:MostPopular:Title' => 'Najbardziej popularne',
 	'UI:Search:AddCriteria:List:Others:Title' => 'Inne',
 	'UI:Search:AddCriteria:List:RecentlyUsed:Placeholder' => 'Jeszcze nic.',
-
-	// - Criteria header actions
+    // - Criteria header actions
 	'UI:Search:Criteria:Toggle' => 'Minimalizuj / Rozwiń',
 	'UI:Search:Criteria:Remove' => 'Usunięty',
 	'UI:Search:Criteria:Locked' => 'Zablokowany',
-
-	// - Criteria titles
-	//   - Default widget
+    // - Criteria titles
+    //   - Default widget
 	'UI:Search:Criteria:Title:Default:Any' => '%1$s: Każdy',
 	'UI:Search:Criteria:Title:Default:Empty' => '%1$s jest pusty',
 	'UI:Search:Criteria:Title:Default:NotEmpty' => '%1$s nie jest pusty',
@@ -1525,53 +1529,57 @@ W przypadku powiązania z wyzwalaczem, każde działanie otrzymuje numer "porzą
 	'UI:Search:Criteria:Title:Default:Between:All' => '%1$s: Każdy',
 	'UI:Search:Criteria:Title:Default:Between:From' => '%1$s z %2$s',
 	'UI:Search:Criteria:Title:Default:Between:Until' => '%1$s aż do %2$s',
-	//   - Numeric widget
-	//   None yet
-	//   - DateTime widget
+    //   - Numeric widget
+    //   None yet
+    //   - DateTime widget
 	'UI:Search:Criteria:Title:DateTime:Between' => '%2$s <= 1$s <= %3$s',
-	//   - Enum widget
+    //   - Enum widget
 	'UI:Search:Criteria:Title:Enum:In' => '%1$s: %2$s',
 	'UI:Search:Criteria:Title:Enum:In:Many' => '%1$s: %2$s i %3$s inne',
 	'UI:Search:Criteria:Title:Enum:In:All' => '%1$s: Każdy',
-	//   - TagSet widget
+    //   - TagSet widget
 	'UI:Search:Criteria:Title:TagSet:Matches' => '%1$s: %2$s',
-	//   - External key widget
+    //   - External key widget
 	'UI:Search:Criteria:Title:ExternalKey:Empty' => '%1$s zdefiniowany',
 	'UI:Search:Criteria:Title:ExternalKey:NotEmpty' => '%1$s nie zdefiniowany',
 	'UI:Search:Criteria:Title:ExternalKey:Equals' => '%1$s %2$s',
 	'UI:Search:Criteria:Title:ExternalKey:In' => '%1$s: %2$s',
 	'UI:Search:Criteria:Title:ExternalKey:In:Many' => '%1$s: %2$s i %3$s inne',
 	'UI:Search:Criteria:Title:ExternalKey:In:All' => '%1$s: Każdy',
-	//   - Hierarchical key widget
+    //   - Hierarchical key widget
 	'UI:Search:Criteria:Title:HierarchicalKey:Empty' => '%1$s zdefiniowany',
 	'UI:Search:Criteria:Title:HierarchicalKey:NotEmpty' => '%1$s nie zdefiniowany',
 	'UI:Search:Criteria:Title:HierarchicalKey:Equals' => '%1$s %2$s',
 	'UI:Search:Criteria:Title:HierarchicalKey:In' => '%1$s: %2$s',
 	'UI:Search:Criteria:Title:HierarchicalKey:In:Many' => '%1$s: %2$s i %3$s inne',
 	'UI:Search:Criteria:Title:HierarchicalKey:In:All' => '%1$s: Każdy',
-
-	// - Criteria operators
-	//   - Default widget
+    // - Criteria operators
+    //   - Default widget
 	'UI:Search:Criteria:Operator:Default:Empty' => 'Jest pusty',
 	'UI:Search:Criteria:Operator:Default:NotEmpty' => 'Nie jest pusty',
 	'UI:Search:Criteria:Operator:Default:Equals' => 'Równe',
 	'UI:Search:Criteria:Operator:Default:Between' => 'Pomiędzy',
-	//   - String widget
+    //   - String widget
 	'UI:Search:Criteria:Operator:String:Contains' => 'Zawiera',
 	'UI:Search:Criteria:Operator:String:StartsWith' => 'Zaczyna się od',
 	'UI:Search:Criteria:Operator:String:EndsWith' => 'Kończy się na',
 	'UI:Search:Criteria:Operator:String:RegExp' => 'Wyr. regularne',
-	//   - Numeric widget
-	'UI:Search:Criteria:Operator:Numeric:Equals' => 'Równe',// => '=',
-	'UI:Search:Criteria:Operator:Numeric:GreaterThan' => 'Większe',// => '>',
-	'UI:Search:Criteria:Operator:Numeric:GreaterThanOrEquals' => 'Większe / równe',// > '>=',
-	'UI:Search:Criteria:Operator:Numeric:LessThan' => 'Mniejsze',// => '<',
-	'UI:Search:Criteria:Operator:Numeric:LessThanOrEquals' => 'Mniejsze / równe',// > '<=',
-	'UI:Search:Criteria:Operator:Numeric:Different' => 'Różne',// => '≠',
-	//   - Tag Set Widget
+    //   - Numeric widget
+	'UI:Search:Criteria:Operator:Numeric:Equals' => 'Równe',
+    // => '=',
+	'UI:Search:Criteria:Operator:Numeric:GreaterThan' => 'Większe',
+    // => '>',
+	'UI:Search:Criteria:Operator:Numeric:GreaterThanOrEquals' => 'Większe / równe',
+    // > '>=',
+	'UI:Search:Criteria:Operator:Numeric:LessThan' => 'Mniejsze',
+    // => '<',
+	'UI:Search:Criteria:Operator:Numeric:LessThanOrEquals' => 'Mniejsze / równe',
+    // > '<=',
+	'UI:Search:Criteria:Operator:Numeric:Different' => 'Różne',
+    // => '≠',
+    //   - Tag Set Widget
 	'UI:Search:Criteria:Operator:TagSet:Matches' => 'Dopasowania',
-
-	// - Other translations
+    // - Other translations
 	'UI:Search:Value:Filter:Placeholder' => 'Filtruj...',
 	'UI:Search:Value:Search:Placeholder' => 'Szukaj...',
 	'UI:Search:Value:Autocomplete:StartTyping' => 'Zacznij wpisywać możliwe wartości.',
@@ -1579,8 +1587,7 @@ W przypadku powiązania z wyzwalaczem, każde działanie otrzymuje numer "porzą
 	'UI:Search:Value:Autocomplete:NoResult' => 'Brak wyników.',
 	'UI:Search:Value:Toggler:CheckAllNone' => 'Zaznacz wszystkie / żadne',
 	'UI:Search:Value:Toggler:CheckAllNoneFiltered' => 'Zaznacz wszystkie / żadne widoczne',
-
-	// - Widget other translations
+    // - Widget other translations
 	'UI:Search:Criteria:Numeric:From' => 'Z',
 	'UI:Search:Criteria:Numeric:Until' => 'Do',
 	'UI:Search:Criteria:Numeric:PlaceholderFrom' => 'Każdy',
@@ -1594,10 +1601,8 @@ W przypadku powiązania z wyzwalaczem, każde działanie otrzymuje numer "porzą
 	'UI:Search:Criteria:DateTime:PlaceholderUntil' => 'Kiedykolwiek',
 	'UI:Search:Criteria:DateTime:PlaceholderUntilTime' => 'Kiedykolwiek',
 	'UI:Search:Criteria:HierarchicalKey:ChildrenIncluded:Hint' => 'Uwzględnione zostaną zależności wybranych obiektów.',
-
 	'UI:Search:Criteria:Raw:Filtered' => 'Wyfiltrowane',
 	'UI:Search:Criteria:Raw:FilteredOn' => 'Filtr według %1$s',
-
 	'UI:StateChanged' => 'Stan zmieniony',
 ));
 
@@ -1608,16 +1613,13 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Expression:Operator:AND' => ' AND ',
 	'Expression:Operator:OR' => ' OR ',
 	'Expression:Operator:=' => ': ',
-
 	'Expression:Unit:Short:DAY' => 'd',
 	'Expression:Unit:Short:WEEK' => 'w',
 	'Expression:Unit:Short:MONTH' => 'm',
 	'Expression:Unit:Short:YEAR' => 'y',
-
 	'Expression:Unit:Long:DAY' => 'dzień(i)',
 	'Expression:Unit:Long:HOUR' => 'godzina(y)',
 	'Expression:Unit:Long:MINUTE' => 'minuta(y)',
-
 	'Expression:Verb:NOW' => 'teraz',
 	'Expression:Verb:ISNULL' => ': nieokreślony',
 ));
@@ -1641,62 +1643,47 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Menu:DataSources' => 'Źródła danych synchronizacji',
 	'Menu:DataSources+' => 'Wszystkie źródła danych synchronizacji',
-	'Menu:WelcomeMenu' => 'Witaj',
-	'Menu:WelcomeMenu+' => 'Witaj w '.ITOP_APPLICATION_SHORT,
-	'Menu:WelcomeMenuPage' => 'Witaj',
-	'Menu:WelcomeMenuPage+' => 'Witaj w '.ITOP_APPLICATION_SHORT,
-	'Menu:AdminTools' => 'Administracja',
-	'Menu:AdminTools+' => 'Narzędzia administracyjne',
-	'Menu:AdminTools?' => 'Narzędzia dostępne tylko dla użytkowników posiadających profil administratora',
-	'Menu:DataModelMenu' => 'Model danych',
-	'Menu:DataModelMenu+' => 'Omówienie modelu danych',
-	'Menu:ExportMenu' => 'Eksport',
-	'Menu:ExportMenu+' => 'Eksportuj wyniki dowolnego zapytania w formacie HTML, CSV lub XML',
-	'Menu:NotificationsMenu' => 'Powiadomienia',
-	'Menu:NotificationsMenu+' => 'Konfiguracja powiadomień',
 	'Menu:AuditCategories' => 'Kategorie audytu',
 	'Menu:AuditCategories+' => 'Kategorie audytu',
 	'Menu:Notifications:Title' => 'Kategorie audytu',
-	'Menu:RunQueriesMenu'         => 'Zapytania',
-	'Menu:RunQueriesMenu+'        => 'Uruchom dowolne zapytanie',
-	'Menu:QueryMenu'              => 'Słownik zapytań',
-	'Menu:QueryMenu+'             => 'Słownik zapytań',
-	'Menu:UniversalSearchMenu'    => 'Wyszukiwanie uniwersalne',
-	'Menu:UniversalSearchMenu+'   => 'Wyszukiwanie wszystkiego...',
-	'Menu:UserManagementMenu'     => 'Zarządzanie użytkownikami',
-	'Menu:UserManagementMenu+'    => 'UZarządzanie użytkownikami',
-	'Menu:ProfilesMenu'           => 'Profile',
-	'Menu:ProfilesMenu+'          => 'Profile',
-	'Menu:ProfilesMenu:Title'     => 'Profile',
-	'Menu:UserAccountsMenu'       => 'Konta użytkowników',
-	'Menu:UserAccountsMenu+'      => 'Konta użytkowników',
+	'Menu:AuditCategories:Title' => 'Audit configuration~~',
+	'Menu:RunQueriesMenu' => 'Zapytania',
+	'Menu:RunQueriesMenu+' => 'Uruchom dowolne zapytanie',
+	'Menu:QueryMenu' => 'Słownik zapytań',
+	'Menu:QueryMenu+' => 'Słownik zapytań',
+	'Menu:UniversalSearchMenu' => 'Wyszukiwanie uniwersalne',
+	'Menu:UniversalSearchMenu+' => 'Wyszukiwanie wszystkiego...',
+	'Menu:UserManagementMenu' => 'Zarządzanie użytkownikami',
+	'Menu:UserManagementMenu+' => 'UZarządzanie użytkownikami',
+	'Menu:ProfilesMenu' => 'Profile',
+	'Menu:ProfilesMenu+' => 'Profile',
+	'Menu:ProfilesMenu:Title' => 'Profile',
+	'Menu:UserAccountsMenu' => 'Konta użytkowników',
+	'Menu:UserAccountsMenu+' => 'Konta użytkowników',
 	'Menu:UserAccountsMenu:Title' => 'Konta użytkowników',
-	'Menu:MyShortcuts'            => 'Moje skróty',
-	'Menu:UserManagement'         => 'Zarządzanie użytkownikami',
-	'Menu:Queries'                => 'Zapytania',
-	'Menu:ConfigurationTools'     => 'Konfiguracja',
+	'Menu:UserManagement' => 'Zarządzanie użytkownikami',
+	'Menu:Queries' => 'Zapytania',
+	'Menu:ConfigurationTools' => 'Konfiguracja'
 ));
-
 // OAuth
 Dict::Add('PL PL', 'Polish', 'Polski', array(
-	'Menu:OAuthWizardMenu'                          => 'OAuth 2.0',
-	'core/Operation:Wizard/Title'                   => 'Konfiguracja OAuth 2.0',
-	'UI:OAuth:Wizard:Page:Title'                    => 'Konfiguracja OAuth 2.0',
-	'UI:OAuth:Wizard:Form:Panel:Title'              => 'Konfiguracja OAuth 2.0',
-	'UI:OAuth:Wizard:Form:Input:ClientId:Label'     => 'Klient ID',
+	'Menu:OAuthWizardMenu' => 'OAuth 2.0',
+	'core/Operation:Wizard/Title' => 'Konfiguracja OAuth 2.0',
+	'UI:OAuth:Wizard:Page:Title' => 'Konfiguracja OAuth 2.0',
+	'UI:OAuth:Wizard:Form:Panel:Title' => 'Konfiguracja OAuth 2.0',
+	'UI:OAuth:Wizard:Form:Input:ClientId:Label' => 'Klient ID',
 	'UI:OAuth:Wizard:Form:Input:ClientSecret:Label' => 'Klient Sekret',
-	'UI:OAuth:Wizard:Form:Input:Scope:Label'        => 'Zakres',
-	'UI:OAuth:Wizard:Form:Input:Additional:Label'   => 'Dodatkowe parametry',
-	'UI:OAuth:Wizard:Form:Input:RedirectUri:Label'  => 'Adres URL przekierowania',
-	'UI:OAuth:Wizard:Form:Button:Submit:Label'      => 'Uwierzytelnianie',
-	'UI:OAuth:Wizard:ResultConf:Panel:Title'        => 'Konfiguracja SMTP',
-	'UI:OAuth:Wizard:ResultConf:Panel:Description'  => 'Wklej tę treść do pliku konfiguracyjnego, aby używać tego połączenia OAuth dla wychodzących e-maili',
+	'UI:OAuth:Wizard:Form:Input:Scope:Label' => 'Zakres',
+	'UI:OAuth:Wizard:Form:Input:Additional:Label' => 'Dodatkowe parametry',
+	'UI:OAuth:Wizard:Form:Input:RedirectUri:Label' => 'Adres URL przekierowania',
+	'UI:OAuth:Wizard:Form:Button:Submit:Label' => 'Uwierzytelnianie',
+	'UI:OAuth:Wizard:ResultConf:Panel:Title' => 'Konfiguracja SMTP',
+	'UI:OAuth:Wizard:ResultConf:Panel:Description' => 'Wklej tę treść do pliku konfiguracyjnego, aby używać tego połączenia OAuth dla wychodzących e-maili'
 ));
-
 // Additional language entries not present in English dict
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'UI:Button:SearchInHIerarchy' => ' Szukaj w hierarchii ',
-	'UI:Error:TemplateRendering'  => 'Błąd renderowania szablonu',
+	'UI:Error:TemplateRendering' => 'Błąd renderowania szablonu',
 	'UI:Toggle:StandardDashboard' => 'Standard',
-	'UI:Toggle:CustomDashboard'   => 'Własny',
+	'UI:Toggle:CustomDashboard' => 'Własny'
 ));
diff --git a/dictionaries/pt_br.dictionary.itop.core.php b/dictionaries/pt_br.dictionary.itop.core.php
index b1b540d916..5a38c7a1a7 100644
--- a/dictionaries/pt_br.dictionary.itop.core.php
+++ b/dictionaries/pt_br.dictionary.itop.core.php
@@ -23,57 +23,42 @@
  */
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Core:DeletedObjectLabel' => '%1s (excluído)',
-	'Core:DeletedObjectTip'   => 'O objeto foi excluído em %1$s (%2$s)',
-
+	'Core:DeletedObjectTip' => 'O objeto foi excluído em %1$s (%2$s)',
 	'Core:UnknownObjectLabel' => 'Objeto não encontrado (classe: %1$s, id: %2$d)',
 	'Core:UnknownObjectTip' => 'O objeto não pode ser encontrado. Ele pode ter sido eliminado há algum tempo e o log foi removido desde então',
-
 	'Core:UniquenessDefaultError' => 'Regra de exclusividade \'%1$s\' com erro',
-	'Core:CheckConsistencyError'  => 'Regras de consistência não seguidas: %1$s',
-	'Core:CheckValueError'        => 'Valor inesperado para o atributo \'%1$s\' (%2$s) : %3$s~~',
-
+	'Core:CheckConsistencyError' => 'Regras de consistência não seguidas: %1$s',
+	'Core:CheckValueError' => 'Valor inesperado para o atributo \'%1$s\' (%2$s) : %3$s~~',
 	'Core:AttributeLinkedSet' => 'Array de objetos',
 	'Core:AttributeLinkedSet+' => 'Quaisquer tipos de objetos da mesma classe ou subclasses',
-
 	'Core:AttributeLinkedSetDuplicatesFound' => 'Duplicatas no campo \'%1$s\' : %2$s',
-
 	'Core:AttributeDashboard' => 'Painel do '.ITOP_APPLICATION_SHORT,
 	'Core:AttributeDashboard+' => '',
-
-	'Core:AttributePhoneNumber'  => 'Número de telefone',
+	'Core:AttributePhoneNumber' => 'Número de telefone',
 	'Core:AttributePhoneNumber+' => '',
-
 	'Core:AttributeObsolescenceDate' => 'Data de obsolescência',
 	'Core:AttributeObsolescenceDate+' => '',
-
 	'Core:AttributeTagSet' => 'Lista de tags',
 	'Core:AttributeTagSet+' => '',
 	'Core:AttributeSet:placeholder' => 'clique para adicionar',
 	'Core:AttributeClassAttCodeSet:ItemLabel:AttributeFromClass' => '%1$s (%2$s)',
 	'Core:AttributeClassAttCodeSet:ItemLabel:AttributeFromOneChildClass' => '%1$s (%2$s de %3$s)',
 	'Core:AttributeClassAttCodeSet:ItemLabel:AttributeFromSeveralChildClasses' => '%1$s (%2$s de classes filhas)',
-
 	'Core:AttributeCaseLog' => 'Log',
 	'Core:AttributeCaseLog+' => '',
-
 	'Core:AttributeMetaEnum' => 'Enum Computado',
 	'Core:AttributeMetaEnum+' => 'Exibir Strings alfanuméricas computadas',
-
 	'Core:AttributeLinkedSetIndirect' => 'Array de objetos (N-N)',
 	'Core:AttributeLinkedSetIndirect+' => 'Qualquer tipo de objetos [subclasse] da mesma classe',
-
 	'Core:AttributeInteger' => 'Inteiro',
 	'Core:AttributeInteger+' => 'Valor numérico (não pode ser negativo)',
-
 	'Core:AttributeDecimal' => 'Decimal',
 	'Core:AttributeDecimal+' => 'Valor decimal (não pode ser negativo)',
-
 	'Core:AttributeBoolean' => 'Booleano',
 	'Core:AttributeBoolean+' => '',
 	'Core:AttributeBoolean/Value:null' => '',
 	'Core:AttributeBoolean/Value:yes' => 'Sim',
 	'Core:AttributeBoolean/Value:no' => 'Não',
-
 	'Core:AttributeArchiveFlag' => 'Flag de arquivamento',
 	'Core:AttributeArchiveFlag/Value:yes' => 'Sim',
 	'Core:AttributeArchiveFlag/Value:yes+' => 'Este objeto é visível apenas no modo de arquivamento',
@@ -82,7 +67,6 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Core:AttributeArchiveFlag/Label+' => '',
 	'Core:AttributeArchiveDate/Label' => 'Data de arquivamento',
 	'Core:AttributeArchiveDate/Label+' => '',
-
 	'Core:AttributeObsolescenceFlag' => 'Flag de obsolescência',
 	'Core:AttributeObsolescenceFlag/Value:yes' => 'Sim',
 	'Core:AttributeObsolescenceFlag/Value:yes+' => 'Este objeto será excluído da análise de impacto e ocultado dos resultados de pesquisa',
@@ -91,54 +75,38 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Core:AttributeObsolescenceFlag/Label+' => 'Calculado dinamicamente com base em outros atributos do objeto',
 	'Core:AttributeObsolescenceDate/Label' => 'Data de obsolescência',
 	'Core:AttributeObsolescenceDate/Label+' => 'Data aproximada em que o objeto foi considerado obsoleto',
-
 	'Core:AttributeString' => 'String',
 	'Core:AttributeString+' => 'Sequência alfanumérica',
-
 	'Core:AttributeClass' => 'Classe',
 	'Core:AttributeClass+' => '',
-
 	'Core:AttributeApplicationLanguage' => 'Idioma do usuário',
 	'Core:AttributeApplicationLanguage+' => 'Idioma e país (por exemplo: EN US)',
-
 	'Core:AttributeFinalClass' => 'Classe (automática)',
 	'Core:AttributeFinalClass+' => 'Classe real do objeto (criada automaticamente pelo sistema)',
-
 	'Core:AttributePassword' => 'Senha',
 	'Core:AttributePassword+' => 'Senha para o dispositivo externo',
-
 	'Core:AttributeEncryptedString' => 'String encriptada',
 	'Core:AttributeEncryptedString+' => 'String encriptada com uma chave local',
 	'Core:AttributeEncryptUnknownLibrary' => 'Biblioteca de criptografia especificada (%1$s) desconhecida',
 	'Core:AttributeEncryptFailedToDecrypt' => '** erro de decriptação **',
-
 	'Core:AttributeText' => 'Texto',
 	'Core:AttributeText+' => 'Cadeia de caracteres Multi-linha',
-
 	'Core:AttributeHTML' => 'HTML',
 	'Core:AttributeHTML+' => 'String HTML',
-
 	'Core:AttributeEmailAddress' => 'Endereço de e-mail',
 	'Core:AttributeEmailAddress+' => '',
-
 	'Core:AttributeIPAddress' => 'Endereço IP',
 	'Core:AttributeIPAddress+' => '',
-
 	'Core:AttributeOQL' => 'OQL',
 	'Core:AttributeOQL+' => 'Expressão Object Query Language (OQL)',
-
 	'Core:AttributeEnum' => 'Enum',
 	'Core:AttributeEnum+' => 'Lista de sequências alfanuméricas pré-definidas',
-
 	'Core:AttributeTemplateString' => 'String do modelo',
 	'Core:AttributeTemplateString+' => 'String de uma linha, contendo espaços reservados para dados do '.ITOP_APPLICATION_SHORT,
-
 	'Core:AttributeTemplateText' => 'Texto do modelo',
 	'Core:AttributeTemplateText+' => 'Texto contendo espaços reservados para dados do '.ITOP_APPLICATION_SHORT,
-
 	'Core:AttributeTemplateHTML' => 'HTML do modelo',
 	'Core:AttributeTemplateHTML+' => 'Código HTML contendo espaços reservados para dados do '.ITOP_APPLICATION_SHORT,
-
 	'Core:AttributeDateTime' => 'Data/hora',
 	'Core:AttributeDateTime+' => 'Data e hora (ano-mês-dia hh:mm:ss)',
 	'Core:AttributeDateTime?SmartSearch' => '
@@ -156,7 +124,6 @@ Operadores:<br/>
 <p>
 Se o tempo for omitido, o padrão é 00:00:00
 </p>',
-
 	'Core:AttributeDate' => 'Data',
 	'Core:AttributeDate+' => 'Data (ano-mês-dia)',
 	'Core:AttributeDate?SmartSearch' => '
@@ -171,43 +138,30 @@ Operadores:<br/>
 	<b>&lt;</b><em>data</em><br/>
 	<b>[</b><em>data</em>,<em>data</em><b>]</b>
 </p>',
-
 	'Core:AttributeDeadline' => 'Prazo determinado',
 	'Core:AttributeDeadline+' => 'Data, apresentada relativamente ao tempo atual',
-
 	'Core:AttributeExternalKey' => 'Chave externa',
 	'Core:AttributeExternalKey+' => 'Chave externa (ou foreign)',
-
 	'Core:AttributeHierarchicalKey' => 'Chave hierárquica',
 	'Core:AttributeHierarchicalKey+' => 'Chave externa (ou foreign key) para o objeto pai',
-
 	'Core:AttributeExternalField' => 'Campo externo',
 	'Core:AttributeExternalField+' => 'Campo mapeado para uma chave externa',
-
 	'Core:AttributeURL' => 'URL',
 	'Core:AttributeURL+' => 'URL absoluto ou relativo como texto',
-
 	'Core:AttributeBlob' => 'Blob',
 	'Core:AttributeBlob+' => 'Qualquer conteúdo binário (documento)',
-
 	'Core:AttributeOneWayPassword' => 'Senha criptografada',
 	'Core:AttributeOneWayPassword+' => 'Uma senha encriptada de uma só via (one-way)',
-
 	'Core:AttributeTable' => 'Tabela',
 	'Core:AttributeTable+' => 'Matriz indexada com duas dimensões',
-
 	'Core:AttributePropertySet' => 'Propriedades',
 	'Core:AttributePropertySet+' => 'Lista de propriedades sem categoria (nome e valor)',
-
 	'Core:AttributeFriendlyName' => 'Nome amigável',
 	'Core:AttributeFriendlyName+' => 'Atributo criado automaticamente; o nome amigável é baseado nos diferentes atributos do objeto',
-
 	'Core:FriendlyName-Label' => 'Nome amigável',
 	'Core:FriendlyName-Description' => '',
-
 	'Core:AttributeTag' => 'Etiquetas',
 	'Core:AttributeTag+' => '',
-	
 	'Core:Context=REST/JSON' => 'REST',
 	'Core:Context=Synchro' => 'Synchro',
 	'Core:Context=Setup' => 'Setup',
@@ -485,6 +439,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:Action' => 'Ação personalizada',
 	'Class:Action+' => 'Ações definidas pelo usuário',
+	'Class:Action/ComplementaryName' => '%1$s: %2$s~~',
 	'Class:Action/Attribute:name' => 'Nome',
 	'Class:Action/Attribute:name+' => '',
 	'Class:Action/Attribute:description' => 'Descrição',
@@ -552,6 +507,22 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:ActionEmail/Attribute:importance/Value:normal+' => '',
 	'Class:ActionEmail/Attribute:importance/Value:high' => 'Alta',
 	'Class:ActionEmail/Attribute:importance/Value:high+' => '',
+	'Class:ActionEmail/Attribute:language' => 'Language~~',
+	'Class:ActionEmail/Attribute:language+' => 'Language to use for placeholders ($xxx$) inside the message (state, importance, priority, etc)~~',
+	'Class:ActionEmail/Attribute:html_template' => 'HTML template~~',
+	'Class:ActionEmail/Attribute:html_template+' => 'Optional HTML template wrapping around the content of the \'Body\' attribute below, useful for tailored email layouts (in the template, content of the \'Body\' attribute will replace the $content$ placeholder)~~',
+	'Class:ActionEmail/Attribute:ignore_notify' => 'Ignore the Notify flag~~',
+	'Class:ActionEmail/Attribute:ignore_notify+' => 'If set to \'Yes\' the \'Notify\' flag on Contacts has no effect.~~',
+	'Class:ActionEmail/Attribute:ignore_notify/Value:no' => 'No~~',
+	'Class:ActionEmail/Attribute:ignore_notify/Value:yes' => 'Yes~~',
+	'ActionEmail:main' => 'Message~~',
+	'ActionEmail:trigger' => 'Triggers~~',
+	'ActionEmail:recipients' => 'Contacts~~',
+	'ActionEmail:preview_tab' => 'Preview~~',
+	'ActionEmail:preview_tab+' => 'Preview of the eMail template~~',
+	'ActionEmail:preview_warning' => 'The actual eMail may look different in the eMail client than this preview in your browser.~~',
+	'ActionEmail:preview_more_info' => 'For more information about the CSS features supported by the different eMail clients, refer to %1$s~~',
+	'ActionEmail:content_placeholder_missing' => 'The placeholder "%1$s" was not found in the HTML template. The content of the field "%2$s" will not be included in the generated emails.~~',
 ));
 
 //
@@ -561,6 +532,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:Trigger' => 'Gatilho',
 	'Class:Trigger+' => 'Manipulador de eventos personalizado',
+	'Class:Trigger/ComplementaryName' => '%1$s, %2$s~~',
 	'Class:Trigger/Attribute:description' => 'Descrição',
 	'Class:Trigger/Attribute:description+' => 'Uma descrição curta',
 	'Class:Trigger/Attribute:action_list' => 'Ações desencadeadas',
@@ -569,6 +541,8 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:Trigger/Attribute:finalclass+' => '',
 	'Class:Trigger/Attribute:context' => 'Contexto',
 	'Class:Trigger/Attribute:context+' => 'Contexto para permitir o acionamento do gatilho',
+	'Class:Trigger/Attribute:complement' => 'Additional information~~',
+	'Class:Trigger/Attribute:complement+' => 'Further information as provided in english, by this trigger~~',
 ));
 
 //
@@ -664,6 +638,17 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:TriggerOnObjectMention/Attribute:mentioned_filter+' => 'Limita a lista de objetos mencionados que ativarão o gatilho. Se vazio, qualquer objeto mencionado (de qualquer classe) irá ativá-lo',
 ));
 
+//
+// Class: TriggerOnAttributeBlobDownload
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:TriggerOnAttributeBlobDownload' => 'Trigger (on object\'s document download)~~',
+	'Class:TriggerOnAttributeBlobDownload+' => 'Trigger on object\'s document field download of [a child class of] the given class~~',
+	'Class:TriggerOnAttributeBlobDownload/Attribute:target_attcodes' => 'Target fields~~',
+	'Class:TriggerOnAttributeBlobDownload/Attribute:target_attcodes+' => '~~',
+));
+
 //
 // Class: TriggerOnThresholdReached
 //
@@ -700,11 +685,13 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 // Synchro Data Source
 //
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:SynchroDataSource' => 'Fonte de Sincronização de Dados',
 	'Class:SynchroDataSource/Attribute:name' => 'Nome',
 	'Class:SynchroDataSource/Attribute:name+' => '',
 	'Class:SynchroDataSource/Attribute:description' => 'Descrição',
 	'Class:SynchroDataSource/Attribute:status' => 'Status',
 	'Class:SynchroDataSource/Attribute:scope_class' => 'Classe alvo',
+	'Class:SynchroDataSource/Attribute:scope_class+' => 'A Synchro Data Source can only populate a single '.ITOP_APPLICATION_SHORT.' class~~',
 	'Class:SynchroDataSource/Attribute:user_id' => 'Usuário',
 	'Class:SynchroDataSource/Attribute:notify_contact_id' => 'Contato para notificação',
 	'Class:SynchroDataSource/Attribute:notify_contact_id+' => 'Contato para notificar em caso de erro',
@@ -713,6 +700,8 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:SynchroDataSource/Attribute:url_application' => 'Hiperlink de aplicativo',
 	'Class:SynchroDataSource/Attribute:url_application+' => 'Hiperlink para o objeto na aplicação externa com a qual o '.ITOP_APPLICATION_SHORT.' é sincronizado (se aplicável). As substituições possíveis: $this->attribute$ e $replica->primary_key$',
 	'Class:SynchroDataSource/Attribute:reconciliation_policy' => 'Política de reconciliação',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy+' => '"Use the attributes": '.ITOP_APPLICATION_SHORT.' object matches replica values for each Synchro attributes flagged for Reconciliation.
+"Use primary_key": the column primary_key of the replica is expected to contain the identifier of the '.ITOP_APPLICATION_SHORT.' object~~',
 	'Class:SynchroDataSource/Attribute:full_load_periodicity' => 'Intervalo de obsolescência programada',
 	'Class:SynchroDataSource/Attribute:full_load_periodicity+' => 'Um objeto é considerado obsoleto se não aparecer nos dados além desse tempo',
 	'Class:SynchroDataSource/Attribute:action_on_zero' => 'Ação sobre zero',
@@ -732,6 +721,33 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:SynchroDataSource/Attribute:delete_policy_retention+' => 'Quanto tempo um objeto obsoleto é mantido antes de ser excluído',
 	'Class:SynchroDataSource/Attribute:database_table_name' => 'Tabela do banco de dados',
 	'Class:SynchroDataSource/Attribute:database_table_name+' => 'Nome da tabela para armazenar os dados de sincronização. Se for deixado vazio, um nome padrão será computado',
+	'Class:SynchroDataSource/Attribute:status/Value:implementation' => 'Em homologação',
+	'Class:SynchroDataSource/Attribute:status/Value:obsolete' => 'Obsoleto',
+	'Class:SynchroDataSource/Attribute:status/Value:production' => 'Em produção',
+	'Class:SynchroDataSource/Attribute:scope_restriction' => 'Restrição de escopo',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_attributes' => 'Use os atributos',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_primary_key' => 'Use o campo primary_key',
+	'Class:SynchroDataSource/Attribute:action_on_zero/Value:create' => 'Criar',
+	'Class:SynchroDataSource/Attribute:action_on_zero/Value:error' => 'Erro',
+	'Class:SynchroDataSource/Attribute:action_on_one/Value:error' => 'Erro',
+	'Class:SynchroDataSource/Attribute:action_on_one/Value:update' => 'Atualizar',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:create' => 'Criar',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:error' => 'Erro',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:take_first' => 'Pegue o primeiro (ao acaso?)',
+	'Class:SynchroDataSource/Attribute:delete_policy' => 'Política de exclusão',
+	'Class:SynchroDataSource/Attribute:delete_policy+' => 'What to do when a replica becomes obsolete:
+"Ignore": do nothing, the associated object remains as is in iTop.
+"Delete": Delete the associated object in iTop (and the replica in the data table).
+"Update": Update the associated object as specified by the Update rules (see below).
+"Update then Delete": apply the "Update rules". When Retention Duration expires, execute a "Delete" ~~',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:delete' => 'Excluir',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:ignore' => 'Ignorar',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:update' => 'Atualizar',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:update_then_delete' => 'Atualizar então Excluir',
+	'Class:SynchroDataSource/Attribute:attribute_list' => 'Exibir atributos',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:administrators' => 'Somente administradores',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:everybody' => 'Todos os usuários',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:nobody' => 'Ninguém',
 	'SynchroDataSource:Description' => 'Descrição',
 	'SynchroDataSource:Reconciliation' => 'Pesquisa &amp; reconciliação',
 	'SynchroDataSource:Deletion' => 'Regras de exclusão',
@@ -756,8 +772,10 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Core:Synchro:NeverRun' => 'Esta sincronização nunca foi executada. Sem registro ainda',
 	'Core:Synchro:SynchroEndedOn_Date' => 'A última sincronização terminou em %1$s',
 	'Core:Synchro:SynchroRunningStartedOn_Date' => 'A sincronização iniciou em %1$s ainda está em execução...',
-	'Menu:DataSources' => 'Fontes de Sincronização de Dados', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:DataSources+' => 'Lista de Fontes de Sincronização de Dados', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataSources' => 'Fontes de Sincronização de Dados',
+    // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataSources+' => 'Lista de Fontes de Sincronização de Dados',
+    // Duplicated into itop-welcome-itil (will be removed from here...)
 	'Core:Synchro:label_repl_ignored' => 'Ignoradas (%1$s)',
 	'Core:Synchro:label_repl_disappeared' => 'Desaparecido (%1$s)',
 	'Core:Synchro:label_repl_existing' => 'Saindo (%1$s)',
@@ -821,29 +839,6 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:CMDBChangeOpSetAttributeEncrypted/Attribute:prevstring' => 'Valor anterior',
 	'Class:CMDBChangeOpSetAttributeCaseLog' => 'Case Log~~',
 	'Class:CMDBChangeOpSetAttributeCaseLog/Attribute:lastentry' => 'Última entrada',
-	'Class:SynchroDataSource' => 'Fonte de Sincronização de Dados',
-	'Class:SynchroDataSource/Attribute:status/Value:implementation' => 'Em homologação',
-	'Class:SynchroDataSource/Attribute:status/Value:obsolete' => 'Obsoleto',
-	'Class:SynchroDataSource/Attribute:status/Value:production' => 'Em produção',
-	'Class:SynchroDataSource/Attribute:scope_restriction' => 'Restrição de escopo',
-	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_attributes' => 'Use os atributos',
-	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_primary_key' => 'Use o campo primary_key',
-	'Class:SynchroDataSource/Attribute:action_on_zero/Value:create' => 'Criar',
-	'Class:SynchroDataSource/Attribute:action_on_zero/Value:error' => 'Erro',
-	'Class:SynchroDataSource/Attribute:action_on_one/Value:error' => 'Erro',
-	'Class:SynchroDataSource/Attribute:action_on_one/Value:update' => 'Atualizar',
-	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:create' => 'Criar',
-	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:error' => 'Erro',
-	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:take_first' => 'Pegue o primeiro (ao acaso?)',
-	'Class:SynchroDataSource/Attribute:delete_policy' => 'Política de exclusão',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:delete' => 'Excluir',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:ignore' => 'Ignorar',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:update' => 'Atualizar',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:update_then_delete' => 'Atualizar então Excluir',
-	'Class:SynchroDataSource/Attribute:attribute_list' => 'Exibir atributos',
-	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:administrators' => 'Somente administradores',
-	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:everybody' => 'Todos os usuários',
-	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:nobody' => 'Ninguém',
 	'Class:SynchroAttribute' => 'Atributo de sincronização',
 	'Class:SynchroAttribute/Attribute:sync_source_id' => 'Fonte de dados',
 	'Class:SynchroAttribute/Attribute:attcode' => 'Código do atributo',
@@ -904,19 +899,16 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:appUserPreferences/Attribute:preferences' => 'Preferências',
 	'Core:ExecProcess:Code1' => 'Comando incorreto ou comando terminou com erros (por exemplo, nome do script errado)',
 	'Core:ExecProcess:Code255' => 'Erro PHP (parsing, ou runtime)',
-
-	// Attribute Duration
+    // Attribute Duration
 	'Core:Duration_Seconds' => '%1$ds',
 	'Core:Duration_Minutes_Seconds' => '%1$dmin %2$ds',
 	'Core:Duration_Hours_Minutes_Seconds' => '%1$dh %2$dmin %3$ds',
 	'Core:Duration_Days_Hours_Minutes_Seconds' => '%1$sd %2$dh %3$dmin %4$ds',
-
-	// Explain working time computing
+    // Explain working time computing
 	'Core:ExplainWTC:ElapsedTime' => 'Tempo decorrido (armazenado como \\"%1$s\\")',
 	'Core:ExplainWTC:StopWatch-TimeSpent' => 'Tempo gasto para \\"%1$s\\"',
 	'Core:ExplainWTC:StopWatch-Deadline' => 'Prazo para \\"%1$s\\" em %2$d%%',
-
-	// Bulk export
+    // Bulk export
 	'Core:BulkExport:MissingParameter_Param' => 'Parâmetro ausente \\"%1$s\\"',
 	'Core:BulkExport:InvalidParameter_Query' => 'Valor inválido para o parâmetro \\"query\\". Não há nenhum entrada no livro de consultas correspondente ao ID: \\"%1$s\\"',
 	'Core:BulkExport:ExportFormatPrompt' => 'Formato de exportação:',
@@ -968,20 +960,34 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Core:BulkExport:DateTimeFormatDefault_Example' => 'Formato padrão (%1$s), por exemplo: %2$s',
 	'Core:BulkExport:DateTimeFormatCustom_Format' => 'Formato personalizado: %1$s',
 	'Core:BulkExport:PDF:PageNumber' => 'Página %1$s',
-	'Core:DateTime:Placeholder_d' => 'DD', // Day of the month: 2 digits (with leading zero)
-	'Core:DateTime:Placeholder_j' => 'D', // Day of the month: 1 or 2 digits (without leading zero)
-	'Core:DateTime:Placeholder_m' => 'MM', // Month on 2 digits i.e. 01-12
-	'Core:DateTime:Placeholder_n' => 'M', // Month on 1 or 2 digits 1-12
-	'Core:DateTime:Placeholder_Y' => 'YYYY', // Year on 4 digits
-	'Core:DateTime:Placeholder_y' => 'YY', // Year on 2 digits
-	'Core:DateTime:Placeholder_H' => 'hh', // Hour 00..23
-	'Core:DateTime:Placeholder_h' => 'h', // Hour 01..12
-	'Core:DateTime:Placeholder_G' => 'hh', // Hour 0..23
-	'Core:DateTime:Placeholder_g' => 'h', // Hour 1..12
-	'Core:DateTime:Placeholder_a' => 'am/pm', // am/pm (lowercase)
-	'Core:DateTime:Placeholder_A' => 'AM/PM', // AM/PM (uppercase)
-	'Core:DateTime:Placeholder_i' => 'mm', // minutes, 2 digits: 00..59
-	'Core:DateTime:Placeholder_s' => 'ss', // seconds, 2 digits 00..59
+	'Core:DateTime:Placeholder_d' => 'DD',
+    // Day of the month: 2 digits (with leading zero)
+	'Core:DateTime:Placeholder_j' => 'D',
+    // Day of the month: 1 or 2 digits (without leading zero)
+	'Core:DateTime:Placeholder_m' => 'MM',
+    // Month on 2 digits i.e. 01-12
+	'Core:DateTime:Placeholder_n' => 'M',
+    // Month on 1 or 2 digits 1-12
+	'Core:DateTime:Placeholder_Y' => 'YYYY',
+    // Year on 4 digits
+	'Core:DateTime:Placeholder_y' => 'YY',
+    // Year on 2 digits
+	'Core:DateTime:Placeholder_H' => 'hh',
+    // Hour 00..23
+	'Core:DateTime:Placeholder_h' => 'h',
+    // Hour 01..12
+	'Core:DateTime:Placeholder_G' => 'hh',
+    // Hour 0..23
+	'Core:DateTime:Placeholder_g' => 'h',
+    // Hour 1..12
+	'Core:DateTime:Placeholder_a' => 'am/pm',
+    // am/pm (lowercase)
+	'Core:DateTime:Placeholder_A' => 'AM/PM',
+    // AM/PM (uppercase)
+	'Core:DateTime:Placeholder_i' => 'mm',
+    // minutes, 2 digits: 00..59
+	'Core:DateTime:Placeholder_s' => 'ss',
+    // seconds, 2 digits 00..59
 	'Core:Validator:Default' => 'Formato inválido',
 	'Core:Validator:Mandatory' => 'Por favor, preencha este campo',
 	'Core:Validator:MustBeInteger' => 'Deve ser um número inteiro',
@@ -994,7 +1000,6 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:TagSetFieldData' => '%2$s para classe %1$s',
 	'Class:TagSetFieldData+' => '',
-
 	'Class:TagSetFieldData/Attribute:code' => 'Código',
 	'Class:TagSetFieldData/Attribute:code+' => 'Código interno. Deve conter pelo menos 3 caracteres alfanuméricos',
 	'Class:TagSetFieldData/Attribute:label' => 'Rótulo',
@@ -1004,7 +1009,6 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:TagSetFieldData/Attribute:finalclass' => 'Classe da etiqueta',
 	'Class:TagSetFieldData/Attribute:obj_class' => 'Classe de objeto',
 	'Class:TagSetFieldData/Attribute:obj_attcode' => 'Código de atributo',
-
 	'Core:TagSetFieldData:ErrorDeleteUsedTag' => 'Tags em uso não podem ser deletadas',
 	'Core:TagSetFieldData:ErrorDuplicateTagCodeOrLabel' => 'O código de tag ou rótulo devem ser únicos',
 	'Core:TagSetFieldData:ErrorTagCodeSyntax' => 'O código de tag deve conter entre 3 e %1$d caracteres alfanuméricos',
@@ -1091,8 +1095,8 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:AsyncTask/Attribute:last_error+' => '',
 	'Class:AsyncTask/Attribute:last_attempt' => 'Última tentativa',
 	'Class:AsyncTask/Attribute:last_attempt+' => '',
-    'Class:AsyncTask:InvalidConfig_Class_Keys' => 'Formato inválido para a configuração de "async_task_retries[%1$s]". Esperando um array com as seguintes chaves: %2$s',
-    'Class:AsyncTask:InvalidConfig_Class_InvalidKey_Keys' => 'Formato inválido para a configuração de "async_task_retries[%1$s]": chave inesperada "%2$s". Esperando somente as seguintes chaves: %3$s',
+	'Class:AsyncTask:InvalidConfig_Class_Keys' => 'Formato inválido para a configuração de "async_task_retries[%1$s]". Esperando um array com as seguintes chaves: %2$s',
+	'Class:AsyncTask:InvalidConfig_Class_InvalidKey_Keys' => 'Formato inválido para a configuração de "async_task_retries[%1$s]": chave inesperada "%2$s". Esperando somente as seguintes chaves: %3$s',
 ));
 
 //
@@ -1130,11 +1134,10 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:ResourceSystemMenu' => 'Menu de Recursos do Sistema',
 	'Class:ResourceSystemMenu+' => '',
 ));
-
-
-
-
 // Additional language entries not present in English dict
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
- 'INTERNAL:JQuery-DatePicker:LangCode' => 'pt-BR',
+	'INTERNAL:JQuery-DatePicker:LangCode' => 'pt-BR'
 ));
+
+
+
diff --git a/dictionaries/pt_br.dictionary.itop.ui.php b/dictionaries/pt_br.dictionary.itop.ui.php
index 1178c28bb5..3d0ba98935 100644
--- a/dictionaries/pt_br.dictionary.itop.ui.php
+++ b/dictionaries/pt_br.dictionary.itop.ui.php
@@ -25,6 +25,12 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:AuditCategory/Attribute:definition_set+' => 'Expressão OQL que define o conjunto de objetos para auditoria',
 	'Class:AuditCategory/Attribute:rules_list' => 'Regras de Auditoria',
 	'Class:AuditCategory/Attribute:rules_list+' => 'Regra de auditoria para essa categoria',
+	'Class:AuditCategory/Attribute:ok_error_tolerance' => 'Warning threshold~~',
+	'Class:AuditCategory/Attribute:ok_error_tolerance+' => 'Percentage of invalid objects below which the result is a warning (orange)~~',
+	'Class:AuditCategory/Attribute:warning_error_tolerance' => 'Error threshold~~',
+	'Class:AuditCategory/Attribute:warning_error_tolerance+' => 'Percentage of invalid objects below which the result is in error (red)~~',
+	'Class:AuditCategory/Attribute:domains_list' => 'Domains~~',
+	'Class:AuditCategory/Attribute:domains_list+' => 'Domains which includes this category~~',
 ));
 
 //
@@ -52,7 +58,42 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:AuditRule/Attribute:category_id' => 'Categoria',
 	'Class:AuditRule/Attribute:category_id+' => 'A categoria para esta regra',
 	'Class:AuditRule/Attribute:category_name' => 'Categoria',
-	'Class:AuditRule/Attribute:category_name+' => 'Nome da categoria para essa regra',
+	'Class:AuditRule/Attribute:category_name+' => 'Nome da categoria para essa regra'
+));
+
+//
+// Class: AuditDomain
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:AuditDomain' => 'Audit Domain~~',
+	'Class:AuditDomain+' => 'Audit domains allow to group the audit categories.
+Domain usually correspond to who is responsible for checking and fixing errors~~',
+	'Class:AuditDomain/Attribute:name' => 'Name~~',
+	'Class:AuditDomain/Attribute:name+' => 'Its a segmentation of the Audit by who is in charge of fixing it or just interested~~',
+	'Class:AuditDomain/Attribute:description' => 'Description~~',
+	'Class:AuditDomain/Attribute:description+' => '~~',
+	'Class:AuditDomain/Attribute:icon' => 'Icon~~',
+	'Class:AuditDomain/Attribute:icon+' => '~~',
+	'Class:AuditDomain/Attribute:categories_list' => 'Categories~~',
+	'Class:AuditDomain/Attribute:categories_list+' => 'Related audit categories. When running the audit on a domain, all related audit categories are checked and only those.~~',
+));
+
+//
+// Class: lnkAuditCategoryToAuditDomain
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:lnkAuditCategoryToAuditDomain' => 'Link AuditCategory / AuditDomain~~',
+	'Class:lnkAuditCategoryToAuditDomain+' => '~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:category_id' => 'Category~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:category_id+' => 'Audit Category~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:category_name' => 'Category name~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:category_name+' => 'Audit category name~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:domain_id' => 'Domain~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:domain_id+' => 'Audit domain~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:domain_name' => 'Domain name~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:domain_name+' => 'Audit domain name~~',
 ));
 
 //
@@ -70,6 +111,16 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:Query/Attribute:is_template+' => 'Utilizável como origem para o Destinatário OQL em Notificações',
 	'Class:Query/Attribute:is_template/Value:yes' => 'Sim',
 	'Class:Query/Attribute:is_template/Value:no' => 'Não',
+	'Class:Query/Attribute:export_count' => 'Export counter~~',
+	'Class:Query/Attribute:export_count+' => 'Counter reflecting the number of time this query has been executed~~',
+	'Class:Query/Attribute:export_last_date' => 'Last export~~',
+	'Class:Query/Attribute:export_last_date+' => 'Date and time of the last export execution~~',
+	'Class:Query/Attribute:export_last_user_id' => 'User~~',
+	'Class:Query/Attribute:export_last_user_id+' => 'The user who executed the last export~~',
+	'Class:Query/Attribute:export_last_user_contact' => 'Contact~~',
+	'Class:Query/Attribute:export_last_user_contact+' => 'The contact who executed the last export~~',
+	'Query:baseinfo' => 'General information~~',
+	'Query:exportInfo' => 'Export information~~',
 	'Class:QueryOQL/Attribute:fields' => 'Campos',
 	'Class:QueryOQL/Attribute:fields+' => 'Lista separada por vírgulas de atributos (ou alias.attribute) para exportar',
 	'Class:QueryOQL' => 'Consulta OQL',
@@ -118,7 +169,6 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:User/Attribute:status+' => 'Se a conta de usuário está habilitada ou desabilitada',
 	'Class:User/Attribute:status/Value:enabled' => 'Ativa',
 	'Class:User/Attribute:status/Value:disabled' => 'Desativada',
-
 	'Class:User/Error:LoginMustBeUnique' => 'Login é único - "%1s" já está ativo',
 	'Class:User/Error:AtLeastOneProfileIsNeeded' => 'Pelo menos um perfil deve ser atribuído a esse usuário',
 	'Class:User/Error:ProfileNotAllowed' => 'O perfil "%1$s" não pode ser adicionado, ele negará o acesso ao backoffice',
@@ -327,6 +377,29 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Expression:Unit:Short:YEAR' => 'a',
 ));
 
+//
+// Duplicated into itop-welcome-itil ( will be removed from here...)
+//
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Menu:WelcomeMenu' => 'Página inicial do '.ITOP_APPLICATION_SHORT,
+	'Menu:WelcomeMenu+' => 'Bem-vindo ao '.ITOP_APPLICATION_SHORT,
+	'Menu:WelcomeMenuPage' => 'Página inicial do '.ITOP_APPLICATION_SHORT,
+	'Menu:WelcomeMenuPage+' => 'Bem-vindo ao '.ITOP_APPLICATION_SHORT,
+	'Menu:AdminTools' => 'Ferramentas Administrativas',
+	'Menu:AdminTools+' => 'Ferramentas Administrativas',
+	'Menu:AdminTools?' => 'Ferramentas acessíveis apenas para usuários com perfil de administrador',
+	'Menu:CSVImportMenu' => 'Importar CSV',
+	'Menu:CSVImportMenu+' => 'Criação ou atualização em massa',
+	'Menu:DataModelMenu' => 'Modelo de Dados',
+	'Menu:DataModelMenu+' => 'Visão geral do Modelo de Dados',
+	'Menu:ExportMenu' => 'Exportar Consulta',
+	'Menu:ExportMenu+' => 'Exportar o resultado de qualquer consulta em HTML, CSV ou XML',
+	'Menu:NotificationsMenu' => 'Notificações',
+	'Menu:NotificationsMenu+' => 'Configuração de Notificações',
+	'Menu:MyShortcuts' => 'Meus atalhos',
+	'Menu:DataAdministration' => 'Administração de Dados',
+	'Menu:DataAdministration+' => 'Administração de Dados',
+));
 
 //
 // String from the User Interface: menu, messages, buttons, etc...
@@ -336,12 +409,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'BooleanLabel:yes' => 'Sim',
 	'BooleanLabel:no' => 'Não',
 	'UI:Login:Title' => 'Login no '.ITOP_APPLICATION_SHORT,
-	'Menu:WelcomeMenu' => 'Página inicial do '.ITOP_APPLICATION_SHORT, // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:WelcomeMenu+' => 'Bem-vindo ao '.ITOP_APPLICATION_SHORT, // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:WelcomeMenuPage' => 'Bem-vindo ao '.ITOP_APPLICATION_SHORT, // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:WelcomeMenuPage+' => 'Bem-vindo ao '.ITOP_APPLICATION_SHORT, // Duplicated into itop-welcome-itil (will be removed from here...)
 	'UI:WelcomeMenu:Title' => 'Bem-vindo ao '.ITOP_APPLICATION_SHORT,
-
 	'UI:WelcomeMenu:LeftBlock' => '<p>O '.ITOP_APPLICATION_SHORT.' é um Portal Operacional de TI de código aberto completo.</p>
 <ul>Ele inclui:
 <li>Um CMDB (Configuration Management Database) completo para documentar e gerenciar o inventário de TI.</li>
@@ -352,7 +420,6 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 <li>Painéis para obter rapidamente uma visão geral de sua TI.</li>
 </ul>
 <p>Todos os módulos podem ser configurados, passo a passo, independentemente uns dos outros.</p>',
-
 	'UI:WelcomeMenu:RightBlock' => '<p>O '.ITOP_APPLICATION_SHORT.' é orientado para o provedor de serviços, ele permite que os especialistas de TI gerenciem facilmente vários clientes ou organizações.
 <ul>O '.ITOP_APPLICATION_SHORT.' oferece um conjunto rico em recursos de processos de negócios que:
 <li>Melhora a eficácia do gerenciamento de TI</li> 
@@ -368,7 +435,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 <li>Gerenciar o ativo mais importante de sua TI: Documentação.</li>
 </ul>
 </p>',
-	'UI:WelcomeMenu:Text'=> '<div>Parabéns, você desembarcou no '.ITOP_APPLICATION.' '.ITOP_VERSION_NAME.'!</div>
+	'UI:WelcomeMenu:Text' => '<div>Parabéns, você desembarcou no '.ITOP_APPLICATION.' '.ITOP_VERSION_NAME.'!</div>
 
 <div>Esta versão apresenta um novo design de backoffice moderno e acessível.</div>
 
@@ -389,6 +456,7 @@ Esperamos que você goste desta versão tanto quanto gostamos de imaginá-la e c
 	'UI:Button:GlobalSearch' => 'Pesquisar',
 	'UI:Button:Search' => ' Pesquisar ',
 	'UI:Button:Clear' => ' Limpar ',
+	'UI:Button:Confirm' => ' Confirm ~~',
 	'UI:Button:SearchInHierarchy' => 'Pesquisar na hierarquia',
 	'UI:Button:Query' => ' Consultar ',
 	'UI:Button:Ok' => 'Ok',
@@ -429,7 +497,6 @@ Esperamos que você goste desta versão tanto quanto gostamos de imaginá-la e c
 	'UI:UserPref:DoNotShowAgain' => 'Não exibir novamente',
 	'UI:InputFile:NoFileSelected' => 'Nenhum arquivo selecionado',
 	'UI:InputFile:SelectFile' => 'Selecione um arquivo',
-
 	'UI:SearchToggle' => 'Pesquisar',
 	'UI:ClickToCreateNew' => 'Criar um(a) %1$s',
 	'UI:SearchFor_Class' => 'Pesquisar por objeto(s) de %1$s',
@@ -449,7 +516,6 @@ Esperamos que você goste desta versão tanto quanto gostamos de imaginá-la e c
 	'UI:Error:CannotWriteToTmp_Dir' => 'Não foi possível gravar o arquivo temporário para o disco. upload_tmp_dir = "%1$s"',
 	'UI:Error:UploadStoppedByExtension_FileName' => 'Upload parou por extensão. (Nome do arquivo original = "%1$s")',
 	'UI:Error:UploadFailedUnknownCause_Code' => 'Arquivo carregado falhou, causa desconhecida. (Código do erro = "%1$s")',
-
 	'UI:Error:1ParametersMissing' => 'Erro: o parâmetro a seguir deve ser especificado para esta operação: %1$s',
 	'UI:Error:2ParametersMissing' => 'Erro: os seguintes parâmetros devem ser especificados para esta operação: %1$s e %2$s',
 	'UI:Error:3ParametersMissing' => 'Erro: os seguintes parâmetros devem ser especificados para esta operação: %1$s, %2$s e %3$s',
@@ -471,9 +537,7 @@ Esperamos que você goste desta versão tanto quanto gostamos de imaginá-la e c
 	'UI:Error:MaintenanceMode' => 'A aplicação está em manutenção',
 	'UI:Error:MaintenanceTitle' => 'Manutenção',
 	'UI:Error:InvalidToken' => 'Erro: A operação solicitada já foi executada (token CSRF não encontrado)',
-
 	'UI:Error:SMTP:UnknownVendor' => 'OAuth SMTP provider %1$s does not exist  (email_transport_smtp.oauth.provider)~~',
-
 	'UI:GroupBy:Count' => 'Número',
 	'UI:GroupBy:Count+' => 'Número de elementos',
 	'UI:CountOfObjects' => '%1$d objeto(s) correspondem aos critérios',
@@ -502,6 +566,7 @@ Esperamos que você goste desta versão tanto quanto gostamos de imaginá-la e c
 	'UI:Menu:OtherActions' => 'Outras ações',
 	'UI:Menu:Transitions' => 'Transições',
 	'UI:Menu:OtherTransitions' => 'Outras Transições',
+	'UI:Menu:View' => 'View this object~~',
 	'UI:Menu:New' => 'Novo...',
 	'UI:Menu:Add' => 'Adicionar...',
 	'UI:Menu:Manage' => 'Gerenciar...',
@@ -510,6 +575,9 @@ Esperamos que você goste desta versão tanto quanto gostamos de imaginá-la e c
 	'UI:Menu:Modify' => 'Editar...',
 	'UI:Menu:Delete' => 'Excluir...',
 	'UI:Menu:BulkDelete' => 'Exclução em massa...',
+	'UI:Menu:BulkDelete_Class' => 'Delete %1$s objects...~~',
+	'UI:Menu:BulkDelete_Link' => 'Delete %1$s...~~',
+	'UI:Menu:BulkDelete_Remote' => 'Delete %1$s...~~',
 	'UI:UndefinedObject' => '(n/a)',
 	'UI:Document:OpenInNewWindow:Download' => 'Abrir em uma nova janela: %1$s, Download: %2$s',
 	'UI:SplitDateTime-Date' => 'data',
@@ -542,61 +610,59 @@ Esperamos que você goste desta versão tanto quanto gostamos de imaginá-la e c
 	'UI:Login:ResetPassword' => 'Enviar agora',
 	'UI:Login:ResetPwdFailed' => 'Falha ao enviar e-mail: %1$s',
 	'UI:Login:SeparatorOr' => 'Ou',
-
 	'UI:ResetPwd-Error-WrongLogin' => '\'%1$s\' não é um login válido',
 	'UI:ResetPwd-Error-NotPossible' => 'Não é permitida alteração de senha de contas externas',
 	'UI:ResetPwd-Error-FixedPwd' => 'A conta não permite alteração de senha',
 	'UI:ResetPwd-Error-NoContact' => 'A conta não está associada a uma pessoa',
-	'UI:ResetPwd-Error-NoEmailAtt' => 'A conta não está associada a uma pessoa que contém um endereço de e-mail no '.ITOP_APPLICATION_SHORT.'. Por favor, contate o administrador',
+	'UI:ResetPwd-Error-NoEmailAtt' => 'A conta não está associada a uma pessoa que contém um endereço de e-mail no '.ITOP_APPLICATION_SHORT.'.Por favor, contate o administrador',
 	'UI:ResetPwd-Error-NoEmail' => 'A conta não contém um endereço de e-mail. Por favor, contate o administrador',
 	'UI:ResetPwd-Error-Send' => 'Houve um problema técnico de transporte de e-mail. Por favor, contate o administrador',
 	'UI:ResetPwd-EmailSent' => 'Verifique sua caixa de e-mail e siga as instruções. Se você não receber nenhum e-mail, verifique a caixa de SPAM e o login que você digitou',
 	'UI:ResetPwd-EmailSubject' => 'Alterar a senha',
 	'UI:ResetPwd-EmailBody' => '<body><p>Você solicitou a alteração da senha do '.ITOP_APPLICATION_SHORT.'.</p><p>Por favor, siga este link (passo simples) para <a href="%1$s">digitar a nova senha</a></p>.',
-
 	'UI:ResetPwd-Title' => 'Alterar senha',
 	'UI:ResetPwd-Error-InvalidToken' => 'Desculpe, a senha já foi alterada, ou você deve ter recebido múltiplos e-mails. Por favor, certifique-se que você acessou o link fornecido no último e-mail recebido',
 	'UI:ResetPwd-Error-EnterPassword' => 'Digite a nova senha para a conta \'%1$s\'',
 	'UI:ResetPwd-Ready' => 'A senha foi alterada com sucesso',
 	'UI:ResetPwd-Login' => 'Clique para entrar...',
-
-	'UI:Login:About'                               => '',
-	'UI:Login:ChangeYourPassword'                  => 'Alterar sua senha',
-	'UI:Login:OldPasswordPrompt'                   => 'Senha antiga',
-	'UI:Login:NewPasswordPrompt'                   => 'Nova senha',
-	'UI:Login:RetypeNewPasswordPrompt'             => 'Repetir nova senha',
-	'UI:Login:IncorrectOldPassword'                => 'Erro: senha antiga incorreta',
-	'UI:LogOffMenu'                                => 'Sair',
-	'UI:LogOff:ThankYou'                           => 'Obrigado por usar o sistema',
-	'UI:LogOff:ClickHereToLoginAgain'              => 'Clique aqui para entrar novamente...',
-	'UI:ChangePwdMenu'                             => 'Alterar senha...',
-	'UI:Login:PasswordChanged'                     => 'Senha alterada com sucesso',
-	'UI:AccessRO-All'                              => 'Somente-leitura',
-	'UI:AccessRO-Users'                            => ITOP_APPLICATION.' é somente leitura para usuários finais',
-	'UI:ApplicationEnvironment'                    => 'Ambiente da aplicação: %1$s',
-	'UI:Login:RetypePwdDoesNotMatch'               => '"Nova senha" e "Repetir nova senha" são diferentes. Tente novamente!',
-	'UI:Button:Login'                              => 'Login',
-	'UI:Login:Error:AccessRestricted'              => 'Acesso restrito. Por favor, contacte o administrador',
-	'UI:Login:Error:AccessAdmin'                   => 'Acesso restrito somente para usuários com privilégios administrativos. Por favor, contacte o administrador',
-	'UI:Login:Error:WrongOrganizationName'         => 'Organização não encontrada',
+	'UI:Login:About' => '',
+	'UI:Login:ChangeYourPassword' => 'Alterar sua senha',
+	'UI:Login:OldPasswordPrompt' => 'Senha antiga',
+	'UI:Login:NewPasswordPrompt' => 'Nova senha',
+	'UI:Login:RetypeNewPasswordPrompt' => 'Repetir nova senha',
+	'UI:Login:IncorrectOldPassword' => 'Erro: senha antiga incorreta',
+	'UI:LogOffMenu' => 'Sair',
+	'UI:LogOff:ThankYou' => 'Obrigado por usar o sistema',
+	'UI:LogOff:ClickHereToLoginAgain' => 'Clique aqui para entrar novamente...',
+	'UI:ChangePwdMenu' => 'Alterar senha...',
+	'UI:Login:PasswordChanged' => 'Senha alterada com sucesso',
+	'UI:Login:PasswordNotChanged' => 'Error: Password is the same!~~',
+	'UI:AccessRO-All' => 'Somente-leitura',
+	'UI:AccessRO-Users' => ITOP_APPLICATION.' é somente leitura para usuários finais',
+	'UI:ApplicationEnvironment' => 'Ambiente da aplicação: %1$s',
+	'UI:Login:RetypePwdDoesNotMatch' => '"Nova senha" e "Repetir nova senha" são diferentes. Tente novamente!',
+	'UI:Button:Login' => 'Login',
+	'UI:Login:Error:AccessRestricted' => 'Acesso restrito. Por favor, contacte o administrador',
+	'UI:Login:Error:AccessAdmin' => 'Acesso restrito somente para usuários com privilégios administrativos. Por favor, contacte o administrador',
+	'UI:Login:Error:WrongOrganizationName' => 'Organização não encontrada',
 	'UI:Login:Error:MultipleContactsHaveSameEmail' => 'Vários contatos têm o mesmo e-mail',
-	'UI:Login:Error:NoValidProfiles'               => 'Nenhum perfil válido fornecido',
-	'UI:CSVImport:MappingSelectOne'                => '-- selecione um --',
-	'UI:CSVImport:MappingNotApplicable'            => '-- ignorar este campo --',
-	'UI:CSVImport:NoData'                          => 'Nenhum dado configurado. Por favor, providencie alguns dados!',
-	'UI:Title:DataPreview'                         => 'Visualizar dados',
-	'UI:CSVImport:ErrorOnlyOneColumn'              => 'Erro: Os dados contêm apenas uma coluna. Você selecionou o caractere separador apropriado?',
-	'UI:CSVImport:FieldName'                       => 'Campo %1$d',
-	'UI:CSVImport:DataLine1'                       => 'Dados da linha 1',
-	'UI:CSVImport:DataLine2'                       => 'Dados da linha 2',
-	'UI:CSVImport:idField'                         => 'ID (Chave primária)',
-	'UI:Title:BulkImport'                          => 'Importação em massa',
-	'UI:Title:BulkImport+'                         => 'Assistente de Importação CSV',
-	'UI:Title:BulkSynchro_nbItem_ofClass_class'    => 'Sincronização de %1$d objetos da classe %2$s',
-	'UI:CSVImport:ClassesSelectOne'                => '-- selecione um --',
-	'UI:CSVImport:ErrorExtendedAttCode'            => 'Erro interno: "%1$s" é um código incorreto porque "%2$s" não é uma chave externa da classe "%3$s"',
-	'UI:CSVImport:ObjectsWillStayUnchanged'        => '%1$d objetos permanecerão inalterados',
-	'UI:CSVImport:ObjectsWillBeModified'           => '%1$d objetos serão modificados',
+	'UI:Login:Error:NoValidProfiles' => 'Nenhum perfil válido fornecido',
+	'UI:CSVImport:MappingSelectOne' => '-- selecione um --',
+	'UI:CSVImport:MappingNotApplicable' => '-- ignorar este campo --',
+	'UI:CSVImport:NoData' => 'Nenhum dado configurado. Por favor, providencie alguns dados!',
+	'UI:Title:DataPreview' => 'Visualizar dados',
+	'UI:CSVImport:ErrorOnlyOneColumn' => 'Erro: Os dados contêm apenas uma coluna. Você selecionou o caractere separador apropriado?',
+	'UI:CSVImport:FieldName' => 'Campo %1$d',
+	'UI:CSVImport:DataLine1' => 'Dados da linha 1',
+	'UI:CSVImport:DataLine2' => 'Dados da linha 2',
+	'UI:CSVImport:idField' => 'ID (Chave primária)',
+	'UI:Title:BulkImport' => 'Importação em massa',
+	'UI:Title:BulkImport+' => 'Assistente de Importação CSV',
+	'UI:Title:BulkSynchro_nbItem_ofClass_class' => 'Sincronização de %1$d objetos da classe %2$s',
+	'UI:CSVImport:ClassesSelectOne' => '-- selecione um --',
+	'UI:CSVImport:ErrorExtendedAttCode' => 'Erro interno: "%1$s" é um código incorreto porque "%2$s" não é uma chave externa da classe "%3$s"',
+	'UI:CSVImport:ObjectsWillStayUnchanged' => '%1$d objetos permanecerão inalterados',
+	'UI:CSVImport:ObjectsWillBeModified' => '%1$d objetos serão modificados',
 	'UI:CSVImport:ObjectsWillBeAdded' => '%1$d objetos serão adicionados',
 	'UI:CSVImport:ObjectsWillHaveErrors' => '%1$d objetos terão erros',
 	'UI:CSVImport:ObjectsRemainedUnchanged' => '%1$d objetos manteve-se inalterados',
@@ -642,11 +708,14 @@ Esperamos que você goste desta versão tanto quanto gostamos de imaginá-la e c
 	'UI:UniversalSearchTitle' => 'Pesquisa Universal',
 	'UI:UniversalSearch:Error' => 'Erro: %1$s',
 	'UI:UniversalSearch:LabelSelectTheClass' => 'Selecione a classe para pesquisar: ',
-
 	'UI:CSVReport-Value-Modified' => 'Modificado',
 	'UI:CSVReport-Value-SetIssue' => 'invalid value for attribute~~',
 	'UI:CSVReport-Value-ChangeIssue' => '\'%1$s\' is an invalid value~~',
 	'UI:CSVReport-Value-NoMatch' => 'No match for value \'%1$s\'~~',
+	'UI:CSVReport-Value-NoMatch-PossibleValues' => 'Some possible \'%1$s\' value(s): %2$s~~',
+	'UI:CSVReport-Value-NoMatch-NoObject' => 'There are no \'%1$s\' objects~~',
+	'UI:CSVReport-Value-NoMatch-NoObject-ForCurrentUser' => 'There are no \'%1$s\' objects found with your current profile~~',
+	'UI:CSVReport-Value-NoMatch-SomeObjectNotVisibleForCurrentUser' => 'There are some \'%1$s\' objects not visible with your current profile~~',
 	'UI:CSVReport-Value-Missing' => 'Faltando valor obrigatório',
 	'UI:CSVReport-Value-Ambiguous' => 'Ambíguo: encontrado %1$s objeto(s)',
 	'UI:CSVReport-Row-Unchanged' => 'inalterado',
@@ -660,15 +729,16 @@ Esperamos que você goste desta versão tanto quanto gostamos de imaginá-la e c
 	'UI:CSVReport-Value-Issue-Readonly' => 'O atributo \'%1$s\' é somente-leitura e não pode ser modificado (valor atual: %2$s, valor proposto: %3$s)',
 	'UI:CSVReport-Value-Issue-Format' => 'Falha ao processar a entrada: %1$s',
 	'UI:CSVReport-Value-Issue-NoMatch' => 'Valor inesperado para o atributo \'%1$s\': nenhuma correspondência encontrada, verifique a ortografia',
+	'UI:CSVReport-Value-Issue-AllowedValues' => 'Allowed \'%1$s\' value(s): %2$s~~',
 	'UI:CSVReport-Value-Issue-Unknown' => 'Valor inesperado para o atributo \'%1$s\': %2$s',
 	'UI:CSVReport-Row-Issue-Inconsistent' => 'Atributos não consistentes uns com os outros: %1$s',
 	'UI:CSVReport-Row-Issue-Attribute' => 'Valor(es) de atributo inesperado(s)',
 	'UI:CSVReport-Row-Issue-MissingExtKey' => 'Não foi possível criar devido à(s) chave(s) externa(s) ausente(s): %1$s',
 	'UI:CSVReport-Row-Issue-DateFormat' => 'formato de data inválido',
+	'UI:CSVReport-Row-Issue-ExpectedDateFormat' => 'Expected format: %1$s~~',
 	'UI:CSVReport-Row-Issue-Reconciliation' => 'não conseguiu reconciliar',
 	'UI:CSVReport-Row-Issue-Ambiguous' => 'reconciliação ambígua',
 	'UI:CSVReport-Row-Issue-Internal' => 'Erro interno: %1$s, %2$s',
-
 	'UI:CSVReport-Icon-Unchanged' => 'Não modificado',
 	'UI:CSVReport-Icon-Modified' => 'Modificado',
 	'UI:CSVReport-Icon-Missing' => 'Ausente',
@@ -683,14 +753,32 @@ Esperamos que você goste desta versão tanto quanto gostamos de imaginá-la e c
 	'UI:CSVReport-Stats-Errors' => '%1$.0f %% dos objetos carregados têm erros e serão ignorados',
 	'UI:CSVReport-Stats-Created' => '%1$.0f %% dos objetos carregados serão criados',
 	'UI:CSVReport-Stats-Modified' => '%1$.0f %% dos objetos carregados serão modificados',
-
 	'UI:CSVExport:AdvancedMode' => 'Modo avançado',
 	'UI:CSVExport:AdvancedMode+' => 'No modo avançado, várias colunas são adicionadas à exportação: o ID do objeto, o ID das chaves externas e seus atributos de reconciliação',
 	'UI:CSVExport:LostChars' => 'Problema de codificação',
 	'UI:CSVExport:LostChars+' => 'O arquivo baixado será codificado em %1$s. O '.ITOP_APPLICATION_SHORT.' detectou alguns caracteres que não são compatíveis com este formato. Esses caracteres serão substituídos por um substituto (por exemplo, caracteres acentuados perdendo o acento) ou serão descartados. Você pode copiar/colar os dados do seu navegador da web. Como alternativa, você pode entrar em contato com seu administrador para alterar a codificação (consulte o parâmetro \'csv_file_default_charset\' do arquivo de configuração do '.ITOP_APPLICATION_SHORT.')',
-
 	'UI:Audit:Title' => 'Auditoria do CMDB',
 	'UI:Audit:InteractiveAudit' => 'Auditoria Interativa',
+	'UI:Audit:Interactive:All:Title' => 'Audit results~~',
+	'UI:Audit:Interactive:All:SubTitle' => 'Full audit: includes all rules, all categories, all domains~~',
+	'UI:Audit:Interactive:All:BreadCrumb' => 'Full audit~~',
+	'UI:Audit:Interactive:All:BreadCrumb+' => 'Audit results for all rules~~',
+	'UI:Audit:Interactive:Categories:Title' => 'Audit results for categories: %1$s~~',
+	'UI:Audit:Interactive:Categories:SubTitle' => 'Audit results for all the rules belonging to one of those %1$s categories~~',
+	'UI:Audit:Interactive:Categories:BreadCrumb' => 'Categories~~',
+	'UI:Audit:Interactive:Categories:BreadCrumb+' => 'Audit categories: %1$s~~',
+	'UI:Audit:Interactive:Domain:Title' => 'Audit results for Domain: %1$s~~',
+	'UI:Audit:Interactive:Domain:SubTitle' => 'Audit results for all the rules belonging to a category related to the domain: %1$s~~',
+	'UI:Audit:Interactive:Domain:BreadCrumb' => '%1$s~~',
+	'UI:Audit:Interactive:Domain:BreadCrumb+' => 'Audit for Domain: %1$s~~',
+	'UI:Audit:Interactive:Selection:Title' => 'Selection of an audit~~',
+	'UI:Audit:Interactive:Selection:SubTitle' => 'Select a domain to get the results limited to this domain or select "All categories" to get a full audit (can take time or even fail if too much data to audit)~~',
+	'UI:Audit:Interactive:Selection:BreadCrumb' => 'Selection~~',
+	'UI:Audit:Interactive:Selection:BreadCrumb+' => 'Selection of an Audit to run~~',
+	'UI:Audit:Interactive:Selection:BadgeAll' => 'All categories~~',
+	'UI:Audit:Interactive:Button:Back' => 'Back to the audit~~',
+	'UI:Audit:Interactive:Button:Configuration' => 'Audit configuration~~',
+	'UI:Audit:ViewRules' => 'Check the rules~~',
 	'UI:Audit:HeaderAuditRule' => 'Regra de Auditoria',
 	'UI:Audit:HeaderNbObjects' => '# Objetos',
 	'UI:Audit:HeaderNbErrors' => '# Erros',
@@ -706,8 +794,6 @@ Esperamos que você goste desta versão tanto quanto gostamos de imaginá-la e c
 	'UI:Audit:Dashboard:ObjectsInError' => 'Objetos com erros',
 	'UI:Audit:Dashboard:ObjectsValidated' => 'Objetos validados',
 	'UI:Audit:AuditCategory:Subtitle' => '%1$s erros de %2$s - %3$s%%',
-
-
 	'UI:RunQuery:Title' => 'Avaliar consultas OQL',
 	'UI:RunQuery:QueryExamples' => 'Exemplos de consultas',
 	'UI:RunQuery:QueryResults' => 'Resultado da consulta',
@@ -726,7 +812,7 @@ Esperamos que você goste desta versão tanto quanto gostamos de imaginá-la e c
 	'UI:RunQuery:ResultSQL' => 'SQL Resultante',
 	'UI:RunQuery:Error' => 'Ocorreu um erro ao executar a consulta',
 	'UI:Query:UrlForExcel' => 'URL a ser usada para consultas web MS-Excel',
-	'UI:Query:UrlV1' => 'A lista de campos não foi especificada. A página <em>export-V2.php</em> não pode ser chamada sem essa informação. Portanto, o URL sugerido abaixo aponta para a página herdada: <em>export.php</em>. Essa versão herdada da exportação tem a seguinte limitação: a lista de campos exportados pode variar dependendo do formato de saída e do modelo de dados do '.ITOP_APPLICATION_SHORT.'. Se você quiser garantir que a lista de colunas exportadas permaneça estável a longo prazo, então você deve especificar um valor para o atributo "Fields" e usar a página <em>export-V2.php</em>',
+	'UI:Query:UrlV1' => 'A lista de campos não foi especificada. A página <em>export-V2.php</em> não pode ser chamada sem essa informação. Portanto, o URL sugerido abaixo aponta para a página herdada: <em>export.php</em>. Essa versão herdada da exportação tem a seguinte limitação: a lista de campos exportados pode variar dependendo do formato de saída e do modelo de dados do '.ITOP_APPLICATION_SHORT.'.Se você quiser garantir que a lista de colunas exportadas permaneça estável a longo prazo, então você deve especificar um valor para o atributo "Fields" e usar a página <em>export-V2.php</em>',
 	'UI:Schema:Title' => 'Esquema de objetos',
 	'UI:Schema:TitleForClass' => 'Esquema de %1$s',
 	'UI:Schema:CategoryMenuItem' => 'Categoria <b>%1$s</b>',
@@ -746,7 +832,6 @@ Esperamos que você goste desta versão tanto quanto gostamos de imaginá-la e c
 	'UI:Schema:Label' => 'Rótulo',
 	'UI:Schema:Label+' => 'Rótulo do atributo',
 	'UI:Schema:Type' => 'Tipo',
-
 	'UI:Schema:Type+' => 'Tipo de dado do atributo',
 	'UI:Schema:Origin' => 'Origem',
 	'UI:Schema:Origin+' => 'A classe base na qual este atributo é definido',
@@ -794,6 +879,16 @@ Esperamos que você goste desta versão tanto quanto gostamos de imaginá-la e c
 	'UI:Schema:DisplaySelector/Code' => 'Código',
 	'UI:Schema:Attribute/Filter' => 'Filtro',
 	'UI:Schema:DefaultNullValue' => 'Padrão nulo : "%1$s"',
+	'UI:Schema:Events' => 'Events~~',
+	'UI:Schema:Events:Defined' => 'Defined events~~',
+	'UI:Schema:Events:NoEvent' => 'No event defined~~',
+	'UI:Schema:Events:Listeners' => 'Event listeners~~',
+	'UI:Schema:Events:NoListener' => 'No event listener~~',
+	'UI:Schema:Events:Event' => 'Event~~',
+	'UI:Schema:Events:Description' => 'Description~~',
+	'UI:Schema:Events:Listener' => 'Listener~~',
+	'UI:Schema:Events:Rank' => 'Rank~~',
+	'UI:Schema:Events:Module' => 'Module~~',
 	'UI:LinksWidget:Autocomplete+' => 'Digite os três caracteres iniciais...',
 	'UI:Edit:SearchQuery' => 'Selecionar uma consulta pré-definida',
 	'UI:Edit:TestQuery' => 'Testar consulta',
@@ -860,8 +955,8 @@ Esperamos que você goste desta versão tanto quanto gostamos de imaginá-la e c
 	'UI:SearchResultsTitle' => 'Resultados da pesquisa',
 	'UI:SearchResultsTitle+' => 'Resultados da pesquisa de texto completo',
 	'UI:Search:NoSearch' => 'Nada a pesquisar',
-	'UI:Search:NeedleTooShort' => 'A string de pesquisa \"%1$s\" é muito curta. Por favor, digite pelo menos %2$d caracteres.',
-	'UI:Search:Ongoing' => 'Procurando por \"%1$s\"',
+	'UI:Search:NeedleTooShort' => 'A string de pesquisa \\"%1$s\\" é muito curta. Por favor, digite pelo menos %2$d caracteres.',
+	'UI:Search:Ongoing' => 'Procurando por \\"%1$s\\"',
 	'UI:Search:Enlarge' => 'Amplie a pesquisa',
 	'UI:FullTextSearchTitle_Text' => 'Resultados da pesquisa para "%1$s":',
 	'UI:Search:Count_ObjectsOf_Class_Found' => '%1$d objeto(s) da classe %2$s encontrado(s).',
@@ -885,7 +980,6 @@ Esperamos que você goste desta versão tanto quanto gostamos de imaginá-la e c
 	'UI:SystemIntrusion' => 'Acesso negado. Você está tentando realizar uma operação que não é permitida para você',
 	'UI:FatalErrorMessage' => 'Erro fatal, o sistema não pode continuar',
 	'UI:Error_Details' => 'Erro: %1$s',
-
 	'UI:PageTitle:ProfileProjections' => 'Gerenciamento de Usuários - Mapeamento de Perfis',
 	'UI:UserManagement:Class' => 'Classe',
 	'UI:UserManagement:Class+' => 'Classe de objetos',
@@ -920,66 +1014,42 @@ Esperamos que você goste desta versão tanto quanto gostamos de imaginá-la e c
 	'UI:UserManagement:NoLifeCycleApplicable' => 'N/A',
 	'UI:UserManagement:NoLifeCycleApplicable+' => 'Ciclo de vida não foi definido para esta classe',
 	'UI:UserManagement:GrantMatrix' => 'Permissões de acesso',
-
-	'Menu:AdminTools' => 'Ferramentas Administrativas',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:AdminTools+' => 'Ferramentas Administrativas',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:AdminTools?' => 'Ferramentas acessíveis apenas para usuários com o perfil de administrador',// Duplicated into itop-welcome-itil (will be removed from here...)
 	'Menu:SystemTools' => 'Sistema',
-
 	'UI:ChangeManagementMenu' => 'Gerenciamento de Mudanças',
 	'UI:ChangeManagementMenu+' => 'Gerenciamento de Mudanças',
 	'UI:ChangeManagementMenu:Title' => 'Visão geral',
 	'UI-ChangeManagementMenu-ChangesByType' => 'Mudanças por tipo',
 	'UI-ChangeManagementMenu-ChangesByStatus' => 'Mudanças por status',
 	'UI-ChangeManagementMenu-ChangesNotYetAssigned' => 'Mudanças não atribuídas',
-
 	'UI:ConfigurationManagementMenu' => 'Gerenciamento Configuração',
 	'UI:ConfigurationManagementMenu+' => 'Gerenciamento de Configuração',
 	'UI:ConfigurationManagementMenu:Title' => 'Visão geral',
 	'UI-ConfigurationManagementMenu-InfraByType' => 'Objetos de infraestrutura por tipo',
 	'UI-ConfigurationManagementMenu-InfraByStatus' => 'Objetos de infraestrutura por status',
-
 	'UI:ConfigMgmtMenuOverview:Title' => 'Painel de Gerenciamento de Configuração',
 	'UI-ConfigMgmtMenuOverview-FunctionalCIbyStatus' => 'Itens de configuração por status',
 	'UI-ConfigMgmtMenuOverview-FunctionalCIByType' => 'Itens de configuração por tipo',
-
 	'UI:RequestMgmtMenuOverview:Title' => 'Painel de Gerenciamento de Solicitações',
 	'UI-RequestManagementOverview-RequestByService' => 'Solicitações de usuários por serviço',
 	'UI-RequestManagementOverview-RequestByPriority' => 'Solicitações de usuários por prioridade',
 	'UI-RequestManagementOverview-RequestUnassigned' => 'Solicitações de usuários não atribuídas a um agente',
-
 	'UI:IncidentMgmtMenuOverview:Title' => 'Painel de Gerenciamento de Incidentes',
 	'UI-IncidentManagementOverview-IncidentByService' => 'Incidentes por serviço',
 	'UI-IncidentManagementOverview-IncidentByPriority' => 'Incidentes por prioridade',
 	'UI-IncidentManagementOverview-IncidentUnassigned' => 'Incidentes não atribuídos a um agente',
-
 	'UI:ChangeMgmtMenuOverview:Title' => 'Painel de Gerenciamento de Mudanças',
 	'UI-ChangeManagementOverview-ChangeByType' => 'Mudanças por tipo',
 	'UI-ChangeManagementOverview-ChangeUnassigned' => 'Mudanças não atribuídas a um agente',
 	'UI-ChangeManagementOverview-ChangeWithOutage' => 'Interrupções devido a mudanças',
-
 	'UI:ServiceMgmtMenuOverview:Title' => 'Painel de Gerenciamento de Serviços',
 	'UI-ServiceManagementOverview-CustomerContractToRenew' => 'Contratos de clientes a serem renovados em 30 dias',
 	'UI-ServiceManagementOverview-ProviderContractToRenew' => 'Contratos de provedores a serem renovados em 30 dias',
-
 	'UI:ContactsMenu' => 'Contatos',
 	'UI:ContactsMenu+' => 'Contatos',
 	'UI:ContactsMenu:Title' => 'Visão geral',
 	'UI-ContactsMenu-ContactsByLocation' => 'Contatos por localização',
 	'UI-ContactsMenu-ContactsByType' => 'Contatos por tipo',
 	'UI-ContactsMenu-ContactsByStatus' => 'Contatos por status',
-
-	'Menu:CSVImportMenu' => 'Importar CSV',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:CSVImportMenu+' => 'Criação ou atualização em massa',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:DataModelMenu' => 'Modelo Dados',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:DataModelMenu+' => 'Visão geral do Modelo de Dados',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:ExportMenu' => 'Exportar',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:ExportMenu+' => 'Exportar o resultado de qualquer consulta em HTML, CSV ou XML',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:NotificationsMenu' => 'Notificações',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:NotificationsMenu+' => 'Configuração de Notificações',// Duplicated into itop-welcome-itil (will be removed from here...)
 	'UI:NotificationsMenu:Title' => 'Configuração de Notificações',
 	'UI:NotificationsMenu:Help' => 'Ajuda',
 	'UI:NotificationsMenu:HelpContent' => '<p>As Notificações são totalmente personalizáveis​​. Elas são baseadas em dois conjuntos de objetos: <i>Gatilhos e Ações</i>.</p>
@@ -1010,53 +1080,18 @@ Quando associada a um gatilho, cada ação recebe um número de "ordem", especif
 	'UI:NotificationsMenu:Actions:ActionWebhook' => 'Ações do Webhook (integrações de saída)',
 	'UI:NotificationsMenu:Actions:Action' => 'Outras ações',
 	'UI:NotificationsMenu:AvailableActions' => 'Ações disponíveis',
-
 	'Menu:TagAdminMenu' => 'Configuração de Tags',
 	'Menu:TagAdminMenu+' => 'Gerenciamento de valores de tags',
 	'UI:TagAdminMenu:Title' => 'Configuração de Tags',
 	'UI:TagAdminMenu:NoTags' => 'Nenhum campo Tag configurado',
 	'UI:TagSetFieldData:Error' => 'Erro: %1$s',
-
-	'Menu:AuditCategories' => 'Categorias de Auditoria',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:AuditCategories+' => 'Categorias de Auditoria',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:Notifications:Title' => 'Categorias de Auditoria',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:RunQueriesMenu' => 'Executar Consultas',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:RunQueriesMenu+' => 'Executar qualquer consulta',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:QueryMenu' => 'Livro de Consultas',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:QueryMenu+' => 'Livro de Consultas',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:DataAdministration' => 'Administração de Dados',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:DataAdministration+' => 'Administração de Dados',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:UniversalSearchMenu' => 'Pesquisa Universal',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UniversalSearchMenu+' => 'Pesquisar em todo o '.ITOP_APPLICATION_SHORT.'...',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:UserManagementMenu' => 'Gerenciamento de Usuários',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UserManagementMenu+' => 'Gerenciamento de Usuários',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:ProfilesMenu' => 'Perfis',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:ProfilesMenu+' => 'Perfis',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:ProfilesMenu:Title' => 'Perfis',
-	// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:UserAccountsMenu' => 'Contas usuários',
-	// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UserAccountsMenu+' => 'Contas usuários',
-	// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UserAccountsMenu:Title' => 'Contas usuários',
-	// Duplicated into itop-welcome-itil (will be removed from here...)
-
 	'UI:iTopVersion:Short' => '%1$s versão %2$s',
 	'UI:iTopVersion:Long' => '%1$s versão %2$s-%3$s compilação %4$s',
 	'UI:PropertiesTab' => 'Propriedades',
-
 	'UI:OpenDocumentInNewWindow_' => 'Abrir',
 	'UI:DownloadDocument_' => 'Baixar',
 	'UI:Document:NoPreview' => 'Nenhuma visualização está disponível para este documento',
 	'UI:Download-CSV' => 'Download %1$s',
-
 	'UI:DeadlineMissedBy_duration' => 'Perdida por %1$s',
 	'UI:Deadline_LessThan1Min' => '< 1 min',
 	'UI:Deadline_Minutes' => '%1$d min',
@@ -1099,7 +1134,7 @@ Quando associada a um gatilho, cada ação recebe um número de "ordem", especif
 	'UI:RelationTooltip:ImpactedItems_N_of_M' => '# de itens impactados: %1$d / %2$d',
 	'UI:RelationTooltip:CriticalThreshold_N_of_M' => 'Limite crítico: %1$d / %2$d',
 	'Portal:Title' => 'Portal do usuário',
-	'Portal:NoRequestMgmt' => 'Caro %1$ s, você foi redirecionado para esta página porque a sua conta é configurado com o perfil de \'usuário do Portal\'. Infelizmente, iTop não foi instalado com a função \'Gerenciamento de Solicitações\'. Por favor, contate o administrador.',
+	'Portal:NoRequestMgmt' => 'Caro %1$ s, você foi redirecionado para esta página porque a sua conta é configurado com o perfil de \'usuário do Portal\'.Infelizmente, iTop não foi instalado com a função \'Gerenciamento de Solicitações\'.Por favor, contate o administrador.',
 	'Portal:Refresh' => 'Atualizar',
 	'Portal:Back' => 'Voltar',
 	'Portal:WelcomeUserOrg' => 'Bem-vindo %1$s, de %2$s',
@@ -1135,9 +1170,13 @@ Quando associada a um gatilho, cada ação recebe um número de "ordem", especif
 	'Enum:Undefined' => '(n/a)',
 	'UI:DurationForm_Days_Hours_Minutes_Seconds' => '%1$s dias %2$s horas %3$s minutos %4$s segundos',
 	'UI:ModifyAllPageTitle' => 'Modificar todos',
+	'UI:Modify_ObjectsOf_Class' => 'Modifying objects of class %1$s~~',
 	'UI:Modify_N_ObjectsOf_Class' => 'Editando objeto %1$d da classe %2$s',
 	'UI:Modify_M_ObjectsOf_Class_OutOf_N' => 'Editando objeto %1$d da classe %2$s de %3$d',
 	'UI:Menu:ModifyAll' => 'Edição em massa...',
+	'UI:Menu:ModifyAll_Class' => 'Modify %1$s objects...~~',
+	'UI:Menu:ModifyAll_Link' => 'Modify %1$s...~~',
+	'UI:Menu:ModifyAll_Remote' => 'Modify %1$s...~~',
 	'UI:Button:ModifyAll' => 'Modificar todos',
 	'UI:Button:PreviewModifications' => 'Visualizar modificações >>',
 	'UI:ModifiedObject' => 'Objeto modificado',
@@ -1197,7 +1236,6 @@ Quando associada a um gatilho, cada ação recebe um número de "ordem", especif
 	'UI:PrintResolution:LetterLandscape' => 'Carta Retrato',
 	'UI:Toggle:SwitchToStandardDashboard' => 'Alternar para o painel padrão',
 	'UI:Toggle:SwitchToCustomDashboard' => 'Alternar para o painel personalizado',
-
 	'UI:ConfigureThisList' => 'Configurar esta lista...',
 	'UI:ListConfigurationTitle' => 'Configurações de exibição',
 	'UI:ColumnsAndSortOrder' => 'Colunas e ordem de classificação:',
@@ -1213,10 +1251,8 @@ Quando associada a um gatilho, cada ação recebe um número de "ordem", especif
 	'UI:ExtField_AsRemoteField' => '%1$s (%2$s)',
 	'UI:Button:MoveUp' => 'Mover acima',
 	'UI:Button:MoveDown' => 'Mover abaixo',
-
 	'UI:OQL:UnknownClassAndFix' => 'Classe desconhecida "%1$s". Ao invés disso, você pode tentar a classe "%2$s"',
 	'UI:OQL:UnknownClassNoFix' => 'Classe desconhecida: "%1$s"',
-
 	'UI:Dashboard:EditCustom' => 'Editar visão personalizada...',
 	'UI:Dashboard:CreateCustom' => 'Criar uma visão personalizada...',
 	'UI:Dashboard:DeleteCustom' => 'Excluir visão personalizada...',
@@ -1227,13 +1263,10 @@ Quando associada a um gatilho, cada ação recebe um número de "ordem", especif
 	'UI:ImportDashboardText' => 'Selecione um arquivo do Painel para importar:',
 	'UI:Dashboard:Actions' => 'Ações do Painel',
 	'UI:Dashboard:NotUpToDateUntilContainerSaved' => 'Este painel exibe informações que não incluem as alterações em andamento',
-
-
 	'UI:DashletCreation:Title' => 'Criar um novo Painel',
 	'UI:DashletCreation:Dashboard' => 'Painel',
 	'UI:DashletCreation:DashletType' => 'Tipo de painel',
 	'UI:DashletCreation:EditNow' => 'Editar o painel',
-
 	'UI:DashboardEdit:Title' => 'Editor',
 	'UI:DashboardEdit:DashboardTitle' => 'Título',
 	'UI:DashboardEdit:AutoReload' => 'Atualizar automaticamente',
@@ -1241,38 +1274,31 @@ Quando associada a um gatilho, cada ação recebe um número de "ordem", especif
 	'UI:DashboardEdit:AutoReloadSec+' => 'O intervalo mínimo permitido é %1$d segundos',
 	'UI:DashboardEdit:Revert' => 'Reverter',
 	'UI:DashboardEdit:Apply' => 'Salvar',
-
 	'UI:DashboardEdit:Layout' => 'Layout',
 	'UI:DashboardEdit:Properties' => 'Propriedades',
 	'UI:DashboardEdit:Dashlets' => 'Painel disponível',
 	'UI:DashboardEdit:DashletProperties' => 'Propriedades',
-
 	'UI:Form:Property' => 'Propriedade',
 	'UI:Form:Value' => 'Valor',
-
 	'UI:DashletUnknown:Label' => 'Desconhecido',
 	'UI:DashletUnknown:Description' => 'Dashlet desconhecido (pode ter sido desinstalado)',
 	'UI:DashletUnknown:RenderText:View' => 'Não é possível renderizar este dashlet',
 	'UI:DashletUnknown:RenderText:Edit' => 'Não é possível renderizar este dashlet (classe "%1$s"). Verifique com seu administrador se este dashlet ainda está disponível',
 	'UI:DashletUnknown:RenderNoDataText:Edit' => 'Não há visualização disponível para este dashlet (classe "%1$s")',
 	'UI:DashletUnknown:Prop-XMLConfiguration' => 'Configuração (mostrada como XML bruta)',
-
 	'UI:DashletProxy:Label' => 'Proxy',
 	'UI:DashletProxy:Description' => 'Proxy dashlet',
 	'UI:DashletProxy:RenderNoDataText:Edit' => 'Nenhuma pré-visualização disponível para este dashlet de terceiros (classe "%1$s")',
 	'UI:DashletProxy:Prop-XMLConfiguration' => 'Configuração (mostrada como XML bruta)',
-
 	'UI:DashletPlainText:Label' => 'Texto',
 	'UI:DashletPlainText:Description' => 'Texto puro (não formatado)',
 	'UI:DashletPlainText:Prop-Text' => 'Texto',
 	'UI:DashletPlainText:Prop-Text:Default' => 'Por favor, insira algum texto aqui...',
-
 	'UI:DashletObjectList:Label' => 'Lista de objetos',
 	'UI:DashletObjectList:Description' => 'Lista objeto no painel',
 	'UI:DashletObjectList:Prop-Title' => 'Título',
 	'UI:DashletObjectList:Prop-Query' => 'Questão',
 	'UI:DashletObjectList:Prop-Menu' => 'Menu',
-
 	'UI:DashletGroupBy:Prop-Title' => 'Título',
 	'UI:DashletGroupBy:Prop-Query' => 'Questão',
 	'UI:DashletGroupBy:Prop-Style' => 'Estilo',
@@ -1286,24 +1312,20 @@ Quando associada a um gatilho, cada ação recebe um número de "ordem", especif
 	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfWeek' => '%1$s (dia da semana)',
 	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfMonth' => '%1$s (dia do mês)',
 	'UI:DashletGroupBy:MissingGroupBy' => 'Por favor, selecione o campo no qual os objetos serão agrupados',
-
 	'UI:DashletGroupByPie:Label' => 'Gráfico de Pizza',
 	'UI:DashletGroupByPie:Description' => 'Gráfico de Pizza',
 	'UI:DashletGroupByBars:Label' => 'Gráfico de Barras',
 	'UI:DashletGroupByBars:Description' => 'Gráfico de Barras',
 	'UI:DashletGroupByTable:Label' => 'Grupo por (tabela)',
 	'UI:DashletGroupByTable:Description' => 'Exibir (Agrupado por um campo)',
-
-	// New in 2.5
+    // New in 2.5
 	'UI:DashletGroupBy:Prop-Function' => 'Função de agregação',
 	'UI:DashletGroupBy:Prop-FunctionAttribute' => 'Atributo de função',
 	'UI:DashletGroupBy:Prop-OrderDirection' => 'Direção',
 	'UI:DashletGroupBy:Prop-OrderField' => 'Ordenar por',
 	'UI:DashletGroupBy:Prop-Limit' => 'Limite',
-
 	'UI:DashletGroupBy:Order:asc' => 'Ascendente',
 	'UI:DashletGroupBy:Order:desc' => 'Descendente',
-
 	'UI:GroupBy:count' => 'Total',
 	'UI:GroupBy:count+' => 'Número de elementos',
 	'UI:GroupBy:sum' => 'Soma',
@@ -1314,14 +1336,12 @@ Quando associada a um gatilho, cada ação recebe um número de "ordem", especif
 	'UI:GroupBy:min+' => 'Mínimo de %1$s',
 	'UI:GroupBy:max' => 'Máximo',
 	'UI:GroupBy:max+' => 'Máximo de %1$s',
-	// ---
-
+    // ---
 	'UI:DashletHeaderStatic:Label' => 'Cabeçalho',
 	'UI:DashletHeaderStatic:Description' => 'Exibe um separador horizontal',
 	'UI:DashletHeaderStatic:Prop-Title' => 'Título',
 	'UI:DashletHeaderStatic:Prop-Title:Default' => 'Contatos',
 	'UI:DashletHeaderStatic:Prop-Icon' => 'Ícone',
-
 	'UI:DashletHeaderDynamic:Label' => 'Cabeçalho com estatísticas',
 	'UI:DashletHeaderDynamic:Description' => 'Cabeçalho com estatística (agrupado por...)',
 	'UI:DashletHeaderDynamic:Prop-Title' => 'Título',
@@ -1332,11 +1352,9 @@ Quando associada a um gatilho, cada ação recebe um número de "ordem", especif
 	'UI:DashletHeaderDynamic:Prop-Query' => 'Consulta',
 	'UI:DashletHeaderDynamic:Prop-GroupBy' => 'Grupo por',
 	'UI:DashletHeaderDynamic:Prop-Values' => 'Valores',
-
 	'UI:DashletBadge:Label' => 'Ícone',
 	'UI:DashletBadge:Description' => 'Ícone representando uma classe de objetos, bem como links para criar/pesquisar',
 	'UI:DashletBadge:Prop-Class' => 'Classe',
-
 	'DayOfWeek-Sunday' => 'Domingo',
 	'DayOfWeek-Monday' => 'Segunda',
 	'DayOfWeek-Tuesday' => 'Terça',
@@ -1356,8 +1374,7 @@ Quando associada a um gatilho, cada ação recebe um número de "ordem", especif
 	'Month-10' => 'Outubro',
 	'Month-11' => 'Novembro',
 	'Month-12' => 'Dezembro',
-
-	// Short version for the DatePicker
+    // Short version for the DatePicker
 	'DayOfWeek-Sunday-Min' => 'D',
 	'DayOfWeek-Monday-Min' => 'S',
 	'DayOfWeek-Tuesday-Min' => 'T',
@@ -1377,13 +1394,13 @@ Quando associada a um gatilho, cada ação recebe um número de "ordem", especif
 	'Month-10-Short' => 'Out',
 	'Month-11-Short' => 'Nov',
 	'Month-12-Short' => 'Dez',
-	'Calendar-FirstDayOfWeek' => '0',// 0 = Sunday, 1 = Monday, etc...
-
+	'Calendar-FirstDayOfWeek' => '0',
+    // 0 = Sunday, 1 = Monday, etc...
 	'UI:Menu:ShortcutList' => 'Criar um atalho...',
+	'UI:Menu:FilterList' => 'Display list with search criteria~~',
 	'UI:ShortcutRenameDlg:Title' => 'Renomear o atalho',
 	'UI:ShortcutListDlg:Title' => 'Criar um atalho para a lista',
 	'UI:ShortcutDelete:Confirm' => 'Por favor, confirme que você deseja excluir o(s) atalho(s)',
-	'Menu:MyShortcuts' => 'Meus atalhos',// Duplicated into itop-welcome-itil (will be removed from here...)
 	'Class:Shortcut' => 'Atalhos',
 	'Class:Shortcut+' => '',
 	'Class:Shortcut/Attribute:name' => 'Nome',
@@ -1397,12 +1414,10 @@ Quando associada a um gatilho, cada ação recebe um número de "ordem", especif
 	'Class:ShortcutOQL/Attribute:auto_reload/Value:custom' => 'Avaliar',
 	'Class:ShortcutOQL/Attribute:auto_reload_sec' => 'Intervalo atualização automática (segundos)',
 	'Class:ShortcutOQL/Attribute:auto_reload_sec/tip' => 'O mínimo permitido é %1$d sgundos',
-
 	'UI:FillAllMandatoryFields' => 'Por favor, preencha todos os campos obrigatórios',
 	'UI:ValueMustBeSet' => 'Por favor, especifique um valor',
 	'UI:ValueMustBeChanged' => 'Por favor, altere o valor',
 	'UI:ValueInvalidFormat' => 'Formato inválido',
-
 	'UI:CSVImportConfirmTitle' => 'Por favor, confirme a operação',
 	'UI:CSVImportConfirmMessage' => 'Tem certeza que deseja confirmar?',
 	'UI:CSVImportError_items' => 'Erros: %1$d',
@@ -1428,11 +1443,9 @@ Quando associada a um gatilho, cada ação recebe um número de "ordem", especif
 <tr><td>i</td><td>minutos (2 dígitos, ex. 00..59)</td></tr>
 <tr><td>s</td><td>segundos (2 dígitos, ex. 00..59)</td></tr>
 </table>',
-
 	'UI:Button:Remove' => 'Excluir',
 	'UI:AddAnExisting_Class' => 'Associar objetos do tipo %1$s...',
 	'UI:SelectionOf_Class' => 'Selecionar objetos do tipo %1$s',
-
 	'UI:AboutBox' => 'Sobre o '.ITOP_APPLICATION_SHORT.'...',
 	'UI:About:Title' => 'Sobre o '.ITOP_APPLICATION_SHORT,
 	'UI:About:DataModel' => 'Modelo de dados',
@@ -1442,12 +1455,10 @@ Quando associada a um gatilho, cada ação recebe um número de "ordem", especif
 	'UI:About:ManualExtensionSource' => 'Extensão',
 	'UI:About:Extension_Version' => 'Versão: %1$s',
 	'UI:About:RemoteExtensionSource' => 'iTop Hub',
-
 	'UI:DisconnectedDlgMessage' => 'Você foi desconectado. Você deve se identificar novamente para continuar usando o aplicativo.',
 	'UI:DisconnectedDlgTitle' => 'Atenção!',
 	'UI:LoginAgain' => 'Entrar novamente',
 	'UI:StayOnThePage' => 'Permanecer nessa página',
-
 	'ExcelExporter:ExportMenu' => 'Exportar para Excel...',
 	'ExcelExporter:ExportDialogTitle' => 'Exportar para Excel',
 	'ExcelExporter:ExportButton' => 'Exportar',
@@ -1460,7 +1471,6 @@ Quando associada a um gatilho, cada ação recebe um número de "ordem", especif
 	'ExcelExport:Statistics' => 'Estatísticas',
 	'portal:legacy_portal' => 'Portal do usuário (legado) do '.ITOP_APPLICATION_SHORT,
 	'portal:backoffice' => 'Interface de usuário back-office do '.ITOP_APPLICATION_SHORT,
-
 	'UI:CurrentObjectIsLockedBy_User' => 'O objeto está bloqueado, pois está sendo modificado por %1$s',
 	'UI:CurrentObjectIsLockedBy_User_Explanation' => 'O objeto está sendo modificado por %1$s. Suas modificações não podem ser enviadas, pois seriam sobrescritas',
 	'UI:CurrentObjectIsSoftLockedBy_User' => 'O objeto está sendo modificado por %1$s. Você será capaz de enviar suas modificações quando terminarem',
@@ -1468,43 +1478,36 @@ Quando associada a um gatilho, cada ação recebe um número de "ordem", especif
 	'UI:CurrentObjectLockExpired_Explanation' => 'O bloqueio para impedir modificações simultâneas do objeto expirou. Você não pode mais enviar sua modificação, pois outros usuários agora podem modificar este objeto',
 	'UI:ConcurrentLockKilled' => 'O bloqueio impedindo modificações no objeto atual foi removido',
 	'UI:Menu:KillConcurrentLock' => 'Matar o bloqueio de modificação simultânea!',
-
 	'UI:Menu:ExportPDF' => 'Exportar como PDF...',
 	'UI:Menu:PrintableVersion' => 'Versão para impressão',
-
 	'UI:BrowseInlineImages' => 'Navegue pelas imagens...',
 	'UI:UploadInlineImageLegend' => 'Carregar uma nova imagem',
 	'UI:SelectInlineImageToUpload' => 'Selecione a imagem para enviar',
 	'UI:AvailableInlineImagesLegend' => 'Imagens disponíveis',
 	'UI:NoInlineImage' => 'Não há imagem disponível no servidor. Use o botão "Escolher arquivo" acima para selecionar uma imagem do seu computador e fazer o upload para o servidor',
-
 	'UI:ToggleFullScreen' => 'Alternancia Maximizar / Minimizar',
 	'UI:Button:ResetImage' => 'Recupere a imagem anterior',
 	'UI:Button:RemoveImage' => 'Remover a imagem',
 	'UI:Button:UploadImage' => 'Carregar uma imagem do disco',
 	'UI:UploadNotSupportedInThisMode' => 'A modificação de imagens ou arquivos não é suportada neste modo',
-
 	'UI:Button:RemoveDocument' => 'Remover o documento',
-
-	// Search form
+    // Search form
 	'UI:Search:Toggle' => 'Minimizar / Expandir',
 	'UI:Search:AutoSubmit:DisabledHint' => 'O envio automático foi desativado para esta classe',
 	'UI:Search:Obsolescence:DisabledHint' => 'Baseado nas suas preferências de usuário, dados obsoletos não são exibidos',
 	'UI:Search:NoAutoSubmit:ExplainText' => 'Adicione algum critério na caixa de pesquisa ou clique no botão de pesquisa para visualizar os objetos',
 	'UI:Search:Criterion:MoreMenu:AddCriteria' => 'Adicionar novos critérios',
-	// - Add new criteria button
+    // - Add new criteria button
 	'UI:Search:AddCriteria:List:RecentlyUsed:Title' => 'Usado recentemente',
 	'UI:Search:AddCriteria:List:MostPopular:Title' => 'Mais popular',
 	'UI:Search:AddCriteria:List:Others:Title' => 'Outros',
 	'UI:Search:AddCriteria:List:RecentlyUsed:Placeholder' => 'Nenhum ainda',
-
-	// - Criteria header actions
+    // - Criteria header actions
 	'UI:Search:Criteria:Toggle' => 'Minimizar / Expandir',
 	'UI:Search:Criteria:Remove' => 'Remover',
 	'UI:Search:Criteria:Locked' => 'Bloqueado',
-
-	// - Criteria titles
-	//   - Default widget
+    // - Criteria titles
+    //   - Default widget
 	'UI:Search:Criteria:Title:Default:Any' => '%1$s: qualquer',
 	'UI:Search:Criteria:Title:Default:Empty' => '%1$s está vazio',
 	'UI:Search:Criteria:Title:Default:NotEmpty' => '%1$s não está vazio',
@@ -1526,53 +1529,57 @@ Quando associada a um gatilho, cada ação recebe um número de "ordem", especif
 	'UI:Search:Criteria:Title:Default:Between:All' => '%1$s: qualquer',
 	'UI:Search:Criteria:Title:Default:Between:From' => '%1$s de %2$s',
 	'UI:Search:Criteria:Title:Default:Between:Until' => '%1$s até %2$s',
-	//   - Numeric widget
-	//   None yet
-	//   - DateTime widget
+    //   - Numeric widget
+    //   None yet
+    //   - DateTime widget
 	'UI:Search:Criteria:Title:DateTime:Between' => '%2$s <= 1$s <= %3$s',
-	//   - Enum widget
+    //   - Enum widget
 	'UI:Search:Criteria:Title:Enum:In' => '%1$s: %2$s',
 	'UI:Search:Criteria:Title:Enum:In:Many' => '%1$s: %2$s e %3$s outros',
 	'UI:Search:Criteria:Title:Enum:In:All' => '%1$s: qualquer',
-	//   - TagSet widget
+    //   - TagSet widget
 	'UI:Search:Criteria:Title:TagSet:Matches' => '%1$s: %2$s',
-	//   - External key widget
+    //   - External key widget
 	'UI:Search:Criteria:Title:ExternalKey:Empty' => '%1$s está definido',
 	'UI:Search:Criteria:Title:ExternalKey:NotEmpty' => '%1$s não está definido',
 	'UI:Search:Criteria:Title:ExternalKey:Equals' => '%1$s = %2$s',
 	'UI:Search:Criteria:Title:ExternalKey:In' => '%1$s: %2$s',
 	'UI:Search:Criteria:Title:ExternalKey:In:Many' => '%1$s: %2$s e %3$s outros',
 	'UI:Search:Criteria:Title:ExternalKey:In:All' => '%1$s: qualquer',
-	//   - Hierarchical key widget
+    //   - Hierarchical key widget
 	'UI:Search:Criteria:Title:HierarchicalKey:Empty' => '%1$s está definido',
 	'UI:Search:Criteria:Title:HierarchicalKey:NotEmpty' => '%1$s não está definido',
 	'UI:Search:Criteria:Title:HierarchicalKey:Equals' => '%1$s = %2$s',
 	'UI:Search:Criteria:Title:HierarchicalKey:In' => '%1$s: %2$s',
 	'UI:Search:Criteria:Title:HierarchicalKey:In:Many' => '%1$s: %2$s e %3$s outros',
 	'UI:Search:Criteria:Title:HierarchicalKey:In:All' => '%1$s: qualquer',
-
-	// - Criteria operators
-	//   - Default widget
+    // - Criteria operators
+    //   - Default widget
 	'UI:Search:Criteria:Operator:Default:Empty' => 'Está vazio',
 	'UI:Search:Criteria:Operator:Default:NotEmpty' => 'Não está vazio',
 	'UI:Search:Criteria:Operator:Default:Equals' => 'Igual',
 	'UI:Search:Criteria:Operator:Default:Between' => 'Entre',
-	//   - String widget
+    //   - String widget
 	'UI:Search:Criteria:Operator:String:Contains' => 'Contém',
 	'UI:Search:Criteria:Operator:String:StartsWith' => 'Inicia com',
 	'UI:Search:Criteria:Operator:String:EndsWith' => 'Termina com',
 	'UI:Search:Criteria:Operator:String:RegExp' => 'Exp. Regular ',
-	//   - Numeric widget
-	'UI:Search:Criteria:Operator:Numeric:Equals' => 'Igual',// => '=',
-	'UI:Search:Criteria:Operator:Numeric:GreaterThan' => 'Maior',// => '>',
-	'UI:Search:Criteria:Operator:Numeric:GreaterThanOrEquals' => 'Maior',// > '>=',
-	'UI:Search:Criteria:Operator:Numeric:LessThan' => 'Menor',// => '<',
-	'UI:Search:Criteria:Operator:Numeric:LessThanOrEquals' => 'Menor / igual a',// > '<=',
-	'UI:Search:Criteria:Operator:Numeric:Different' => 'Diferente de',// => '≠',
-	//   - Tag Set Widget
+    //   - Numeric widget
+	'UI:Search:Criteria:Operator:Numeric:Equals' => 'Igual',
+    // => '=',
+	'UI:Search:Criteria:Operator:Numeric:GreaterThan' => 'Maior',
+    // => '>',
+	'UI:Search:Criteria:Operator:Numeric:GreaterThanOrEquals' => 'Maior',
+    // > '>=',
+	'UI:Search:Criteria:Operator:Numeric:LessThan' => 'Menor',
+    // => '<',
+	'UI:Search:Criteria:Operator:Numeric:LessThanOrEquals' => 'Menor / igual a',
+    // > '<=',
+	'UI:Search:Criteria:Operator:Numeric:Different' => 'Diferente de',
+    // => '≠',
+    //   - Tag Set Widget
 	'UI:Search:Criteria:Operator:TagSet:Matches' => 'Correspondências',
-
-	// - Other translations
+    // - Other translations
 	'UI:Search:Value:Filter:Placeholder' => 'Filtrar...',
 	'UI:Search:Value:Search:Placeholder' => 'Pesquisar...',
 	'UI:Search:Value:Autocomplete:StartTyping' => 'Comece a digitar os valores possíveis',
@@ -1580,8 +1587,7 @@ Quando associada a um gatilho, cada ação recebe um número de "ordem", especif
 	'UI:Search:Value:Autocomplete:NoResult' => 'Sem resultados',
 	'UI:Search:Value:Toggler:CheckAllNone' => 'Marcar todos / nenhum',
 	'UI:Search:Value:Toggler:CheckAllNoneFiltered' => 'Marcar todos / Nenhum visíveis',
-
-	// - Widget other translations
+    // - Widget other translations
 	'UI:Search:Criteria:Numeric:From' => 'De',
 	'UI:Search:Criteria:Numeric:Until' => 'Para',
 	'UI:Search:Criteria:Numeric:PlaceholderFrom' => 'Qualquer',
@@ -1595,10 +1601,8 @@ Quando associada a um gatilho, cada ação recebe um número de "ordem", especif
 	'UI:Search:Criteria:DateTime:PlaceholderUntil' => 'Qualquer data',
 	'UI:Search:Criteria:DateTime:PlaceholderUntilTime' => 'Qualquer data',
 	'UI:Search:Criteria:HierarchicalKey:ChildrenIncluded:Hint' => 'Os objetos filhos dos objetos selecionados serão incluídos',
-
 	'UI:Search:Criteria:Raw:Filtered' => 'Filtrado',
 	'UI:Search:Criteria:Raw:FilteredOn' => 'Filtrado em %1$s',
-
 	'UI:StateChanged' => 'Status alterado',
 ));
 
@@ -1609,16 +1613,13 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Expression:Operator:AND' => ' E ',
 	'Expression:Operator:OR' => ' OU ',
 	'Expression:Operator:=' => ': ',
-
 	'Expression:Unit:Short:DAY' => 'd',
 	'Expression:Unit:Short:WEEK' => 's',
 	'Expression:Unit:Short:MONTH' => 'm',
 	'Expression:Unit:Short:YEAR' => 'a',
-
 	'Expression:Unit:Long:DAY' => 'dia(s)',
 	'Expression:Unit:Long:HOUR' => 'hora(s)',
 	'Expression:Unit:Long:MINUTE' => 'minuto(s)',
-
 	'Expression:Verb:NOW' => 'agora',
 	'Expression:Verb:ISNULL' => ': indefinido',
 ));
@@ -1642,22 +1643,10 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Menu:DataSources' => 'Fontes de Sincronização de Dados',
 	'Menu:DataSources+' => 'Lista de Fontes de Sincronização de Dados',
-	'Menu:WelcomeMenu' => 'Página inicial do '.ITOP_APPLICATION_SHORT,
-	'Menu:WelcomeMenu+' => 'Bem-vindo ao '.ITOP_APPLICATION_SHORT,
-	'Menu:WelcomeMenuPage' => 'Página inicial do '.ITOP_APPLICATION_SHORT,
-	'Menu:WelcomeMenuPage+' => 'Bem-vindo ao '.ITOP_APPLICATION_SHORT,
-	'Menu:AdminTools' => 'Ferramentas Administrativas',
-	'Menu:AdminTools+' => 'Ferramentas Administrativas',
-	'Menu:AdminTools?' => 'Ferramentas acessíveis apenas para usuários com perfil de administrador',
-	'Menu:DataModelMenu' => 'Modelo de Dados',
-	'Menu:DataModelMenu+' => 'Visão geral do Modelo de Dados',
-	'Menu:ExportMenu' => 'Exportar Consulta',
-	'Menu:ExportMenu+' => 'Exportar o resultado de qualquer consulta em HTML, CSV ou XML',
-	'Menu:NotificationsMenu' => 'Notificações',
-	'Menu:NotificationsMenu+' => 'Configuração de Notificações',
 	'Menu:AuditCategories' => 'Categorias de Auditoria',
 	'Menu:AuditCategories+' => 'Lista de Categorias de Auditoria',
 	'Menu:Notifications:Title' => 'Categorias de Auditoria',
+	'Menu:AuditCategories:Title' => 'Audit configuration~~',
 	'Menu:RunQueriesMenu' => 'Executar Consultas',
 	'Menu:RunQueriesMenu+' => 'Executar qualquer consulta',
 	'Menu:QueryMenu' => 'Livro de Consultas',
@@ -1672,16 +1661,14 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Menu:UserAccountsMenu' => 'Contas de Usuários',
 	'Menu:UserAccountsMenu+' => 'Lista de Contas de Usuário',
 	'Menu:UserAccountsMenu:Title' => 'Contas de Usuários',
-	'Menu:MyShortcuts' => 'Meus atalhos',
 	'Menu:UserManagement' => 'Gerenciamento de Usuários',
 	'Menu:Queries' => 'Consultas',
-	'Menu:ConfigurationTools' => 'Configurações',
+	'Menu:ConfigurationTools' => 'Configurações'
 ));
-
 // Additional language entries not present in English dict
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'UI:Toggle:StandardDashboard' => 'Padrão',
-	'UI:Toggle:CustomDashboard'   => 'Customizado',
-	'UI:Dashboard:Edit'           => 'Editar esta página...',
-	'UI:Dashboard:Revert'         => 'Reverter para versão original...',
+	'UI:Toggle:CustomDashboard' => 'Customizado',
+	'UI:Dashboard:Edit' => 'Editar esta página...',
+	'UI:Dashboard:Revert' => 'Reverter para versão original...'
 ));
diff --git a/dictionaries/ru.dictionary.itop.core.php b/dictionaries/ru.dictionary.itop.core.php
index 2e19f6ba74..5f084e8d5a 100644
--- a/dictionaries/ru.dictionary.itop.core.php
+++ b/dictionaries/ru.dictionary.itop.core.php
@@ -10,57 +10,42 @@
  */
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Core:DeletedObjectLabel' => '%1ы (удален)',
-	'Core:DeletedObjectTip'   => 'Объект был удален %1$s (%2$s)',
-
+	'Core:DeletedObjectTip' => 'Объект был удален %1$s (%2$s)',
 	'Core:UnknownObjectLabel' => 'Объект не найден (class: %1$s, id: %2$d)',
-	'Core:UnknownObjectTip'   => 'Объект не удается найти. Возможно, он был удален некоторое время назад, и журнал с тех пор был очищен.',
-
+	'Core:UnknownObjectTip' => 'Объект не удается найти. Возможно, он был удален некоторое время назад, и журнал с тех пор был очищен.',
 	'Core:UniquenessDefaultError' => 'Ошибка правила уникальности \'%1$s\'',
-	'Core:CheckConsistencyError'  => 'Consistency rules not followed: %1$s~~',
-	'Core:CheckValueError'        => 'Unexpected value for attribute \'%1$s\' (%2$s) : %3$s~~',
-
-	'Core:AttributeLinkedSet'  => 'Массив объектов (1-n)',
+	'Core:CheckConsistencyError' => 'Consistency rules not followed: %1$s~~',
+	'Core:CheckValueError' => 'Unexpected value for attribute \'%1$s\' (%2$s) : %3$s~~',
+	'Core:AttributeLinkedSet' => 'Массив объектов (1-n)',
 	'Core:AttributeLinkedSet+' => 'Список объектов заданного класса, указывающих на текущий объект',
-
 	'Core:AttributeLinkedSetDuplicatesFound' => 'Duplicates in the \'%1$s\' field : %2$s~~',
-
-	'Core:AttributeDashboard'  => 'Дашборд',
+	'Core:AttributeDashboard' => 'Дашборд',
 	'Core:AttributeDashboard+' => '',
-
-	'Core:AttributePhoneNumber'  => 'Номер телефона',
+	'Core:AttributePhoneNumber' => 'Номер телефона',
 	'Core:AttributePhoneNumber+' => '',
-
 	'Core:AttributeObsolescenceDate' => 'Дата устаревания',
 	'Core:AttributeObsolescenceDate+' => '',
-
 	'Core:AttributeTagSet' => 'Список тегов',
 	'Core:AttributeTagSet+' => '',
 	'Core:AttributeSet:placeholder' => 'нажмите, чтобы добавить',
 	'Core:AttributeClassAttCodeSet:ItemLabel:AttributeFromClass' => '%1$s (%2$s)~~',
 	'Core:AttributeClassAttCodeSet:ItemLabel:AttributeFromOneChildClass' => '%1$s (%2$s from %3$s)~~',
 	'Core:AttributeClassAttCodeSet:ItemLabel:AttributeFromSeveralChildClasses' => '%1$s (%2$s from child classes)~~',
-
 	'Core:AttributeCaseLog' => 'Журнал',
 	'Core:AttributeCaseLog+' => '',
-
 	'Core:AttributeMetaEnum' => 'Вычисляемый enum',
 	'Core:AttributeMetaEnum+' => '',
-
 	'Core:AttributeLinkedSetIndirect' => 'Массив объектов (n-n)',
 	'Core:AttributeLinkedSetIndirect+' => 'Список объектов заданного класса, связанные с текущим объектом через промежуточный класс',
-
 	'Core:AttributeInteger' => 'Целое',
 	'Core:AttributeInteger+' => 'Целочисленное значение (может быть отрицательным)',
-
 	'Core:AttributeDecimal' => 'Десятичное',
 	'Core:AttributeDecimal+' => 'Десятичное значение (может быть отрицательным)',
-
 	'Core:AttributeBoolean' => 'Логическое',
 	'Core:AttributeBoolean+' => 'Да/Нет',
 	'Core:AttributeBoolean/Value:null' => '',
 	'Core:AttributeBoolean/Value:yes' => 'Да',
 	'Core:AttributeBoolean/Value:no' => 'Нет',
-
 	'Core:AttributeArchiveFlag' => 'Архивный флаг',
 	'Core:AttributeArchiveFlag/Value:yes' => 'Да',
 	'Core:AttributeArchiveFlag/Value:yes+' => 'Этот объект виден только в режиме архива',
@@ -69,7 +54,6 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Core:AttributeArchiveFlag/Label+' => '',
 	'Core:AttributeArchiveDate/Label' => 'Дата архивирования',
 	'Core:AttributeArchiveDate/Label+' => '',
-
 	'Core:AttributeObsolescenceFlag' => 'Устаревший флаг',
 	'Core:AttributeObsolescenceFlag/Value:yes' => 'Да',
 	'Core:AttributeObsolescenceFlag/Value:yes+' => 'Этот объект исключен из анализа влияния и скрыт из результатов поиска',
@@ -78,54 +62,38 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Core:AttributeObsolescenceFlag/Label+' => 'Вычисляется динамически на основании значений других атрибутов',
 	'Core:AttributeObsolescenceDate/Label' => 'Дата устаревания',
 	'Core:AttributeObsolescenceDate/Label+' => 'Приблизительная дата, с которой объект считается устаревшим',
-
 	'Core:AttributeString' => 'Строка',
 	'Core:AttributeString+' => 'Текстовая строка',
-
 	'Core:AttributeClass' => 'Класс',
 	'Core:AttributeClass+' => 'Класс объекта',
-
 	'Core:AttributeApplicationLanguage' => 'Язык пользователя',
 	'Core:AttributeApplicationLanguage+' => 'Язык и страна (EN US)',
-
 	'Core:AttributeFinalClass' => 'Класс (авто)',
 	'Core:AttributeFinalClass+' => 'Реальный класс объекта (автоматически создаваемый ядром)',
-
 	'Core:AttributePassword' => 'Пароль',
 	'Core:AttributePassword+' => 'Пароль внешнего устройства',
-
 	'Core:AttributeEncryptedString' => 'Зашифрованная строка',
 	'Core:AttributeEncryptedString+' => 'Строка, зашифрованная локальным ключом',
 	'Core:AttributeEncryptUnknownLibrary' => 'Заданная библиотека шифрования (%1$s) неизвестна',
 	'Core:AttributeEncryptFailedToDecrypt' => '** ошибка расшифровки **',
-
 	'Core:AttributeText' => 'Текст',
 	'Core:AttributeText+' => 'Многострочный текст',
-
 	'Core:AttributeHTML' => 'HTML',
 	'Core:AttributeHTML+' => '',
-
 	'Core:AttributeEmailAddress' => 'Email',
 	'Core:AttributeEmailAddress+' => 'Email адрес',
-
 	'Core:AttributeIPAddress' => 'IP адрес',
 	'Core:AttributeIPAddress+' => '',
-
 	'Core:AttributeOQL' => 'OQL',
 	'Core:AttributeOQL+' => 'Выражение языка запроса объекта (Object Query Language)',
-
 	'Core:AttributeEnum' => 'Enum',
 	'Core:AttributeEnum+' => 'Список предопределенных тестовых строк',
-
 	'Core:AttributeTemplateString' => 'Шаблон строки',
 	'Core:AttributeTemplateString+' => 'Строка, содержащая плейсхолдеры',
-
 	'Core:AttributeTemplateText' => 'Шаблон текста',
 	'Core:AttributeTemplateText+' => 'Текст, содержащий плейсхолдеры',
-
 	'Core:AttributeTemplateHTML' => 'Шаблон HTML',
 	'Core:AttributeTemplateHTML+' => 'HTML, содержащий плейсхолдеры',
-
 	'Core:AttributeDateTime' => 'Дата/время',
 	'Core:AttributeDateTime+' => 'Дата и время (гггг-мм-дд чч:мм:сс)',
 	'Core:AttributeDateTime?SmartSearch' => '
@@ -143,7 +111,6 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 <p>
 Если время не указано, по умолчанию используется 00:00:00
 </p>',
-
 	'Core:AttributeDate' => 'Дата',
 	'Core:AttributeDate+' => 'Дата (гггг-мм-дд)',
 	'Core:AttributeDate?SmartSearch' => '
@@ -158,43 +125,30 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	<b>&lt;</b><em>дата</em><br/>
 	<b>[</b><em>дата</em>,<em>дата</em><b>]</b>
 </p>',
-
 	'Core:AttributeDeadline' => 'Крайний срок',
 	'Core:AttributeDeadline+' => 'Дата, отображаемая относительно текущего времени',
-
 	'Core:AttributeExternalKey' => 'Внешний ключ',
 	'Core:AttributeExternalKey+' => '',
-
 	'Core:AttributeHierarchicalKey' => 'Иерархический ключ',
 	'Core:AttributeHierarchicalKey+' => 'Внешний ключ к родителю',
-
 	'Core:AttributeExternalField' => 'Внешнее поле',
 	'Core:AttributeExternalField+' => 'Поле, сопоставленное с внешним ключом',
-
 	'Core:AttributeURL' => 'URL',
 	'Core:AttributeURL+' => 'Абсолютный или относительный URL в виде текстовой строки',
-
 	'Core:AttributeBlob' => 'Blob',
 	'Core:AttributeBlob+' => 'Любой двоичный контент (документ)',
-
 	'Core:AttributeOneWayPassword' => 'Хэшированный пароль',
 	'Core:AttributeOneWayPassword+' => 'Зашифрованный (хэшированный) пароль',
-
 	'Core:AttributeTable' => 'Таблица',
 	'Core:AttributeTable+' => 'Индексированный массив с двумя измерениями',
-
 	'Core:AttributePropertySet' => 'Свойства',
 	'Core:AttributePropertySet+' => 'Список нетипизированных свойств (имя и значение)',
-
 	'Core:AttributeFriendlyName' => 'Полное название',
 	'Core:AttributeFriendlyName+' => 'Атрибут создается автоматически; полное название вычисляется из нескольких атрибутов',
-
 	'Core:FriendlyName-Label' => 'Полное название',
 	'Core:FriendlyName-Description' => 'Полное название',
-
 	'Core:AttributeTag' => 'Тег',
 	'Core:AttributeTag+' => '',
-	
 	'Core:Context=REST/JSON' => 'REST',
 	'Core:Context=Synchro' => 'Synchro',
 	'Core:Context=Setup' => 'Setup',
@@ -472,6 +426,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:Action' => 'Действие',
 	'Class:Action+' => 'Действие, определённое пользователем',
+	'Class:Action/ComplementaryName' => '%1$s: %2$s~~',
 	'Class:Action/Attribute:name' => 'Название',
 	'Class:Action/Attribute:name+' => '',
 	'Class:Action/Attribute:description' => 'Описание',
@@ -539,6 +494,22 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:ActionEmail/Attribute:importance/Value:normal+' => '',
 	'Class:ActionEmail/Attribute:importance/Value:high' => 'Высокая',
 	'Class:ActionEmail/Attribute:importance/Value:high+' => '',
+	'Class:ActionEmail/Attribute:language' => 'Language~~',
+	'Class:ActionEmail/Attribute:language+' => 'Language to use for placeholders ($xxx$) inside the message (state, importance, priority, etc)~~',
+	'Class:ActionEmail/Attribute:html_template' => 'HTML template~~',
+	'Class:ActionEmail/Attribute:html_template+' => 'Optional HTML template wrapping around the content of the \'Body\' attribute below, useful for tailored email layouts (in the template, content of the \'Body\' attribute will replace the $content$ placeholder)~~',
+	'Class:ActionEmail/Attribute:ignore_notify' => 'Ignore the Notify flag~~',
+	'Class:ActionEmail/Attribute:ignore_notify+' => 'If set to \'Yes\' the \'Notify\' flag on Contacts has no effect.~~',
+	'Class:ActionEmail/Attribute:ignore_notify/Value:no' => 'No~~',
+	'Class:ActionEmail/Attribute:ignore_notify/Value:yes' => 'Yes~~',
+	'ActionEmail:main' => 'Message~~',
+	'ActionEmail:trigger' => 'Triggers~~',
+	'ActionEmail:recipients' => 'Contacts~~',
+	'ActionEmail:preview_tab' => 'Preview~~',
+	'ActionEmail:preview_tab+' => 'Preview of the eMail template~~',
+	'ActionEmail:preview_warning' => 'The actual eMail may look different in the eMail client than this preview in your browser.~~',
+	'ActionEmail:preview_more_info' => 'For more information about the CSS features supported by the different eMail clients, refer to %1$s~~',
+	'ActionEmail:content_placeholder_missing' => 'The placeholder "%1$s" was not found in the HTML template. The content of the field "%2$s" will not be included in the generated emails.~~',
 ));
 
 //
@@ -548,6 +519,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:Trigger' => 'Триггер',
 	'Class:Trigger+' => 'Пользовательский обработчик событий',
+	'Class:Trigger/ComplementaryName' => '%1$s, %2$s~~',
 	'Class:Trigger/Attribute:description' => 'Описание',
 	'Class:Trigger/Attribute:description+' => 'Описание триггера',
 	'Class:Trigger/Attribute:action_list' => 'Действия триггера',
@@ -556,6 +528,8 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:Trigger/Attribute:finalclass+' => '',
 	'Class:Trigger/Attribute:context' => 'Контекст',
 	'Class:Trigger/Attribute:context+' => 'Контекст, в котором будет срабатывать триггер',
+	'Class:Trigger/Attribute:complement' => 'Additional information~~',
+	'Class:Trigger/Attribute:complement+' => 'Further information as provided in english, by this trigger~~',
 ));
 
 //
@@ -651,6 +625,17 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:TriggerOnObjectMention/Attribute:mentioned_filter+' => 'Limit the list of mentioned objects which will activate the trigger. If empty, any mentioned object (of any class) will activate it.~~',
 ));
 
+//
+// Class: TriggerOnAttributeBlobDownload
+//
+
+Dict::Add('RU RU', 'Russian', 'Русский', array(
+	'Class:TriggerOnAttributeBlobDownload' => 'Trigger (on object\'s document download)~~',
+	'Class:TriggerOnAttributeBlobDownload+' => 'Trigger on object\'s document field download of [a child class of] the given class~~',
+	'Class:TriggerOnAttributeBlobDownload/Attribute:target_attcodes' => 'Target fields~~',
+	'Class:TriggerOnAttributeBlobDownload/Attribute:target_attcodes+' => '~~',
+));
+
 //
 // Class: TriggerOnThresholdReached
 //
@@ -687,11 +672,13 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 // Synchro Data Source
 //
 Dict::Add('RU RU', 'Russian', 'Русский', array(
+	'Class:SynchroDataSource' => 'Источник синхронизации данных',
 	'Class:SynchroDataSource/Attribute:name' => 'Название',
 	'Class:SynchroDataSource/Attribute:name+' => '',
 	'Class:SynchroDataSource/Attribute:description' => 'Описание',
 	'Class:SynchroDataSource/Attribute:status' => 'Статус',
 	'Class:SynchroDataSource/Attribute:scope_class' => 'Целевой класс',
+	'Class:SynchroDataSource/Attribute:scope_class+' => 'A Synchro Data Source can only populate a single '.ITOP_APPLICATION_SHORT.' class~~',
 	'Class:SynchroDataSource/Attribute:user_id' => 'Пользователь',
 	'Class:SynchroDataSource/Attribute:notify_contact_id' => 'Контакт для уведомления',
 	'Class:SynchroDataSource/Attribute:notify_contact_id+' => 'Контакт для уведомления в случае ошибки',
@@ -700,6 +687,8 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:SynchroDataSource/Attribute:url_application' => 'Приложение (ссылка)',
 	'Class:SynchroDataSource/Attribute:url_application+' => 'Гиперссылка на объект в приложение-источнике данных. Возможные шаблоны: $this->attribute$ и $replica->primary_key$',
 	'Class:SynchroDataSource/Attribute:reconciliation_policy' => 'Политика сопоставления',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy+' => '"Use the attributes": '.ITOP_APPLICATION_SHORT.' object matches replica values for each Synchro attributes flagged for Reconciliation.
+"Use primary_key": the column primary_key of the replica is expected to contain the identifier of the '.ITOP_APPLICATION_SHORT.' object~~',
 	'Class:SynchroDataSource/Attribute:full_load_periodicity' => 'Интервал устаревания',
 	'Class:SynchroDataSource/Attribute:full_load_periodicity+' => 'Объект будет считаться устаревшим, если данные о нем в таблице синхронизации не обновлялись в течение этого интервала.',
 	'Class:SynchroDataSource/Attribute:action_on_zero' => 'Действие при нуле',
@@ -719,6 +708,33 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:SynchroDataSource/Attribute:delete_policy_retention+' => 'Сколько времени хранятся устаревшие объекты, прежде чем будут удалены',
 	'Class:SynchroDataSource/Attribute:database_table_name' => 'Таблица данных',
 	'Class:SynchroDataSource/Attribute:database_table_name+' => 'Имя таблицы для хранения данных синхронизации. Если оставить поле пустым, будет назначено имя по умолчанию.',
+	'Class:SynchroDataSource/Attribute:status/Value:implementation' => 'Внедрение',
+	'Class:SynchroDataSource/Attribute:status/Value:obsolete' => 'Устаревший',
+	'Class:SynchroDataSource/Attribute:status/Value:production' => 'Эксплуатация',
+	'Class:SynchroDataSource/Attribute:scope_restriction' => 'Объем ограничений',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_attributes' => 'Использовать атрибуты',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_primary_key' => 'Использовать primary_key значение',
+	'Class:SynchroDataSource/Attribute:action_on_zero/Value:create' => 'Создать',
+	'Class:SynchroDataSource/Attribute:action_on_zero/Value:error' => 'Ошибка',
+	'Class:SynchroDataSource/Attribute:action_on_one/Value:error' => 'Ошибка',
+	'Class:SynchroDataSource/Attribute:action_on_one/Value:update' => 'Обновить',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:create' => 'Создать',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:error' => 'Ошибка',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:take_first' => 'Использовать первый (случайно)',
+	'Class:SynchroDataSource/Attribute:delete_policy' => 'Устаревшие объекты',
+	'Class:SynchroDataSource/Attribute:delete_policy+' => 'What to do when a replica becomes obsolete:
+"Ignore": do nothing, the associated object remains as is in iTop.
+"Delete": Delete the associated object in iTop (and the replica in the data table).
+"Update": Update the associated object as specified by the Update rules (see below).
+"Update then Delete": apply the "Update rules". When Retention Duration expires, execute a "Delete" ~~',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:delete' => 'Удалить',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:ignore' => 'Игнорировать',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:update' => 'Обновить',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:update_then_delete' => 'Обновить, затем удалить',
+	'Class:SynchroDataSource/Attribute:attribute_list' => 'Атрибуты',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:administrators' => 'Только администраторы',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:everybody' => 'Пользователи с правами на удаление',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:nobody' => 'Никто',
 	'SynchroDataSource:Description' => 'Описание',
 	'SynchroDataSource:Reconciliation' => 'Поиск и сопоставление',
 	'SynchroDataSource:Deletion' => 'Устаревание и удаление',
@@ -743,8 +759,10 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Core:Synchro:NeverRun' => 'Синхронизация не запускалась. Логи отсутсвуют.',
 	'Core:Synchro:SynchroEndedOn_Date' => 'Синхронизация была закончена в %1$s.',
 	'Core:Synchro:SynchroRunningStartedOn_Date' => 'Синхронизация запущена в %1$s, сейчас в процессе...',
-	'Menu:DataSources' => 'Синхронизация данных', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:DataSources+' => '', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataSources' => 'Синхронизация данных',
+    // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataSources+' => '',
+    // Duplicated into itop-welcome-itil (will be removed from here...)
 	'Core:Synchro:label_repl_ignored' => 'Игнор. (%1$s)~~',
 	'Core:Synchro:label_repl_disappeared' => 'Невид. (%1$s)~~',
 	'Core:Synchro:label_repl_existing' => 'Existing (%1$s)~~',
@@ -808,29 +826,6 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:CMDBChangeOpSetAttributeEncrypted/Attribute:prevstring' => 'Предыдущее значение~~',
 	'Class:CMDBChangeOpSetAttributeCaseLog' => 'Лог',
 	'Class:CMDBChangeOpSetAttributeCaseLog/Attribute:lastentry' => 'Посл.значение',
-	'Class:SynchroDataSource' => 'Источник синхронизации данных',
-	'Class:SynchroDataSource/Attribute:status/Value:implementation' => 'Внедрение',
-	'Class:SynchroDataSource/Attribute:status/Value:obsolete' => 'Устаревший',
-	'Class:SynchroDataSource/Attribute:status/Value:production' => 'Эксплуатация',
-	'Class:SynchroDataSource/Attribute:scope_restriction' => 'Объем ограничений',
-	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_attributes' => 'Использовать атрибуты',
-	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_primary_key' => 'Использовать primary_key значение',
-	'Class:SynchroDataSource/Attribute:action_on_zero/Value:create' => 'Создать',
-	'Class:SynchroDataSource/Attribute:action_on_zero/Value:error' => 'Ошибка',
-	'Class:SynchroDataSource/Attribute:action_on_one/Value:error' => 'Ошибка',
-	'Class:SynchroDataSource/Attribute:action_on_one/Value:update' => 'Обновить',
-	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:create' => 'Создать',
-	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:error' => 'Ошибка',
-	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:take_first' => 'Использовать первый (случайно)',
-	'Class:SynchroDataSource/Attribute:delete_policy' => 'Устаревшие объекты',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:delete' => 'Удалить',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:ignore' => 'Игнорировать',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:update' => 'Обновить',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:update_then_delete' => 'Обновить, затем удалить',
-	'Class:SynchroDataSource/Attribute:attribute_list' => 'Атрибуты',
-	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:administrators' => 'Только администраторы',
-	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:everybody' => 'Пользователи с правами на удаление',
-	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:nobody' => 'Никто',
 	'Class:SynchroAttribute' => 'Синх.характеристики~~',
 	'Class:SynchroAttribute/Attribute:sync_source_id' => 'Синхронизация данных',
 	'Class:SynchroAttribute/Attribute:attcode' => 'Код атрибута',
@@ -891,19 +886,16 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:appUserPreferences/Attribute:preferences' => 'Предпочтения',
 	'Core:ExecProcess:Code1' => 'Неверная команда или команда завершена с ошибкой (возможно, неверное имя скрипта)',
 	'Core:ExecProcess:Code255' => 'Ошибка PHP (parsing, or runtime)~~',
-
-	// Attribute Duration
+    // Attribute Duration
 	'Core:Duration_Seconds' => '%1$d с',
 	'Core:Duration_Minutes_Seconds' => '%1$d мин %2$d с',
 	'Core:Duration_Hours_Minutes_Seconds' => '%1$d ч %2$d мин %3$d с',
 	'Core:Duration_Days_Hours_Minutes_Seconds' => '%1$s д %2$d ч %3$d мин %4$d с',
-
-	// Explain working time computing
+    // Explain working time computing
 	'Core:ExplainWTC:ElapsedTime' => 'Time elapsed (stored as "%1$s")',
 	'Core:ExplainWTC:StopWatch-TimeSpent' => 'Time spent for "%1$s"',
 	'Core:ExplainWTC:StopWatch-Deadline' => 'Deadline for "%1$s" at %2$d%%',
-
-	// Bulk export
+    // Bulk export
 	'Core:BulkExport:MissingParameter_Param' => 'Отсутствует параметр "%1$s"',
 	'Core:BulkExport:InvalidParameter_Query' => 'Недопустимое значение параметра "query". В Книге запросов отсутствует запись с id: "%1$s".',
 	'Core:BulkExport:ExportFormatPrompt' => 'Формат экспорта:',
@@ -955,20 +947,34 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Core:BulkExport:DateTimeFormatDefault_Example' => 'Формат по умолчанию (%1$s), например %2$s',
 	'Core:BulkExport:DateTimeFormatCustom_Format' => 'Пользовательский формат: %1$s',
 	'Core:BulkExport:PDF:PageNumber' => 'Страница %1$s',
-	'Core:DateTime:Placeholder_d' => 'DD', // Day of the month: 2 digits (with leading zero)
-	'Core:DateTime:Placeholder_j' => 'D', // Day of the month: 1 or 2 digits (without leading zero)
-	'Core:DateTime:Placeholder_m' => 'MM', // Month on 2 digits i.e. 01-12
-	'Core:DateTime:Placeholder_n' => 'M', // Month on 1 or 2 digits 1-12
-	'Core:DateTime:Placeholder_Y' => 'YYYY', // Year on 4 digits
-	'Core:DateTime:Placeholder_y' => 'YY', // Year on 2 digits
-	'Core:DateTime:Placeholder_H' => 'hh', // Hour 00..23
-	'Core:DateTime:Placeholder_h' => 'h', // Hour 01..12
-	'Core:DateTime:Placeholder_G' => 'hh', // Hour 0..23
-	'Core:DateTime:Placeholder_g' => 'h', // Hour 1..12
-	'Core:DateTime:Placeholder_a' => 'am/pm', // am/pm (lowercase)
-	'Core:DateTime:Placeholder_A' => 'AM/PM', // AM/PM (uppercase)
-	'Core:DateTime:Placeholder_i' => 'mm', // minutes, 2 digits: 00..59
-	'Core:DateTime:Placeholder_s' => 'ss', // seconds, 2 digits 00..59
+	'Core:DateTime:Placeholder_d' => 'DD',
+    // Day of the month: 2 digits (with leading zero)
+	'Core:DateTime:Placeholder_j' => 'D',
+    // Day of the month: 1 or 2 digits (without leading zero)
+	'Core:DateTime:Placeholder_m' => 'MM',
+    // Month on 2 digits i.e. 01-12
+	'Core:DateTime:Placeholder_n' => 'M',
+    // Month on 1 or 2 digits 1-12
+	'Core:DateTime:Placeholder_Y' => 'YYYY',
+    // Year on 4 digits
+	'Core:DateTime:Placeholder_y' => 'YY',
+    // Year on 2 digits
+	'Core:DateTime:Placeholder_H' => 'hh',
+    // Hour 00..23
+	'Core:DateTime:Placeholder_h' => 'h',
+    // Hour 01..12
+	'Core:DateTime:Placeholder_G' => 'hh',
+    // Hour 0..23
+	'Core:DateTime:Placeholder_g' => 'h',
+    // Hour 1..12
+	'Core:DateTime:Placeholder_a' => 'am/pm',
+    // am/pm (lowercase)
+	'Core:DateTime:Placeholder_A' => 'AM/PM',
+    // AM/PM (uppercase)
+	'Core:DateTime:Placeholder_i' => 'mm',
+    // minutes, 2 digits: 00..59
+	'Core:DateTime:Placeholder_s' => 'ss',
+    // seconds, 2 digits 00..59
 	'Core:Validator:Default' => 'Неправильный формат',
 	'Core:Validator:Mandatory' => 'Пожалуйста, заполните это поле',
 	'Core:Validator:MustBeInteger' => 'Должно быть целым числом',
@@ -981,7 +987,6 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:TagSetFieldData' => '%2$s для класса %1$s',
 	'Class:TagSetFieldData+' => '',
-
 	'Class:TagSetFieldData/Attribute:code' => 'Код',
 	'Class:TagSetFieldData/Attribute:code+' => 'Внутренний код. Должен содержать не менее 3 цифробуквенных символа.',
 	'Class:TagSetFieldData/Attribute:label' => 'Метка',
@@ -991,7 +996,6 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:TagSetFieldData/Attribute:finalclass' => 'Класс тега',
 	'Class:TagSetFieldData/Attribute:obj_class' => 'Класс объекта',
 	'Class:TagSetFieldData/Attribute:obj_attcode' => 'Код поля',
-
 	'Core:TagSetFieldData:ErrorDeleteUsedTag' => 'Используемые теги не могут быть удалены',
 	'Core:TagSetFieldData:ErrorDuplicateTagCodeOrLabel' => 'Коды и метки тегов должны быть уникальными',
 	'Core:TagSetFieldData:ErrorTagCodeSyntax' => 'Код тега должен содержать от 3 до %1$d цифробуквенных символов',
@@ -1078,8 +1082,8 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:AsyncTask/Attribute:last_error+' => '',
 	'Class:AsyncTask/Attribute:last_attempt' => 'Last attempt~~',
 	'Class:AsyncTask/Attribute:last_attempt+' => '',
-    'Class:AsyncTask:InvalidConfig_Class_Keys' => 'Invalid format for the configuration of "async_task_retries[%1$s]". Expecting an array with the following keys: %2$s~~',
-    'Class:AsyncTask:InvalidConfig_Class_InvalidKey_Keys' => 'Invalid format for the configuration of "async_task_retries[%1$s]": unexpected key "%2$s". Expecting only the following keys: %3$s~~',
+	'Class:AsyncTask:InvalidConfig_Class_Keys' => 'Invalid format for the configuration of "async_task_retries[%1$s]". Expecting an array with the following keys: %2$s~~',
+	'Class:AsyncTask:InvalidConfig_Class_InvalidKey_Keys' => 'Invalid format for the configuration of "async_task_retries[%1$s]": unexpected key "%2$s". Expecting only the following keys: %3$s~~',
 ));
 
 //
diff --git a/dictionaries/ru.dictionary.itop.ui.php b/dictionaries/ru.dictionary.itop.ui.php
index 8adcdf7265..392b293d5b 100644
--- a/dictionaries/ru.dictionary.itop.ui.php
+++ b/dictionaries/ru.dictionary.itop.ui.php
@@ -26,6 +26,12 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:AuditCategory/Attribute:definition_set+' => 'OQL выражение, определяющее набор объектов для проверки',
 	'Class:AuditCategory/Attribute:rules_list' => 'Правила аудита',
 	'Class:AuditCategory/Attribute:rules_list+' => 'Правила аудита для этой категории',
+	'Class:AuditCategory/Attribute:ok_error_tolerance' => 'Warning threshold~~',
+	'Class:AuditCategory/Attribute:ok_error_tolerance+' => 'Percentage of invalid objects below which the result is a warning (orange)~~',
+	'Class:AuditCategory/Attribute:warning_error_tolerance' => 'Error threshold~~',
+	'Class:AuditCategory/Attribute:warning_error_tolerance+' => 'Percentage of invalid objects below which the result is in error (red)~~',
+	'Class:AuditCategory/Attribute:domains_list' => 'Domains~~',
+	'Class:AuditCategory/Attribute:domains_list+' => 'Domains which includes this category~~',
 ));
 
 //
@@ -53,7 +59,42 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:AuditRule/Attribute:category_id' => 'Категория',
 	'Class:AuditRule/Attribute:category_id+' => 'Категория для этого правила',
 	'Class:AuditRule/Attribute:category_name' => 'Категория',
-	'Class:AuditRule/Attribute:category_name+' => 'Категория для этого правила',
+	'Class:AuditRule/Attribute:category_name+' => 'Категория для этого правила'
+));
+
+//
+// Class: AuditDomain
+//
+
+Dict::Add('RU RU', 'Russian', 'Русский', array(
+	'Class:AuditDomain' => 'Audit Domain~~',
+	'Class:AuditDomain+' => 'Audit domains allow to group the audit categories.
+Domain usually correspond to who is responsible for checking and fixing errors~~',
+	'Class:AuditDomain/Attribute:name' => 'Name~~',
+	'Class:AuditDomain/Attribute:name+' => 'Its a segmentation of the Audit by who is in charge of fixing it or just interested~~',
+	'Class:AuditDomain/Attribute:description' => 'Description~~',
+	'Class:AuditDomain/Attribute:description+' => '~~',
+	'Class:AuditDomain/Attribute:icon' => 'Icon~~',
+	'Class:AuditDomain/Attribute:icon+' => '~~',
+	'Class:AuditDomain/Attribute:categories_list' => 'Categories~~',
+	'Class:AuditDomain/Attribute:categories_list+' => 'Related audit categories. When running the audit on a domain, all related audit categories are checked and only those.~~',
+));
+
+//
+// Class: lnkAuditCategoryToAuditDomain
+//
+
+Dict::Add('RU RU', 'Russian', 'Русский', array(
+	'Class:lnkAuditCategoryToAuditDomain' => 'Link AuditCategory / AuditDomain~~',
+	'Class:lnkAuditCategoryToAuditDomain+' => '~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:category_id' => 'Category~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:category_id+' => 'Audit Category~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:category_name' => 'Category name~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:category_name+' => 'Audit category name~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:domain_id' => 'Domain~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:domain_id+' => 'Audit domain~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:domain_name' => 'Domain name~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:domain_name+' => 'Audit domain name~~',
 ));
 
 //
@@ -71,6 +112,16 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:Query/Attribute:is_template+' => 'Usable as source for recipient OQL in Notifications~~',
 	'Class:Query/Attribute:is_template/Value:yes' => 'Yes~~',
 	'Class:Query/Attribute:is_template/Value:no' => 'No~~',
+	'Class:Query/Attribute:export_count' => 'Export counter~~',
+	'Class:Query/Attribute:export_count+' => 'Counter reflecting the number of time this query has been executed~~',
+	'Class:Query/Attribute:export_last_date' => 'Last export~~',
+	'Class:Query/Attribute:export_last_date+' => 'Date and time of the last export execution~~',
+	'Class:Query/Attribute:export_last_user_id' => 'User~~',
+	'Class:Query/Attribute:export_last_user_id+' => 'The user who executed the last export~~',
+	'Class:Query/Attribute:export_last_user_contact' => 'Contact~~',
+	'Class:Query/Attribute:export_last_user_contact+' => 'The contact who executed the last export~~',
+	'Query:baseinfo' => 'General information~~',
+	'Query:exportInfo' => 'Export information~~',
 	'Class:QueryOQL/Attribute:fields' => 'Экспорт. поля',
 	'Class:QueryOQL/Attribute:fields+' => 'Список атрибутов для экспорта, разделённых запятыми (или alias.attribute)',
 	'Class:QueryOQL' => 'OQL запрос',
@@ -119,7 +170,6 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:User/Attribute:status+' => 'Учетная запись пользователя включена или отключена.',
 	'Class:User/Attribute:status/Value:enabled' => 'Включен',
 	'Class:User/Attribute:status/Value:disabled' => 'Отключен',
-
 	'Class:User/Error:LoginMustBeUnique' => 'Логин должен быть уникальным - "%1s" уже используется.',
 	'Class:User/Error:AtLeastOneProfileIsNeeded' => 'Как минимум один профиль должен быть назначен данному пользователю.',
 	'Class:User/Error:ProfileNotAllowed' => 'Profile "%1$s" cannot be added it will deny the access to backoffice~~',
@@ -328,6 +378,29 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Expression:Unit:Short:YEAR' => 'y',
 ));
 
+//
+// Duplicated into itop-welcome-itil ( will be removed from here...)
+//
+Dict::Add('RU RU', 'Russian', 'Русский', array(
+	'Menu:WelcomeMenu' => 'Добро пожаловать',
+	'Menu:WelcomeMenu+' => 'Добро пожаловать в '.ITOP_APPLICATION_SHORT,
+	'Menu:WelcomeMenuPage' => 'Добро пожаловать',
+	'Menu:WelcomeMenuPage+' => 'Добро пожаловать в '.ITOP_APPLICATION_SHORT,
+	'Menu:AdminTools' => 'Инструменты администратора',
+	'Menu:AdminTools+' => 'Инструменты администратора',
+	'Menu:AdminTools?' => 'Инструменты доступны только для пользователей c правами администратора',
+	'Menu:CSVImportMenu' => 'Импорт CSV',
+	'Menu:CSVImportMenu+' => 'Пакетное создание или обновление',
+	'Menu:DataModelMenu' => 'Модель данных',
+	'Menu:DataModelMenu+' => 'Обзор модели данных',
+	'Menu:ExportMenu' => 'Экспорт',
+	'Menu:ExportMenu+' => 'Экспорт результатов любого запроса в HTML, CSV или XML',
+	'Menu:NotificationsMenu' => 'Уведомления',
+	'Menu:NotificationsMenu+' => 'Настройка уведомлений',
+	'Menu:MyShortcuts' => 'Избранное',
+	'Menu:DataAdministration' => 'Администрирование данных',
+	'Menu:DataAdministration+' => 'Администрирование данных',
+));
 
 //
 // String from the User Interface: menu, messages, buttons, etc...
@@ -337,12 +410,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'BooleanLabel:yes' => 'да',
 	'BooleanLabel:no' => 'нет',
 	'UI:Login:Title' => 'Вход в '.ITOP_APPLICATION_SHORT,
-	'Menu:WelcomeMenu' => 'Добро пожаловать',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:WelcomeMenu+' => 'Добро пожаловать в '.ITOP_APPLICATION_SHORT, // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:WelcomeMenuPage' => 'Добро пожаловать',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:WelcomeMenuPage+' => 'Добро пожаловать в '.ITOP_APPLICATION_SHORT, // Duplicated into itop-welcome-itil (will be removed from here...)
 	'UI:WelcomeMenu:Title' => 'Добро пожаловать в '.ITOP_APPLICATION_SHORT,
-
 	'UI:WelcomeMenu:LeftBlock' => '<p>'.ITOP_APPLICATION_SHORT.' является порталом оперативного централизованного управления IT инфраструктурой с открытым исходным кодом.</p>
 <ul>Он включает:
 <li>A complete CMDB (Configuration management database) to document and manage the IT inventory.</li>
@@ -353,7 +421,6 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 <li>Панели для быстрого обзора IT.</li>
 </ul>
 <p>Все модули могут быть настроены, шаг за шагом, независмо друг от друга.</p>',
-
 	'UI:WelcomeMenu:RightBlock' => '<p>'.ITOP_APPLICATION_SHORT.' ориентирован на предоставления сервисов, он позволяет IT специалистам легко управляться с несколькими заказчиками или организациями.
 <ul>'.ITOP_APPLICATION_SHORT.' обеспечивает многофункциональный набор бизнес-процессов, которые:
 <li>Повышают эффективность управления IT</li>
@@ -369,7 +436,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 <li>Управлять наиболее важным активом ИТ: документацией.</li>
 </ul>
 </p>',
-	'UI:WelcomeMenu:Text'=> '<div>Поздравляем, вы приземлились на '.ITOP_APPLICATION.' '.ITOP_VERSION_NAME.'!</div>
+	'UI:WelcomeMenu:Text' => '<div>Поздравляем, вы приземлились на '.ITOP_APPLICATION.' '.ITOP_VERSION_NAME.'!</div>
 
 <div>Эта версия имеет совершенно новый современный и отзывчивый дизайн бэк-офиса.</div>
 
@@ -390,6 +457,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'UI:Button:GlobalSearch' => 'Поиск',
 	'UI:Button:Search' => 'Поиск',
 	'UI:Button:Clear' => 'Очистить',
+	'UI:Button:Confirm' => ' Confirm ~~',
 	'UI:Button:SearchInHierarchy' => 'Поиск в иерархии',
 	'UI:Button:Query' => ' Запрос ',
 	'UI:Button:Ok' => 'Ok',
@@ -430,7 +498,6 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'UI:UserPref:DoNotShowAgain' => 'Больше не показывать',
 	'UI:InputFile:NoFileSelected' => 'Файл не выбран',
 	'UI:InputFile:SelectFile' => 'Выбрать файл',
-
 	'UI:SearchToggle' => 'Поиск',
 	'UI:ClickToCreateNew' => 'Создать: %1$s',
 	'UI:SearchFor_Class' => 'Поиск: %1$s',
@@ -450,7 +517,6 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'UI:Error:CannotWriteToTmp_Dir' => ' Невозможно записать временный файл на диск. upload_tmp_dir = "%1$s".',
 	'UI:Error:UploadStoppedByExtension_FileName' => 'Загрузка остановлена по расширению. (Имя файла = "%1$s").',
 	'UI:Error:UploadFailedUnknownCause_Code' => 'Загрузка файла не удалась по неизвестной причине. (Код ошибки = "%1$s").',
-
 	'UI:Error:1ParametersMissing' => 'Ошибка: следующий параметр должен быть указан для этой операции: %1$s.',
 	'UI:Error:2ParametersMissing' => 'Ошибка: следующие параметры должен быть указан для этой операции: %1$s и %2$s.',
 	'UI:Error:3ParametersMissing' => 'Ошибка: следующие параметры должен быть указан для этой операции: %1$s, %2$s и %3$s.',
@@ -472,9 +538,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'UI:Error:MaintenanceMode' => 'Приложение в режиме технического обслуживания',
 	'UI:Error:MaintenanceTitle' => 'Техническое обслуживание',
 	'UI:Error:InvalidToken' => 'Error: the requested operation has already been performed (CSRF token not found)~~',
-
 	'UI:Error:SMTP:UnknownVendor' => 'OAuth SMTP provider %1$s does not exist  (email_transport_smtp.oauth.provider)~~',
-
 	'UI:GroupBy:Count' => 'Количество',
 	'UI:GroupBy:Count+' => 'Количество элементов',
 	'UI:CountOfObjects' => '%1$d объектов соответствует критериям.',
@@ -503,6 +567,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'UI:Menu:OtherActions' => 'Другие действия',
 	'UI:Menu:Transitions' => 'Переходы',
 	'UI:Menu:OtherTransitions' => 'Другие переходы',
+	'UI:Menu:View' => 'View this object~~',
 	'UI:Menu:New' => 'Создать...',
 	'UI:Menu:Add' => 'Добавить...',
 	'UI:Menu:Manage' => 'Управление...',
@@ -511,6 +576,9 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'UI:Menu:Modify' => 'Редактировать...',
 	'UI:Menu:Delete' => 'Удалить...',
 	'UI:Menu:BulkDelete' => 'Удалить...',
+	'UI:Menu:BulkDelete_Class' => 'Delete %1$s objects...~~',
+	'UI:Menu:BulkDelete_Link' => 'Delete %1$s...~~',
+	'UI:Menu:BulkDelete_Remote' => 'Delete %1$s...~~',
 	'UI:UndefinedObject' => 'неопределённый',
 	'UI:Document:OpenInNewWindow:Download' => 'Открыть в новом окне: %1$s, Загрузка: %2$s',
 	'UI:SplitDateTime-Date' => 'дата',
@@ -543,7 +611,6 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'UI:Login:ResetPassword' => 'Отправить',
 	'UI:Login:ResetPwdFailed' => 'Не удалось отправить email: %1$s',
 	'UI:Login:SeparatorOr' => 'или',
-
 	'UI:ResetPwd-Error-WrongLogin' => 'учетная запись с логином "%1$s" не найдена.',
 	'UI:ResetPwd-Error-NotPossible' => 'восстановление пароля для внешних учётных записей недоступно.',
 	'UI:ResetPwd-Error-FixedPwd' => 'восстановление пароля для данной учётной записи недоступно. Пожалуйста, обратитесь к администратору.',
@@ -554,50 +621,49 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'UI:ResetPwd-EmailSent' => 'Please check your email box and follow the instructions. If you receive no email, please check the login you typed.~~',
 	'UI:ResetPwd-EmailSubject' => 'Восстановление пароля',
 	'UI:ResetPwd-EmailBody' => '<body><p>Вы запросили восстановление пароля '.ITOP_APPLICATION_SHORT.'.</p><p>Пожалуйста, воспользуйтесь <a href="%1$s">этой ссылкой</a> для задания нового пароля.</p></body>',
-
 	'UI:ResetPwd-Title' => 'Восстановление пароля',
 	'UI:ResetPwd-Error-InvalidToken' => 'Извините, недействительная ссылка. Если вы запрашивали восстановление пароля несколько раз подряд, пожалуйста, убедитесь, что используете ссылку из последнего полученного письма.',
 	'UI:ResetPwd-Error-EnterPassword' => 'Введите новый пароль для учетной записи пользователя \'%1$s\'.',
 	'UI:ResetPwd-Ready' => 'Пароль успешно изменён.',
 	'UI:ResetPwd-Login' => 'Войти...',
-
-	'UI:Login:About'                               => '',
-	'UI:Login:ChangeYourPassword'                  => 'Изменение пароля',
-	'UI:Login:OldPasswordPrompt'                   => 'Старый пароль',
-	'UI:Login:NewPasswordPrompt'                   => 'Новый пароль',
-	'UI:Login:RetypeNewPasswordPrompt'             => 'Повторите новый пароль',
-	'UI:Login:IncorrectOldPassword'                => 'Ошибка: старый пароль неверный',
-	'UI:LogOffMenu'                                => 'Выход',
+	'UI:Login:About' => '',
+	'UI:Login:ChangeYourPassword' => 'Изменение пароля',
+	'UI:Login:OldPasswordPrompt' => 'Старый пароль',
+	'UI:Login:NewPasswordPrompt' => 'Новый пароль',
+	'UI:Login:RetypeNewPasswordPrompt' => 'Повторите новый пароль',
+	'UI:Login:IncorrectOldPassword' => 'Ошибка: старый пароль неверный',
+	'UI:LogOffMenu' => 'Выход',
 	'UI:LogOff:ThankYou' => 'Спасибо за использование '.ITOP_APPLICATION_SHORT,
-	'UI:LogOff:ClickHereToLoginAgain'              => 'Нажмите здесь, чтобы снова войти...',
-	'UI:ChangePwdMenu'                             => 'Изменить пароль...',
-	'UI:Login:PasswordChanged'                     => 'Пароль успешно изменён!',
-	'UI:AccessRO-All'                              => 'Только чтение~~',
-	'UI:AccessRO-Users'                            => 'Только чтение для конечных пользователей~~',
-	'UI:ApplicationEnvironment'                    => 'Application environment: %1$s~~',
-	'UI:Login:RetypePwdDoesNotMatch'               => 'Пароли не совпадают',
-	'UI:Button:Login'                              => 'Войти',
+	'UI:LogOff:ClickHereToLoginAgain' => 'Нажмите здесь, чтобы снова войти...',
+	'UI:ChangePwdMenu' => 'Изменить пароль...',
+	'UI:Login:PasswordChanged' => 'Пароль успешно изменён!',
+	'UI:Login:PasswordNotChanged' => 'Error: Password is the same!~~',
+	'UI:AccessRO-All' => 'Только чтение~~',
+	'UI:AccessRO-Users' => 'Только чтение для конечных пользователей~~',
+	'UI:ApplicationEnvironment' => 'Application environment: %1$s~~',
+	'UI:Login:RetypePwdDoesNotMatch' => 'Пароли не совпадают',
+	'UI:Button:Login' => 'Войти',
 	'UI:Login:Error:AccessRestricted' => 'Доступ к '.ITOP_APPLICATION_SHORT.' ограничен. Пожалуйста, свяжитесь с администратором '.ITOP_APPLICATION_SHORT.'.',
 	'UI:Login:Error:AccessAdmin' => 'Доступ ограничен для лиц с административными привилегиями. Пожалуйста, свяжитесь с администратором '.ITOP_APPLICATION_SHORT.'.',
-	'UI:Login:Error:WrongOrganizationName'         => 'Неизвестная организация',
+	'UI:Login:Error:WrongOrganizationName' => 'Неизвестная организация',
 	'UI:Login:Error:MultipleContactsHaveSameEmail' => 'Несколько контактов имеют один и тот же адрес электронной почты',
-	'UI:Login:Error:NoValidProfiles'               => 'Нет допустимого профиля',
-	'UI:CSVImport:MappingSelectOne'                => '-- выберите значение --',
-	'UI:CSVImport:MappingNotApplicable'            => '-- игнорировать это поле --',
-	'UI:CSVImport:NoData'                          => 'Пустой набор данных..., пожалуйста введите что-нибудь!',
-	'UI:Title:DataPreview'                         => 'Предпросмотр данных',
-	'UI:CSVImport:ErrorOnlyOneColumn'              => 'Ошибка: данные содержат только один столбец (выбран правильный разделитель?).',
-	'UI:CSVImport:FieldName'                       => 'Поле %1$d',
-	'UI:CSVImport:DataLine1'                       => 'Строка данных 1',
-	'UI:CSVImport:DataLine2'                       => 'Строка данных 2',
-	'UI:CSVImport:idField'                         => 'id (Первичный ключ)',
+	'UI:Login:Error:NoValidProfiles' => 'Нет допустимого профиля',
+	'UI:CSVImport:MappingSelectOne' => '-- выберите значение --',
+	'UI:CSVImport:MappingNotApplicable' => '-- игнорировать это поле --',
+	'UI:CSVImport:NoData' => 'Пустой набор данных..., пожалуйста введите что-нибудь!',
+	'UI:Title:DataPreview' => 'Предпросмотр данных',
+	'UI:CSVImport:ErrorOnlyOneColumn' => 'Ошибка: данные содержат только один столбец (выбран правильный разделитель?).',
+	'UI:CSVImport:FieldName' => 'Поле %1$d',
+	'UI:CSVImport:DataLine1' => 'Строка данных 1',
+	'UI:CSVImport:DataLine2' => 'Строка данных 2',
+	'UI:CSVImport:idField' => 'id (Первичный ключ)',
 	'UI:Title:BulkImport' => ITOP_APPLICATION_SHORT.' - Пакетный импорт',
-	'UI:Title:BulkImport+'                         => 'Мастер импорта CSV',
-	'UI:Title:BulkSynchro_nbItem_ofClass_class'    => 'Synchronization of %1$d objects of class %2$s~~',
-	'UI:CSVImport:ClassesSelectOne'                => '-- выберите значение --',
-	'UI:CSVImport:ErrorExtendedAttCode'            => 'Внутренняя ошибка: "%1$s" некорректный код потому, что "%2$s" НЕ является внешним ключом класса "%3$s"',
-	'UI:CSVImport:ObjectsWillStayUnchanged'        => '%1$d объект(ов) останутся неизменными.',
-	'UI:CSVImport:ObjectsWillBeModified'           => '%1$d объект(ов) будут изменены.',
+	'UI:Title:BulkImport+' => 'Мастер импорта CSV',
+	'UI:Title:BulkSynchro_nbItem_ofClass_class' => 'Synchronization of %1$d objects of class %2$s~~',
+	'UI:CSVImport:ClassesSelectOne' => '-- выберите значение --',
+	'UI:CSVImport:ErrorExtendedAttCode' => 'Внутренняя ошибка: "%1$s" некорректный код потому, что "%2$s" НЕ является внешним ключом класса "%3$s"',
+	'UI:CSVImport:ObjectsWillStayUnchanged' => '%1$d объект(ов) останутся неизменными.',
+	'UI:CSVImport:ObjectsWillBeModified' => '%1$d объект(ов) будут изменены.',
 	'UI:CSVImport:ObjectsWillBeAdded' => '%1$d объект(ов) будут добавлены.',
 	'UI:CSVImport:ObjectsWillHaveErrors' => '%1$d объект(ов) будут содержать ошибки.',
 	'UI:CSVImport:ObjectsRemainedUnchanged' => '%1$d objects(s) remained unchanged.~~',
@@ -643,11 +709,14 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'UI:UniversalSearchTitle' => ITOP_APPLICATION_SHORT.' - Универсальный поиск',
 	'UI:UniversalSearch:Error' => 'Ошибка: %1$s',
 	'UI:UniversalSearch:LabelSelectTheClass' => 'Выбор класса для поиска: ',
-
 	'UI:CSVReport-Value-Modified' => 'Изменен',
 	'UI:CSVReport-Value-SetIssue' => 'invalid value for attribute~~',
 	'UI:CSVReport-Value-ChangeIssue' => '\'%1$s\' is an invalid value~~',
 	'UI:CSVReport-Value-NoMatch' => 'No match for value \'%1$s\'~~',
+	'UI:CSVReport-Value-NoMatch-PossibleValues' => 'Some possible \'%1$s\' value(s): %2$s~~',
+	'UI:CSVReport-Value-NoMatch-NoObject' => 'There are no \'%1$s\' objects~~',
+	'UI:CSVReport-Value-NoMatch-NoObject-ForCurrentUser' => 'There are no \'%1$s\' objects found with your current profile~~',
+	'UI:CSVReport-Value-NoMatch-SomeObjectNotVisibleForCurrentUser' => 'There are some \'%1$s\' objects not visible with your current profile~~',
 	'UI:CSVReport-Value-Missing' => 'Отсутствует обязательное значение',
 	'UI:CSVReport-Value-Ambiguous' => 'Неоднозначное сопоставление: найдено %1$s объектов',
 	'UI:CSVReport-Row-Unchanged' => 'без изменений',
@@ -661,15 +730,16 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'UI:CSVReport-Value-Issue-Readonly' => 'Аттрибут \'%1$s\' доступен только для чтения и не может быть изменен (ткущее значение: %2$s, предложенное значение: %3$s)',
 	'UI:CSVReport-Value-Issue-Format' => 'Не удалось обработать запрос: %1$s',
 	'UI:CSVReport-Value-Issue-NoMatch' => 'Неизвестное значение атрибута \'%1$s\': ничего не найдено, проверьте правильность ввода',
+	'UI:CSVReport-Value-Issue-AllowedValues' => 'Allowed \'%1$s\' value(s): %2$s~~',
 	'UI:CSVReport-Value-Issue-Unknown' => 'Неизвестное значение атрибута \'%1$s\': %2$s',
 	'UI:CSVReport-Row-Issue-Inconsistent' => 'Несоответствие атрибутов: %1$s',
 	'UI:CSVReport-Row-Issue-Attribute' => 'Неизвестное значение(я) атрибута',
 	'UI:CSVReport-Row-Issue-MissingExtKey' => 'Не может быть создан так как отсутствует внешний ключ(и): %1$s',
 	'UI:CSVReport-Row-Issue-DateFormat' => 'Формат даты неверен',
+	'UI:CSVReport-Row-Issue-ExpectedDateFormat' => 'Expected format: %1$s~~',
 	'UI:CSVReport-Row-Issue-Reconciliation' => 'Невозможно согласовать',
 	'UI:CSVReport-Row-Issue-Ambiguous' => 'Неоднозначное сопоставление',
 	'UI:CSVReport-Row-Issue-Internal' => 'Внутренняя ошибка: %1$s, %2$s',
-
 	'UI:CSVReport-Icon-Unchanged' => 'Неизмен.',
 	'UI:CSVReport-Icon-Modified' => 'Измен.',
 	'UI:CSVReport-Icon-Missing' => 'Упущен.',
@@ -684,14 +754,32 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'UI:CSVReport-Stats-Errors' => '%1$.0f %% загруженных объектов имеют ошибки. Проигнорированы.',
 	'UI:CSVReport-Stats-Created' => '%1$.0f %% загруженных объектов были созданы.',
 	'UI:CSVReport-Stats-Modified' => '%1$.0f %% загруженных объектов были изменены.',
-
 	'UI:CSVExport:AdvancedMode' => 'Расширенный режим',
 	'UI:CSVExport:AdvancedMode+' => 'In advanced mode, several columns are added to the export: the id of the object, the id of external keys and their reconciliation attributes.',
 	'UI:CSVExport:LostChars' => 'Проблема кодировки',
 	'UI:CSVExport:LostChars+' => 'The downloaded file will be encoded into %1$s. '.ITOP_APPLICATION_SHORT.' has detected some characters that are not compatible with this format. Those characters will either be replaced by a substitute (e.g. accentuated chars losing the accent), or they will be discarded. You can copy/paste the data from your web browser. Alternatively, you can contact your administrator to change the encoding (See parameter \'csv_file_default_charset\').',
-
 	'UI:Audit:Title' => ITOP_APPLICATION_SHORT.' - Аудит CMDB',
 	'UI:Audit:InteractiveAudit' => 'Интерактивный аудит',
+	'UI:Audit:Interactive:All:Title' => 'Audit results~~',
+	'UI:Audit:Interactive:All:SubTitle' => 'Full audit: includes all rules, all categories, all domains~~',
+	'UI:Audit:Interactive:All:BreadCrumb' => 'Full audit~~',
+	'UI:Audit:Interactive:All:BreadCrumb+' => 'Audit results for all rules~~',
+	'UI:Audit:Interactive:Categories:Title' => 'Audit results for categories: %1$s~~',
+	'UI:Audit:Interactive:Categories:SubTitle' => 'Audit results for all the rules belonging to one of those %1$s categories~~',
+	'UI:Audit:Interactive:Categories:BreadCrumb' => 'Categories~~',
+	'UI:Audit:Interactive:Categories:BreadCrumb+' => 'Audit categories: %1$s~~',
+	'UI:Audit:Interactive:Domain:Title' => 'Audit results for Domain: %1$s~~',
+	'UI:Audit:Interactive:Domain:SubTitle' => 'Audit results for all the rules belonging to a category related to the domain: %1$s~~',
+	'UI:Audit:Interactive:Domain:BreadCrumb' => '%1$s~~',
+	'UI:Audit:Interactive:Domain:BreadCrumb+' => 'Audit for Domain: %1$s~~',
+	'UI:Audit:Interactive:Selection:Title' => 'Selection of an audit~~',
+	'UI:Audit:Interactive:Selection:SubTitle' => 'Select a domain to get the results limited to this domain or select "All categories" to get a full audit (can take time or even fail if too much data to audit)~~',
+	'UI:Audit:Interactive:Selection:BreadCrumb' => 'Selection~~',
+	'UI:Audit:Interactive:Selection:BreadCrumb+' => 'Selection of an Audit to run~~',
+	'UI:Audit:Interactive:Selection:BadgeAll' => 'All categories~~',
+	'UI:Audit:Interactive:Button:Back' => 'Back to the audit~~',
+	'UI:Audit:Interactive:Button:Configuration' => 'Audit configuration~~',
+	'UI:Audit:ViewRules' => 'Check the rules~~',
 	'UI:Audit:HeaderAuditRule' => 'Правило аудита',
 	'UI:Audit:HeaderNbObjects' => '# Объекты',
 	'UI:Audit:HeaderNbErrors' => '# Ошибки',
@@ -707,8 +795,6 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'UI:Audit:Dashboard:ObjectsInError' => 'Objects in errors~~',
 	'UI:Audit:Dashboard:ObjectsValidated' => 'Objects validated~~',
 	'UI:Audit:AuditCategory:Subtitle' => '%1$s errors ouf of %2$s - %3$s%%~~',
-
-
 	'UI:RunQuery:Title' => ITOP_APPLICATION_SHORT.' - Оценка запросов OQL',
 	'UI:RunQuery:QueryExamples' => 'Примеры запросов',
 	'UI:RunQuery:QueryResults' => 'Результаты запроса',
@@ -747,7 +833,6 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'UI:Schema:Label' => 'Метка',
 	'UI:Schema:Label+' => 'Метка атрибута',
 	'UI:Schema:Type' => 'Тип',
-
 	'UI:Schema:Type+' => 'Тип данных атрибута',
 	'UI:Schema:Origin' => 'Происхождение',
 	'UI:Schema:Origin+' => 'Базовый класс, в котором этот атрибут определен',
@@ -795,6 +880,16 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'UI:Schema:DisplaySelector/Code' => 'Code~~',
 	'UI:Schema:Attribute/Filter' => 'Filter~~',
 	'UI:Schema:DefaultNullValue' => 'Default null : "%1$s"~~',
+	'UI:Schema:Events' => 'Events~~',
+	'UI:Schema:Events:Defined' => 'Defined events~~',
+	'UI:Schema:Events:NoEvent' => 'No event defined~~',
+	'UI:Schema:Events:Listeners' => 'Event listeners~~',
+	'UI:Schema:Events:NoListener' => 'No event listener~~',
+	'UI:Schema:Events:Event' => 'Event~~',
+	'UI:Schema:Events:Description' => 'Description~~',
+	'UI:Schema:Events:Listener' => 'Listener~~',
+	'UI:Schema:Events:Rank' => 'Rank~~',
+	'UI:Schema:Events:Module' => 'Module~~',
 	'UI:LinksWidget:Autocomplete+' => 'Введите первые 3 символа...',
 	'UI:Edit:SearchQuery' => 'Select a predefined query~~',
 	'UI:Edit:TestQuery' => 'Проверить запрос',
@@ -886,7 +981,6 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'UI:SystemIntrusion' => 'Доступ запрещён. Вы пытаетесь выполнить неразрешённую операцию.',
 	'UI:FatalErrorMessage' => 'Критическая ошибка, '.ITOP_APPLICATION_SHORT.' не может продолжать работу.',
 	'UI:Error_Details' => 'Ошибка: %1$s.',
-
 	'UI:PageTitle:ProfileProjections' => ITOP_APPLICATION_SHORT.' управление пользователями - проектирование профилей',
 	'UI:UserManagement:Class' => 'Класс',
 	'UI:UserManagement:Class+' => 'Класс объектов',
@@ -921,66 +1015,42 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'UI:UserManagement:NoLifeCycleApplicable' => 'не определено',
 	'UI:UserManagement:NoLifeCycleApplicable+' => 'Не определён жизненный цикл для данного класса',
 	'UI:UserManagement:GrantMatrix' => 'Матрица разрешений',
-
-	'Menu:AdminTools' => 'Инструменты администратора',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:AdminTools+' => 'Инструменты администратора',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:AdminTools?' => 'Инструменты доступны только для пользователей c правами администратора',// Duplicated into itop-welcome-itil (will be removed from here...)
 	'Menu:SystemTools' => 'Система',
-
 	'UI:ChangeManagementMenu' => 'Управление изменениями',
 	'UI:ChangeManagementMenu+' => 'Управление изменениями',
 	'UI:ChangeManagementMenu:Title' => 'Обзор изменений',
 	'UI-ChangeManagementMenu-ChangesByType' => 'Изменения по типу',
 	'UI-ChangeManagementMenu-ChangesByStatus' => 'Изменения по статусу',
 	'UI-ChangeManagementMenu-ChangesNotYetAssigned' => 'Изменения, ожидающие назначения',
-
 	'UI:ConfigurationManagementMenu' => 'Управление конфигурациями',
 	'UI:ConfigurationManagementMenu+' => 'Управление конфигурациями',
 	'UI:ConfigurationManagementMenu:Title' => 'Обзор инфраструктуры',
 	'UI-ConfigurationManagementMenu-InfraByType' => 'Объекты инфраструктуры по типу',
 	'UI-ConfigurationManagementMenu-InfraByStatus' => 'Объекты инфраструктуры по статусу',
-
 	'UI:ConfigMgmtMenuOverview:Title' => 'Панель управления конфигурациями',
 	'UI-ConfigMgmtMenuOverview-FunctionalCIbyStatus' => 'Элементы конфигурации по статусу',
 	'UI-ConfigMgmtMenuOverview-FunctionalCIByType' => 'Элементы конфигурации по типу',
-
 	'UI:RequestMgmtMenuOverview:Title' => 'Панель управления запросами',
 	'UI-RequestManagementOverview-RequestByService' => 'Запросы по услугам',
 	'UI-RequestManagementOverview-RequestByPriority' => 'Запросы по приоритетам',
 	'UI-RequestManagementOverview-RequestUnassigned' => 'Запросы, не назначенные агентам',
-
 	'UI:IncidentMgmtMenuOverview:Title' => 'Панель управления инцидентами',
 	'UI-IncidentManagementOverview-IncidentByService' => 'Инциденты по услугам',
 	'UI-IncidentManagementOverview-IncidentByPriority' => 'Инциденты по приоритетам',
 	'UI-IncidentManagementOverview-IncidentUnassigned' => 'Инциденты, не назначенные агентам',
-
 	'UI:ChangeMgmtMenuOverview:Title' => 'Панель управления изменениями',
 	'UI-ChangeManagementOverview-ChangeByType' => 'Изменения по типу',
 	'UI-ChangeManagementOverview-ChangeUnassigned' => 'Изменения, не назначенные агентам',
 	'UI-ChangeManagementOverview-ChangeWithOutage' => 'Перерывы в обслуживании, связанные с изменениями',
-
 	'UI:ServiceMgmtMenuOverview:Title' => 'Панель управления услугами',
 	'UI-ServiceManagementOverview-CustomerContractToRenew' => 'Договоры с заказчиками, которые должны быть продлены в течение 30 дней',
 	'UI-ServiceManagementOverview-ProviderContractToRenew' => 'Договоры с поставщиками, которые должны быть продлены в течение 30 дней',
-
 	'UI:ContactsMenu' => 'Договоры',
 	'UI:ContactsMenu+' => 'Договоры',
 	'UI:ContactsMenu:Title' => 'Обзор договоров',
 	'UI-ContactsMenu-ContactsByLocation' => 'Договоры по размещению',
 	'UI-ContactsMenu-ContactsByType' => 'Договоры по типу',
 	'UI-ContactsMenu-ContactsByStatus' => 'Договоры по статусу',
-
-	'Menu:CSVImportMenu' => 'Импорт CSV',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:CSVImportMenu+' => 'Пакетное создание или обновление',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:DataModelMenu' => 'Модель данных',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:DataModelMenu+' => 'Обзор модели данных',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:ExportMenu' => 'Экспорт',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:ExportMenu+' => 'Экспорт результатов любого запроса в HTML, CSV или XML',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:NotificationsMenu' => 'Уведомления',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:NotificationsMenu+' => 'Настройка уведомлений',// Duplicated into itop-welcome-itil (will be removed from here...)
 	'UI:NotificationsMenu:Title' => 'Настройка Уведомлений',
 	'UI:NotificationsMenu:Help' => 'Помощь',
 	'UI:NotificationsMenu:HelpContent' => '<p>В '.ITOP_APPLICATION_SHORT.' полностью настраиваемые уведомления, которые основаны на двух наборах объектов: <i>триггерах и действиях</i>.</p>
@@ -1010,53 +1080,18 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'UI:NotificationsMenu:Actions:ActionWebhook' => 'Webhook actions (outgoing integrations)~~',
 	'UI:NotificationsMenu:Actions:Action' => 'Other actions~~',
 	'UI:NotificationsMenu:AvailableActions' => 'Доступные действия',
-
 	'Menu:TagAdminMenu' => 'Теги',
 	'Menu:TagAdminMenu+' => 'Теги',
 	'UI:TagAdminMenu:Title' => 'Настройка тегов',
 	'UI:TagAdminMenu:NoTags' => 'Не настроены поля тегов',
 	'UI:TagSetFieldData:Error' => 'Ошибка: %1$s',
-
-	'Menu:AuditCategories' => 'Категории аудита',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:AuditCategories+' => 'Категории аудита',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:Notifications:Title' => 'Категории аудита',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:RunQueriesMenu' => 'Выполнение запросов',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:RunQueriesMenu+' => 'Выполнение любых запросов',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:QueryMenu' => 'Книга запросов',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:QueryMenu+' => 'Книга запросов',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:DataAdministration' => 'Администрирование данных',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:DataAdministration+' => 'Администрирование данных',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:UniversalSearchMenu' => 'Универсальный поиск',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UniversalSearchMenu+' => 'Поиск чего угодно...',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:UserManagementMenu' => 'Управление пользователями',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UserManagementMenu+' => 'Управление пользователями',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:ProfilesMenu' => 'Профили',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:ProfilesMenu+' => 'Профили пользователей',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:ProfilesMenu:Title' => 'Профили пользователей',
-	// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:UserAccountsMenu' => 'Учетные записи',
-	// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UserAccountsMenu+' => 'Учетные записи пользователей',
-	// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UserAccountsMenu:Title' => 'Учетные записи пользователей',
-	// Duplicated into itop-welcome-itil (will be removed from here...)
-
 	'UI:iTopVersion:Short' => '%1$s версия %2$s',
 	'UI:iTopVersion:Long' => '%1$s версия %2$s-%3$s основан на %4$s',
 	'UI:PropertiesTab' => 'Свойства',
-
 	'UI:OpenDocumentInNewWindow_' => 'Открыть',
 	'UI:DownloadDocument_' => 'Скачать',
 	'UI:Document:NoPreview' => 'Предпросмотр документов данного типа недоступен',
 	'UI:Download-CSV' => 'Загрузка %1$s~~',
-
 	'UI:DeadlineMissedBy_duration' => 'Пропущен %1$s',
 	'UI:Deadline_LessThan1Min' => '< 1 мин',
 	'UI:Deadline_Minutes' => '%1$d мин',
@@ -1135,9 +1170,13 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Enum:Undefined' => 'Не определён',
 	'UI:DurationForm_Days_Hours_Minutes_Seconds' => '%1$s д %2$s ч %3$s мин %4$s с',
 	'UI:ModifyAllPageTitle' => 'Пакетное редактирование',
+	'UI:Modify_ObjectsOf_Class' => 'Modifying objects of class %1$s~~',
 	'UI:Modify_N_ObjectsOf_Class' => 'Редактирование %1$d объектов класса %2$s',
 	'UI:Modify_M_ObjectsOf_Class_OutOf_N' => 'Редактирование %1$d объектов класса %2$s из %3$d',
 	'UI:Menu:ModifyAll' => 'Редактировать...',
+	'UI:Menu:ModifyAll_Class' => 'Modify %1$s objects...~~',
+	'UI:Menu:ModifyAll_Link' => 'Modify %1$s...~~',
+	'UI:Menu:ModifyAll_Remote' => 'Modify %1$s...~~',
 	'UI:Button:ModifyAll' => 'Редактировать все',
 	'UI:Button:PreviewModifications' => 'Предпросмотр изменений >>',
 	'UI:ModifiedObject' => 'Объект изменен',
@@ -1197,7 +1236,6 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'UI:PrintResolution:LetterLandscape' => 'US Letter – альбомная раскладка',
 	'UI:Toggle:SwitchToStandardDashboard' => 'Переключить на стандартный дашборд',
 	'UI:Toggle:SwitchToCustomDashboard' => 'Переключить на пользовательский дашборд',
-
 	'UI:ConfigureThisList' => 'Настроить список...',
 	'UI:ListConfigurationTitle' => 'Настройка списка',
 	'UI:ColumnsAndSortOrder' => 'Колонки и порядок сортировки:',
@@ -1213,10 +1251,8 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'UI:ExtField_AsRemoteField' => '%1$s (%2$s)~~',
 	'UI:Button:MoveUp' => 'Вверх',
 	'UI:Button:MoveDown' => 'Вниз',
-
 	'UI:OQL:UnknownClassAndFix' => 'Unknown class "%1$s". You may try "%2$s" instead.~~',
 	'UI:OQL:UnknownClassNoFix' => 'Unknown class "%1$s"~~',
-
 	'UI:Dashboard:EditCustom' => 'Редактировать пользовательскую версию...',
 	'UI:Dashboard:CreateCustom' => 'Создать пользовательскую версию...',
 	'UI:Dashboard:DeleteCustom' => 'Удалить пользовательскую версию...',
@@ -1227,13 +1263,10 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'UI:ImportDashboardText' => 'Выберите файл дашборда для импорта:',
 	'UI:Dashboard:Actions' => 'Действия дашборда',
 	'UI:Dashboard:NotUpToDateUntilContainerSaved' => 'This dashboard displays information that does not include the on-going changes.~~',
-
-
 	'UI:DashletCreation:Title' => 'Создать новый дашлет',
 	'UI:DashletCreation:Dashboard' => 'Добавить на дашборд',
 	'UI:DashletCreation:DashletType' => 'Тип дашлета',
 	'UI:DashletCreation:EditNow' => 'Перейти в редактор дашборда',
-
 	'UI:DashboardEdit:Title' => 'Редактор дашборда',
 	'UI:DashboardEdit:DashboardTitle' => 'Заголовок',
 	'UI:DashboardEdit:AutoReload' => 'Обновлять автоматически',
@@ -1241,38 +1274,31 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'UI:DashboardEdit:AutoReloadSec+' => 'Минимальный интервал %1$d секунд',
 	'UI:DashboardEdit:Revert' => 'Revert~~',
 	'UI:DashboardEdit:Apply' => 'Apply~~',
-
 	'UI:DashboardEdit:Layout' => 'Макет',
 	'UI:DashboardEdit:Properties' => 'Свойства дашборда',
 	'UI:DashboardEdit:Dashlets' => 'Доступные дашлеты',
 	'UI:DashboardEdit:DashletProperties' => 'Свойства дашлета',
-
 	'UI:Form:Property' => 'Свойство',
 	'UI:Form:Value' => 'Значение',
-
 	'UI:DashletUnknown:Label' => 'Unknown~~',
 	'UI:DashletUnknown:Description' => 'Unknown dashlet (might have been uninstalled)~~',
 	'UI:DashletUnknown:RenderText:View' => 'Unable to render this dashlet.~~',
 	'UI:DashletUnknown:RenderText:Edit' => 'Unable to render this dashlet (class "%1$s"). Check with your administrator if it is still available.~~',
 	'UI:DashletUnknown:RenderNoDataText:Edit' => 'No preview available for this dashlet (class "%1$s").~~',
 	'UI:DashletUnknown:Prop-XMLConfiguration' => 'Configuration (shown as raw XML)~~',
-
 	'UI:DashletProxy:Label' => 'Proxy~~',
 	'UI:DashletProxy:Description' => 'Proxy dashlet~~',
 	'UI:DashletProxy:RenderNoDataText:Edit' => 'No preview available for this third-party dashlet (class "%1$s").~~',
 	'UI:DashletProxy:Prop-XMLConfiguration' => 'Configuration (shown as raw XML)~~',
-
 	'UI:DashletPlainText:Label' => 'Текст',
 	'UI:DashletPlainText:Description' => 'Текст (без форматирования)',
 	'UI:DashletPlainText:Prop-Text' => 'Текст',
 	'UI:DashletPlainText:Prop-Text:Default' => 'Введите текст...',
-
 	'UI:DashletObjectList:Label' => 'Список объектов',
 	'UI:DashletObjectList:Description' => 'Список объектов',
 	'UI:DashletObjectList:Prop-Title' => 'Заголовок',
 	'UI:DashletObjectList:Prop-Query' => 'Запрос',
 	'UI:DashletObjectList:Prop-Menu' => 'Меню',
-
 	'UI:DashletGroupBy:Prop-Title' => 'Заголовок',
 	'UI:DashletGroupBy:Prop-Query' => 'Запрос',
 	'UI:DashletGroupBy:Prop-Style' => 'Стиль',
@@ -1286,24 +1312,20 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfWeek' => '%1$s (day of week)~~',
 	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfMonth' => '%1$s (day of month)~~',
 	'UI:DashletGroupBy:MissingGroupBy' => 'Пожалуйста, выберите поле по которому объекты будут сгруппированы',
-
 	'UI:DashletGroupByPie:Label' => 'Круговая диаграмма',
 	'UI:DashletGroupByPie:Description' => 'Круговая диаграмма',
 	'UI:DashletGroupByBars:Label' => 'Столбчатая диаграмма',
 	'UI:DashletGroupByBars:Description' => 'Столбчатая диаграмма',
 	'UI:DashletGroupByTable:Label' => 'Группировка (таблица)',
 	'UI:DashletGroupByTable:Description' => 'Список (сгруппированный по полю)',
-
-	// New in 2.5
+    // New in 2.5
 	'UI:DashletGroupBy:Prop-Function' => 'Функция агрегирования',
 	'UI:DashletGroupBy:Prop-FunctionAttribute' => 'Атрибут функции',
 	'UI:DashletGroupBy:Prop-OrderDirection' => 'Направление',
 	'UI:DashletGroupBy:Prop-OrderField' => 'Сортировать по',
 	'UI:DashletGroupBy:Prop-Limit' => 'Лимит',
-
 	'UI:DashletGroupBy:Order:asc' => 'По возрастанию',
 	'UI:DashletGroupBy:Order:desc' => 'По убыванию',
-
 	'UI:GroupBy:count' => 'Количество',
 	'UI:GroupBy:count+' => 'Число элементов',
 	'UI:GroupBy:sum' => 'Сумма',
@@ -1314,14 +1336,12 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'UI:GroupBy:min+' => 'Minimum of %1$s',
 	'UI:GroupBy:max' => 'Максимум',
 	'UI:GroupBy:max+' => 'Maximum of %1$s',
-	// ---
-
+    // ---
 	'UI:DashletHeaderStatic:Label' => 'Заголовок',
 	'UI:DashletHeaderStatic:Description' => 'Displays an horizontal separator~~',
 	'UI:DashletHeaderStatic:Prop-Title' => 'Заголовок',
 	'UI:DashletHeaderStatic:Prop-Title:Default' => 'Контакты',
 	'UI:DashletHeaderStatic:Prop-Icon' => 'Иконка',
-
 	'UI:DashletHeaderDynamic:Label' => 'Заголовок со статистикой',
 	'UI:DashletHeaderDynamic:Description' => 'Заголовок со статистикой (группировать по ...)',
 	'UI:DashletHeaderDynamic:Prop-Title' => 'Заголовок',
@@ -1332,11 +1352,9 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'UI:DashletHeaderDynamic:Prop-Query' => 'Запрос',
 	'UI:DashletHeaderDynamic:Prop-GroupBy' => 'Группировать по',
 	'UI:DashletHeaderDynamic:Prop-Values' => 'Значения',
-
 	'UI:DashletBadge:Label' => 'Значок',
 	'UI:DashletBadge:Description' => 'Иконка объекта с возможностью создания и поиска',
 	'UI:DashletBadge:Prop-Class' => 'Класс',
-
 	'DayOfWeek-Sunday' => 'Воскресенье',
 	'DayOfWeek-Monday' => 'Понедельник',
 	'DayOfWeek-Tuesday' => 'Вторник',
@@ -1356,8 +1374,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Month-10' => 'Октябрь',
 	'Month-11' => 'Ноябрь',
 	'Month-12' => 'Декабрь',
-
-	// Short version for the DatePicker
+    // Short version for the DatePicker
 	'DayOfWeek-Sunday-Min' => 'Вс',
 	'DayOfWeek-Monday-Min' => 'Пн',
 	'DayOfWeek-Tuesday-Min' => 'Вт',
@@ -1377,13 +1394,13 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Month-10-Short' => 'Окт.',
 	'Month-11-Short' => 'Ноя.',
 	'Month-12-Short' => 'Дек.',
-	'Calendar-FirstDayOfWeek' => '1',// 0 = Sunday, 1 = Monday, etc...
-
+	'Calendar-FirstDayOfWeek' => '1',
+    // 0 = Sunday, 1 = Monday, etc...
 	'UI:Menu:ShortcutList' => 'Добавить в избранное...',
+	'UI:Menu:FilterList' => 'Display list with search criteria~~',
 	'UI:ShortcutRenameDlg:Title' => 'Переименовать ссылку',
 	'UI:ShortcutListDlg:Title' => 'Добавить в избранное ссылку на список',
 	'UI:ShortcutDelete:Confirm' => 'Подтвердите удаление ссылки (ссылок).',
-	'Menu:MyShortcuts' => 'Избранное',// Duplicated into itop-welcome-itil (will be removed from here...)
 	'Class:Shortcut' => 'Ссылка',
 	'Class:Shortcut+' => '',
 	'Class:Shortcut/Attribute:name' => 'Название',
@@ -1397,12 +1414,10 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:ShortcutOQL/Attribute:auto_reload/Value:custom' => 'Custom rate',
 	'Class:ShortcutOQL/Attribute:auto_reload_sec' => 'Интервал обновления (секунды)',
 	'Class:ShortcutOQL/Attribute:auto_reload_sec/tip' => 'Минимальное значение %1$d секунд(ы)',
-
 	'UI:FillAllMandatoryFields' => 'Пожалуйста, заполните все обязательные поля.',
 	'UI:ValueMustBeSet' => 'Пожалуйста, укажите значение',
 	'UI:ValueMustBeChanged' => 'Пожалуйста, измените значение',
 	'UI:ValueInvalidFormat' => 'Недопустимый формат',
-
 	'UI:CSVImportConfirmTitle' => 'Please confirm the operation',
 	'UI:CSVImportConfirmMessage' => 'Are you sure you want to do this?',
 	'UI:CSVImportError_items' => 'Errors: %1$d',
@@ -1428,11 +1443,9 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 <tr><td>i</td><td>minutes (2 digits, e.g. 00..59)</td></tr>
 <tr><td>s</td><td>seconds (2 digits, e.g. 00..59)</td></tr>
 </table>',
-
 	'UI:Button:Remove' => 'Удалить',
 	'UI:AddAnExisting_Class' => 'Добавить объекты класса %1$s...',
 	'UI:SelectionOf_Class' => 'Выбор объектов класса %1$s',
-
 	'UI:AboutBox' => 'Об этом '.ITOP_APPLICATION_SHORT.'...',
 	'UI:About:Title' => 'Об этом '.ITOP_APPLICATION_SHORT,
 	'UI:About:DataModel' => 'Модель данных',
@@ -1442,12 +1455,10 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'UI:About:ManualExtensionSource' => 'Расширение',
 	'UI:About:Extension_Version' => 'Версия: %1$s',
 	'UI:About:RemoteExtensionSource' => 'Data~~',
-
 	'UI:DisconnectedDlgMessage' => 'Вы вышли из системы. Выполните повторный вход для продолжения работы.',
 	'UI:DisconnectedDlgTitle' => 'Внимание!',
 	'UI:LoginAgain' => 'Войти снова',
 	'UI:StayOnThePage' => 'Остаться на этой странице',
-
 	'ExcelExporter:ExportMenu' => 'Экспорт в Excel...',
 	'ExcelExporter:ExportDialogTitle' => 'Экспорт в Excel',
 	'ExcelExporter:ExportButton' => 'Экспорт',
@@ -1460,7 +1471,6 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'ExcelExport:Statistics' => 'Статистика',
 	'portal:legacy_portal' => 'Пользовательский портал',
 	'portal:backoffice' => ITOP_APPLICATION_SHORT.' Back-Office интерфейс',
-
 	'UI:CurrentObjectIsLockedBy_User' => 'Объект заблокирован, поскольку в настоящее время редактируется пользователем %1$s.',
 	'UI:CurrentObjectIsLockedBy_User_Explanation' => 'Объект в настоящее время редактируется пользователем %1$s. Ваши изменения не будут сохранены, поскольку они могут быть перезаписаны.',
 	'UI:CurrentObjectIsSoftLockedBy_User' => 'The object is currently being modified by %1$s. You\'ll be able to submit your modifications once they have finished.~~',
@@ -1468,43 +1478,36 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'UI:CurrentObjectLockExpired_Explanation' => 'Срок блокировки для предотвращения одновременного изменения объекта истек. Вы больше не можете сохранить свои изменения, поскольку другим пользователям теперь разрешено изменять данный объект.',
 	'UI:ConcurrentLockKilled' => 'Блокировка для предотвращения изменений текущего объекта снята.',
 	'UI:Menu:KillConcurrentLock' => 'Снять блокировку одноврем. измен.!',
-
 	'UI:Menu:ExportPDF' => 'Экспорт в PDF...',
 	'UI:Menu:PrintableVersion' => 'Версия для печати',
-
 	'UI:BrowseInlineImages' => 'Обзор...',
 	'UI:UploadInlineImageLegend' => 'Загрузить новое изображение',
 	'UI:SelectInlineImageToUpload' => 'Выберите изображение для загрузки',
 	'UI:AvailableInlineImagesLegend' => 'Доступные изображения',
 	'UI:NoInlineImage' => 'На сервере нет доступных изображений. С помощью кнопки "Обзор..." выше выберите изображение на вашем компьютере, чтобы загрузить его на сервер.',
-
 	'UI:ToggleFullScreen' => 'Развернуть / Свернуть',
 	'UI:Button:ResetImage' => 'Восстановить предыдущее изображение',
 	'UI:Button:RemoveImage' => 'Удалить изображение',
 	'UI:Button:UploadImage' => 'Загрузить изображение с компьютера',
 	'UI:UploadNotSupportedInThisMode' => 'Изменение изображений и файлов не поддерживается в этом режиме.',
-
 	'UI:Button:RemoveDocument' => 'Удалить документ',
-
-	// Search form
+    // Search form
 	'UI:Search:Toggle' => 'Развернуть / Свернуть',
 	'UI:Search:AutoSubmit:DisabledHint' => 'Автоматический запуск поиска отключен для данного класса',
 	'UI:Search:Obsolescence:DisabledHint' => 'Устаревшие данные скрыты в соответствии с вашими предпочтениями',
 	'UI:Search:NoAutoSubmit:ExplainText' => 'Добавьте критерии поиска или нажмите кнопку поиска, чтобы просмотреть объекты.',
 	'UI:Search:Criterion:MoreMenu:AddCriteria' => 'Добавить критерий',
-	// - Add new criteria button
+    // - Add new criteria button
 	'UI:Search:AddCriteria:List:RecentlyUsed:Title' => 'Недавние',
 	'UI:Search:AddCriteria:List:MostPopular:Title' => 'Популярные',
 	'UI:Search:AddCriteria:List:Others:Title' => 'Остальные',
 	'UI:Search:AddCriteria:List:RecentlyUsed:Placeholder' => 'Пока нет',
-
-	// - Criteria header actions
+    // - Criteria header actions
 	'UI:Search:Criteria:Toggle' => 'Развернуть / Свернуть',
 	'UI:Search:Criteria:Remove' => 'Удалить',
 	'UI:Search:Criteria:Locked' => 'Заблокирован',
-
-	// - Criteria titles
-	//   - Default widget
+    // - Criteria titles
+    //   - Default widget
 	'UI:Search:Criteria:Title:Default:Any' => '%1$s: все',
 	'UI:Search:Criteria:Title:Default:Empty' => '%1$s пусто',
 	'UI:Search:Criteria:Title:Default:NotEmpty' => '%1$s не пусто',
@@ -1526,53 +1529,57 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'UI:Search:Criteria:Title:Default:Between:All' => '%1$s: все',
 	'UI:Search:Criteria:Title:Default:Between:From' => '%1$s от %2$s',
 	'UI:Search:Criteria:Title:Default:Between:Until' => '%1$s до %2$s',
-	//   - Numeric widget
-	//   None yet
-	//   - DateTime widget
+    //   - Numeric widget
+    //   None yet
+    //   - DateTime widget
 	'UI:Search:Criteria:Title:DateTime:Between' => '%2$s <= 1$s <= %3$s',
-	//   - Enum widget
+    //   - Enum widget
 	'UI:Search:Criteria:Title:Enum:In' => '%1$s: %2$s',
 	'UI:Search:Criteria:Title:Enum:In:Many' => '%1$s: %2$s и %3$s других',
 	'UI:Search:Criteria:Title:Enum:In:All' => '%1$s: все',
-	//   - TagSet widget
+    //   - TagSet widget
 	'UI:Search:Criteria:Title:TagSet:Matches' => '%1$s: %2$s',
-	//   - External key widget
+    //   - External key widget
 	'UI:Search:Criteria:Title:ExternalKey:Empty' => '%1$s определён',
 	'UI:Search:Criteria:Title:ExternalKey:NotEmpty' => '%1$s не определён',
 	'UI:Search:Criteria:Title:ExternalKey:Equals' => '%1$s %2$s',
 	'UI:Search:Criteria:Title:ExternalKey:In' => '%1$s: %2$s',
 	'UI:Search:Criteria:Title:ExternalKey:In:Many' => '%1$s: %2$s и %3$s других',
 	'UI:Search:Criteria:Title:ExternalKey:In:All' => '%1$s: все',
-	//   - Hierarchical key widget
+    //   - Hierarchical key widget
 	'UI:Search:Criteria:Title:HierarchicalKey:Empty' => '%1$s определён',
 	'UI:Search:Criteria:Title:HierarchicalKey:NotEmpty' => '%1$s не определён',
 	'UI:Search:Criteria:Title:HierarchicalKey:Equals' => '%1$s %2$s',
 	'UI:Search:Criteria:Title:HierarchicalKey:In' => '%1$s: %2$s',
 	'UI:Search:Criteria:Title:HierarchicalKey:In:Many' => '%1$s: %2$s и %3$s других',
 	'UI:Search:Criteria:Title:HierarchicalKey:In:All' => '%1$s: все',
-
-	// - Criteria operators
-	//   - Default widget
+    // - Criteria operators
+    //   - Default widget
 	'UI:Search:Criteria:Operator:Default:Empty' => 'Пусто',
 	'UI:Search:Criteria:Operator:Default:NotEmpty' => 'Не пусто',
 	'UI:Search:Criteria:Operator:Default:Equals' => 'Равно',
 	'UI:Search:Criteria:Operator:Default:Between' => 'Между',
-	//   - String widget
+    //   - String widget
 	'UI:Search:Criteria:Operator:String:Contains' => 'Содержит',
 	'UI:Search:Criteria:Operator:String:StartsWith' => 'Начинается с',
 	'UI:Search:Criteria:Operator:String:EndsWith' => 'Заканч. на',
 	'UI:Search:Criteria:Operator:String:RegExp' => 'Регуляр. выраж.',
-	//   - Numeric widget
-	'UI:Search:Criteria:Operator:Numeric:Equals' => 'Равно',// => '=',
-	'UI:Search:Criteria:Operator:Numeric:GreaterThan' => 'Больше',// => '>',
-	'UI:Search:Criteria:Operator:Numeric:GreaterThanOrEquals' => 'Больше / равно',// > '>=',
-	'UI:Search:Criteria:Operator:Numeric:LessThan' => 'Меньше',// => '<',
-	'UI:Search:Criteria:Operator:Numeric:LessThanOrEquals' => 'Меньше / равно',// > '<=',
-	'UI:Search:Criteria:Operator:Numeric:Different' => 'Не равно',// => '≠',
-	//   - Tag Set Widget
+    //   - Numeric widget
+	'UI:Search:Criteria:Operator:Numeric:Equals' => 'Равно',
+    // => '=',
+	'UI:Search:Criteria:Operator:Numeric:GreaterThan' => 'Больше',
+    // => '>',
+	'UI:Search:Criteria:Operator:Numeric:GreaterThanOrEquals' => 'Больше / равно',
+    // > '>=',
+	'UI:Search:Criteria:Operator:Numeric:LessThan' => 'Меньше',
+    // => '<',
+	'UI:Search:Criteria:Operator:Numeric:LessThanOrEquals' => 'Меньше / равно',
+    // > '<=',
+	'UI:Search:Criteria:Operator:Numeric:Different' => 'Не равно',
+    // => '≠',
+    //   - Tag Set Widget
 	'UI:Search:Criteria:Operator:TagSet:Matches' => 'Совпадает',
-
-	// - Other translations
+    // - Other translations
 	'UI:Search:Value:Filter:Placeholder' => 'Фильтр...',
 	'UI:Search:Value:Search:Placeholder' => 'Поиск...',
 	'UI:Search:Value:Autocomplete:StartTyping' => 'Начните печатать, чтобы увидеть возможные значения.',
@@ -1580,8 +1587,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'UI:Search:Value:Autocomplete:NoResult' => 'Нет результата.',
 	'UI:Search:Value:Toggler:CheckAllNone' => 'Отметить / снять все',
 	'UI:Search:Value:Toggler:CheckAllNoneFiltered' => 'Отметить / снять все видимые',
-
-	// - Widget other translations
+    // - Widget other translations
 	'UI:Search:Criteria:Numeric:From' => 'С',
 	'UI:Search:Criteria:Numeric:Until' => 'По',
 	'UI:Search:Criteria:Numeric:PlaceholderFrom' => 'Любой',
@@ -1595,10 +1601,8 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'UI:Search:Criteria:DateTime:PlaceholderUntil' => 'Любая дата',
 	'UI:Search:Criteria:DateTime:PlaceholderUntilTime' => 'Любая дата',
 	'UI:Search:Criteria:HierarchicalKey:ChildrenIncluded:Hint' => 'Включаются все нижестоящие объекты.',
-
 	'UI:Search:Criteria:Raw:Filtered' => 'Отфильтровано',
 	'UI:Search:Criteria:Raw:FilteredOn' => 'Отфильтровано по %1$s',
-
 	'UI:StateChanged' => 'State changed~~',
 ));
 
@@ -1609,16 +1613,13 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Expression:Operator:AND' => ' AND ',
 	'Expression:Operator:OR' => ' OR ',
 	'Expression:Operator:=' => ': ~~',
-
 	'Expression:Unit:Short:DAY' => 'd',
 	'Expression:Unit:Short:WEEK' => 'w',
 	'Expression:Unit:Short:MONTH' => 'm',
 	'Expression:Unit:Short:YEAR' => 'y',
-
 	'Expression:Unit:Long:DAY' => 'day(s)',
 	'Expression:Unit:Long:HOUR' => 'hour(s)',
 	'Expression:Unit:Long:MINUTE' => 'minute(s)',
-
 	'Expression:Verb:NOW' => 'now',
 	'Expression:Verb:ISNULL' => ': undefined~~',
 ));
@@ -1642,47 +1643,33 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Menu:DataSources' => 'Синхронизация данных',
 	'Menu:DataSources+' => 'Синхронизация данных',
-	'Menu:WelcomeMenu' => 'Добро пожаловать',
-	'Menu:WelcomeMenu+' => 'Добро пожаловать в '.ITOP_APPLICATION_SHORT,
-	'Menu:WelcomeMenuPage' => 'Добро пожаловать',
-	'Menu:WelcomeMenuPage+' => 'Добро пожаловать в '.ITOP_APPLICATION_SHORT,
-	'Menu:AdminTools' => 'Инструменты администратора',
-	'Menu:AdminTools+' => 'Инструменты администратора',
-	'Menu:AdminTools?' => 'Инструменты доступны только для пользователей c правами администратора',
-	'Menu:DataModelMenu' => 'Модель данных',
-	'Menu:DataModelMenu+' => 'Обзор модели данных',
-	'Menu:ExportMenu' => 'Экспорт',
-	'Menu:ExportMenu+' => 'Экспорт результатов любого запроса в HTML, CSV или XML',
-	'Menu:NotificationsMenu' => 'Уведомления',
-	'Menu:NotificationsMenu+' => 'Настройка уведомлений',
 	'Menu:AuditCategories' => 'Категории аудита',
 	'Menu:AuditCategories+' => 'Категории аудита',
 	'Menu:Notifications:Title' => 'Категории аудита',
-	'Menu:RunQueriesMenu'         => 'Выполнение запросов',
-	'Menu:RunQueriesMenu+'        => 'Выполнение любых запросов',
-	'Menu:QueryMenu'              => 'Книга запросов',
-	'Menu:QueryMenu+'             => 'Книга запросов',
-	'Menu:UniversalSearchMenu'    => 'Универсальный поиск',
-	'Menu:UniversalSearchMenu+'   => 'Поиск чего угодно...',
-	'Menu:UserManagementMenu'     => 'Управление пользователями',
-	'Menu:UserManagementMenu+'    => 'Управление пользователями',
-	'Menu:ProfilesMenu'           => 'Профили',
-	'Menu:ProfilesMenu+'          => 'Профили пользователей',
-	'Menu:ProfilesMenu:Title'     => 'Профили пользователей',
-	'Menu:UserAccountsMenu'       => 'Учетные записи',
-	'Menu:UserAccountsMenu+'      => 'Учетные записи пользователей',
+	'Menu:AuditCategories:Title' => 'Audit configuration~~',
+	'Menu:RunQueriesMenu' => 'Выполнение запросов',
+	'Menu:RunQueriesMenu+' => 'Выполнение любых запросов',
+	'Menu:QueryMenu' => 'Книга запросов',
+	'Menu:QueryMenu+' => 'Книга запросов',
+	'Menu:UniversalSearchMenu' => 'Универсальный поиск',
+	'Menu:UniversalSearchMenu+' => 'Поиск чего угодно...',
+	'Menu:UserManagementMenu' => 'Управление пользователями',
+	'Menu:UserManagementMenu+' => 'Управление пользователями',
+	'Menu:ProfilesMenu' => 'Профили',
+	'Menu:ProfilesMenu+' => 'Профили пользователей',
+	'Menu:ProfilesMenu:Title' => 'Профили пользователей',
+	'Menu:UserAccountsMenu' => 'Учетные записи',
+	'Menu:UserAccountsMenu+' => 'Учетные записи пользователей',
 	'Menu:UserAccountsMenu:Title' => 'Учетные записи пользователей',
-	'Menu:MyShortcuts'            => 'Избранное',
-	'Menu:UserManagement'         => 'Управление пользователями',
-	'Menu:Queries'                => 'Запросы OQL',
-	'Menu:ConfigurationTools'     => 'Конфигурация',
+	'Menu:UserManagement' => 'Управление пользователями',
+	'Menu:Queries' => 'Запросы OQL',
+	'Menu:ConfigurationTools' => 'Конфигурация'
 ));
-
 // Additional language entries not present in English dict
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'UI:CSVImport:ObjectsReчmainedUnchanged' => '%1$d объект(ов) не изменились.',
-	'UI:Toggle:StandardDashboard'            => 'Стандартный',
-	'UI:Toggle:CustomDashboard'              => 'Пользовательский',
-	'UI:Dashboard:Edit'                      => 'Редактировать дашборд...',
-	'UI:Dashboard:Revert'                    => 'Вернуть стандартную версию...',
+	'UI:Toggle:StandardDashboard' => 'Стандартный',
+	'UI:Toggle:CustomDashboard' => 'Пользовательский',
+	'UI:Dashboard:Edit' => 'Редактировать дашборд...',
+	'UI:Dashboard:Revert' => 'Вернуть стандартную версию...'
 ));
diff --git a/dictionaries/sk.dictionary.itop.core.php b/dictionaries/sk.dictionary.itop.core.php
index 74cbcdf9ce..37f8f4c0f7 100644
--- a/dictionaries/sk.dictionary.itop.core.php
+++ b/dictionaries/sk.dictionary.itop.core.php
@@ -20,57 +20,42 @@
  */
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Core:DeletedObjectLabel' => '%1s (odstránené)',
-	'Core:DeletedObjectTip'   => 'Objekt bol odstránený o %1$s (%2$s)',
-
+	'Core:DeletedObjectTip' => 'Objekt bol odstránený o %1$s (%2$s)',
 	'Core:UnknownObjectLabel' => 'Objekt nebol nájdený (trieda: %1$s, id: %2$d)',
-	'Core:UnknownObjectTip'   => 'Objekt nebol nájdený. Mohol byť odstránený pred nejakým časom a záznam bol odvtedy nenávratne zmazaný.',
-
+	'Core:UnknownObjectTip' => 'Objekt nebol nájdený. Mohol byť odstránený pred nejakým časom a záznam bol odvtedy nenávratne zmazaný.',
 	'Core:UniquenessDefaultError' => 'Uniqueness rule \'%1$s\' in error~~',
-	'Core:CheckConsistencyError'  => 'Consistency rules not followed: %1$s~~',
-	'Core:CheckValueError'        => 'Unexpected value for attribute \'%1$s\' (%2$s) : %3$s~~',
-
-	'Core:AttributeLinkedSet'  => 'Pole objektov',
+	'Core:CheckConsistencyError' => 'Consistency rules not followed: %1$s~~',
+	'Core:CheckValueError' => 'Unexpected value for attribute \'%1$s\' (%2$s) : %3$s~~',
+	'Core:AttributeLinkedSet' => 'Pole objektov',
 	'Core:AttributeLinkedSet+' => '',
-
 	'Core:AttributeLinkedSetDuplicatesFound' => 'Duplicates in the \'%1$s\' field : %2$s~~',
-
-	'Core:AttributeDashboard'  => 'Dashboard~~',
+	'Core:AttributeDashboard' => 'Dashboard~~',
 	'Core:AttributeDashboard+' => '',
-
-	'Core:AttributePhoneNumber'  => 'Phone number~~',
+	'Core:AttributePhoneNumber' => 'Phone number~~',
 	'Core:AttributePhoneNumber+' => '',
-
 	'Core:AttributeObsolescenceDate' => 'Obsolescence date~~',
 	'Core:AttributeObsolescenceDate+' => '',
-
 	'Core:AttributeTagSet' => 'List of tags~~',
 	'Core:AttributeTagSet+' => '',
 	'Core:AttributeSet:placeholder' => 'click to add~~',
 	'Core:AttributeClassAttCodeSet:ItemLabel:AttributeFromClass' => '%1$s (%2$s)~~',
 	'Core:AttributeClassAttCodeSet:ItemLabel:AttributeFromOneChildClass' => '%1$s (%2$s from %3$s)~~',
 	'Core:AttributeClassAttCodeSet:ItemLabel:AttributeFromSeveralChildClasses' => '%1$s (%2$s from child classes)~~',
-
 	'Core:AttributeCaseLog' => 'Log~~',
 	'Core:AttributeCaseLog+' => '',
-
 	'Core:AttributeMetaEnum' => 'Computed enum~~',
 	'Core:AttributeMetaEnum+' => '',
-
 	'Core:AttributeLinkedSetIndirect' => 'Pole objektov (N-N)',
 	'Core:AttributeLinkedSetIndirect+' => '',
-
 	'Core:AttributeInteger' => 'Celé číslo',
 	'Core:AttributeInteger+' => '',
-
 	'Core:AttributeDecimal' => 'Desatinné číslo',
 	'Core:AttributeDecimal+' => '',
-
 	'Core:AttributeBoolean' => 'Boolean',
 	'Core:AttributeBoolean+' => '',
 	'Core:AttributeBoolean/Value:null' => '~~',
 	'Core:AttributeBoolean/Value:yes' => 'Yes~~',
 	'Core:AttributeBoolean/Value:no' => 'No~~',
-
 	'Core:AttributeArchiveFlag' => 'Archive flag~~',
 	'Core:AttributeArchiveFlag/Value:yes' => 'Yes~~',
 	'Core:AttributeArchiveFlag/Value:yes+' => 'This object is visible only in archive mode~~',
@@ -79,7 +64,6 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Core:AttributeArchiveFlag/Label+' => '',
 	'Core:AttributeArchiveDate/Label' => 'Archive date~~',
 	'Core:AttributeArchiveDate/Label+' => '',
-
 	'Core:AttributeObsolescenceFlag' => 'Obsolescence flag~~',
 	'Core:AttributeObsolescenceFlag/Value:yes' => 'Yes~~',
 	'Core:AttributeObsolescenceFlag/Value:yes+' => 'This object is excluded from the impact analysis, and hidden from search results~~',
@@ -88,54 +72,38 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Core:AttributeObsolescenceFlag/Label+' => 'Computed dynamically on other attributes~~',
 	'Core:AttributeObsolescenceDate/Label' => 'Obsolescence date~~',
 	'Core:AttributeObsolescenceDate/Label+' => 'Approximative date at which the object has been considered obsolete~~',
-
 	'Core:AttributeString' => 'Reťazec',
 	'Core:AttributeString+' => '',
-
 	'Core:AttributeClass' => 'Trieda',
 	'Core:AttributeClass+' => '',
-
 	'Core:AttributeApplicationLanguage' => 'Užívateľský jazyk',
 	'Core:AttributeApplicationLanguage+' => '',
-
 	'Core:AttributeFinalClass' => 'Trieda (auto)',
 	'Core:AttributeFinalClass+' => '',
-
 	'Core:AttributePassword' => 'Heslo',
 	'Core:AttributePassword+' => '',
-
 	'Core:AttributeEncryptedString' => 'Zakódovaný reťazec',
 	'Core:AttributeEncryptedString+' => '',
 	'Core:AttributeEncryptUnknownLibrary' => 'Encryption library specified (%1$s) unknown~~',
 	'Core:AttributeEncryptFailedToDecrypt' => '** decryption error **~~',
-
 	'Core:AttributeText' => 'Text',
 	'Core:AttributeText+' => '',
-
 	'Core:AttributeHTML' => 'HTML',
 	'Core:AttributeHTML+' => '',
-
 	'Core:AttributeEmailAddress' => 'Emailova Adresa',
 	'Core:AttributeEmailAddress+' => '',
-
 	'Core:AttributeIPAddress' => 'IP Adresa',
 	'Core:AttributeIPAddress+' => '',
-
 	'Core:AttributeOQL' => 'OQL',
 	'Core:AttributeOQL+' => '',
-
 	'Core:AttributeEnum' => 'Enum',
 	'Core:AttributeEnum+' => '',
-
 	'Core:AttributeTemplateString' => 'Predloha reťazca',
 	'Core:AttributeTemplateString+' => '',
-
 	'Core:AttributeTemplateText' => 'Predloha textu',
 	'Core:AttributeTemplateText+' => '',
-
 	'Core:AttributeTemplateHTML' => 'Predloha HTML',
 	'Core:AttributeTemplateHTML+' => '',
-
 	'Core:AttributeDateTime' => 'Dátum/čas',
 	'Core:AttributeDateTime+' => '',
 	'Core:AttributeDateTime?SmartSearch' => '
@@ -153,7 +121,6 @@ Operatori:<br/>
 <p>
 Ak je čas vynechaný, predvolený čas je 00:00:00
 </p>',
-
 	'Core:AttributeDate' => 'Dátum',
 	'Core:AttributeDate+' => '',
 	'Core:AttributeDate?SmartSearch' => '
@@ -168,43 +135,30 @@ Operatori:<br/>
 	<b>&lt;</b><em>dátum</em><br/>
 	<b>[</b><em>dátum</em>,<em>dátum</em><b>]</b>
 </p>',
-
 	'Core:AttributeDeadline' => 'Dátum eskalácie',
 	'Core:AttributeDeadline+' => '',
-
 	'Core:AttributeExternalKey' => 'Externý kľúč',
 	'Core:AttributeExternalKey+' => '',
-
 	'Core:AttributeHierarchicalKey' => 'Hierarchický kľúč',
 	'Core:AttributeHierarchicalKey+' => '',
-
 	'Core:AttributeExternalField' => 'Externé pole',
 	'Core:AttributeExternalField+' => '',
-
 	'Core:AttributeURL' => 'URL',
 	'Core:AttributeURL+' => '',
-
 	'Core:AttributeBlob' => 'Binarny object',
 	'Core:AttributeBlob+' => '',
-
 	'Core:AttributeOneWayPassword' => 'Jednorazové heslo',
 	'Core:AttributeOneWayPassword+' => '',
-
 	'Core:AttributeTable' => 'Tabuľka',
 	'Core:AttributeTable+' => '',
-
 	'Core:AttributePropertySet' => 'Vlastnosti',
 	'Core:AttributePropertySet+' => '',
-
 	'Core:AttributeFriendlyName' => 'Ľahko čitateľný názov',
 	'Core:AttributeFriendlyName+' => '',
-
 	'Core:FriendlyName-Label' => 'Ľahko čitateľný názov',
 	'Core:FriendlyName-Description' => 'Ľahko čitateľný názov',
-
 	'Core:AttributeTag' => 'Tags~~',
 	'Core:AttributeTag+' => '',
-	
 	'Core:Context=REST/JSON' => 'REST~~',
 	'Core:Context=Synchro' => 'Synchro~~',
 	'Core:Context=Setup' => 'Setup~~',
@@ -482,6 +436,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:Action' => 'Vlastná akcia',
 	'Class:Action+' => '',
+	'Class:Action/ComplementaryName' => '%1$s: %2$s~~',
 	'Class:Action/Attribute:name' => 'Názov',
 	'Class:Action/Attribute:name+' => '',
 	'Class:Action/Attribute:description' => 'Popis',
@@ -549,6 +504,22 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:ActionEmail/Attribute:importance/Value:normal+' => '',
 	'Class:ActionEmail/Attribute:importance/Value:high' => 'Vysoká',
 	'Class:ActionEmail/Attribute:importance/Value:high+' => '',
+	'Class:ActionEmail/Attribute:language' => 'Language~~',
+	'Class:ActionEmail/Attribute:language+' => 'Language to use for placeholders ($xxx$) inside the message (state, importance, priority, etc)~~',
+	'Class:ActionEmail/Attribute:html_template' => 'HTML template~~',
+	'Class:ActionEmail/Attribute:html_template+' => 'Optional HTML template wrapping around the content of the \'Body\' attribute below, useful for tailored email layouts (in the template, content of the \'Body\' attribute will replace the $content$ placeholder)~~',
+	'Class:ActionEmail/Attribute:ignore_notify' => 'Ignore the Notify flag~~',
+	'Class:ActionEmail/Attribute:ignore_notify+' => 'If set to \'Yes\' the \'Notify\' flag on Contacts has no effect.~~',
+	'Class:ActionEmail/Attribute:ignore_notify/Value:no' => 'No~~',
+	'Class:ActionEmail/Attribute:ignore_notify/Value:yes' => 'Yes~~',
+	'ActionEmail:main' => 'Message~~',
+	'ActionEmail:trigger' => 'Triggers~~',
+	'ActionEmail:recipients' => 'Contacts~~',
+	'ActionEmail:preview_tab' => 'Preview~~',
+	'ActionEmail:preview_tab+' => 'Preview of the eMail template~~',
+	'ActionEmail:preview_warning' => 'The actual eMail may look different in the eMail client than this preview in your browser.~~',
+	'ActionEmail:preview_more_info' => 'For more information about the CSS features supported by the different eMail clients, refer to %1$s~~',
+	'ActionEmail:content_placeholder_missing' => 'The placeholder "%1$s" was not found in the HTML template. The content of the field "%2$s" will not be included in the generated emails.~~',
 ));
 
 //
@@ -558,6 +529,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:Trigger' => 'Spúštač',
 	'Class:Trigger+' => '',
+	'Class:Trigger/ComplementaryName' => '%1$s, %2$s~~',
 	'Class:Trigger/Attribute:description' => 'Popis',
 	'Class:Trigger/Attribute:description+' => '',
 	'Class:Trigger/Attribute:action_list' => 'Spúšťané akcie',
@@ -566,6 +538,8 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:Trigger/Attribute:finalclass+' => '',
 	'Class:Trigger/Attribute:context' => 'Context~~',
 	'Class:Trigger/Attribute:context+' => 'Context to allow the trigger to start~~',
+	'Class:Trigger/Attribute:complement' => 'Additional information~~',
+	'Class:Trigger/Attribute:complement+' => 'Further information as provided in english, by this trigger~~',
 ));
 
 //
@@ -661,6 +635,17 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:TriggerOnObjectMention/Attribute:mentioned_filter+' => 'Limit the list of mentioned objects which will activate the trigger. If empty, any mentioned object (of any class) will activate it.~~',
 ));
 
+//
+// Class: TriggerOnAttributeBlobDownload
+//
+
+Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
+	'Class:TriggerOnAttributeBlobDownload' => 'Trigger (on object\'s document download)~~',
+	'Class:TriggerOnAttributeBlobDownload+' => 'Trigger on object\'s document field download of [a child class of] the given class~~',
+	'Class:TriggerOnAttributeBlobDownload/Attribute:target_attcodes' => 'Target fields~~',
+	'Class:TriggerOnAttributeBlobDownload/Attribute:target_attcodes+' => '~~',
+));
+
 //
 // Class: TriggerOnThresholdReached
 //
@@ -697,11 +682,13 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 // Synchro Data Source
 //
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
+	'Class:SynchroDataSource' => 'Synchronizovaný zdroj dát',
 	'Class:SynchroDataSource/Attribute:name' => 'Názov',
 	'Class:SynchroDataSource/Attribute:name+' => '',
 	'Class:SynchroDataSource/Attribute:description' => 'Popis',
 	'Class:SynchroDataSource/Attribute:status' => 'Stav',
 	'Class:SynchroDataSource/Attribute:scope_class' => 'Cieľová trieda',
+	'Class:SynchroDataSource/Attribute:scope_class+' => 'A Synchro Data Source can only populate a single '.ITOP_APPLICATION_SHORT.' class~~',
 	'Class:SynchroDataSource/Attribute:user_id' => 'Užívateľ',
 	'Class:SynchroDataSource/Attribute:notify_contact_id' => 'Notifikovať kontakt',
 	'Class:SynchroDataSource/Attribute:notify_contact_id+' => '',
@@ -710,6 +697,8 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:SynchroDataSource/Attribute:url_application' => 'URL aplikácie',
 	'Class:SynchroDataSource/Attribute:url_application+' => '',
 	'Class:SynchroDataSource/Attribute:reconciliation_policy' => 'Harmonizačná politika',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy+' => '"Use the attributes": '.ITOP_APPLICATION_SHORT.' object matches replica values for each Synchro attributes flagged for Reconciliation.
+"Use primary_key": the column primary_key of the replica is expected to contain the identifier of the '.ITOP_APPLICATION_SHORT.' object~~',
 	'Class:SynchroDataSource/Attribute:full_load_periodicity' => 'Intervaly plného zaťaženia',
 	'Class:SynchroDataSource/Attribute:full_load_periodicity+' => '',
 	'Class:SynchroDataSource/Attribute:action_on_zero' => 'Akcia pri hodnote nula',
@@ -729,6 +718,33 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:SynchroDataSource/Attribute:delete_policy_retention+' => '',
 	'Class:SynchroDataSource/Attribute:database_table_name' => 'Tabuľka dát',
 	'Class:SynchroDataSource/Attribute:database_table_name+' => '',
+	'Class:SynchroDataSource/Attribute:status/Value:implementation' => 'Implementácia',
+	'Class:SynchroDataSource/Attribute:status/Value:obsolete' => 'Vyradené',
+	'Class:SynchroDataSource/Attribute:status/Value:production' => 'Produkcia',
+	'Class:SynchroDataSource/Attribute:scope_restriction' => 'Obmedzenie rozsahu',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_attributes' => 'Použiť atribúty',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_primary_key' => 'Použiť pole "Primárny kľúč"',
+	'Class:SynchroDataSource/Attribute:action_on_zero/Value:create' => 'Vytvoriť',
+	'Class:SynchroDataSource/Attribute:action_on_zero/Value:error' => 'Chyba',
+	'Class:SynchroDataSource/Attribute:action_on_one/Value:error' => 'Chyba',
+	'Class:SynchroDataSource/Attribute:action_on_one/Value:update' => 'Aktualizácia',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:create' => 'Vytvoriť',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:error' => 'Chyba',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:take_first' => 'Vziať prvý (náhodný?)',
+	'Class:SynchroDataSource/Attribute:delete_policy' => 'Politika odstraňovania',
+	'Class:SynchroDataSource/Attribute:delete_policy+' => 'What to do when a replica becomes obsolete:
+"Ignore": do nothing, the associated object remains as is in iTop.
+"Delete": Delete the associated object in iTop (and the replica in the data table).
+"Update": Update the associated object as specified by the Update rules (see below).
+"Update then Delete": apply the "Update rules". When Retention Duration expires, execute a "Delete" ~~',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:delete' => 'Odstrániť',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:ignore' => 'Ignorovať',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:update' => 'Aktualizovať',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:update_then_delete' => 'Aktualizovať, potom odstrániť',
+	'Class:SynchroDataSource/Attribute:attribute_list' => 'Zoznam atribútov',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:administrators' => 'Len administrátori',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:everybody' => 'Všetci majú povolené odstraňovať takéto objekty',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:nobody' => 'Nikto',
 	'SynchroDataSource:Description' => 'Popis',
 	'SynchroDataSource:Reconciliation' => 'Hľadať &amp; harmonizáciu',
 	'SynchroDataSource:Deletion' => 'Pravidlá odstraňovania',
@@ -753,8 +769,10 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Core:Synchro:NeverRun' => 'Táto synchronizácia nikdy nebežala. Zatiaľ bez záznamu .',
 	'Core:Synchro:SynchroEndedOn_Date' => 'Posledná synchronizácia skončila: %1$s.',
 	'Core:Synchro:SynchroRunningStartedOn_Date' => 'The Synchronizácia spustené %1$s stále beží...',
-	'Menu:DataSources' => 'Synchronizované zdroje dát', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:DataSources+' => '', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataSources' => 'Synchronizované zdroje dát',
+    // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataSources+' => '',
+    // Duplicated into itop-welcome-itil (will be removed from here...)
 	'Core:Synchro:label_repl_ignored' => 'Ignorované (%1$s)',
 	'Core:Synchro:label_repl_disappeared' => 'Zmiznuté (%1$s)',
 	'Core:Synchro:label_repl_existing' => 'Existujúce (%1$s)',
@@ -818,29 +836,6 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:CMDBChangeOpSetAttributeEncrypted/Attribute:prevstring' => 'Predchádzajúca hodnota',
 	'Class:CMDBChangeOpSetAttributeCaseLog' => 'Záznam o riešení',
 	'Class:CMDBChangeOpSetAttributeCaseLog/Attribute:lastentry' => 'Posledný záznam',
-	'Class:SynchroDataSource' => 'Synchronizovaný zdroj dát',
-	'Class:SynchroDataSource/Attribute:status/Value:implementation' => 'Implementácia',
-	'Class:SynchroDataSource/Attribute:status/Value:obsolete' => 'Vyradené',
-	'Class:SynchroDataSource/Attribute:status/Value:production' => 'Produkcia',
-	'Class:SynchroDataSource/Attribute:scope_restriction' => 'Obmedzenie rozsahu',
-	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_attributes' => 'Použiť atribúty',
-	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_primary_key' => 'Použiť pole "Primárny kľúč"',
-	'Class:SynchroDataSource/Attribute:action_on_zero/Value:create' => 'Vytvoriť',
-	'Class:SynchroDataSource/Attribute:action_on_zero/Value:error' => 'Chyba',
-	'Class:SynchroDataSource/Attribute:action_on_one/Value:error' => 'Chyba',
-	'Class:SynchroDataSource/Attribute:action_on_one/Value:update' => 'Aktualizácia',
-	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:create' => 'Vytvoriť',
-	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:error' => 'Chyba',
-	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:take_first' => 'Vziať prvý (náhodný?)',
-	'Class:SynchroDataSource/Attribute:delete_policy' => 'Politika odstraňovania',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:delete' => 'Odstrániť',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:ignore' => 'Ignorovať',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:update' => 'Aktualizovať',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:update_then_delete' => 'Aktualizovať, potom odstrániť',
-	'Class:SynchroDataSource/Attribute:attribute_list' => 'Zoznam atribútov',
-	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:administrators' => 'Len administrátori',
-	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:everybody' => 'Všetci majú povolené odstraňovať takéto objekty',
-	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:nobody' => 'Nikto',
 	'Class:SynchroAttribute' => 'Synchronizovaný atribút',
 	'Class:SynchroAttribute/Attribute:sync_source_id' => 'Synchronizovaný zdroj dát',
 	'Class:SynchroAttribute/Attribute:attcode' => 'Kód atribútu',
@@ -901,19 +896,16 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:appUserPreferences/Attribute:preferences' => 'Preferencie',
 	'Core:ExecProcess:Code1' => 'Nesprávny príkaz alebo príkaz skončil s chybami (napr. nesprávne meno skriptu)',
 	'Core:ExecProcess:Code255' => 'PHP chyba (pri parsovaní, alebo počas behu)',
-
-	// Attribute Duration
+    // Attribute Duration
 	'Core:Duration_Seconds' => '%1$ds',
 	'Core:Duration_Minutes_Seconds' => '%1$dmin %2$ds',
 	'Core:Duration_Hours_Minutes_Seconds' => '%1$dh %2$dmin %3$ds',
 	'Core:Duration_Days_Hours_Minutes_Seconds' => '%1$sd %2$dh %3$dmin %4$ds',
-
-	// Explain working time computing
+    // Explain working time computing
 	'Core:ExplainWTC:ElapsedTime' => 'Time elapsed (stored as "%1$s")~~',
 	'Core:ExplainWTC:StopWatch-TimeSpent' => 'Time spent for "%1$s"~~',
 	'Core:ExplainWTC:StopWatch-Deadline' => 'Deadline for "%1$s" at %2$d%%~~',
-
-	// Bulk export
+    // Bulk export
 	'Core:BulkExport:MissingParameter_Param' => 'Missing parameter "%1$s"~~',
 	'Core:BulkExport:InvalidParameter_Query' => 'Invalid value for the parameter "query". There is no Query Phrasebook corresponding to the id: "%1$s".~~',
 	'Core:BulkExport:ExportFormatPrompt' => 'Export format:~~',
@@ -965,20 +957,34 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Core:BulkExport:DateTimeFormatDefault_Example' => 'Default format (%1$s), e.g. %2$s~~',
 	'Core:BulkExport:DateTimeFormatCustom_Format' => 'Custom format: %1$s~~',
 	'Core:BulkExport:PDF:PageNumber' => 'Page %1$s~~',
-	'Core:DateTime:Placeholder_d' => 'DD~~', // Day of the month: 2 digits (with leading zero)
-	'Core:DateTime:Placeholder_j' => 'D~~', // Day of the month: 1 or 2 digits (without leading zero)
-	'Core:DateTime:Placeholder_m' => 'MM~~', // Month on 2 digits i.e. 01-12
-	'Core:DateTime:Placeholder_n' => 'M~~', // Month on 1 or 2 digits 1-12
-	'Core:DateTime:Placeholder_Y' => 'YYYY~~', // Year on 4 digits
-	'Core:DateTime:Placeholder_y' => 'YY~~', // Year on 2 digits
-	'Core:DateTime:Placeholder_H' => 'hh~~', // Hour 00..23
-	'Core:DateTime:Placeholder_h' => 'h~~', // Hour 01..12
-	'Core:DateTime:Placeholder_G' => 'hh~~', // Hour 0..23
-	'Core:DateTime:Placeholder_g' => 'h~~', // Hour 1..12
-	'Core:DateTime:Placeholder_a' => 'am/pm~~', // am/pm (lowercase)
-	'Core:DateTime:Placeholder_A' => 'AM/PM~~', // AM/PM (uppercase)
-	'Core:DateTime:Placeholder_i' => 'mm~~', // minutes, 2 digits: 00..59
-	'Core:DateTime:Placeholder_s' => 'ss~~', // seconds, 2 digits 00..59
+	'Core:DateTime:Placeholder_d' => 'DD~~',
+    // Day of the month: 2 digits (with leading zero)
+	'Core:DateTime:Placeholder_j' => 'D~~',
+    // Day of the month: 1 or 2 digits (without leading zero)
+	'Core:DateTime:Placeholder_m' => 'MM~~',
+    // Month on 2 digits i.e. 01-12
+	'Core:DateTime:Placeholder_n' => 'M~~',
+    // Month on 1 or 2 digits 1-12
+	'Core:DateTime:Placeholder_Y' => 'YYYY~~',
+    // Year on 4 digits
+	'Core:DateTime:Placeholder_y' => 'YY~~',
+    // Year on 2 digits
+	'Core:DateTime:Placeholder_H' => 'hh~~',
+    // Hour 00..23
+	'Core:DateTime:Placeholder_h' => 'h~~',
+    // Hour 01..12
+	'Core:DateTime:Placeholder_G' => 'hh~~',
+    // Hour 0..23
+	'Core:DateTime:Placeholder_g' => 'h~~',
+    // Hour 1..12
+	'Core:DateTime:Placeholder_a' => 'am/pm~~',
+    // am/pm (lowercase)
+	'Core:DateTime:Placeholder_A' => 'AM/PM~~',
+    // AM/PM (uppercase)
+	'Core:DateTime:Placeholder_i' => 'mm~~',
+    // minutes, 2 digits: 00..59
+	'Core:DateTime:Placeholder_s' => 'ss~~',
+    // seconds, 2 digits 00..59
 	'Core:Validator:Default' => 'Wrong format~~',
 	'Core:Validator:Mandatory' => 'Please, fill this field~~',
 	'Core:Validator:MustBeInteger' => 'Must be an integer~~',
@@ -991,7 +997,6 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:TagSetFieldData' => '%2$s for class %1$s~~',
 	'Class:TagSetFieldData+' => '',
-
 	'Class:TagSetFieldData/Attribute:code' => 'Code~~',
 	'Class:TagSetFieldData/Attribute:code+' => 'Internal code. Must contain at least 3 alphanumeric characters~~',
 	'Class:TagSetFieldData/Attribute:label' => 'Label~~',
@@ -1001,7 +1006,6 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:TagSetFieldData/Attribute:finalclass' => 'Tag class~~~~',
 	'Class:TagSetFieldData/Attribute:obj_class' => 'Object class~~~~',
 	'Class:TagSetFieldData/Attribute:obj_attcode' => 'Field code~~~~',
-
 	'Core:TagSetFieldData:ErrorDeleteUsedTag' => 'Used tags cannot be deleted~~',
 	'Core:TagSetFieldData:ErrorDuplicateTagCodeOrLabel' => 'Tags codes or labels must be unique~~',
 	'Core:TagSetFieldData:ErrorTagCodeSyntax' => 'Tags code must contain between 3 and %1$d alphanumeric characters, starting with a letter.~~',
@@ -1088,8 +1092,8 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:AsyncTask/Attribute:last_error+' => '',
 	'Class:AsyncTask/Attribute:last_attempt' => 'Last attempt~~',
 	'Class:AsyncTask/Attribute:last_attempt+' => '',
-    'Class:AsyncTask:InvalidConfig_Class_Keys' => 'Invalid format for the configuration of "async_task_retries[%1$s]". Expecting an array with the following keys: %2$s~~',
-    'Class:AsyncTask:InvalidConfig_Class_InvalidKey_Keys' => 'Invalid format for the configuration of "async_task_retries[%1$s]": unexpected key "%2$s". Expecting only the following keys: %3$s~~',
+	'Class:AsyncTask:InvalidConfig_Class_Keys' => 'Invalid format for the configuration of "async_task_retries[%1$s]". Expecting an array with the following keys: %2$s~~',
+	'Class:AsyncTask:InvalidConfig_Class_InvalidKey_Keys' => 'Invalid format for the configuration of "async_task_retries[%1$s]": unexpected key "%2$s". Expecting only the following keys: %3$s~~',
 ));
 
 //
@@ -1127,1885 +1131,1884 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:ResourceSystemMenu' => 'Resource System Menu~~',
 	'Class:ResourceSystemMenu+' => '',
 ));
-
-
-
-
 // Additional language entries not present in English dict
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
- 'Class:lnkVirtualDeviceToVolume' => 'väzba Virtuálne zariadenie / Logický disk',
- 'Class:lnkVirtualDeviceToVolume+' => '',
- 'Class:lnkVirtualDeviceToVolume/Attribute:volume_id' => 'Logický disk',
- 'Class:lnkVirtualDeviceToVolume/Attribute:volume_id+' => '',
- 'Class:lnkVirtualDeviceToVolume/Attribute:virtualdevice_id' => 'Virtuálne zariadenie',
- 'Class:lnkVirtualDeviceToVolume/Attribute:virtualdevice_id+' => '',
- 'Class:lnkVirtualDeviceToVolume/Attribute:size_used' => 'Použité miesto',
- 'Class:lnkVirtualDeviceToVolume/Attribute:size_used+' => '',
- 'Class:Organization' => 'Organizácia',
- 'Class:Organization+' => '',
- 'Class:Organization/Attribute:name' => 'Názov',
- 'Class:Organization/Attribute:name+' => '',
- 'Class:Organization/Attribute:code' => 'Kód',
- 'Class:Organization/Attribute:code+' => '',
- 'Class:Organization/Attribute:status' => 'Stav',
- 'Class:Organization/Attribute:status+' => '',
- 'Class:Organization/Attribute:status/Value:active' => 'Aktívna',
- 'Class:Organization/Attribute:status/Value:active+' => '',
- 'Class:Organization/Attribute:status/Value:inactive' => 'Neaktívna',
- 'Class:Organization/Attribute:status/Value:inactive+' => '',
- 'Class:Organization/Attribute:parent_id' => 'Nadradená organizácia',
- 'Class:Organization/Attribute:parent_id+' => '',
- 'Class:Organization/Attribute:deliverymodel_id' => 'Model dodávky',
- 'Class:Organization/Attribute:deliverymodel_id+' => '',
- 'Class:Location' => 'Poloha',
- 'Class:Location+' => '',
- 'Class:Location/Attribute:name' => 'Názov',
- 'Class:Location/Attribute:name+' => '',
- 'Class:Location/Attribute:status' => 'Stav',
- 'Class:Location/Attribute:status+' => '',
- 'Class:Location/Attribute:status/Value:active' => 'Aktívna',
- 'Class:Location/Attribute:status/Value:active+' => '',
- 'Class:Location/Attribute:status/Value:inactive' => 'Neaktívna',
- 'Class:Location/Attribute:status/Value:inactive+' => '',
- 'Class:Location/Attribute:org_id' => 'Organizácia vlastníka',
- 'Class:Location/Attribute:org_id+' => '',
- 'Class:Location/Attribute:address' => 'Adresa',
- 'Class:Location/Attribute:address+' => '',
- 'Class:Location/Attribute:postal_code' => 'PSČ',
- 'Class:Location/Attribute:postal_code+' => '',
- 'Class:Location/Attribute:city' => 'Mesto',
- 'Class:Location/Attribute:city+' => '',
- 'Class:Location/Attribute:country' => 'Štát',
- 'Class:Location/Attribute:country+' => '',
- 'Class:Location/Attribute:physicaldevice_list' => 'Zariadenia',
- 'Class:Location/Attribute:physicaldevice_list+' => 'All the devices in this location~~',
- 'Class:Location/Attribute:person_list' => 'Kontakty',
- 'Class:Location/Attribute:person_list+' => 'All the contacts located on this location~~',
- 'Class:Person' => 'Osoba',
- 'Class:Person+' => '',
- 'Class:Person/Attribute:first_name' => 'Krstné meno',
- 'Class:Person/Attribute:first_name+' => '',
- 'Class:Person/Attribute:employee_number' => 'Číslo zamestnanca',
- 'Class:Person/Attribute:employee_number+' => '',
- 'Class:Person/Attribute:mobile_phone' => 'Telefónne číslo',
- 'Class:Person/Attribute:mobile_phone+' => '',
- 'Class:Person/Attribute:location_id' => 'Poloha',
- 'Class:Person/Attribute:location_id+' => '',
- 'Class:Person/Attribute:manager_id' => 'Manažér',
- 'Class:Person/Attribute:manager_id+' => '',
- 'Class:Person/Attribute:team_list' => 'Tímy',
- 'Class:Person/Attribute:team_list+' => 'All the teams this person belongs to~~',
- 'Class:Person/Attribute:tickets_list' => 'Tickety',
- 'Class:Person/Attribute:tickets_list+' => 'All the tickets this person is the caller~~',
- 'Class:Team' => 'Tím',
- 'Class:Team+' => '',
- 'Class:Team/Attribute:persons_list' => 'Osoby',
- 'Class:Team/Attribute:persons_list+' => 'All the people belonging to this team~~',
- 'Class:Team/Attribute:tickets_list' => 'Tickety',
- 'Class:Team/Attribute:tickets_list+' => 'All the tickets assigned to this team~~',
- 'Class:DocumentFile' => 'Dokumentový súbor',
- 'Class:DocumentFile+' => '',
- 'Class:DocumentFile/Attribute:file' => 'Súbor',
- 'Class:DocumentFile/Attribute:file+' => '',
- 'Class:DocumentNote' => 'Poznámka dokumentu',
- 'Class:DocumentNote+' => '',
- 'Class:DocumentNote/Attribute:text' => 'Text',
- 'Class:DocumentNote/Attribute:text+' => '',
- 'Class:DocumentWeb' => 'Web stránka dokumentu',
- 'Class:DocumentWeb+' => '',
- 'Class:DocumentWeb/Attribute:url' => 'URL',
- 'Class:DocumentWeb/Attribute:url+' => '',
- 'Class:NetworkDevice' => 'Sieťové zariadenie',
- 'Class:NetworkDevice+' => '',
- 'Class:NetworkDevice/Attribute:networkdevicetype_id' => 'Typ sieťového zariadenia',
- 'Class:NetworkDevice/Attribute:networkdevicetype_id+' => '',
- 'Class:NetworkDevice/Attribute:connectablecis_list' => 'Zariadenia',
- 'Class:NetworkDevice/Attribute:connectablecis_list+' => 'All the devices connected to this network device~~',
- 'Class:NetworkDevice/Attribute:iosversion_id' => 'IVerzia OS',
- 'Class:NetworkDevice/Attribute:iosversion_id+' => '',
- 'Class:NetworkDevice/Attribute:ram' => 'Operačná pamäť',
- 'Class:NetworkDevice/Attribute:ram+' => '',
- 'Class:Server' => 'Server',
- 'Class:Server+' => '',
- 'Class:Server/Attribute:osfamily_id' => 'Kategória OS',
- 'Class:Server/Attribute:osfamily_id+' => '',
- 'Class:Server/Attribute:osversion_id' => 'Verzia OS',
- 'Class:Server/Attribute:osversion_id+' => '',
- 'Class:Server/Attribute:oslicence_id' => 'Licencia OS',
- 'Class:Server/Attribute:oslicence_id+' => '',
- 'Class:Server/Attribute:cpu' => 'Procesor',
- 'Class:Server/Attribute:cpu+' => '',
- 'Class:Server/Attribute:ram' => 'Operačna pamäť',
- 'Class:Server/Attribute:ram+' => '',
- 'Class:Server/Attribute:logicalvolumes_list' => 'Logické disky',
- 'Class:Server/Attribute:logicalvolumes_list+' => 'All the logical volumes connected to this server~~',
- 'Class:ApplicationSolution' => 'Aplikačné riešenie',
- 'Class:ApplicationSolution+' => '',
- 'Class:ApplicationSolution/Attribute:functionalcis_list' => 'Komponenty',
- 'Class:ApplicationSolution/Attribute:functionalcis_list+' => 'All the configuration items that compose this application solution~~',
- 'Class:ApplicationSolution/Attribute:businessprocess_list' => 'Biznis procesy',
- 'Class:ApplicationSolution/Attribute:businessprocess_list+' => 'All the business processes depending on this application solution~~',
- 'Class:ApplicationSolution/Attribute:status' => 'Stav',
- 'Class:ApplicationSolution/Attribute:status+' => '',
- 'Class:ApplicationSolution/Attribute:status/Value:active' => 'Aktívne',
- 'Class:ApplicationSolution/Attribute:status/Value:active+' => '',
- 'Class:ApplicationSolution/Attribute:status/Value:inactive' => 'Neaktívne',
- 'Class:ApplicationSolution/Attribute:status/Value:inactive+' => '',
- 'Class:BusinessProcess' => 'Biznis proces',
- 'Class:BusinessProcess+' => '',
- 'Class:BusinessProcess/Attribute:applicationsolutions_list' => 'Aplikačné riešenia',
- 'Class:BusinessProcess/Attribute:applicationsolutions_list+' => 'All the application solutions that impact this business process~~',
- 'Class:BusinessProcess/Attribute:status' => 'Stav',
- 'Class:BusinessProcess/Attribute:status+' => '',
- 'Class:BusinessProcess/Attribute:status/Value:active' => 'Aktívny',
- 'Class:BusinessProcess/Attribute:status/Value:active+' => '',
- 'Class:BusinessProcess/Attribute:status/Value:inactive' => 'Neaktívny',
- 'Class:BusinessProcess/Attribute:status/Value:inactive+' => '',
- 'Class:Middleware' => 'Middleware',
- 'Class:Middleware+' => '',
- 'Class:Middleware/Attribute:middlewareinstance_list' => 'Middleware inštancie',
- 'Class:Middleware/Attribute:middlewareinstance_list+' => 'All the middleware instances provided by this middleware~~',
- 'Class:DBServer' => 'DB Server',
- 'Class:DBServer+' => '',
- 'Class:DBServer/Attribute:dbschema_list' => 'DB schémy',
- 'Class:DBServer/Attribute:dbschema_list+' => 'All the database schemas for this DB server~~',
- 'Class:WebServer' => 'Web server',
- 'Class:WebServer+' => '',
- 'Class:WebServer/Attribute:webapp_list' => 'Webové aplikácie',
- 'Class:WebServer/Attribute:webapp_list+' => 'All the web applications available on this web server~~',
- 'Class:PCSoftware' => 'PC softvér',
- 'Class:PCSoftware+' => '',
- 'Class:OtherSoftware' => 'Iný softvér',
- 'Class:OtherSoftware+' => '',
- 'Class:MiddlewareInstance' => 'Middleware inštancia',
- 'Class:MiddlewareInstance+' => '',
- 'Class:MiddlewareInstance/Attribute:middleware_id' => 'Middleware',
- 'Class:MiddlewareInstance/Attribute:middleware_id+' => '',
- 'Class:DatabaseSchema' => 'Databázová schéma',
- 'Class:DatabaseSchema+' => '',
- 'Class:DatabaseSchema/Attribute:dbserver_id' => 'DB server',
- 'Class:DatabaseSchema/Attribute:dbserver_id+' => '',
- 'Class:WebApplication' => 'Webová Aplikácia',
- 'Class:WebApplication+' => '',
- 'Class:WebApplication/Attribute:webserver_id' => 'Web server',
- 'Class:WebApplication/Attribute:webserver_id+' => '',
- 'Class:WebApplication/Attribute:url' => 'URL',
- 'Class:WebApplication/Attribute:url+' => '',
- 'Class:Software' => 'Softvér',
- 'Class:Software+' => '',
- 'Class:Software/Attribute:name' => 'Názov',
- 'Class:Software/Attribute:name+' => '',
- 'Class:Software/Attribute:vendor' => 'Dodávateľ',
- 'Class:Software/Attribute:vendor+' => '',
- 'Class:Software/Attribute:version' => 'Verzia',
- 'Class:Software/Attribute:version+' => '',
- 'Class:Software/Attribute:documents_list' => 'Dokumenty',
- 'Class:Software/Attribute:documents_list+' => 'All the documents linked to this software~~',
- 'Class:Software/Attribute:type' => 'Typ',
- 'Class:Software/Attribute:type+' => '',
- 'Class:Software/Attribute:type/Value:DBServer' => 'DB Server',
- 'Class:Software/Attribute:type/Value:DBServer+' => '',
- 'Class:Software/Attribute:type/Value:Middleware' => 'Middleware',
- 'Class:Software/Attribute:type/Value:Middleware+' => '',
- 'Class:Software/Attribute:type/Value:OtherSoftware' => 'Iný softvér',
- 'Class:Software/Attribute:type/Value:OtherSoftware+' => '',
- 'Class:Software/Attribute:type/Value:PCSoftware' => 'PC softvér',
- 'Class:Software/Attribute:type/Value:PCSoftware+' => '',
- 'Class:Software/Attribute:type/Value:WebServer' => 'Web Server',
- 'Class:Software/Attribute:type/Value:WebServer+' => '',
- 'Class:Software/Attribute:softwareinstance_list' => 'Softvérové inštancie',
- 'Class:Software/Attribute:softwareinstance_list+' => 'All the software instances for this software~~',
- 'Class:Software/Attribute:softwarepatch_list' => 'Softvérové záplaty',
- 'Class:Software/Attribute:softwarepatch_list+' => 'All the patchs for this software~~',
- 'Class:Software/Attribute:softwarelicence_list' => 'Softvérové licencie',
- 'Class:Software/Attribute:softwarelicence_list+' => 'All the licenses for this software~~',
- 'Class:OSPatch' => 'Záplata OS',
- 'Class:OSPatch+' => '',
- 'Class:OSPatch/Attribute:functionalcis_list' => 'Zariadenia',
- 'Class:OSPatch/Attribute:functionalcis_list+' => 'All the systems where this patch is installed~~',
- 'Class:OSPatch/Attribute:osversion_id' => 'Verzia OS',
- 'Class:OSPatch/Attribute:osversion_id+' => '',
- 'Class:SoftwarePatch' => 'Softvérová záplata',
- 'Class:SoftwarePatch+' => '',
- 'Class:SoftwarePatch/Attribute:software_id' => 'Softvér',
- 'Class:SoftwarePatch/Attribute:software_id+' => '',
- 'Class:SoftwarePatch/Attribute:softwareinstances_list' => 'Inštancie softvéru',
- 'Class:SoftwarePatch/Attribute:softwareinstances_list+' => 'All the systems where this software patch is installed~~',
- 'Class:OSLicence' => 'Licencia OS',
- 'Class:OSLicence+' => '',
- 'Class:OSLicence/Attribute:osversion_id' => 'Verzia OS',
- 'Class:OSLicence/Attribute:osversion_id+' => '',
- 'Class:OSLicence/Attribute:virtualmachines_list' => 'Virtuálne zariadenia',
- 'Class:OSLicence/Attribute:virtualmachines_list+' => 'All the virtual machines where this license is used~~',
- 'Class:OSLicence/Attribute:servers_list' => 'Servery',
- 'Class:OSLicence/Attribute:servers_list+' => 'All the servers where this license is used~~',
- 'Class:SoftwareLicence' => 'Softvérová licencia',
- 'Class:SoftwareLicence+' => '',
- 'Class:SoftwareLicence/Attribute:software_id' => 'Softvér',
- 'Class:SoftwareLicence/Attribute:software_id+' => '',
- 'Class:SoftwareLicence/Attribute:softwareinstance_list' => 'Inštancie softvéru',
- 'Class:SoftwareLicence/Attribute:softwareinstance_list+' => 'All the systems where this license is used~~',
- 'Class:lnkDocumentToLicence' => 'väzba Dokument/Licencia',
- 'Class:lnkDocumentToLicence+' => '',
- 'Class:lnkDocumentToLicence/Attribute:licence_id' => 'Licencia',
- 'Class:lnkDocumentToLicence/Attribute:licence_id+' => '',
- 'Class:lnkDocumentToLicence/Attribute:document_id' => 'Dokument',
- 'Class:lnkDocumentToLicence/Attribute:document_id+' => '',
- 'Class:OSVersion' => 'Verzia OS',
- 'Class:OSVersion+' => '',
- 'Class:OSVersion/Attribute:osfamily_id' => 'Kategória OS',
- 'Class:OSVersion/Attribute:osfamily_id+' => '',
- 'Class:OSFamily' => 'Kategória OS',
- 'Class:OSFamily+' => '',
- 'Class:DocumentType' => 'Typ dokumentu',
- 'Class:DocumentType+' => '',
- 'Class:ContactType' => 'Typ kontaktu',
- 'Class:ContactType+' => '',
- 'Class:Brand' => 'Značka',
- 'Class:Brand+' => '',
- 'Class:Brand/Attribute:physicaldevices_list' => 'Zariadenia',
- 'Class:Brand/Attribute:physicaldevices_list+' => 'All the physical devices corresponding to this brand~~',
- 'Class:Model' => 'Model',
- 'Class:Model+' => '',
- 'Class:Model/Attribute:brand_id' => 'Značka',
- 'Class:Model/Attribute:brand_id+' => '',
- 'Class:Model/Attribute:type' => 'Typ zariadena',
- 'Class:Model/Attribute:type+' => '',
- 'Class:Model/Attribute:type/Value:DiskArray' => 'Diskové pole',
- 'Class:Model/Attribute:type/Value:DiskArray+' => '',
- 'Class:Model/Attribute:type/Value:Enclosure' => 'Kryt',
- 'Class:Model/Attribute:type/Value:Enclosure+' => '',
- 'Class:Model/Attribute:type/Value:IPPhone' => 'IP Telefón',
- 'Class:Model/Attribute:type/Value:IPPhone+' => '',
- 'Class:Model/Attribute:type/Value:MobilePhone' => 'Mobilný telefón',
- 'Class:Model/Attribute:type/Value:MobilePhone+' => '',
- 'Class:Model/Attribute:type/Value:NAS' => 'NAS',
- 'Class:Model/Attribute:type/Value:NAS+' => '',
- 'Class:Model/Attribute:type/Value:NetworkDevice' => 'Sieťové zariadenie',
- 'Class:Model/Attribute:type/Value:NetworkDevice+' => '',
- 'Class:Model/Attribute:type/Value:PC' => 'PC',
- 'Class:Model/Attribute:type/Value:PC+' => '',
- 'Class:Model/Attribute:type/Value:PDU' => 'PDU',
- 'Class:Model/Attribute:type/Value:PDU+' => '',
- 'Class:Model/Attribute:type/Value:Peripheral' => 'Periférie',
- 'Class:Model/Attribute:type/Value:Peripheral+' => '',
- 'Class:Model/Attribute:type/Value:PowerSource' => 'Zdroj napájania',
- 'Class:Model/Attribute:type/Value:PowerSource+' => '',
- 'Class:Model/Attribute:type/Value:Printer' => 'Tlačiareň',
- 'Class:Model/Attribute:type/Value:Printer+' => '',
- 'Class:Model/Attribute:type/Value:Rack' => 'stojan (Rack)',
- 'Class:Model/Attribute:type/Value:Rack+' => '',
- 'Class:Model/Attribute:type/Value:SANSwitch' => 'SAN prepínač',
- 'Class:Model/Attribute:type/Value:SANSwitch+' => '',
- 'Class:Model/Attribute:type/Value:Server' => 'Server',
- 'Class:Model/Attribute:type/Value:Server+' => '',
- 'Class:Model/Attribute:type/Value:StorageSystem' => 'Úložiskový systém',
- 'Class:Model/Attribute:type/Value:StorageSystem+' => '',
- 'Class:Model/Attribute:type/Value:Tablet' => 'Tablet',
- 'Class:Model/Attribute:type/Value:Tablet+' => '',
- 'Class:Model/Attribute:type/Value:TapeLibrary' => 'Pásková knižnica',
- 'Class:Model/Attribute:type/Value:TapeLibrary+' => '',
- 'Class:Model/Attribute:type/Value:Telephone' => 'Telefón',
- 'Class:Model/Attribute:type/Value:Telephone+' => '',
- 'Class:Model/Attribute:physicaldevices_list' => 'Zariadenia',
- 'Class:Model/Attribute:physicaldevices_list+' => 'All the physical devices corresponding to this model~~',
- 'Class:NetworkDeviceType' => 'Typ sieťového zariadenia',
- 'Class:NetworkDeviceType+' => '',
- 'Class:NetworkDeviceType/Attribute:networkdevicesdevices_list' => 'Sieťové zariadenia',
- 'Class:NetworkDeviceType/Attribute:networkdevicesdevices_list+' => 'All the network devices corresponding to this type~~',
- 'Class:IOSVersion' => 'Verzia IOSu',
- 'Class:IOSVersion+' => '',
- 'Class:IOSVersion/Attribute:brand_id' => 'Značka',
- 'Class:IOSVersion/Attribute:brand_id+' => '',
- 'Class:lnkDocumentToPatch' => 'väzba - Dokument / Záplata',
- 'Class:lnkDocumentToPatch+' => '',
- 'Class:lnkDocumentToPatch/Attribute:patch_id' => 'Záplata',
- 'Class:lnkDocumentToPatch/Attribute:patch_id+' => '',
- 'Class:lnkDocumentToPatch/Attribute:document_id' => 'Dokument',
- 'Class:lnkDocumentToPatch/Attribute:document_id+' => '',
- 'Class:lnkSoftwareInstanceToSoftwarePatch' => 'väzba - Softvérová inštancia / Softvérová záplata',
- 'Class:lnkSoftwareInstanceToSoftwarePatch+' => '',
- 'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id' => 'Softvérová záplata',
- 'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id+' => '',
- 'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_id' => 'Softvérová inštancia',
- 'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_id+' => '',
- 'Class:lnkFunctionalCIToOSPatch' => 'väzba - Komponent / Záplata OS',
- 'Class:lnkFunctionalCIToOSPatch+' => '',
- 'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id' => 'Záplata OS',
- 'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id+' => '',
- 'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_id' => 'Komponent',
- 'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_id+' => '',
- 'Class:lnkDocumentToSoftware' => 'väzba Dokument / Softvér',
- 'Class:lnkDocumentToSoftware+' => '',
- 'Class:lnkDocumentToSoftware/Attribute:software_id' => 'Softvér',
- 'Class:lnkDocumentToSoftware/Attribute:software_id+' => '',
- 'Class:lnkDocumentToSoftware/Attribute:document_id' => 'Dokument',
- 'Class:lnkDocumentToSoftware/Attribute:document_id+' => '',
- 'Class:lnkContactToFunctionalCI' => 'väzba - Kontakt / Komponent',
- 'Class:lnkContactToFunctionalCI+' => '',
- 'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'Komponent',
- 'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
- 'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Kontakt',
- 'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '',
- 'Class:lnkDocumentToFunctionalCI' => 'väzba - Dokument / Komponent',
- 'Class:lnkDocumentToFunctionalCI+' => '',
- 'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id' => 'Komponent',
- 'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id+' => '',
- 'Class:lnkDocumentToFunctionalCI/Attribute:document_id' => 'Dokument',
- 'Class:lnkDocumentToFunctionalCI/Attribute:document_id+' => '',
- 'Class:Subnet' => 'Podsieť',
- 'Class:Subnet+' => '',
- 'Class:Subnet/Attribute:description' => 'Popis',
- 'Class:Subnet/Attribute:description+' => '',
- 'Class:Subnet/Attribute:org_id' => 'Organizácia',
- 'Class:Subnet/Attribute:org_id+' => '',
- 'Class:Subnet/Attribute:ip' => 'IP Adresa',
- 'Class:Subnet/Attribute:ip+' => '',
- 'Class:Subnet/Attribute:ip_mask' => 'Maska IP adresy',
- 'Class:Subnet/Attribute:ip_mask+' => '',
- 'Class:PhysicalInterface' => 'Fyzické rozhranie',
- 'Class:PhysicalInterface+' => '',
- 'Class:PhysicalInterface/Attribute:connectableci_id' => 'Pripojitelné Zariadenie',
- 'Class:PhysicalInterface/Attribute:connectableci_id+' => '',
- 'Class:lnkConnectableCIToNetworkDevice' => 'väzba - Komponent / Sieťové zariadenie',
- 'Class:lnkConnectableCIToNetworkDevice+' => '',
- 'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id' => 'Sieťové zariadenie',
- 'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id+' => '',
- 'Class:lnkConnectableCIToNetworkDevice/Attribute:connectableci_id' => 'Pripojiteľné zariadenie',
- 'Class:lnkConnectableCIToNetworkDevice/Attribute:connectableci_id+' => '',
- 'Class:lnkConnectableCIToNetworkDevice/Attribute:network_port' => 'Sieťový port',
- 'Class:lnkConnectableCIToNetworkDevice/Attribute:network_port+' => '',
- 'Class:lnkConnectableCIToNetworkDevice/Attribute:device_port' => 'Port zariadenia',
- 'Class:lnkConnectableCIToNetworkDevice/Attribute:device_port+' => '',
- 'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type' => 'Typ pripojenia',
- 'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type+' => '',
- 'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type/Value:downlink' => 'downlink',
- 'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type/Value:downlink+' => '',
- 'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type/Value:uplink' => 'uplink',
- 'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type/Value:uplink+' => '',
- 'Class:lnkApplicationSolutionToFunctionalCI' => 'väzba - Aplikačné riešenie / Komponent',
- 'Class:lnkApplicationSolutionToFunctionalCI+' => '',
- 'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_id' => 'Aplikačné riešenie',
- 'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_id+' => '',
- 'Class:lnkApplicationSolutionToFunctionalCI/Attribute:functionalci_id' => 'Komponent',
- 'Class:lnkApplicationSolutionToFunctionalCI/Attribute:functionalci_id+' => '',
- 'Class:lnkApplicationSolutionToBusinessProcess' => 'väzba - Aplikačné riešenie / Biznis proces',
- 'Class:lnkApplicationSolutionToBusinessProcess+' => '',
- 'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_id' => 'Biznis proces',
- 'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_id+' => '',
- 'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_id' => 'Aplikačné riešenie',
- 'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_id+' => '',
- 'Class:lnkPersonToTeam' => 'väzba - Osoba / Tím',
- 'Class:lnkPersonToTeam+' => '',
- 'Class:lnkPersonToTeam/Attribute:team_id' => 'Tím',
- 'Class:lnkPersonToTeam/Attribute:team_id+' => '',
- 'Class:lnkPersonToTeam/Attribute:person_id' => 'Osoba',
- 'Class:lnkPersonToTeam/Attribute:person_id+' => '',
- 'Class:lnkPersonToTeam/Attribute:role_id' => 'Rola',
- 'Class:lnkPersonToTeam/Attribute:role_id+' => '',
- 'Class:Group' => 'Skupina',
- 'Class:Group+' => '',
- 'Class:Group/Attribute:name' => 'Názov',
- 'Class:Group/Attribute:name+' => '',
- 'Class:Group/Attribute:status' => 'Stav',
- 'Class:Group/Attribute:status+' => '',
- 'Class:Group/Attribute:status/Value:implementation' => 'Implementácia',
- 'Class:Group/Attribute:status/Value:implementation+' => '',
- 'Class:Group/Attribute:status/Value:obsolete' => 'Vyradená',
- 'Class:Group/Attribute:status/Value:obsolete+' => '',
- 'Class:Group/Attribute:status/Value:production' => 'Produkcia',
- 'Class:Group/Attribute:status/Value:production+' => '',
- 'Class:Group/Attribute:org_id' => 'Organizácia',
- 'Class:Group/Attribute:org_id+' => '',
- 'Class:Group/Attribute:description' => 'Popis',
- 'Class:Group/Attribute:description+' => '',
- 'Class:Group/Attribute:type' => 'Typ',
- 'Class:Group/Attribute:type+' => '',
- 'Class:Group/Attribute:parent_id' => 'Nadradená skupina',
- 'Class:Group/Attribute:parent_id+' => '',
- 'Class:Group/Attribute:ci_list' => 'Prislúchajúce zariadenia',
- 'Class:Group/Attribute:ci_list+' => 'All the configuration items linked to this group~~',
- 'Class:lnkGroupToCI' => 'väzba - Skupina / Zariadenie',
- 'Class:lnkGroupToCI+' => '',
- 'Class:lnkGroupToCI/Attribute:group_id' => 'Skupina',
- 'Class:lnkGroupToCI/Attribute:group_id+' => '',
- 'Class:lnkGroupToCI/Attribute:ci_id' => 'Zariadenie',
- 'Class:lnkGroupToCI/Attribute:ci_id+' => '',
- 'Class:lnkGroupToCI/Attribute:reason' => 'Dôvod',
- 'Class:lnkGroupToCI/Attribute:reason+' => '',
- 'Class:Rack' => 'stojan (Rack)',
- 'Class:Rack+' => '',
- 'Class:Rack/Attribute:nb_u' => 'NB U',
- 'Class:Rack/Attribute:nb_u+' => '',
- 'Class:Rack/Attribute:device_list' => 'Zariadenia',
- 'Class:Rack/Attribute:device_list+' => 'All the physical devices racked into this rack~~',
- 'Class:Rack/Attribute:enclosure_list' => 'Kryt',
- 'Class:Rack/Attribute:enclosure_list+' => 'All the enclosures in this rack~~',
- 'Class:Enclosure' => 'Kryt (enclosure)',
- 'Class:Enclosure+' => '',
- 'Class:Enclosure/Attribute:rack_id' => 'stojan (Rack)',
- 'Class:Enclosure/Attribute:rack_id+' => '',
- 'Class:Enclosure/Attribute:nb_u' => 'NB U',
- 'Class:Enclosure/Attribute:nb_u+' => '',
- 'Class:Enclosure/Attribute:device_list' => 'Zariadenia',
- 'Class:Enclosure/Attribute:device_list+' => 'All the devices in this enclosure~~',
- 'Class:PowerSource' => 'Napájací zdroj',
- 'Class:PowerSource+' => '',
- 'Class:PowerSource/Attribute:pdus_list' => 'Napäťové distribučné jednotky (PDU)',
- 'Class:PowerSource/Attribute:pdus_list+' => 'All the PDUs using this power source~~',
- 'Class:PDU' => 'Napäťová distribučná jednotka (PDU)',
- 'Class:PDU+' => '',
- 'Class:PDU/Attribute:rack_id' => 'stojan (Rack)',
- 'Class:PDU/Attribute:rack_id+' => '',
- 'Class:PDU/Attribute:powerstart_id' => 'Power start',
- 'Class:PDU/Attribute:powerstart_id+' => '',
- 'Class:PC' => 'PC',
- 'Class:PC+' => '',
- 'Class:PC/Attribute:osfamily_id' => 'Kategória OS',
- 'Class:PC/Attribute:osfamily_id+' => '',
- 'Class:PC/Attribute:osversion_id' => 'Verzia OS',
- 'Class:PC/Attribute:osversion_id+' => '',
- 'Class:PC/Attribute:cpu' => 'Procesor',
- 'Class:PC/Attribute:cpu+' => '',
- 'Class:PC/Attribute:ram' => 'Operačná pamäť',
- 'Class:PC/Attribute:ram+' => '',
- 'Class:PC/Attribute:type' => 'Typ',
- 'Class:PC/Attribute:type+' => '',
- 'Class:PC/Attribute:type/Value:desktop' => 'Stolový počítač',
- 'Class:PC/Attribute:type/Value:desktop+' => '',
- 'Class:PC/Attribute:type/Value:laptop' => 'Laptop',
- 'Class:PC/Attribute:type/Value:laptop+' => '',
- 'Class:Printer' => 'Tlačiareň',
- 'Class:Printer+' => '',
- 'Class:Phone' => 'Telefón',
- 'Class:Phone+' => '',
- 'Class:MobilePhone' => 'Mobilný telefón',
- 'Class:MobilePhone+' => '',
- 'Class:MobilePhone/Attribute:imei' => 'IMEI',
- 'Class:MobilePhone/Attribute:imei+' => '',
- 'Class:MobilePhone/Attribute:hw_pin' => 'HW PIN',
- 'Class:MobilePhone/Attribute:hw_pin+' => '',
- 'Class:IPPhone' => 'IP telefón',
- 'Class:IPPhone+' => '',
- 'Class:Tablet' => 'Tablet',
- 'Class:Tablet+' => '',
- 'Class:Peripheral' => 'Periférie',
- 'Class:Peripheral+' => '',
- 'Class:ContractType' => 'Typ zmluvy',
- 'Class:ContractType+' => '',
- 'Class:CustomerContract' => 'Zákaznícka zmluva',
- 'Class:CustomerContract+' => '',
- 'Class:CustomerContract/Attribute:services_list' => 'Služby',
- 'Class:CustomerContract/Attribute:services_list+' => 'All the services purchased for this contract~~',
- 'Class:ProviderContract' => 'Poskytovateľská zmluva',
- 'Class:ProviderContract+' => '',
- 'Class:ProviderContract/Attribute:functionalcis_list' => 'Zariadenia',
- 'Class:ProviderContract/Attribute:functionalcis_list+' => 'All the configuration items covered by this provider contract~~',
- 'Class:ProviderContract/Attribute:sla' => 'SLA',
- 'Class:ProviderContract/Attribute:sla+' => '',
- 'Class:ProviderContract/Attribute:coverage' => 'Časy pokrytia',
- 'Class:ProviderContract/Attribute:coverage+' => '',
- 'Class:lnkContactToContract' => 'väzba - Kontakt / zmluva',
- 'Class:lnkContactToContract+' => '',
- 'Class:lnkContactToContract/Attribute:contract_id' => 'zmluva',
- 'Class:lnkContactToContract/Attribute:contract_id+' => '',
- 'Class:lnkContactToContract/Attribute:contact_id' => 'Kontakt',
- 'Class:lnkContactToContract/Attribute:contact_id+' => '',
- 'Class:lnkContractToDocument' => 'väzba - zmluva / Dokument',
- 'Class:lnkContractToDocument+' => '',
- 'Class:lnkContractToDocument/Attribute:contract_id' => 'zmluva',
- 'Class:lnkContractToDocument/Attribute:contract_id+' => '',
- 'Class:lnkContractToDocument/Attribute:document_id' => 'Dokument',
- 'Class:lnkContractToDocument/Attribute:document_id+' => '',
- 'Class:lnkFunctionalCIToProviderContract' => 'väzba - Komponent / Poskytovateľská zmluva',
- 'Class:lnkFunctionalCIToProviderContract+' => '',
- 'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Poskytovateľská zmluva',
- 'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
- 'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'Zariadenie',
- 'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '',
- 'Class:ServiceFamily' => 'Kategória služieb',
- 'Class:ServiceFamily+' => '',
- 'Class:ServiceFamily/Attribute:name' => 'Názov',
- 'Class:ServiceFamily/Attribute:name+' => '',
- 'Class:ServiceFamily/Attribute:services_list' => 'Služby',
- 'Class:ServiceFamily/Attribute:services_list+' => 'All the services in this category~~',
- 'Class:Service' => 'Služby',
- 'Class:Service+' => '',
- 'Class:Service/Attribute:name' => 'Názov',
- 'Class:Service/Attribute:name+' => '',
- 'Class:Service/Attribute:org_id' => 'Poskytovateľ',
- 'Class:Service/Attribute:org_id+' => '',
- 'Class:Service/Attribute:servicefamily_id' => 'Kategória služieb',
- 'Class:Service/Attribute:servicefamily_id+' => '',
- 'Class:Service/Attribute:description' => 'Popis',
- 'Class:Service/Attribute:description+' => '',
- 'Class:Service/Attribute:documents_list' => 'Dokumenty',
- 'Class:Service/Attribute:documents_list+' => 'All the documents linked to the service~~',
- 'Class:Service/Attribute:contacts_list' => 'Kontakty',
- 'Class:Service/Attribute:contacts_list+' => 'All the contacts for this service~~',
- 'Class:Service/Attribute:status' => 'Stav',
- 'Class:Service/Attribute:status+' => '',
- 'Class:Service/Attribute:status/Value:implementation' => 'Implementácia',
- 'Class:Service/Attribute:status/Value:implementation+' => '',
- 'Class:Service/Attribute:status/Value:obsolete' => 'Vyradená',
- 'Class:Service/Attribute:status/Value:obsolete+' => '',
- 'Class:Service/Attribute:status/Value:production' => 'Produkcia',
- 'Class:Service/Attribute:status/Value:production+' => '',
- 'Class:Service/Attribute:customercontracts_list' => 'Zákaznícke zmluvy',
- 'Class:Service/Attribute:customercontracts_list+' => 'All the customer contracts that have purchased this service~~',
- 'Class:Service/Attribute:providercontracts_list' => 'Poskytovateľské zmluvy',
- 'Class:Service/Attribute:providercontracts_list+' => 'All the provider contracts to support this service~~',
- 'Class:Service/Attribute:functionalcis_list' => 'Zariadenia',
- 'Class:Service/Attribute:functionalcis_list+' => 'All the configuration items that are used to provide this service~~',
- 'Class:Service/Attribute:servicesubcategories_list' => 'Podkategórie služieb',
- 'Class:Service/Attribute:servicesubcategories_list+' => 'All the sub categories for this service~~',
- 'Class:lnkDocumentToService' => 'väzba - Dokument / Služba',
- 'Class:lnkDocumentToService+' => '',
- 'Class:lnkDocumentToService/Attribute:service_id' => 'Služba',
- 'Class:lnkDocumentToService/Attribute:service_id+' => '',
- 'Class:lnkDocumentToService/Attribute:document_id' => 'Dokument',
- 'Class:lnkDocumentToService/Attribute:document_id+' => '',
- 'Class:lnkContactToService' => 'väzba - Kontakt / Služba',
- 'Class:lnkContactToService+' => '',
- 'Class:lnkContactToService/Attribute:service_id' => 'Služba',
- 'Class:lnkContactToService/Attribute:service_id+' => '',
- 'Class:lnkContactToService/Attribute:contact_id' => 'Kontakt',
- 'Class:lnkContactToService/Attribute:contact_id+' => '',
- 'Class:ServiceSubcategory' => 'Podkategória služieb',
- 'Class:ServiceSubcategory+' => '',
- 'Class:ServiceSubcategory/Attribute:name' => 'Názov',
- 'Class:ServiceSubcategory/Attribute:name+' => '',
- 'Class:ServiceSubcategory/Attribute:description' => 'Popis',
- 'Class:ServiceSubcategory/Attribute:description+' => '',
- 'Class:ServiceSubcategory/Attribute:service_id' => 'Služba',
- 'Class:ServiceSubcategory/Attribute:service_id+' => '',
- 'Class:ServiceSubcategory/Attribute:request_type' => 'Typ požiadavky',
- 'Class:ServiceSubcategory/Attribute:request_type+' => '',
- 'Class:ServiceSubcategory/Attribute:request_type/Value:incident' => 'Incident',
- 'Class:ServiceSubcategory/Attribute:request_type/Value:incident+' => '',
- 'Class:ServiceSubcategory/Attribute:request_type/Value:service_request' => 'Požiadavka',
- 'Class:ServiceSubcategory/Attribute:request_type/Value:service_request+' => '',
- 'Class:ServiceSubcategory/Attribute:status' => 'Stav',
- 'Class:ServiceSubcategory/Attribute:status+' => '',
- 'Class:ServiceSubcategory/Attribute:status/Value:implementation' => 'Implementácia',
- 'Class:ServiceSubcategory/Attribute:status/Value:implementation+' => '',
- 'Class:ServiceSubcategory/Attribute:status/Value:obsolete' => 'Vyradená',
- 'Class:ServiceSubcategory/Attribute:status/Value:obsolete+' => '',
- 'Class:ServiceSubcategory/Attribute:status/Value:production' => 'Produkcia',
- 'Class:ServiceSubcategory/Attribute:status/Value:production+' => '',
- 'Class:SLA' => 'SLA',
- 'Class:SLA+' => '',
- 'Class:SLA/Attribute:name' => 'Názov',
- 'Class:SLA/Attribute:name+' => '',
- 'Class:SLA/Attribute:description' => 'Popis',
- 'Class:SLA/Attribute:description+' => '',
- 'Class:SLA/Attribute:org_id' => 'Poskytovateľ',
- 'Class:SLA/Attribute:org_id+' => '',
- 'Class:SLA/Attribute:slts_list' => 'SLTs',
- 'Class:SLA/Attribute:slts_list+' => 'All the service level targets for this SLA~~',
- 'Class:SLA/Attribute:customercontracts_list' => 'Zákaznícke zmluvy',
- 'Class:SLA/Attribute:customercontracts_list+' => 'All the customer contracts using this SLA~~',
- 'Class:SLT' => 'SLT',
- 'Class:SLT+' => '',
- 'Class:SLT/Attribute:name' => 'Názov',
- 'Class:SLT/Attribute:name+' => '',
- 'Class:SLT/Attribute:priority' => 'Priorita',
- 'Class:SLT/Attribute:priority+' => '',
- 'Class:SLT/Attribute:priority/Value:1' => 'Kritická',
- 'Class:SLT/Attribute:priority/Value:1+' => '',
- 'Class:SLT/Attribute:priority/Value:2' => 'Vysoká',
- 'Class:SLT/Attribute:priority/Value:2+' => '',
- 'Class:SLT/Attribute:priority/Value:3' => 'Stredná',
- 'Class:SLT/Attribute:priority/Value:3+' => '',
- 'Class:SLT/Attribute:priority/Value:4' => 'Nízka',
- 'Class:SLT/Attribute:priority/Value:4+' => '',
- 'Class:SLT/Attribute:request_type' => 'Typ požiadavky',
- 'Class:SLT/Attribute:request_type+' => '',
- 'Class:SLT/Attribute:request_type/Value:incident' => 'Incident',
- 'Class:SLT/Attribute:request_type/Value:incident+' => '',
- 'Class:SLT/Attribute:request_type/Value:service_request' => 'Požiadavka',
- 'Class:SLT/Attribute:request_type/Value:service_request+' => '',
- 'Class:SLT/Attribute:metric' => 'Metrika',
- 'Class:SLT/Attribute:metric+' => '',
- 'Class:SLT/Attribute:metric/Value:tto' => 'TTO',
- 'Class:SLT/Attribute:metric/Value:tto+' => '',
- 'Class:SLT/Attribute:metric/Value:ttr' => 'TTR',
- 'Class:SLT/Attribute:metric/Value:ttr+' => '',
- 'Class:SLT/Attribute:value' => 'Hodnota',
- 'Class:SLT/Attribute:value+' => '',
- 'Class:SLT/Attribute:unit' => 'Jednotka',
- 'Class:SLT/Attribute:unit+' => '',
- 'Class:SLT/Attribute:unit/Value:hours' => 'Hodiny',
- 'Class:SLT/Attribute:unit/Value:hours+' => '',
- 'Class:SLT/Attribute:unit/Value:minutes' => 'Minúty',
- 'Class:SLT/Attribute:unit/Value:minutes+' => '',
- 'Class:lnkSLAToSLT' => 'väzba - SLA / SLT',
- 'Class:lnkSLAToSLT+' => '',
- 'Class:lnkSLAToSLT/Attribute:sla_id' => 'SLA',
- 'Class:lnkSLAToSLT/Attribute:sla_id+' => '',
- 'Class:lnkSLAToSLT/Attribute:slt_id' => 'SLT',
- 'Class:lnkSLAToSLT/Attribute:slt_id+' => '',
- 'Class:lnkCustomerContractToService' => 'väzba - Zákaznícka zmluva / Služba',
- 'Class:lnkCustomerContractToService+' => '',
- 'Class:lnkCustomerContractToService/Attribute:customercontract_id' => 'Zákaznícka zmluva',
- 'Class:lnkCustomerContractToService/Attribute:customercontract_id+' => '',
- 'Class:lnkCustomerContractToService/Attribute:service_id' => 'Služba',
- 'Class:lnkCustomerContractToService/Attribute:service_id+' => '',
- 'Class:lnkCustomerContractToService/Attribute:sla_id' => 'SLA',
- 'Class:lnkCustomerContractToService/Attribute:sla_id+' => '',
- 'Class:lnkProviderContractToService' => 'väzba - Poskytovateľská zmluva / Služba',
- 'Class:lnkProviderContractToService+' => '',
- 'Class:lnkProviderContractToService/Attribute:service_id' => 'Služba',
- 'Class:lnkProviderContractToService/Attribute:service_id+' => '',
- 'Class:lnkProviderContractToService/Attribute:providercontract_id' => 'Poskytovateľská zmluva',
- 'Class:lnkProviderContractToService/Attribute:providercontract_id+' => '',
- 'Class:lnkFunctionalCIToService' => 'väzba - Komponent / Služba',
- 'Class:lnkFunctionalCIToService+' => '',
- 'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Služba',
- 'Class:lnkFunctionalCIToService/Attribute:service_id+' => '',
- 'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => 'Zariadenie',
- 'Class:lnkFunctionalCIToService/Attribute:functionalci_id+' => '',
- 'Class:DeliveryModel' => 'Model dodávky',
- 'Class:DeliveryModel+' => '',
- 'Class:DeliveryModel/Attribute:name' => 'Názov',
- 'Class:DeliveryModel/Attribute:name+' => '',
- 'Class:DeliveryModel/Attribute:org_id' => 'Organizácia',
- 'Class:DeliveryModel/Attribute:org_id+' => '',
- 'Class:DeliveryModel/Attribute:description' => 'Popis',
- 'Class:DeliveryModel/Attribute:description+' => '',
- 'Class:DeliveryModel/Attribute:contacts_list' => 'Kontakty',
- 'Class:DeliveryModel/Attribute:contacts_list+' => 'All the contacts (Teams and Person) for this delivery model~~',
- 'Class:DeliveryModel/Attribute:customers_list' => 'Zákazníci',
- 'Class:DeliveryModel/Attribute:customers_list+' => 'All the customers having this delivering model~~',
- 'Class:lnkDeliveryModelToContact' => 'väzba - Model dodávky / Kontakt',
- 'Class:lnkDeliveryModelToContact+' => '',
- 'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id' => 'Model dodávky',
- 'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id+' => '',
- 'Class:lnkDeliveryModelToContact/Attribute:contact_id' => 'Kontakt',
- 'Class:lnkDeliveryModelToContact/Attribute:contact_id+' => '',
- 'Class:lnkDeliveryModelToContact/Attribute:role_id' => 'Rola',
- 'Class:lnkDeliveryModelToContact/Attribute:role_id+' => '',
- 'Class:StorageSystem' => 'Úložiskový systém',
- 'Class:StorageSystem+' => '',
- 'Class:StorageSystem/Attribute:logicalvolume_list' => 'Logické disky',
- 'Class:StorageSystem/Attribute:logicalvolume_list+' => 'All the logical volumes in this storage system~~',
- 'Class:SANSwitch' => 'SAN prepínač',
- 'Class:SANSwitch+' => '',
- 'Class:SANSwitch/Attribute:datacenterdevice_list' => 'Zariadenia',
- 'Class:SANSwitch/Attribute:datacenterdevice_list+' => 'All the devices connected to this SAN switch~~',
- 'Class:TapeLibrary' => 'Pásková knižnica',
- 'Class:TapeLibrary+' => '',
- 'Class:TapeLibrary/Attribute:tapes_list' => 'Pásky',
- 'Class:TapeLibrary/Attribute:tapes_list+' => 'All the tapes in the tape library~~',
- 'Class:NAS' => 'NAS',
- 'Class:NAS+' => '',
- 'Class:NAS/Attribute:nasfilesystem_list' => 'Súborové systémy',
- 'Class:NAS/Attribute:nasfilesystem_list+' => 'All the file systems in this NAS~~',
- 'Class:FiberChannelInterface' => 'Optické rozhranie',
- 'Class:FiberChannelInterface+' => '',
- 'Class:FiberChannelInterface/Attribute:speed' => 'Rýchlosť',
- 'Class:FiberChannelInterface/Attribute:speed+' => '',
- 'Class:FiberChannelInterface/Attribute:topology' => 'Topológia',
- 'Class:FiberChannelInterface/Attribute:topology+' => '',
- 'Class:FiberChannelInterface/Attribute:wwn' => 'WWN',
- 'Class:FiberChannelInterface/Attribute:wwn+' => '',
- 'Class:FiberChannelInterface/Attribute:datacenterdevice_id' => 'Zariadenie',
- 'Class:FiberChannelInterface/Attribute:datacenterdevice_id+' => '',
- 'Class:Tape' => 'Páska',
- 'Class:Tape+' => '',
- 'Class:Tape/Attribute:name' => 'Názov',
- 'Class:Tape/Attribute:name+' => '',
- 'Class:Tape/Attribute:description' => 'Popis',
- 'Class:Tape/Attribute:description+' => '',
- 'Class:Tape/Attribute:size' => 'Veľkosť',
- 'Class:Tape/Attribute:size+' => '',
- 'Class:Tape/Attribute:tapelibrary_id' => 'Pásková knižnica',
- 'Class:Tape/Attribute:tapelibrary_id+' => '',
- 'Class:NASFileSystem' => 'NAS Súborový systém',
- 'Class:NASFileSystem+' => '',
- 'Class:NASFileSystem/Attribute:name' => 'Názov',
- 'Class:NASFileSystem/Attribute:name+' => '',
- 'Class:NASFileSystem/Attribute:description' => 'Popis',
- 'Class:NASFileSystem/Attribute:description+' => '',
- 'Class:NASFileSystem/Attribute:raid_level' => 'Raid úroveň',
- 'Class:NASFileSystem/Attribute:raid_level+' => '',
- 'Class:NASFileSystem/Attribute:size' => 'Veľkosť',
- 'Class:NASFileSystem/Attribute:size+' => '',
- 'Class:NASFileSystem/Attribute:nas_id' => 'NAS',
- 'Class:NASFileSystem/Attribute:nas_id+' => '',
- 'Class:LogicalVolume' => 'Logické disky',
- 'Class:LogicalVolume+' => '',
- 'Class:LogicalVolume/Attribute:name' => 'Názov',
- 'Class:LogicalVolume/Attribute:name+' => '',
- 'Class:LogicalVolume/Attribute:lun_id' => 'LUN ID',
- 'Class:LogicalVolume/Attribute:lun_id+' => '',
- 'Class:LogicalVolume/Attribute:description' => 'Popis',
- 'Class:LogicalVolume/Attribute:description+' => '',
- 'Class:LogicalVolume/Attribute:raid_level' => 'Raid úroveň',
- 'Class:LogicalVolume/Attribute:raid_level+' => '',
- 'Class:LogicalVolume/Attribute:size' => 'Veľkosť',
- 'Class:LogicalVolume/Attribute:size+' => '',
- 'Class:LogicalVolume/Attribute:storagesystem_id' => 'Úložiskový systém',
- 'Class:LogicalVolume/Attribute:storagesystem_id+' => '',
- 'Class:LogicalVolume/Attribute:servers_list' => 'Servery',
- 'Class:LogicalVolume/Attribute:servers_list+' => 'All the servers using this volume~~',
- 'Class:LogicalVolume/Attribute:virtualdevices_list' => 'Virtuálne zariadenia',
- 'Class:LogicalVolume/Attribute:virtualdevices_list+' => 'All the virtual devices using this volume~~',
- 'Class:lnkServerToVolume' => 'väzba - Server / Logický Disk',
- 'Class:lnkServerToVolume+' => '',
- 'Class:lnkServerToVolume/Attribute:volume_id' => 'Logický Disk',
- 'Class:lnkServerToVolume/Attribute:volume_id+' => '',
- 'Class:lnkServerToVolume/Attribute:server_id' => 'Server',
- 'Class:lnkServerToVolume/Attribute:server_id+' => '',
- 'Class:lnkServerToVolume/Attribute:size_used' => 'Použité miesto',
- 'Class:lnkServerToVolume/Attribute:size_used+' => '',
- 'Class:lnkSanToDatacenterDevice' => 'väzba - SAN / Zariadenie',
- 'Class:lnkSanToDatacenterDevice+' => '',
- 'Class:lnkSanToDatacenterDevice/Attribute:san_id' => 'SAN prepínač',
- 'Class:lnkSanToDatacenterDevice/Attribute:san_id+' => '',
- 'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_id' => 'Zariadenie',
- 'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_id+' => '',
- 'Class:lnkSanToDatacenterDevice/Attribute:san_port' => 'SAN port',
- 'Class:lnkSanToDatacenterDevice/Attribute:san_port+' => '',
- 'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_port' => '(FC) Port zariadenia',
- 'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_port+' => '',
- 'Class:Ticket' => 'Ticket',
- 'Class:Ticket+' => '',
- 'Class:Ticket/Attribute:ref' => 'Referencia',
- 'Class:Ticket/Attribute:ref+' => '',
- 'Class:Ticket/Attribute:org_id' => 'Organizácia',
- 'Class:Ticket/Attribute:org_id+' => '',
- 'Class:Ticket/Attribute:caller_id' => 'Zadávateľ',
- 'Class:Ticket/Attribute:caller_id+' => '',
- 'Class:Ticket/Attribute:team_id' => 'Tím',
- 'Class:Ticket/Attribute:team_id+' => '',
- 'Class:Ticket/Attribute:agent_id' => 'Agent',
- 'Class:Ticket/Attribute:agent_id+' => '',
- 'Class:Ticket/Attribute:title' => 'Nadpis',
- 'Class:Ticket/Attribute:title+' => '',
- 'Class:Ticket/Attribute:description' => 'Popis',
- 'Class:Ticket/Attribute:description+' => '',
- 'Class:Ticket/Attribute:start_date' => 'Dátum začiatku',
- 'Class:Ticket/Attribute:start_date+' => '',
- 'Class:Ticket/Attribute:end_date' => 'Dátum ukončenia',
- 'Class:Ticket/Attribute:end_date+' => '',
- 'Class:Ticket/Attribute:last_update' => 'Posledná aktualizácia',
- 'Class:Ticket/Attribute:last_update+' => '',
- 'Class:Ticket/Attribute:close_date' => 'Dátum uzavretia',
- 'Class:Ticket/Attribute:close_date+' => '',
- 'Class:Ticket/Attribute:private_log' => 'Skrytý záznam',
- 'Class:Ticket/Attribute:private_log+' => '',
- 'Class:Ticket/Attribute:contacts_list' => 'Kontakty',
- 'Class:Ticket/Attribute:contacts_list+' => 'All the contacts linked to this ticket~~',
- 'Class:Ticket/Attribute:functionalcis_list' => 'Komponenty',
- 'Class:Ticket/Attribute:functionalcis_list+' => 'All the configuration items impacted by this ticket. Items marked as "Computed" have been automatically marked as impacted. Items marked as "Not impacted" are excluded from the impact.~~',
- 'Class:Ticket/Attribute:workorders_list' => 'Pracovné príkazy',
- 'Class:Ticket/Attribute:workorders_list+' => 'All the work orders for this ticket~~',
- 'Class:Ticket/Attribute:finalclass' => 'Typ',
- 'Class:Ticket/Attribute:finalclass+' => '',
- 'Class:lnkContactToTicket' => 'väzba - Kontakt / Ticket',
- 'Class:lnkContactToTicket+' => '',
- 'Class:lnkContactToTicket/Attribute:ticket_id' => 'Ticket',
- 'Class:lnkContactToTicket/Attribute:ticket_id+' => '',
- 'Class:lnkContactToTicket/Attribute:contact_id' => 'Kontakt',
- 'Class:lnkContactToTicket/Attribute:contact_id+' => '',
- 'Class:lnkContactToTicket/Attribute:role' => 'Rola',
- 'Class:lnkContactToTicket/Attribute:role+' => '',
- 'Class:lnkFunctionalCIToTicket' => 'väzba - Komponent / Ticket',
- 'Class:lnkFunctionalCIToTicket+' => '',
- 'Class:lnkFunctionalCIToTicket/Attribute:ticket_id' => 'Ticket',
- 'Class:lnkFunctionalCIToTicket/Attribute:ticket_id+' => '',
- 'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id' => 'Komponent',
- 'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id+' => '',
- 'Class:lnkFunctionalCIToTicket/Attribute:impact' => 'Dopad',
- 'Class:lnkFunctionalCIToTicket/Attribute:impact+' => '',
- 'Class:WorkOrder' => 'Pracovný príkaz',
- 'Class:WorkOrder+' => '',
- 'Class:WorkOrder/Attribute:name' => 'Názov',
- 'Class:WorkOrder/Attribute:name+' => '',
- 'Class:WorkOrder/Attribute:status' => 'Stav',
- 'Class:WorkOrder/Attribute:status+' => '',
- 'Class:WorkOrder/Attribute:status/Value:open' => 'Otvorený',
- 'Class:WorkOrder/Attribute:status/Value:open+' => '',
- 'Class:WorkOrder/Attribute:status/Value:closed' => 'Zatvorený',
- 'Class:WorkOrder/Attribute:status/Value:closed+' => '',
- 'Class:WorkOrder/Attribute:description' => 'Popis',
- 'Class:WorkOrder/Attribute:description+' => '',
- 'Class:WorkOrder/Attribute:ticket_id' => 'Ticket',
- 'Class:WorkOrder/Attribute:ticket_id+' => '',
- 'Class:WorkOrder/Attribute:team_id' => 'Tím',
- 'Class:WorkOrder/Attribute:team_id+' => '',
- 'Class:WorkOrder/Attribute:agent_id' => 'Agent',
- 'Class:WorkOrder/Attribute:agent_id+' => '',
- 'Class:WorkOrder/Attribute:start_date' => 'Dátum začiatku',
- 'Class:WorkOrder/Attribute:start_date+' => '',
- 'Class:WorkOrder/Attribute:end_date' => 'Dátum ukončenia',
- 'Class:WorkOrder/Attribute:end_date+' => '',
- 'Class:WorkOrder/Attribute:log' => 'Záznam',
- 'Class:WorkOrder/Attribute:log+' => '',
- 'Class:WorkOrder/Stimulus:ev_close' => 'Zatvoriť',
- 'Class:WorkOrder/Stimulus:ev_close+' => '',
- 'Class:Hypervisor' => 'Hypervisor',
- 'Class:Hypervisor+' => '',
- 'Class:Hypervisor/Attribute:farm_id' => 'Farma',
- 'Class:Hypervisor/Attribute:farm_id+' => '',
- 'Class:Hypervisor/Attribute:server_id' => 'Server',
- 'Class:Hypervisor/Attribute:server_id+' => '',
- 'Class:Farm' => 'Farma',
- 'Class:Farm+' => '',
- 'Class:Farm/Attribute:hypervisor_list' => 'Hypervisori',
- 'Class:Farm/Attribute:hypervisor_list+' => 'All the hypervisors that compose this farm~~',
- 'Class:VirtualMachine' => 'Virtuálne zariadenie',
- 'Class:VirtualMachine+' => '',
- 'Class:VirtualMachine/Attribute:virtualhost_id' => 'Virtuálny host',
- 'Class:VirtualMachine/Attribute:virtualhost_id+' => '',
- 'Class:VirtualMachine/Attribute:osfamily_id' => 'Kategória OS',
- 'Class:VirtualMachine/Attribute:osfamily_id+' => '',
- 'Class:VirtualMachine/Attribute:osversion_id' => 'Verzia OS',
- 'Class:VirtualMachine/Attribute:osversion_id+' => '',
- 'Class:VirtualMachine/Attribute:oslicence_id' => 'Licencia OS',
- 'Class:VirtualMachine/Attribute:oslicence_id+' => '',
- 'Class:VirtualMachine/Attribute:cpu' => 'Procesor',
- 'Class:VirtualMachine/Attribute:cpu+' => '',
- 'Class:VirtualMachine/Attribute:ram' => 'Operačná pamäť',
- 'Class:VirtualMachine/Attribute:ram+' => '',
- 'Class:VirtualMachine/Attribute:logicalinterface_list' => 'Zoznam sieťových rozhraní',
- 'Class:VirtualMachine/Attribute:logicalinterface_list+' => 'All the logical network interfaces~~',
- 'Class:LogicalInterface' => 'Logické rozhranie',
- 'Class:LogicalInterface+' => '',
- 'Class:LogicalInterface/Attribute:virtualmachine_id' => 'Virtuálne zariadenie',
- 'Class:LogicalInterface/Attribute:virtualmachine_id+' => '',
- 'Class:Change' => 'Zmena',
- 'Class:Change+' => '',
- 'Class:Change/Attribute:status' => 'Stav',
- 'Class:Change/Attribute:status+' => '',
- 'Class:Change/Attribute:status/Value:new' => 'Nová',
- 'Class:Change/Attribute:status/Value:new+' => '',
- 'Class:Change/Attribute:status/Value:assigned' => 'Pridelená',
- 'Class:Change/Attribute:status/Value:assigned+' => '',
- 'Class:Change/Attribute:status/Value:planned' => 'Plánovaná',
- 'Class:Change/Attribute:status/Value:planned+' => '',
- 'Class:Change/Attribute:status/Value:rejected' => 'Zamietnutá',
- 'Class:Change/Attribute:status/Value:rejected+' => '',
- 'Class:Change/Attribute:status/Value:approved' => 'Schválená',
- 'Class:Change/Attribute:status/Value:approved+' => '',
- 'Class:Change/Attribute:status/Value:closed' => 'Zatvorená',
- 'Class:Change/Attribute:status/Value:closed+' => '',
- 'Class:Change/Attribute:category' => 'Kategória',
- 'Class:Change/Attribute:category+' => '',
- 'Class:Change/Attribute:category/Value:application' => 'Aplikácia',
- 'Class:Change/Attribute:category/Value:application+' => '',
- 'Class:Change/Attribute:category/Value:hardware' => 'Hardvér',
- 'Class:Change/Attribute:category/Value:hardware+' => '',
- 'Class:Change/Attribute:category/Value:network' => 'Sieť',
- 'Class:Change/Attribute:category/Value:network+' => '',
- 'Class:Change/Attribute:category/Value:other' => 'Iné',
- 'Class:Change/Attribute:category/Value:other+' => '',
- 'Class:Change/Attribute:category/Value:software' => 'Softvér',
- 'Class:Change/Attribute:category/Value:software+' => '',
- 'Class:Change/Attribute:category/Value:system' => 'Systém',
- 'Class:Change/Attribute:category/Value:system+' => '',
- 'Class:Change/Attribute:reject_reason' => 'Dôvod zamietnutia',
- 'Class:Change/Attribute:reject_reason+' => '',
- 'Class:Change/Attribute:changeManažér_id' => 'Manažér zmien',
- 'Class:Change/Attribute:changemanager_id+' => '',
- 'Class:Change/Attribute:parent_id' => 'Nadradená zmena',
- 'Class:Change/Attribute:parent_id+' => '',
- 'Class:Change/Attribute:creation_date' => 'Dátum vytvorenia',
- 'Class:Change/Attribute:creation_date+' => '',
- 'Class:Change/Attribute:approval_date' => 'Dátum schválenia',
- 'Class:Change/Attribute:approval_date+' => '',
- 'Class:Change/Attribute:fallback_plan' => 'Návratový plán',
- 'Class:Change/Attribute:fallback_plan+' => '',
- 'Class:Change/Attribute:related_request_list' => 'Súvisiace požiadavky',
- 'Class:Change/Attribute:related_request_list+' => 'All the user requests linked to this change~~',
- 'Class:Change/Attribute:child_changes_list' => 'Podriadené zmeny',
- 'Class:Change/Attribute:child_changes_list+' => 'All the sub changes linked to this change~~',
- 'Class:Change/Stimulus:ev_assign' => 'Prideiť',
- 'Class:Change/Stimulus:ev_assign+' => '',
- 'Class:Change/Stimulus:ev_plan' => 'Naplánuj',
- 'Class:Change/Stimulus:ev_plan+' => '',
- 'Class:Change/Stimulus:ev_reject' => 'Zamietnúť',
- 'Class:Change/Stimulus:ev_reject+' => '',
- 'Class:Change/Stimulus:ev_reopen' => 'Znova otvoriť',
- 'Class:Change/Stimulus:ev_reopen+' => '',
- 'Class:Change/Stimulus:ev_approve' => 'Schváliť',
- 'Class:Change/Stimulus:ev_approve+' => '',
- 'Class:Change/Stimulus:ev_finish' => 'Zatvoriť',
- 'Class:Change/Stimulus:ev_finish+' => '',
- 'Class:UserRequest' => 'Požiadavka užívateľa',
- 'Class:UserRequest+' => '',
- 'Class:UserRequest/Attribute:status' => 'Stav',
- 'Class:UserRequest/Attribute:status+' => '',
- 'Class:UserRequest/Attribute:status/Value:new' => 'Nová',
- 'Class:UserRequest/Attribute:status/Value:new+' => '',
- 'Class:UserRequest/Attribute:status/Value:escalated_tto' => 'Eskalované TTO',
- 'Class:UserRequest/Attribute:status/Value:escalated_tto+' => '',
- 'Class:UserRequest/Attribute:status/Value:assigned' => 'Pridelené',
- 'Class:UserRequest/Attribute:status/Value:assigned+' => '',
- 'Class:UserRequest/Attribute:status/Value:escalated_ttr' => 'Eskalované TTR',
- 'Class:UserRequest/Attribute:status/Value:escalated_ttr+' => '',
- 'Class:UserRequest/Attribute:status/Value:waiting_for_approval' => 'Čaká sa na schválenie',
- 'Class:UserRequest/Attribute:status/Value:waiting_for_approval+' => '',
- 'Class:UserRequest/Attribute:status/Value:approved' => 'Schválená',
- 'Class:UserRequest/Attribute:status/Value:approved+' => '',
- 'Class:UserRequest/Attribute:status/Value:rejected' => 'Zamietnutá',
- 'Class:UserRequest/Attribute:status/Value:rejected+' => '',
- 'Class:UserRequest/Attribute:status/Value:pending' => 'Pozdržaná',
- 'Class:UserRequest/Attribute:status/Value:pending+' => '',
- 'Class:UserRequest/Attribute:status/Value:resolved' => 'Vyriešená',
- 'Class:UserRequest/Attribute:status/Value:resolved+' => '',
- 'Class:UserRequest/Attribute:status/Value:closed' => 'Zatvorená',
- 'Class:UserRequest/Attribute:status/Value:closed+' => '',
- 'Class:UserRequest/Attribute:request_type' => 'Typ požiadavky',
- 'Class:UserRequest/Attribute:request_type+' => '',
- 'Class:UserRequest/Attribute:request_type/Value:incident' => 'Incident',
- 'Class:UserRequest/Attribute:request_type/Value:incident+' => '',
- 'Class:UserRequest/Attribute:request_type/Value:service_request' => 'Požiadavka',
- 'Class:UserRequest/Attribute:request_type/Value:service_request+' => '',
- 'Class:UserRequest/Attribute:impact' => 'Dopad',
- 'Class:UserRequest/Attribute:impact+' => '',
- 'Class:UserRequest/Attribute:impact/Value:1' => 'Oddelenie',
- 'Class:UserRequest/Attribute:impact/Value:1+' => '',
- 'Class:UserRequest/Attribute:impact/Value:2' => 'Služba',
- 'Class:UserRequest/Attribute:impact/Value:2+' => '',
- 'Class:UserRequest/Attribute:impact/Value:3' => 'Osoba',
- 'Class:UserRequest/Attribute:impact/Value:3+' => '',
- 'Class:UserRequest/Attribute:priority' => 'Priorita',
- 'Class:UserRequest/Attribute:priority+' => '',
- 'Class:UserRequest/Attribute:priority/Value:1' => 'Kritická',
- 'Class:UserRequest/Attribute:priority/Value:1+' => '',
- 'Class:UserRequest/Attribute:priority/Value:2' => 'Vysoká',
- 'Class:UserRequest/Attribute:priority/Value:2+' => '',
- 'Class:UserRequest/Attribute:priority/Value:3' => 'Stredná',
- 'Class:UserRequest/Attribute:priority/Value:3+' => '',
- 'Class:UserRequest/Attribute:priority/Value:4' => 'Nízka',
- 'Class:UserRequest/Attribute:priority/Value:4+' => '',
- 'Class:UserRequest/Attribute:urgency' => 'Naliehavosť',
- 'Class:UserRequest/Attribute:urgency+' => '',
- 'Class:UserRequest/Attribute:urgency/Value:1' => 'Kritická',
- 'Class:UserRequest/Attribute:urgency/Value:1+' => '',
- 'Class:UserRequest/Attribute:urgency/Value:2' => 'Vysoká',
- 'Class:UserRequest/Attribute:urgency/Value:2+' => '',
- 'Class:UserRequest/Attribute:urgency/Value:3' => 'Stredná',
- 'Class:UserRequest/Attribute:urgency/Value:3+' => '',
- 'Class:UserRequest/Attribute:urgency/Value:4' => 'Nízka',
- 'Class:UserRequest/Attribute:urgency/Value:4+' => '',
- 'Class:UserRequest/Attribute:origin' => 'Pôvod',
- 'Class:UserRequest/Attribute:origin+' => '',
- 'Class:UserRequest/Attribute:origin/Value:mail' => 'Mail',
- 'Class:UserRequest/Attribute:origin/Value:mail+' => '',
- 'Class:UserRequest/Attribute:origin/Value:monitoring' => 'Dohľad',
- 'Class:UserRequest/Attribute:origin/Value:monitoring+' => '',
- 'Class:UserRequest/Attribute:origin/Value:phone' => 'Telefón',
- 'Class:UserRequest/Attribute:origin/Value:phone+' => '',
- 'Class:UserRequest/Attribute:origin/Value:portal' => 'Portál',
- 'Class:UserRequest/Attribute:origin/Value:portal+' => '',
- 'Class:UserRequest/Attribute:approver_id' => 'Schvalovateľ',
- 'Class:UserRequest/Attribute:approver_id+' => '',
- 'Class:UserRequest/Attribute:service_id' => 'Služba',
- 'Class:UserRequest/Attribute:service_id+' => '',
- 'Class:UserRequest/Attribute:servicesubcategory_id' => 'Subkategórie služieb',
- 'Class:UserRequest/Attribute:servicesubcategory_id+' => '',
- 'Class:UserRequest/Attribute:escalation_flag' => 'Eskalačný príznak',
- 'Class:UserRequest/Attribute:escalation_flag+' => '',
- 'Class:UserRequest/Attribute:escalation_flag/Value:no' => 'Nie',
- 'Class:UserRequest/Attribute:escalation_flag/Value:no+' => '',
- 'Class:UserRequest/Attribute:escalation_flag/Value:yes' => 'Áno',
- 'Class:UserRequest/Attribute:escalation_flag/Value:yes+' => '',
- 'Class:UserRequest/Attribute:escalation_reason' => 'Dôvod eskalácie',
- 'Class:UserRequest/Attribute:escalation_reason+' => '',
- 'Class:UserRequest/Attribute:assignment_date' => 'Dátum pridelenia',
- 'Class:UserRequest/Attribute:assignment_date+' => '',
- 'Class:UserRequest/Attribute:resolution_date' => 'Dátum vyriešenia',
- 'Class:UserRequest/Attribute:resolution_date+' => '',
- 'Class:UserRequest/Attribute:last_pending_date' => 'Posledný dátum pozdržania',
- 'Class:UserRequest/Attribute:last_pending_date+' => '',
- 'Class:UserRequest/Attribute:tto' => 'TTO',
- 'Class:UserRequest/Attribute:tto+' => '',
- 'Class:UserRequest/Attribute:ttr' => 'TTR',
- 'Class:UserRequest/Attribute:ttr+' => '',
- 'Class:UserRequest/Attribute:tto_escalation_deadline' => 'Dátum eskalácie TTO',
- 'Class:UserRequest/Attribute:tto_escalation_deadline+' => '',
- 'Class:UserRequest/Attribute:sla_tto_passed' => 'SLA TTO dodržané',
- 'Class:UserRequest/Attribute:sla_tto_passed+' => '',
- 'Class:UserRequest/Attribute:sla_tto_over' => 'SLA TTO prekročené',
- 'Class:UserRequest/Attribute:sla_tto_over+' => '',
- 'Class:UserRequest/Attribute:ttr_escalation_deadline' => 'Dátum eskalácie TTR',
- 'Class:UserRequest/Attribute:ttr_escalation_deadline+' => '',
- 'Class:UserRequest/Attribute:sla_ttr_passed' => 'SLA TTR dodržané',
- 'Class:UserRequest/Attribute:sla_ttr_passed+' => '',
- 'Class:UserRequest/Attribute:sla_ttr_over' => 'SLA TTR prekročené',
- 'Class:UserRequest/Attribute:sla_ttr_over+' => '',
- 'Class:UserRequest/Attribute:time_spent' => 'Oneskorenie vyriešenia',
- 'Class:UserRequest/Attribute:time_spent+' => '',
- 'Class:UserRequest/Attribute:resolution_code' => 'Kód riešenia',
- 'Class:UserRequest/Attribute:resolution_code+' => '',
- 'Class:UserRequest/Attribute:resolution_code/Value:assistance' => 'Asistencia',
- 'Class:UserRequest/Attribute:resolution_code/Value:assistance+' => '',
- 'Class:UserRequest/Attribute:resolution_code/Value:bug fixed' => 'Chyba opravená',
- 'Class:UserRequest/Attribute:resolution_code/Value:bug fixed+' => '',
- 'Class:UserRequest/Attribute:resolution_code/Value:hardware repair' => 'Oprava hardvéru',
- 'Class:UserRequest/Attribute:resolution_code/Value:hardware repair+' => '',
- 'Class:UserRequest/Attribute:resolution_code/Value:other' => 'Iné',
- 'Class:UserRequest/Attribute:resolution_code/Value:other+' => '',
- 'Class:UserRequest/Attribute:resolution_code/Value:software patch' => 'Softvérová záplata',
- 'Class:UserRequest/Attribute:resolution_code/Value:software patch+' => '',
- 'Class:UserRequest/Attribute:resolution_code/Value:system update' => 'Aktualizácia systému',
- 'Class:UserRequest/Attribute:resolution_code/Value:system update+' => '',
- 'Class:UserRequest/Attribute:resolution_code/Value:training' => 'Školenie',
- 'Class:UserRequest/Attribute:resolution_code/Value:training+' => '',
- 'Class:UserRequest/Attribute:solution' => 'Riešenie',
- 'Class:UserRequest/Attribute:solution+' => '',
- 'Class:UserRequest/Attribute:pending_reason' => 'Dôvod pozdržania',
- 'Class:UserRequest/Attribute:pending_reason+' => '',
- 'Class:UserRequest/Attribute:parent_request_id' => 'Nadradená Požiadavka',
- 'Class:UserRequest/Attribute:parent_request_id+' => '',
- 'Class:UserRequest/Attribute:parent_change_id' => 'Nadradená Zmena',
- 'Class:UserRequest/Attribute:parent_change_id+' => '',
- 'Class:UserRequest/Attribute:related_request_list' => 'Podriadené požiadavky',
- 'Class:UserRequest/Attribute:related_request_list+' => 'All the requests that are linked to this parent request~~',
- 'Class:UserRequest/Attribute:public_log' => 'Verejný záznam',
- 'Class:UserRequest/Attribute:public_log+' => '',
- 'Class:UserRequest/Attribute:user_satisfaction' => 'Spokojnosť užívateľa',
- 'Class:UserRequest/Attribute:user_satisfaction+' => '',
- 'Class:UserRequest/Attribute:user_satisfaction/Value:1' => 'Veľmi spokojný',
- 'Class:UserRequest/Attribute:user_satisfaction/Value:1+' => '',
- 'Class:UserRequest/Attribute:user_satisfaction/Value:2' => 'Pomerne spokojný',
- 'Class:UserRequest/Attribute:user_satisfaction/Value:2+' => '',
- 'Class:UserRequest/Attribute:user_satisfaction/Value:3' => 'Skôr nespokojný',
- 'Class:UserRequest/Attribute:user_satisfaction/Value:3+' => '',
- 'Class:UserRequest/Attribute:user_satisfaction/Value:4' => 'Veľmi nespokojný',
- 'Class:UserRequest/Attribute:user_satisfaction/Value:4+' => '',
- 'Class:UserRequest/Attribute:user_comment' => 'Komentár užívateľa',
- 'Class:UserRequest/Attribute:user_comment+' => '',
- 'Class:UserRequest/Stimulus:ev_assign' => 'Prideiť',
- 'Class:UserRequest/Stimulus:ev_assign+' => '',
- 'Class:UserRequest/Stimulus:ev_reassign' => 'Znovu Prideiť',
- 'Class:UserRequest/Stimulus:ev_reassign+' => '',
- 'Class:UserRequest/Stimulus:ev_approve' => 'Schváliť',
- 'Class:UserRequest/Stimulus:ev_approve+' => '',
- 'Class:UserRequest/Stimulus:ev_reject' => 'Zamietnúť',
- 'Class:UserRequest/Stimulus:ev_reject+' => '',
- 'Class:UserRequest/Stimulus:ev_pending' => 'Pozdržať',
- 'Class:UserRequest/Stimulus:ev_pending+' => '',
- 'Class:UserRequest/Stimulus:ev_timeout' => 'Vypršanie času',
- 'Class:UserRequest/Stimulus:ev_timeout+' => '',
- 'Class:UserRequest/Stimulus:ev_autoresolve' => 'Automatické vyriešenie',
- 'Class:UserRequest/Stimulus:ev_autoresolve+' => '',
- 'Class:UserRequest/Stimulus:ev_autoclose' => 'Automatické zatvorenie',
- 'Class:UserRequest/Stimulus:ev_autoclose+' => '',
- 'Class:UserRequest/Stimulus:ev_resolve' => 'Vyriešiť',
- 'Class:UserRequest/Stimulus:ev_resolve+' => '',
- 'Class:UserRequest/Stimulus:ev_close' => 'Zatvoriť',
- 'Class:UserRequest/Stimulus:ev_close+' => '',
- 'Class:UserRequest/Stimulus:ev_reopen' => 'Znova otvoriť',
- 'Class:UserRequest/Stimulus:ev_reopen+' => '',
- 'Class:UserRequest/Stimulus:ev_wait_for_approval' => 'Počkať na schválenie',
- 'Class:UserRequest/Stimulus:ev_wait_for_approval+' => '',
- 'Class:UserExternal' => 'Externý užívateľ',
- 'Class:UserExternal+' => '',
- 'Class:UserLDAP' => 'LDAP užívateľ',
- 'Class:UserLDAP+' => '',
- 'Class:UserLocal' => ITOP_APPLICATION_SHORT.' užívateľ',
- 'Class:UserLocal+' => '',
- 'Class:UserLocal/Attribute:password' => 'Heslo',
- 'Class:UserLocal/Attribute:password+' => '',
- 'Attachments:TabTitle_Count' => 'Prílohy (%1$d)',
- 'Attachments:EmptyTabTitle' => 'Prílohy',
- 'Attachments:FieldsetTitle' => 'Prílohy',
- 'Attachments:DeleteBtn' => 'Odstrániť',
- 'Attachments:History_File_Added' => 'Príloha %1$s pridaná.',
- 'Attachments:History_File_Removed' => 'Príloha %1$s odstránená.',
- 'Attachments:AddAttachment' => 'Pridaj prílohu: ',
- 'Attachments:UploadNotAllowedOnThisSystem' => 'Nahrávanie súboru NIE JE povolené na tomto systéme.',
- 'Attachment:Max_Go' => '(Maximálna Veľkosť súboru : %1$s Go)',
- 'Attachment:Max_Mo' => '(Maximálna Veľkosť súboru : %1$s Mo)',
- 'Attachment:Max_Ko' => '(Maximálna Veľkosť súboru : %1$s Ko)',
- 'Attachments:NoAttachment' => 'Bez prílohy. ',
- 'Relation:impacts/Description' => 'Prvky zasiahnuté',
- 'Relation:impacts/VerbUp' => 'Dopad...',
- 'Relation:impacts/VerbDown' => 'Prvky zasiahnuté ...',
- 'Relation:depends on/Description' => 'Prvky, od ktorých závisí tento prvok',
- 'Relation:depends on/VerbUp' => 'Závisí od...',
- 'Relation:depends on/VerbDown' => 'Dopady...',
- 'Class:Organization/Attribute:parent_name' => 'Nadradená organizácia',
- 'Class:Organization/Attribute:parent_name+' => '',
- 'Class:Organization/Attribute:deliverymodel_name' => 'Názov modelu dodávky',
- 'Class:Organization/Attribute:deliverymodel_name+' => '',
- 'Class:Organization/Attribute:parent_id_friendlyname' => 'Nadradená organizácia',
- 'Class:Organization/Attribute:parent_id_friendlyname+' => '',
- 'Class:Location/Attribute:org_name' => 'Názov organizácie vlastníka',
- 'Class:Location/Attribute:org_name+' => '',
- 'Class:Contact' => 'Kontakt',
- 'Class:Contact+' => '',
- 'Class:Contact/Attribute:name' => 'Meno',
- 'Class:Contact/Attribute:name+' => '',
- 'Class:Contact/Attribute:status' => 'Stav',
- 'Class:Contact/Attribute:status+' => '',
- 'Class:Contact/Attribute:status/Value:active' => 'Aktívny',
- 'Class:Contact/Attribute:status/Value:active+' => '',
- 'Class:Contact/Attribute:status/Value:inactive' => 'Neaktívny',
- 'Class:Contact/Attribute:status/Value:inactive+' => '',
- 'Class:Contact/Attribute:org_id' => 'Organizácia',
- 'Class:Contact/Attribute:org_id+' => '',
- 'Class:Contact/Attribute:org_name' => 'Názov Organizácie',
- 'Class:Contact/Attribute:org_name+' => '',
- 'Class:Contact/Attribute:email' => 'Email',
- 'Class:Contact/Attribute:email+' => '',
- 'Class:Contact/Attribute:phone' => 'Telefón',
- 'Class:Contact/Attribute:phone+' => '',
- 'Class:Contact/Attribute:notify' => 'Upozornenie',
- 'Class:Contact/Attribute:notify+' => '',
- 'Class:Contact/Attribute:notify/Value:no' => 'nie',
- 'Class:Contact/Attribute:notify/Value:no+' => '',
- 'Class:Contact/Attribute:notify/Value:yes' => 'áno',
- 'Class:Contact/Attribute:notify/Value:yes+' => '',
- 'Class:Contact/Attribute:function' => 'Funkcia',
- 'Class:Contact/Attribute:function+' => '',
- 'Class:Contact/Attribute:cis_list' => 'Zariadenia',
- 'Class:Contact/Attribute:cis_list+' => 'All the configuration items linked to this contact~~',
- 'Class:Contact/Attribute:finalclass' => 'Typ kontaktu',
- 'Class:Contact/Attribute:finalclass+' => '',
- 'Class:Person/Attribute:name' => 'Priezvisko',
- 'Class:Person/Attribute:name+' => '',
- 'Class:Person/Attribute:location_name' => 'Názov lokality',
- 'Class:Person/Attribute:location_name+' => '',
- 'Class:Person/Attribute:manager_name' => 'Meno manažéra',
- 'Class:Person/Attribute:manager_name+' => '',
- 'Class:Person/Attribute:manager_id_friendlyname' => 'Ľahko čitateľné meno manažéra',
- 'Class:Person/Attribute:manager_id_friendlyname+' => '',
- 'Class:Document' => 'Dokument',
- 'Class:Document+' => '',
- 'Class:Document/Attribute:name' => 'Názov',
- 'Class:Document/Attribute:name+' => '',
- 'Class:Document/Attribute:org_id' => 'Organizácia',
- 'Class:Document/Attribute:org_id+' => '',
- 'Class:Document/Attribute:org_name' => 'Názov Organizácie',
- 'Class:Document/Attribute:org_name+' => '',
- 'Class:Document/Attribute:documenttype_id' => 'Typ dokumentu',
- 'Class:Document/Attribute:documenttype_id+' => '',
- 'Class:Document/Attribute:documenttype_name' => 'Názov typu dokumentu',
- 'Class:Document/Attribute:documenttype_name+' => '',
- 'Class:Document/Attribute:description' => 'Popis',
- 'Class:Document/Attribute:description+' => '',
- 'Class:Document/Attribute:status' => 'Stav',
- 'Class:Document/Attribute:status+' => '',
- 'Class:Document/Attribute:status/Value:draft' => 'Návrh',
- 'Class:Document/Attribute:status/Value:draft+' => '',
- 'Class:Document/Attribute:status/Value:obsolete' => 'Vyradený',
- 'Class:Document/Attribute:status/Value:obsolete+' => '',
- 'Class:Document/Attribute:status/Value:published' => 'Publikovaný',
- 'Class:Document/Attribute:status/Value:published+' => '',
- 'Class:Document/Attribute:cis_list' => 'Komponenty',
- 'Class:Document/Attribute:cis_list+' => 'All the configuration items linked to this document~~',
- 'Class:Document/Attribute:contracts_list' => 'Zmluvy',
- 'Class:Document/Attribute:contracts_list+' => 'All the contracts linked to this document~~',
- 'Class:Document/Attribute:services_list' => 'Služby',
- 'Class:Document/Attribute:services_list+' => 'All the services linked to this document~~',
- 'Class:Document/Attribute:finalclass' => 'Typ dokumentu',
- 'Class:Document/Attribute:finalclass+' => '',
- 'Class:FunctionalCI' => 'Komponent',
- 'Class:FunctionalCI+' => '',
- 'Class:FunctionalCI/Attribute:name' => 'Názov',
- 'Class:FunctionalCI/Attribute:name+' => '',
- 'Class:FunctionalCI/Attribute:description' => 'Popis',
- 'Class:FunctionalCI/Attribute:description+' => '',
- 'Class:FunctionalCI/Attribute:org_id' => 'Organizácia',
- 'Class:FunctionalCI/Attribute:org_id+' => '',
- 'Class:FunctionalCI/Attribute:organization_name' => 'Názov Organizácie',
- 'Class:FunctionalCI/Attribute:organization_name+' => '',
- 'Class:FunctionalCI/Attribute:business_criticity' => 'Dôležitosť pre biznis',
- 'Class:FunctionalCI/Attribute:business_criticity+' => '',
- 'Class:FunctionalCI/Attribute:business_criticity/Value:high' => 'vysoká',
- 'Class:FunctionalCI/Attribute:business_criticity/Value:high+' => '',
- 'Class:FunctionalCI/Attribute:business_criticity/Value:low' => 'nízka',
- 'Class:FunctionalCI/Attribute:business_criticity/Value:low+' => '',
- 'Class:FunctionalCI/Attribute:business_criticity/Value:medium' => 'stredná',
- 'Class:FunctionalCI/Attribute:business_criticity/Value:medium+' => '',
- 'Class:FunctionalCI/Attribute:move2production' => 'Dátum presunu do produkcie',
- 'Class:FunctionalCI/Attribute:move2production+' => '',
- 'Class:FunctionalCI/Attribute:contacts_list' => 'Kontakty',
- 'Class:FunctionalCI/Attribute:contacts_list+' => 'All the contacts for this configuration item~~',
- 'Class:FunctionalCI/Attribute:documents_list' => 'Zoznam dokumentov',
- 'Class:FunctionalCI/Attribute:documents_list+' => 'All the documents linked to this configuration item~~',
- 'Class:FunctionalCI/Attribute:applicationsolution_list' => 'Zoznam aplikačných riešení',
- 'Class:FunctionalCI/Attribute:applicationsolution_list+' => 'All the application solutions depending on this configuration item~~',
- 'Class:FunctionalCI/Attribute:providercontracts_list' => 'Poskytovateľské zmluvy',
- 'Class:FunctionalCI/Attribute:providercontracts_list+' => 'All the provider contracts for this configuration item~~',
- 'Class:FunctionalCI/Attribute:services_list' => 'Služby',
- 'Class:FunctionalCI/Attribute:services_list+' => '',
- 'Class:FunctionalCI/Attribute:softwares_list' => 'Softvér',
- 'Class:FunctionalCI/Attribute:softwares_list+' => 'All the softwares installed on this configuration item~~',
- 'Class:FunctionalCI/Attribute:tickets_list' => 'Tickety',
- 'Class:FunctionalCI/Attribute:tickets_list+' => '',
- 'Class:FunctionalCI/Attribute:finalclass' => 'Typ komponentu',
- 'Class:FunctionalCI/Attribute:finalclass+' => '',
- 'Class:PhysicalDevice' => 'Fyzické zariadenie',
- 'Class:PhysicalDevice+' => '',
- 'Class:PhysicalDevice/Attribute:serialnumber' => 'Sériové číslo',
- 'Class:PhysicalDevice/Attribute:serialnumber+' => '',
- 'Class:PhysicalDevice/Attribute:location_id' => 'Lokalita',
- 'Class:PhysicalDevice/Attribute:location_id+' => '',
- 'Class:PhysicalDevice/Attribute:location_name' => 'Názov lokality',
- 'Class:PhysicalDevice/Attribute:location_name+' => '',
- 'Class:PhysicalDevice/Attribute:status' => 'Stav',
- 'Class:PhysicalDevice/Attribute:status+' => '',
- 'Class:PhysicalDevice/Attribute:status/Value:implementation' => 'Implementácia',
- 'Class:PhysicalDevice/Attribute:status/Value:implementation+' => '',
- 'Class:PhysicalDevice/Attribute:status/Value:obsolete' => 'vyradené',
- 'Class:PhysicalDevice/Attribute:status/Value:obsolete+' => '',
- 'Class:PhysicalDevice/Attribute:status/Value:production' => 'v produkcií',
- 'Class:PhysicalDevice/Attribute:status/Value:production+' => '',
- 'Class:PhysicalDevice/Attribute:status/Value:stock' => 'na sklade',
- 'Class:PhysicalDevice/Attribute:status/Value:stock+' => '',
- 'Class:PhysicalDevice/Attribute:brand_id' => 'Značka',
- 'Class:PhysicalDevice/Attribute:brand_id+' => '',
- 'Class:PhysicalDevice/Attribute:brand_name' => 'Názov značky',
- 'Class:PhysicalDevice/Attribute:brand_name+' => '',
- 'Class:PhysicalDevice/Attribute:model_id' => 'Model',
- 'Class:PhysicalDevice/Attribute:model_id+' => '',
- 'Class:PhysicalDevice/Attribute:model_name' => 'Názov modelu',
- 'Class:PhysicalDevice/Attribute:model_name+' => '',
- 'Class:PhysicalDevice/Attribute:asset_number' => 'Číslo položky',
- 'Class:PhysicalDevice/Attribute:asset_number+' => '',
- 'Class:PhysicalDevice/Attribute:purchase_date' => 'Dátum zakúpenia',
- 'Class:PhysicalDevice/Attribute:purchase_date+' => '',
- 'Class:PhysicalDevice/Attribute:end_of_warranty' => 'Koniec záruky',
- 'Class:PhysicalDevice/Attribute:end_of_warranty+' => '',
- 'Class:TelephonyCI' => 'Telefónne zariadenie',
- 'Class:TelephonyCI+' => '',
- 'Class:TelephonyCI/Attribute:phonenumber' => 'Telefónne číslo',
- 'Class:TelephonyCI/Attribute:phonenumber+' => '',
- 'Class:ConnectableCI' => 'Pripojiteľné zariadenie',
- 'Class:ConnectableCI+' => '',
- 'Class:ConnectableCI/Attribute:networkdevice_list' => 'Sieťové zariadenia',
- 'Class:ConnectableCI/Attribute:networkdevice_list+' => 'All network devices connected to this device~~',
- 'Class:ConnectableCI/Attribute:physicalinterface_list' => 'Sieťové rozhrania',
- 'Class:ConnectableCI/Attribute:physicalinterface_list+' => 'All the physical network interfaces~~',
- 'Class:DatacenterDevice' => 'Zariadenie dátového centra',
- 'Class:DatacenterDevice+' => '',
- 'Class:DatacenterDevice/Attribute:rack_id' => 'stojan (Rack)',
- 'Class:DatacenterDevice/Attribute:rack_id+' => '',
- 'Class:DatacenterDevice/Attribute:rack_name' => 'Názov stojanu',
- 'Class:DatacenterDevice/Attribute:rack_name+' => '',
- 'Class:DatacenterDevice/Attribute:enclosure_id' => 'Kryt',
- 'Class:DatacenterDevice/Attribute:enclosure_id+' => '',
- 'Class:DatacenterDevice/Attribute:enclosure_name' => 'Názov krytu',
- 'Class:DatacenterDevice/Attribute:enclosure_name+' => '',
- 'Class:DatacenterDevice/Attribute:nb_u' => 'NB U',
- 'Class:DatacenterDevice/Attribute:nb_u+' => '',
- 'Class:DatacenterDevice/Attribute:managementip' => 'Menežmentová IP adresa',
- 'Class:DatacenterDevice/Attribute:managementip+' => '',
- 'Class:DatacenterDevice/Attribute:powerA_id' => 'Zdroj napájania A',
- 'Class:DatacenterDevice/Attribute:powerA_id+' => '',
- 'Class:DatacenterDevice/Attribute:powerA_name' => 'Názov zdroja napájania A',
- 'Class:DatacenterDevice/Attribute:powerA_name+' => '',
- 'Class:DatacenterDevice/Attribute:powerB_id' => 'Zdroj napájania B',
- 'Class:DatacenterDevice/Attribute:powerB_id+' => '',
- 'Class:DatacenterDevice/Attribute:powerB_name' => 'Názov zdroja napájania B',
- 'Class:DatacenterDevice/Attribute:powerB_name+' => '',
- 'Class:DatacenterDevice/Attribute:fiberinterfacelist_list' => 'Zoznam optických rozhraní',
- 'Class:DatacenterDevice/Attribute:fiberinterfacelist_list+' => 'All the fiber channel interfaces for this device~~',
- 'Class:DatacenterDevice/Attribute:san_list' => 'Úložiská (SAN)',
- 'Class:DatacenterDevice/Attribute:san_list+' => 'All the SAN switches connected to this device~~',
- 'Class:NetworkDevice/Attribute:networkdevicetype_name' => 'Názov typu sieťového zariadenia',
- 'Class:NetworkDevice/Attribute:networkdevicetype_name+' => '',
- 'Class:NetworkDevice/Attribute:iosversion_name' => 'Názov IOS verzie',
- 'Class:NetworkDevice/Attribute:iosversion_name+' => '',
- 'Class:Server/Attribute:osfamily_name' => 'Názov kategórie OS',
- 'Class:Server/Attribute:osfamily_name+' => '',
- 'Class:Server/Attribute:osversion_name' => 'Názov verzie OS',
- 'Class:Server/Attribute:osversion_name+' => '',
- 'Class:Server/Attribute:oslicence_name' => 'Názov licence OS',
- 'Class:Server/Attribute:oslicence_name+' => '',
- 'Class:PC/Attribute:osfamily_name' => 'Názov kategórie OS',
- 'Class:PC/Attribute:osfamily_name+' => '',
- 'Class:PC/Attribute:osversion_name' => 'Názov verzie OS',
- 'Class:PC/Attribute:osversion_name+' => '',
- 'Class:PowerConnection' => 'Elektrická prípojka',
- 'Class:PowerConnection+' => '',
- 'Class:PDU/Attribute:rack_name' => 'Názov stojanu (rack)',
- 'Class:PDU/Attribute:rack_name+' => '',
- 'Class:PDU/Attribute:powerstart_name' => 'Názov Power start-u',
- 'Class:PDU/Attribute:powerstart_name+' => '',
- 'Class:Enclosure/Attribute:rack_name' => 'Názov stojanu (rack)',
- 'Class:Enclosure/Attribute:rack_name+' => '',
- 'Class:SoftwareInstance' => 'Softvérová inštancia',
- 'Class:SoftwareInstance+' => '',
- 'Class:SoftwareInstance/Attribute:system_id' => 'Systém',
- 'Class:SoftwareInstance/Attribute:system_id+' => '',
- 'Class:SoftwareInstance/Attribute:system_name' => 'Názov systému',
- 'Class:SoftwareInstance/Attribute:system_name+' => '',
- 'Class:SoftwareInstance/Attribute:software_id' => 'Softvér',
- 'Class:SoftwareInstance/Attribute:software_id+' => '',
- 'Class:SoftwareInstance/Attribute:software_name' => 'Názov softvéru',
- 'Class:SoftwareInstance/Attribute:software_name+' => '',
- 'Class:SoftwareInstance/Attribute:softwarelicence_id' => 'Softvérová licencia',
- 'Class:SoftwareInstance/Attribute:softwarelicence_id+' => '',
- 'Class:SoftwareInstance/Attribute:softwarelicence_name' => 'Názov softvérovej licencie',
- 'Class:SoftwareInstance/Attribute:softwarelicence_name+' => '',
- 'Class:SoftwareInstance/Attribute:path' => 'Cesta',
- 'Class:SoftwareInstance/Attribute:path+' => '',
- 'Class:SoftwareInstance/Attribute:status' => 'Stav',
- 'Class:SoftwareInstance/Attribute:status+' => '',
- 'Class:SoftwareInstance/Attribute:status/Value:active' => 'aktívna',
- 'Class:SoftwareInstance/Attribute:status/Value:active+' => '',
- 'Class:SoftwareInstance/Attribute:status/Value:inactive' => 'neaktívna',
- 'Class:SoftwareInstance/Attribute:status/Value:inactive+' => '',
- 'Class:MiddlewareInstance/Attribute:middleware_name' => 'Názov Middleware-u',
- 'Class:MiddlewareInstance/Attribute:middleware_name+' => '',
- 'Class:DatabaseSchema/Attribute:dbserver_name' => 'Názov DB serveru',
- 'Class:DatabaseSchema/Attribute:dbserver_name+' => '',
- 'Class:WebApplication/Attribute:webserver_name' => 'Názov Web serveru',
- 'Class:WebApplication/Attribute:webserver_name+' => '',
- 'Class:VirtualDevice' => 'Virtuálne zariadenie',
- 'Class:VirtualDevice+' => '',
- 'Class:VirtualDevice/Attribute:status' => 'Stav',
- 'Class:VirtualDevice/Attribute:status+' => '',
- 'Class:VirtualDevice/Attribute:status/Value:implementation' => 'Implementácia',
- 'Class:VirtualDevice/Attribute:status/Value:implementation+' => '',
- 'Class:VirtualDevice/Attribute:status/Value:obsolete' => 'Vyradené',
- 'Class:VirtualDevice/Attribute:status/Value:obsolete+' => '',
- 'Class:VirtualDevice/Attribute:status/Value:production' => 'Produkcia',
- 'Class:VirtualDevice/Attribute:status/Value:production+' => '',
- 'Class:VirtualDevice/Attribute:status/Value:stock' => 'Zásoby',
- 'Class:VirtualDevice/Attribute:status/Value:stock+' => '',
- 'Class:VirtualDevice/Attribute:logicalvolumes_list' => 'Zoznam logických dielov',
- 'Class:VirtualDevice/Attribute:logicalvolumes_list+' => 'All the logical volumes used by this device~~',
- 'Class:VirtualHost' => 'Virtuálny host',
- 'Class:VirtualHost+' => '',
- 'Class:VirtualHost/Attribute:virtualmachine_list' => 'Zoznam virtuálnych strojov',
- 'Class:VirtualHost/Attribute:virtualmachine_list+' => 'All the virtual machines hosted by this host~~',
- 'Class:Hypervisor/Attribute:farm_name' => 'Názov farmy',
- 'Class:Hypervisor/Attribute:farm_name+' => '',
- 'Class:Hypervisor/Attribute:server_name' => 'Názov serveru',
- 'Class:Hypervisor/Attribute:server_name+' => '',
- 'Class:VirtualMachine/Attribute:virtualhost_name' => 'Názov virtuálneho hosta',
- 'Class:VirtualMachine/Attribute:virtualhost_name+' => '',
- 'Class:VirtualMachine/Attribute:osfamily_name' => 'Názov kategórie OS',
- 'Class:VirtualMachine/Attribute:osfamily_name+' => '',
- 'Class:VirtualMachine/Attribute:osversion_name' => 'Názov OS verzie',
- 'Class:VirtualMachine/Attribute:osversion_name+' => '',
- 'Class:VirtualMachine/Attribute:oslicence_name' => 'OS licence Názov',
- 'Class:VirtualMachine/Attribute:oslicence_name+' => '',
- 'Class:LogicalVolume/Attribute:storagesystem_name' => 'Názov úložného systému',
- 'Class:LogicalVolume/Attribute:storagesystem_name+' => '',
- 'Class:lnkServerToVolume/Attribute:volume_name' => 'Názov dielu',
- 'Class:lnkServerToVolume/Attribute:volume_name+' => '',
- 'Class:lnkServerToVolume/Attribute:server_name' => 'Názov serveru',
- 'Class:lnkServerToVolume/Attribute:server_name+' => '',
- 'Class:lnkVirtualDeviceToVolume/Attribute:volume_name' => 'Názov dielu',
- 'Class:lnkVirtualDeviceToVolume/Attribute:volume_name+' => '',
- 'Class:lnkVirtualDeviceToVolume/Attribute:virtualdevice_name' => 'Názov virtuálneho zariadenia',
- 'Class:lnkVirtualDeviceToVolume/Attribute:virtualdevice_name+' => '',
- 'Class:lnkSanToDatacenterDevice/Attribute:san_name' => 'Názov SAN prepínaču',
- 'Class:lnkSanToDatacenterDevice/Attribute:san_name+' => '',
- 'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_name' => 'Názov zariadenia',
- 'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_name+' => '',
- 'Class:Tape/Attribute:tapelibrary_name' => 'Názov knižnice pásiek',
- 'Class:Tape/Attribute:tapelibrary_name+' => '',
- 'Class:NASFileSystem/Attribute:nas_name' => 'Názov NAS',
- 'Class:NASFileSystem/Attribute:nas_name+' => '',
- 'Class:Patch' => 'Záplata',
- 'Class:Patch+' => '',
- 'Class:Patch/Attribute:name' => 'Názov',
- 'Class:Patch/Attribute:name+' => '',
- 'Class:Patch/Attribute:documents_list' => 'Zoznam dokumentov',
- 'Class:Patch/Attribute:documents_list+' => 'All the documents linked to this patch~~',
- 'Class:Patch/Attribute:description' => 'Popis',
- 'Class:Patch/Attribute:description+' => '',
- 'Class:Patch/Attribute:finalclass' => 'Typ',
- 'Class:Patch/Attribute:finalclass+' => '',
- 'Class:OSPatch/Attribute:osversion_name' => 'Názov OS verzie',
- 'Class:OSPatch/Attribute:osversion_name+' => '',
- 'Class:SoftwarePatch/Attribute:software_name' => 'Názov softvéru',
- 'Class:SoftwarePatch/Attribute:software_name+' => '',
- 'Class:Licence' => 'Licencia',
- 'Class:Licence+' => '',
- 'Class:Licence/Attribute:name' => 'Názov',
- 'Class:Licence/Attribute:name+' => '',
- 'Class:Licence/Attribute:documents_list' => 'Zoznam dokumentov',
- 'Class:Licence/Attribute:documents_list+' => 'All the documents linked to this license~~',
- 'Class:Licence/Attribute:org_id' => 'Organizácia',
- 'Class:Licence/Attribute:org_id+' => '',
- 'Class:Licence/Attribute:organization_name' => 'Názov organizácie',
- 'Class:Licence/Attribute:organization_name+' => '',
- 'Class:Licence/Attribute:usage_limit' => 'Limit používania',
- 'Class:Licence/Attribute:usage_limit+' => '',
- 'Class:Licence/Attribute:description' => 'Popis',
- 'Class:Licence/Attribute:description+' => '',
- 'Class:Licence/Attribute:start_date' => 'Dátum začiatku',
- 'Class:Licence/Attribute:start_date+' => '',
- 'Class:Licence/Attribute:end_date' => 'Dátum ukončenia',
- 'Class:Licence/Attribute:end_date+' => '',
- 'Class:Licence/Attribute:licence_key' => 'Licenčný kľúč',
- 'Class:Licence/Attribute:licence_key+' => '',
- 'Class:Licence/Attribute:perpetual' => 'Pretrvávajúci',
- 'Class:Licence/Attribute:perpetual+' => '',
- 'Class:Licence/Attribute:perpetual/Value:no' => 'Nie',
- 'Class:Licence/Attribute:perpetual/Value:no+' => '',
- 'Class:Licence/Attribute:perpetual/Value:yes' => 'Áno',
- 'Class:Licence/Attribute:perpetual/Value:yes+' => '',
- 'Class:Licence/Attribute:finalclass' => 'Typ',
- 'Class:Licence/Attribute:finalclass+' => '',
- 'Class:OSLicence/Attribute:osversion_name' => 'Názov OS verzie',
- 'Class:OSLicence/Attribute:osversion_name+' => '',
- 'Class:SoftwareLicence/Attribute:software_name' => 'Názov softvéru',
- 'Class:SoftwareLicence/Attribute:software_name+' => '',
- 'Class:lnkDocumentToLicence/Attribute:licence_name' => 'Názov licence',
- 'Class:lnkDocumentToLicence/Attribute:licence_name+' => '',
- 'Class:lnkDocumentToLicence/Attribute:document_name' => 'Názov dokumentu',
- 'Class:lnkDocumentToLicence/Attribute:document_name+' => '',
- 'Class:Typology' => 'Typológia',
- 'Class:Typology+' => '',
- 'Class:Typology/Attribute:name' => 'Názov',
- 'Class:Typology/Attribute:name+' => '',
- 'Class:Typology/Attribute:finalclass' => 'Typ',
- 'Class:Typology/Attribute:finalclass+' => '',
- 'Class:OSVersion/Attribute:osfamily_name' => 'Názov kategórie OS',
- 'Class:OSVersion/Attribute:osfamily_name+' => '',
- 'Class:Model/Attribute:brand_name' => 'Názov značky',
- 'Class:Model/Attribute:brand_name+' => '',
- 'Class:IOSVersion/Attribute:brand_name' => 'Názov značky',
- 'Class:IOSVersion/Attribute:brand_name+' => '',
- 'Class:lnkDocumentToPatch/Attribute:patch_name' => 'Názov záplaty',
- 'Class:lnkDocumentToPatch/Attribute:patch_name+' => '',
- 'Class:lnkDocumentToPatch/Attribute:document_name' => 'Názov dokumentu',
- 'Class:lnkDocumentToPatch/Attribute:document_name+' => '',
- 'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_name' => 'Názov softvérovej záplaty',
- 'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_name+' => '',
- 'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_name' => 'Názov softvérovej inštancie',
- 'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_name+' => '',
- 'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_name' => 'Názov OS záplaty',
- 'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_name+' => '',
- 'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_name' => 'Názov funkčných CI',
- 'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_name+' => '',
- 'Class:lnkDocumentToSoftware/Attribute:software_name' => 'Názov softvéru',
- 'Class:lnkDocumentToSoftware/Attribute:software_name+' => '',
- 'Class:lnkDocumentToSoftware/Attribute:document_name' => 'Názov dokumentu',
- 'Class:lnkDocumentToSoftware/Attribute:document_name+' => '',
- 'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Názov funkčných CI',
- 'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '',
- 'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Názov kontaktu',
- 'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '',
- 'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_name' => 'Názov funkčných CI',
- 'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_name+' => '',
- 'Class:lnkDocumentToFunctionalCI/Attribute:document_name' => 'Názov dokumentu',
- 'Class:lnkDocumentToFunctionalCI/Attribute:document_name+' => '',
- 'Class:Subnet/Attribute:org_name' => 'Názov organizácie',
- 'Class:Subnet/Attribute:org_name+' => '',
- 'Class:NetworkInterface' => 'Sieťové rozhranie',
- 'Class:NetworkInterface+' => '',
- 'Class:NetworkInterface/Attribute:name' => 'Názov',
- 'Class:NetworkInterface/Attribute:name+' => '',
- 'Class:NetworkInterface/Attribute:finalclass' => 'Typ',
- 'Class:NetworkInterface/Attribute:finalclass+' => '',
- 'Class:IPInterface' => 'IP rozhranie',
- 'Class:IPInterface+' => '',
- 'Class:IPInterface/Attribute:ipaddress' => 'IP Adresa',
- 'Class:IPInterface/Attribute:ipaddress+' => '',
- 'Class:IPInterface/Attribute:macaddress' => 'MAC Adresa',
- 'Class:IPInterface/Attribute:macaddress+' => '',
- 'Class:IPInterface/Attribute:comment' => 'Komentár',
- 'Class:IPInterface/Attribute:coment+' => '',
- 'Class:IPInterface/Attribute:ipgateway' => 'Východzia brána IP',
- 'Class:IPInterface/Attribute:ipgateway+' => '',
- 'Class:IPInterface/Attribute:ipmask' => 'Maska IP adresy',
- 'Class:IPInterface/Attribute:ipmask+' => '',
- 'Class:IPInterface/Attribute:speed' => 'Rýchlosť',
- 'Class:IPInterface/Attribute:speed+' => '',
- 'Class:PhysicalInterface/Attribute:connectableci_name' => 'Názov zariadenia',
- 'Class:PhysicalInterface/Attribute:connectableci_name+' => '',
- 'Class:LogicalInterface/Attribute:virtualmachine_name' => 'Názov virtuálneho stroja',
- 'Class:LogicalInterface/Attribute:virtualmachine_name+' => '',
- 'Class:FiberChannelInterface/Attribute:datacenterdevice_name' => 'Názov zariadenia',
- 'Class:FiberChannelInterface/Attribute:datacenterdevice_name+' => '',
- 'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_name' => 'Názov sieťového zariadenia',
- 'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_name+' => '',
- 'Class:lnkConnectableCIToNetworkDevice/Attribute:connectableci_name' => 'Názov pripojeného zariadenia',
- 'Class:lnkConnectableCIToNetworkDevice/Attribute:connectableci_name+' => '',
- 'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_name' => 'Názov aplikačného riešenia',
- 'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_name+' => '',
- 'Class:lnkApplicationSolutionToFunctionalCI/Attribute:functionalci_name' => 'Názov funkčných CI',
- 'Class:lnkApplicationSolutionToFunctionalCI/Attribute:functionalci_name+' => '',
- 'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_name' => 'Názov biznisových procesov',
- 'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_name+' => '',
- 'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_name' => 'Názov aplikačného riešenia',
- 'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_name+' => '',
- 'Class:lnkPersonToTeam/Attribute:team_name' => 'Názov tímu',
- 'Class:lnkPersonToTeam/Attribute:team_name+' => '',
- 'Class:lnkPersonToTeam/Attribute:person_name' => 'Meno osoby',
- 'Class:lnkPersonToTeam/Attribute:person_name+' => '',
- 'Class:lnkPersonToTeam/Attribute:role_name' => 'Názov role',
- 'Class:lnkPersonToTeam/Attribute:role_name+' => '',
- 'Class:Group/Attribute:owner_name' => 'Meno vlastníka',
- 'Class:Group/Attribute:owner_name+' => '',
- 'Class:Group/Attribute:parent_name' => 'Meno rodiča',
- 'Class:Group/Attribute:parent_name+' => '',
- 'Class:Group/Attribute:parent_id_friendlyname' => 'Priateľské meno rodičovskej skupiny',
- 'Class:Group/Attribute:parent_id_friendlyname+' => '',
- 'Class:lnkGroupToCI/Attribute:group_name' => 'Názov',
- 'Class:lnkGroupToCI/Attribute:group_name+' => '',
- 'Class:lnkGroupToCI/Attribute:ci_name' => 'Názov',
- 'Class:lnkGroupToCI/Attribute:ci_name+' => '',
- 'Menu:Catalogs' => 'Katalógy',
- 'Menu:Catalogs+' => '',
- 'Menu:Audit' => 'Audity',
- 'Menu:Audit+' => '',
- 'Menu:Organization' => 'Organizácia',
- 'Menu:Organization+' => '',
- 'Menu:Application' => 'Aplikácie',
- 'Menu:Application+' => '',
- 'Menu:DBServer' => 'Databázové servery',
- 'Menu:DBServer+' => '',
- 'Menu:ConfigManagement' => 'Manažment konfigurácie',
- 'Menu:ConfigManagement+' => '',
- 'Menu:ConfigManagementOverview' => 'Prehľad',
- 'Menu:ConfigManagementOverview+' => '',
- 'Menu:Contact' => 'Kontakty',
- 'Menu:Contact+' => '',
- 'Menu:Contact:Count' => '%1$d kontakt/y/ov',
- 'Menu:Person' => 'Osoby',
- 'Menu:Person+' => '',
- 'Menu:Team' => 'Tímy',
- 'Menu:Team+' => '',
- 'Menu:Document' => 'Dokumenty',
- 'Menu:Document+' => '',
- 'Menu:Location' => 'Poloha',
- 'Menu:Location+' => '',
- 'Menu:ConfigManagementCI' => 'Konfiguračné položky',
- 'Menu:ConfigManagementCI+' => '',
- 'Menu:BusinessProcess' => 'Biznisové procesy',
- 'Menu:BusinessProcess+' => '',
- 'Menu:ApplicationSolution' => 'Aplikačné riešenia',
- 'Menu:ApplicationSolution+' => '',
- 'Menu:ConfigManagementSoftware' => 'Aplikačný manažment',
- 'Menu:Licence' => 'Licencie',
- 'Menu:Licence+' => '',
- 'Menu:Patch' => 'Záplaty',
- 'Menu:Patch+' => '',
- 'Menu:ApplicationInstance' => 'Nainštalovaný softvér',
- 'Menu:ApplicationInstance+' => '',
- 'Menu:ConfigManagementHardware' => 'Manažment infraštruktúry',
- 'Menu:Subnet' => 'Podsiete',
- 'Menu:Subnet+' => '',
- 'Menu:NetworkDevice' => 'Sieťové zariadenia',
- 'Menu:NetworkDevice+' => '',
- 'Menu:Server' => 'Servery',
- 'Menu:Server+' => '',
- 'Menu:Printer' => 'Tlačiarne',
- 'Menu:Printer+' => '',
- 'Menu:MobilePhone' => 'Mobilné telefóny',
- 'Menu:MobilePhone+' => '',
- 'Menu:PC' => 'Osobné počítače',
- 'Menu:PC+' => '',
- 'Menu:NewContact' => 'Nový kontakt',
- 'Menu:NewContact+' => '',
- 'Menu:SearchContacts' => 'Vyhľadať kontakty',
- 'Menu:SearchContacts+' => '',
- 'Menu:NewCI' => 'Nové CI',
- 'Menu:NewCI+' => '',
- 'Menu:SearchCIs' => 'Vyhľadať CIs',
- 'Menu:SearchCIs+' => '',
- 'Menu:ConfigManagement:Devices' => 'Zariadenia',
- 'Menu:ConfigManagement:AllDevices' => 'Infraštruktúra',
- 'Menu:ConfigManagement:virtualization' => 'Virtualizácia',
- 'Menu:ConfigManagement:EndUsers' => 'Koncové užívateľské zariadenia',
- 'Menu:ConfigManagement:SWAndApps' => 'Softvér a aplikácie',
- 'Menu:ConfigManagement:Misc' => 'Rôzne',
- 'Menu:Group' => 'Skupiny CI',
- 'Menu:Group+' => '',
- 'Menu:ConfigManagement:Shortcuts' => 'Skratky',
- 'Menu:ConfigManagement:AllContacts' => 'Všetky kontakty: %1$d',
- 'Menu:Typology' => 'Konfiguračná typológia',
- 'Menu:Typology+' => '',
- 'Menu:OSVersion' => 'OS verzie',
- 'Menu:OSVersion+' => '',
- 'Menu:Software' => 'Katalóg softvéru',
- 'Menu:Software+' => '',
- 'UI_WelcomeMenu_AllConfigItems' => 'Zhrnutie',
- 'Menu:ConfigManagement:Typology' => 'Konfiguračná typológia',
- 'Server:baseinfo' => 'Všeobecné informácie',
- 'Server:Date' => 'Dátum',
- 'Server:moreinfo' => 'Viac informácií',
- 'Server:otherinfo' => 'Iné informácie',
- 'Person:info' => 'Všeobecné informácie',
- 'Class:Subnet/Tab:IPUsage' => 'Využívanosť IP adries',
- 'Class:Subnet/Tab:IPUsage-explain' => 'Rozhrania majúce IP adresu v rozsahu: <em>%1$s</em> do <em>%2$s</em>',
- 'Class:Subnet/Tab:FreeIPs' => 'Voľné IP adresy',
- 'Class:Subnet/Tab:FreeIPs-count' => 'Voľných IP adries: %1$s',
- 'Class:Subnet/Tab:FreeIPs-explain' => 'Tu je extrakt 10 voľných IP adries',
- 'Menu:ServiceManagement' => 'Manažment služieb',
- 'Menu:ServiceManagement+' => '',
- 'Menu:Service:Overview' => 'Prehľad',
- 'Menu:Service:Overview+' => '',
- 'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'zmluvy podľa úrovne služby',
- 'UI-ServiceManagementMenu-ContractsByStatus' => 'zmluvy podla stavu',
- 'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'zmluvy končiace za menej ako 30 dní',
- 'Menu:ServiceType' => 'Typy služieb',
- 'Menu:ServiceType+' => '',
- 'Menu:ProviderContract' => 'Poskytovateľské zmluvy',
- 'Menu:ProviderContract+' => '',
- 'Menu:CustomerContract' => 'Zákaznícke zmluvy',
- 'Menu:CustomerContract+' => '',
- 'Menu:ServiceSubcategory' => 'Subkategórie služieb',
- 'Menu:ServiceSubcategory+' => '',
- 'Menu:Service' => 'Služby',
- 'Menu:Service+' => '',
- 'Menu:ServiceElement' => 'Prvky služby',
- 'Menu:ServiceElement+' => '',
- 'Menu:SLA' => 'SLAs',
- 'Menu:SLA+' => '',
- 'Menu:SLT' => 'SLTs',
- 'Menu:SLT+' => '',
- 'Menu:DeliveryModel' => 'Typy dodávky',
- 'Menu:DeliveryModel+' => '',
- 'Menu:ServiceFamily' => 'Rodiny služieb',
- 'Menu:ServiceFamily+' => '',
- 'Menu:Procedure' => 'Katalóg procedúr',
- 'Menu:Procedure+' => '',
- 'Class:Contract' => 'zmluva',
- 'Class:Contract+' => '',
- 'Class:Contract/Attribute:name' => 'Názov',
- 'Class:Contract/Attribute:name+' => '',
- 'Class:Contract/Attribute:org_id' => 'Zákazník',
- 'Class:Contract/Attribute:org_id+' => '',
- 'Class:Contract/Attribute:organization_name' => 'Meno zákazníka',
- 'Class:Contract/Attribute:organization_name+' => '',
- 'Class:Contract/Attribute:contacts_list' => 'Kontakty',
- 'Class:Contract/Attribute:contacts_list+' => 'All the contacts for this customer contract~~',
- 'Class:Contract/Attribute:documents_list' => 'Zoznam dokumentov',
- 'Class:Contract/Attribute:documents_list+' => 'All the documents for this customer contract~~',
- 'Class:Contract/Attribute:description' => 'Popis',
- 'Class:Contract/Attribute:description+' => '',
- 'Class:Contract/Attribute:start_date' => 'Dátum začiatku',
- 'Class:Contract/Attribute:start_date+' => '',
- 'Class:Contract/Attribute:end_date' => 'Dátum ukončenia',
- 'Class:Contract/Attribute:end_date+' => '',
- 'Class:Contract/Attribute:cost' => 'Cena',
- 'Class:Contract/Attribute:cost+' => '',
- 'Class:Contract/Attribute:cost_currency' => 'Mena ceny',
- 'Class:Contract/Attribute:cost_currency+' => '',
- 'Class:Contract/Attribute:cost_currency/Value:dollars' => 'USD',
- 'Class:Contract/Attribute:cost_currency/Value:dollars+' => '',
- 'Class:Contract/Attribute:cost_currency/Value:euros' => 'EUR',
- 'Class:Contract/Attribute:cost_currency/Value:euros+' => '',
- 'Class:Contract/Attribute:contracttype_id' => 'Typ zmluvy',
- 'Class:Contract/Attribute:contracttype_id+' => '',
- 'Class:Contract/Attribute:contracttype_name' => 'Názov typu zmluvy',
- 'Class:Contract/Attribute:contracttype_name+' => '',
- 'Class:Contract/Attribute:billing_frequency' => 'Frekvencia faktúrovania',
- 'Class:Contract/Attribute:billing_frequency+' => '',
- 'Class:Contract/Attribute:cost_unit' => 'Cenová jednotka',
- 'Class:Contract/Attribute:cost_unit+' => '',
- 'Class:Contract/Attribute:provider_id' => 'Poskytovateľ',
- 'Class:Contract/Attribute:provider_id+' => '',
- 'Class:Contract/Attribute:provider_name' => 'Meno poskytovateľa',
- 'Class:Contract/Attribute:provider_name+' => '',
- 'Class:Contract/Attribute:status' => 'Stav',
- 'Class:Contract/Attribute:status+' => '',
- 'Class:Contract/Attribute:status/Value:implementation' => 'Implementácia',
- 'Class:Contract/Attribute:status/Value:implementation+' => '',
- 'Class:Contract/Attribute:status/Value:obsolete' => 'Vyradený',
- 'Class:Contract/Attribute:status/Value:obsolete+' => '',
- 'Class:Contract/Attribute:status/Value:production' => 'Produkcia',
- 'Class:Contract/Attribute:status/Value:production+' => '',
- 'Class:Contract/Attribute:finalclass' => 'Typ',
- 'Class:Contract/Attribute:finalclass+' => '',
- 'Class:ProviderContract/Attribute:contracttype_id' => 'Typ zmluvy',
- 'Class:ProviderContract/Attribute:contracttype_id+' => '',
- 'Class:ProviderContract/Attribute:contracttype_name' => 'Názov typu zmluvy',
- 'Class:ProviderContract/Attribute:contracttype_name+' => '',
- 'Class:lnkContactToContract/Attribute:contract_name' => 'Názov zmluvy',
- 'Class:lnkContactToContract/Attribute:contract_name+' => '',
- 'Class:lnkContactToContract/Attribute:contact_name' => 'Názov kontaktu',
- 'Class:lnkContactToContract/Attribute:contact_name+' => '',
- 'Class:lnkContractToDocument/Attribute:contract_name' => 'Názov zmluvy',
- 'Class:lnkContractToDocument/Attribute:contract_name+' => '',
- 'Class:lnkContractToDocument/Attribute:document_name' => 'Názov dokumentu',
- 'Class:lnkContractToDocument/Attribute:document_name+' => '',
- 'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Názov poskytovateľského zmluvy',
- 'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '',
- 'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'Názov CI',
- 'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '',
- 'Class:Service/Attribute:organization_name' => 'Meno poskytovateľa',
- 'Class:Service/Attribute:organization_name+' => '',
- 'Class:Service/Attribute:servicefamily_name' => 'Názov rodiny služieb',
- 'Class:Service/Attribute:servicefamily_name+' => '',
- 'Class:lnkDocumentToService/Attribute:service_name' => 'Názov služby',
- 'Class:lnkDocumentToService/Attribute:service_name+' => '',
- 'Class:lnkDocumentToService/Attribute:document_name' => 'Názov dokumentu',
- 'Class:lnkDocumentToService/Attribute:document_name+' => '',
- 'Class:lnkContactToService/Attribute:service_name' => 'Názov služby',
- 'Class:lnkContactToService/Attribute:service_name+' => '',
- 'Class:lnkContactToService/Attribute:contact_name' => 'Názov kontaktu',
- 'Class:lnkContactToService/Attribute:contact_name+' => '',
- 'Class:ServiceSubcategory/Attribute:service_name' => 'Názov služby',
- 'Class:ServiceSubcategory/Attribute:service_name+' => '',
- 'Class:SLA/Attribute:organization_name' => 'Názov organizácie poskytovateľa',
- 'Class:SLA/Attribute:organization_name+' => '',
- 'Class:lnkSLAToSLT/Attribute:sla_name' => 'SLA Názov',
- 'Class:lnkSLAToSLT/Attribute:sla_name+' => '',
- 'Class:lnkSLAToSLT/Attribute:slt_name' => 'SLT Názov',
- 'Class:lnkSLAToSLT/Attribute:slt_name+' => '',
- 'Class:lnkCustomerContractToService/Attribute:customercontract_name' => 'Názov zákazníckeho zmluvy',
- 'Class:lnkCustomerContractToService/Attribute:customercontract_name+' => '',
- 'Class:lnkCustomerContractToService/Attribute:service_name' => 'Názov služby',
- 'Class:lnkCustomerContractToService/Attribute:service_name+' => '',
- 'Class:lnkCustomerContractToService/Attribute:sla_name' => 'SLA Názov',
- 'Class:lnkCustomerContractToService/Attribute:sla_name+' => '',
- 'Class:lnkProviderContractToService/Attribute:service_name' => 'Názov služby',
- 'Class:lnkProviderContractToService/Attribute:service_name+' => '',
- 'Class:lnkProviderContractToService/Attribute:providercontract_name' => 'Názov poskytovateľského zmluvy',
- 'Class:lnkProviderContractToService/Attribute:providercontract_name+' => '',
- 'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Názov služby',
- 'Class:lnkFunctionalCIToService/Attribute:service_name+' => '',
- 'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => 'Názov CI',
- 'Class:lnkFunctionalCIToService/Attribute:functionalci_name+' => '',
- 'Class:DeliveryModel/Attribute:organization_name' => 'Názov organizácie',
- 'Class:DeliveryModel/Attribute:organization_name+' => '',
- 'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name' => 'Názov typu dodávky',
- 'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name+' => '',
- 'Class:lnkDeliveryModelToContact/Attribute:contact_name' => 'Meno kontaktu',
- 'Class:lnkDeliveryModelToContact/Attribute:contact_name+' => '',
- 'Class:lnkDeliveryModelToContact/Attribute:role_name' => 'Názov role',
- 'Class:lnkDeliveryModelToContact/Attribute:role_name+' => '',
- 'Class:Ticket/Attribute:org_name' => 'Názov organizácie',
- 'Class:Ticket/Attribute:org_name+' => '',
- 'Class:Ticket/Attribute:caller_name' => 'Meno volajúceho',
- 'Class:Ticket/Attribute:caller_name+' => '',
- 'Class:Ticket/Attribute:team_name' => 'Názov tímu',
- 'Class:Ticket/Attribute:team_name+' => '',
- 'Class:Ticket/Attribute:agent_name' => 'Meno agenta',
- 'Class:Ticket/Attribute:agent_name+' => '',
- 'Class:lnkContactToTicket/Attribute:ticket_ref' => 'Referencia na Ticket',
- 'Class:lnkContactToTicket/Attribute:ticket_ref+' => '',
- 'Class:lnkContactToTicket/Attribute:contact_email' => 'Email kontaktu',
- 'Class:lnkContactToTicket/Attribute:contact_email+' => '',
- 'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref' => 'Referencia na Ticket',
- 'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref+' => '',
- 'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name' => 'Názov CI',
- 'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name+' => '',
- 'Class:WorkOrder/Attribute:ticket_ref' => 'Referencia na Ticket',
- 'Class:WorkOrder/Attribute:ticket_ref+' => '',
- 'Class:WorkOrder/Attribute:team_name' => 'Názov tímu',
- 'Class:WorkOrder/Attribute:team_name+' => '',
- 'Class:WorkOrder/Attribute:agent_email' => 'Email agenta',
- 'Class:WorkOrder/Attribute:agent_email+' => '',
- 'Ticket:baseinfo' => 'Všeobecné informácia',
- 'Ticket:date' => 'Dátumy',
- 'Ticket:contact' => 'Kontakt',
- 'Ticket:moreinfo' => 'Viac informácií',
- 'Ticket:relation' => 'Vzťahy',
- 'Ticket:log' => 'Komunikácie',
- 'Ticket:Type' => 'Kvalifikácia',
- 'Ticket:support' => 'Podpora',
- 'Ticket:resolution' => 'Riešenie',
- 'Ticket:SLA' => 'SLA report',
- 'WorkOrder:Details' => 'Detaily',
- 'WorkOrder:Moreinfo' => 'Viac informácií',
- 'Menu:ChangeManagement' => 'Manažment zmien',
- 'Menu:Change:Overview' => 'Prehľad',
- 'Menu:Change:Overview+' => '',
- 'Menu:NewChange' => 'Nová zmena',
- 'Menu:NewChange+' => '',
- 'Menu:SearchChanges' => 'Vyhľadať zmeny',
- 'Menu:SearchChanges+' => '',
- 'Menu:Change:Shortcuts' => 'Skratky',
- 'Menu:Change:Shortcuts+' => '',
- 'Menu:WaitingAcceptance' => 'Zmeny očakávajúce prijatie',
- 'Menu:WaitingAcceptance+' => '',
- 'Menu:WaitingApproval' => 'Zmeny očakávajúce schválenie',
- 'Menu:WaitingApproval+' => '',
- 'Menu:Changes' => 'Otvorené zmeny',
- 'Menu:Changes+' => '',
- 'Menu:MyChanges' => 'Zmeny pridelené mne',
- 'Menu:MyChanges+' => '',
- 'UI-ChangeManagementOverview-ChangeByCategory-last-7-days' => 'Zmeny podľa kategórie za posledných 7 dní',
- 'UI-ChangeManagementOverview-Last-7-days' => 'Počet zmien za posledných 7 dní',
- 'UI-ChangeManagementOverview-ChangeByDomain-last-7-days' => 'Zmeny podľa domény za posledných 7 dní',
- 'UI-ChangeManagementOverview-ChangeByStatus-last-7-days' => 'Zmeny podľa stavu za posledných 7 dní',
- 'Class:Change/Attribute:changemanager_email' => 'Email manažéra zmien',
- 'Class:Change/Attribute:changemanager_email+' => '',
- 'Class:Change/Attribute:parent_name' => 'Referencia na rodičovskú zmenu',
- 'Class:Change/Attribute:parent_name+' => '',
- 'Class:Change/Attribute:related_incident_list' => 'Súvisiace incidenty',
- 'Class:Change/Attribute:related_incident_list+' => 'All the incidents linked to this change~~',
- 'Class:Change/Attribute:related_problems_list' => 'Súvisiace problémy',
- 'Class:Change/Attribute:related_problems_list+' => 'All the problems linked to this change~~',
- 'Class:Change/Attribute:parent_id_friendlyname' => 'Priateľské meno rodičovskej zmeny',
- 'Class:Change/Attribute:parent_id_friendlyname+' => '',
- 'Menu:RequestManagement' => 'Helpdesk',
- 'Menu:RequestManagement+' => '',
- 'Menu:RequestManagementProvider' => 'Poskytovateľ Helpdesku',
- 'Menu:RequestManagementProvider+' => '',
- 'Menu:UserRequest:Provider' => 'Otvorené požiadavky prenesené na poskytovateľa',
- 'Menu:UserRequest:Provider+' => '',
- 'Menu:UserRequest:Overview' => 'Prehľad',
- 'Menu:UserRequest:Overview+' => '',
- 'Menu:NewUserRequest' => 'Nové požiadavky užívateľa',
- 'Menu:NewUserRequest+' => '',
- 'Menu:SearchUserRequests' => 'Vyhľadať užívateľské požiadavky',
- 'Menu:SearchUserRequests+' => '',
- 'Menu:UserRequest:Shortcuts' => 'Skratky',
- 'Menu:UserRequest:Shortcuts+' => '',
- 'Menu:UserRequest:MyRequests' => 'požiadavky pridelené mne',
- 'Menu:UserRequest:MyRequests+' => '',
- 'Menu:UserRequest:MySupportRequests' => 'Moje hovory podpory',
- 'Menu:UserRequest:MySupportRequests+' => '',
- 'Menu:UserRequest:EscalatedRequests' => 'Eskalované požiadavky',
- 'Menu:UserRequest:EscalatedRequests+' => '',
- 'Menu:UserRequest:OpenRequests' => 'Všetky otvorené požiadavky',
- 'Menu:UserRequest:OpenRequests+' => '',
- 'UI:WelcomeMenu:MyAssignedCalls' => 'požiadavky pridelené mne',
- 'UI-RequestManagementOverview-RequestByType-last-14-days' => 'požiadavky za posledných 14 dní (po typoch)',
- 'UI-RequestManagementOverview-Last-14-days' => 'požiadavky posledných 14 dní (po dňoch)',
- 'UI-RequestManagementOverview-OpenRequestByStatus' => 'Otvorené požiadavky podľa stavu',
- 'UI-RequestManagementOverview-OpenRequestByAgent' => 'Otvorené požiadavky podľa agenta',
- 'UI-RequestManagementOverview-OpenRequestByType' => 'Otvorené požiadavky podľa typu',
- 'UI-RequestManagementOverview-OpenRequestByCustomer' => 'Otvorené požiadavky podľa organizácie',
- 'Class:UserRequest:KnownErrorList' => 'Známe chyby',
- 'Menu:UserRequest:MyWorkOrders' => 'Pracovné príkazy pridelené mne',
- 'Menu:UserRequest:MyWorkOrders+' => '',
- 'Class:Problem:KnownProblemList' => 'Známe problémy',
- 'Class:UserRequest/Attribute:approver_email' => 'Email schvalovateľa',
- 'Class:UserRequest/Attribute:approver_email+' => '',
- 'Class:UserRequest/Attribute:service_name' => 'Názov služby',
- 'Class:UserRequest/Attribute:service_name+' => '',
- 'Class:UserRequest/Attribute:servicesubcategory_name' => 'Názov subkategórie služieb',
- 'Class:UserRequest/Attribute:servicesubcategory_name+' => '',
- 'Class:UserRequest/Attribute:parent_request_ref' => 'Požiadavka o odporúčanie',
- 'Class:UserRequest/Attribute:parent_request_ref+' => '',
- 'Class:UserRequest/Attribute:parent_problem_id' => 'Rodičovský problém',
- 'Class:UserRequest/Attribute:parent_problem_id+' => '',
- 'Class:UserRequest/Attribute:parent_problem_ref' => 'Referencia na problém',
- 'Class:UserRequest/Attribute:parent_problem_ref+' => '',
- 'Class:UserRequest/Attribute:parent_change_ref' => 'Referencia na zmenu',
- 'Class:UserRequest/Attribute:parent_change_ref+' => '',
- 'Class:UserRequest/Attribute:parent_request_id_friendlyname' => 'Priateľské meno ID požiadavky rodiča',
- 'Class:UserRequest/Attribute:parent_request_id_friendlyname+' => '',
- 'Portal:TitleDetailsFor_Request' => 'Detaily pre požiadavky',
- 'Portal:ButtonUpdate' => 'Aktualizácia',
- 'Portal:ButtonClose' => 'Zatvoriť',
- 'Portal:ButtonReopen' => 'Znova otvoriť',
- 'Portal:ShowServices' => 'Katalóg služieb',
- 'Portal:SelectRequestType' => 'Zvoľ typ požiadavky',
- 'Portal:SelectServiceElementFrom_Service' => 'Zvoľ služby prvku pre %1$s',
- 'Portal:SelectRequestTemplate' => 'Zvoľ predlohu pre %1$s',
- 'Portal:ListServices' => 'Zoznam služieb',
- 'Portal:TitleDetailsFor_Service' => 'Detaily pre službu',
- 'Portal:Button:CreateRequestFromService' => 'Vytvor Požiadavka pre túto službu',
- 'Portal:ListOpenRequests' => 'Vypíš otvorené požiadavky',
- 'Portal:UserRequest:MoreInfo' => 'Viac informácií',
- 'Portal:Details-Service-Element' => 'Prvky služieb',
- 'Portal:NoClosedTicket' => 'Žiadne zatvorené požiadavky',
- 'Portal:NoService' => '',
- 'Portal:ListOpenProblems' => 'Prebiehajúce problémy',
- 'Portal:ShowProblem' => 'Problémy',
- 'Portal:ShowFaqs' => 'Často kladené otázky',
- 'Portal:NoOpenProblem' => 'Žiadny otvorený problém',
- 'Portal:SelectLanguage' => 'Zmeň svoj jazyk',
- 'Portal:LanguageChangedTo_Lang' => 'Jazyk zmenený na',
- 'Portal:ChooseYourFavoriteLanguage' => 'Vyberte si svoj obľúbený jazyk',
+	'Class:lnkVirtualDeviceToVolume' => 'väzba Virtuálne zariadenie / Logický disk',
+	'Class:lnkVirtualDeviceToVolume+' => '',
+	'Class:lnkVirtualDeviceToVolume/Attribute:volume_id' => 'Logický disk',
+	'Class:lnkVirtualDeviceToVolume/Attribute:volume_id+' => '',
+	'Class:lnkVirtualDeviceToVolume/Attribute:virtualdevice_id' => 'Virtuálne zariadenie',
+	'Class:lnkVirtualDeviceToVolume/Attribute:virtualdevice_id+' => '',
+	'Class:lnkVirtualDeviceToVolume/Attribute:size_used' => 'Použité miesto',
+	'Class:lnkVirtualDeviceToVolume/Attribute:size_used+' => '',
+	'Class:Organization' => 'Organizácia',
+	'Class:Organization+' => '',
+	'Class:Organization/Attribute:name' => 'Názov',
+	'Class:Organization/Attribute:name+' => '',
+	'Class:Organization/Attribute:code' => 'Kód',
+	'Class:Organization/Attribute:code+' => '',
+	'Class:Organization/Attribute:status' => 'Stav',
+	'Class:Organization/Attribute:status+' => '',
+	'Class:Organization/Attribute:status/Value:active' => 'Aktívna',
+	'Class:Organization/Attribute:status/Value:active+' => '',
+	'Class:Organization/Attribute:status/Value:inactive' => 'Neaktívna',
+	'Class:Organization/Attribute:status/Value:inactive+' => '',
+	'Class:Organization/Attribute:parent_id' => 'Nadradená organizácia',
+	'Class:Organization/Attribute:parent_id+' => '',
+	'Class:Organization/Attribute:deliverymodel_id' => 'Model dodávky',
+	'Class:Organization/Attribute:deliverymodel_id+' => '',
+	'Class:Location' => 'Poloha',
+	'Class:Location+' => '',
+	'Class:Location/Attribute:name' => 'Názov',
+	'Class:Location/Attribute:name+' => '',
+	'Class:Location/Attribute:status' => 'Stav',
+	'Class:Location/Attribute:status+' => '',
+	'Class:Location/Attribute:status/Value:active' => 'Aktívna',
+	'Class:Location/Attribute:status/Value:active+' => '',
+	'Class:Location/Attribute:status/Value:inactive' => 'Neaktívna',
+	'Class:Location/Attribute:status/Value:inactive+' => '',
+	'Class:Location/Attribute:org_id' => 'Organizácia vlastníka',
+	'Class:Location/Attribute:org_id+' => '',
+	'Class:Location/Attribute:address' => 'Adresa',
+	'Class:Location/Attribute:address+' => '',
+	'Class:Location/Attribute:postal_code' => 'PSČ',
+	'Class:Location/Attribute:postal_code+' => '',
+	'Class:Location/Attribute:city' => 'Mesto',
+	'Class:Location/Attribute:city+' => '',
+	'Class:Location/Attribute:country' => 'Štát',
+	'Class:Location/Attribute:country+' => '',
+	'Class:Location/Attribute:physicaldevice_list' => 'Zariadenia',
+	'Class:Location/Attribute:physicaldevice_list+' => 'All the devices in this location~~',
+	'Class:Location/Attribute:person_list' => 'Kontakty',
+	'Class:Location/Attribute:person_list+' => 'All the contacts located on this location~~',
+	'Class:Person' => 'Osoba',
+	'Class:Person+' => '',
+	'Class:Person/Attribute:first_name' => 'Krstné meno',
+	'Class:Person/Attribute:first_name+' => '',
+	'Class:Person/Attribute:employee_number' => 'Číslo zamestnanca',
+	'Class:Person/Attribute:employee_number+' => '',
+	'Class:Person/Attribute:mobile_phone' => 'Telefónne číslo',
+	'Class:Person/Attribute:mobile_phone+' => '',
+	'Class:Person/Attribute:location_id' => 'Poloha',
+	'Class:Person/Attribute:location_id+' => '',
+	'Class:Person/Attribute:manager_id' => 'Manažér',
+	'Class:Person/Attribute:manager_id+' => '',
+	'Class:Person/Attribute:team_list' => 'Tímy',
+	'Class:Person/Attribute:team_list+' => 'All the teams this person belongs to~~',
+	'Class:Person/Attribute:tickets_list' => 'Tickety',
+	'Class:Person/Attribute:tickets_list+' => 'All the tickets this person is the caller~~',
+	'Class:Team' => 'Tím',
+	'Class:Team+' => '',
+	'Class:Team/Attribute:persons_list' => 'Osoby',
+	'Class:Team/Attribute:persons_list+' => 'All the people belonging to this team~~',
+	'Class:Team/Attribute:tickets_list' => 'Tickety',
+	'Class:Team/Attribute:tickets_list+' => 'All the tickets assigned to this team~~',
+	'Class:DocumentFile' => 'Dokumentový súbor',
+	'Class:DocumentFile+' => '',
+	'Class:DocumentFile/Attribute:file' => 'Súbor',
+	'Class:DocumentFile/Attribute:file+' => '',
+	'Class:DocumentNote' => 'Poznámka dokumentu',
+	'Class:DocumentNote+' => '',
+	'Class:DocumentNote/Attribute:text' => 'Text',
+	'Class:DocumentNote/Attribute:text+' => '',
+	'Class:DocumentWeb' => 'Web stránka dokumentu',
+	'Class:DocumentWeb+' => '',
+	'Class:DocumentWeb/Attribute:url' => 'URL',
+	'Class:DocumentWeb/Attribute:url+' => '',
+	'Class:NetworkDevice' => 'Sieťové zariadenie',
+	'Class:NetworkDevice+' => '',
+	'Class:NetworkDevice/Attribute:networkdevicetype_id' => 'Typ sieťového zariadenia',
+	'Class:NetworkDevice/Attribute:networkdevicetype_id+' => '',
+	'Class:NetworkDevice/Attribute:connectablecis_list' => 'Zariadenia',
+	'Class:NetworkDevice/Attribute:connectablecis_list+' => 'All the devices connected to this network device~~',
+	'Class:NetworkDevice/Attribute:iosversion_id' => 'IVerzia OS',
+	'Class:NetworkDevice/Attribute:iosversion_id+' => '',
+	'Class:NetworkDevice/Attribute:ram' => 'Operačná pamäť',
+	'Class:NetworkDevice/Attribute:ram+' => '',
+	'Class:Server' => 'Server',
+	'Class:Server+' => '',
+	'Class:Server/Attribute:osfamily_id' => 'Kategória OS',
+	'Class:Server/Attribute:osfamily_id+' => '',
+	'Class:Server/Attribute:osversion_id' => 'Verzia OS',
+	'Class:Server/Attribute:osversion_id+' => '',
+	'Class:Server/Attribute:oslicence_id' => 'Licencia OS',
+	'Class:Server/Attribute:oslicence_id+' => '',
+	'Class:Server/Attribute:cpu' => 'Procesor',
+	'Class:Server/Attribute:cpu+' => '',
+	'Class:Server/Attribute:ram' => 'Operačna pamäť',
+	'Class:Server/Attribute:ram+' => '',
+	'Class:Server/Attribute:logicalvolumes_list' => 'Logické disky',
+	'Class:Server/Attribute:logicalvolumes_list+' => 'All the logical volumes connected to this server~~',
+	'Class:ApplicationSolution' => 'Aplikačné riešenie',
+	'Class:ApplicationSolution+' => '',
+	'Class:ApplicationSolution/Attribute:functionalcis_list' => 'Komponenty',
+	'Class:ApplicationSolution/Attribute:functionalcis_list+' => 'All the configuration items that compose this application solution~~',
+	'Class:ApplicationSolution/Attribute:businessprocess_list' => 'Biznis procesy',
+	'Class:ApplicationSolution/Attribute:businessprocess_list+' => 'All the business processes depending on this application solution~~',
+	'Class:ApplicationSolution/Attribute:status' => 'Stav',
+	'Class:ApplicationSolution/Attribute:status+' => '',
+	'Class:ApplicationSolution/Attribute:status/Value:active' => 'Aktívne',
+	'Class:ApplicationSolution/Attribute:status/Value:active+' => '',
+	'Class:ApplicationSolution/Attribute:status/Value:inactive' => 'Neaktívne',
+	'Class:ApplicationSolution/Attribute:status/Value:inactive+' => '',
+	'Class:BusinessProcess' => 'Biznis proces',
+	'Class:BusinessProcess+' => '',
+	'Class:BusinessProcess/Attribute:applicationsolutions_list' => 'Aplikačné riešenia',
+	'Class:BusinessProcess/Attribute:applicationsolutions_list+' => 'All the application solutions that impact this business process~~',
+	'Class:BusinessProcess/Attribute:status' => 'Stav',
+	'Class:BusinessProcess/Attribute:status+' => '',
+	'Class:BusinessProcess/Attribute:status/Value:active' => 'Aktívny',
+	'Class:BusinessProcess/Attribute:status/Value:active+' => '',
+	'Class:BusinessProcess/Attribute:status/Value:inactive' => 'Neaktívny',
+	'Class:BusinessProcess/Attribute:status/Value:inactive+' => '',
+	'Class:Middleware' => 'Middleware',
+	'Class:Middleware+' => '',
+	'Class:Middleware/Attribute:middlewareinstance_list' => 'Middleware inštancie',
+	'Class:Middleware/Attribute:middlewareinstance_list+' => 'All the middleware instances provided by this middleware~~',
+	'Class:DBServer' => 'DB Server',
+	'Class:DBServer+' => '',
+	'Class:DBServer/Attribute:dbschema_list' => 'DB schémy',
+	'Class:DBServer/Attribute:dbschema_list+' => 'All the database schemas for this DB server~~',
+	'Class:WebServer' => 'Web server',
+	'Class:WebServer+' => '',
+	'Class:WebServer/Attribute:webapp_list' => 'Webové aplikácie',
+	'Class:WebServer/Attribute:webapp_list+' => 'All the web applications available on this web server~~',
+	'Class:PCSoftware' => 'PC softvér',
+	'Class:PCSoftware+' => '',
+	'Class:OtherSoftware' => 'Iný softvér',
+	'Class:OtherSoftware+' => '',
+	'Class:MiddlewareInstance' => 'Middleware inštancia',
+	'Class:MiddlewareInstance+' => '',
+	'Class:MiddlewareInstance/Attribute:middleware_id' => 'Middleware',
+	'Class:MiddlewareInstance/Attribute:middleware_id+' => '',
+	'Class:DatabaseSchema' => 'Databázová schéma',
+	'Class:DatabaseSchema+' => '',
+	'Class:DatabaseSchema/Attribute:dbserver_id' => 'DB server',
+	'Class:DatabaseSchema/Attribute:dbserver_id+' => '',
+	'Class:WebApplication' => 'Webová Aplikácia',
+	'Class:WebApplication+' => '',
+	'Class:WebApplication/Attribute:webserver_id' => 'Web server',
+	'Class:WebApplication/Attribute:webserver_id+' => '',
+	'Class:WebApplication/Attribute:url' => 'URL',
+	'Class:WebApplication/Attribute:url+' => '',
+	'Class:Software' => 'Softvér',
+	'Class:Software+' => '',
+	'Class:Software/Attribute:name' => 'Názov',
+	'Class:Software/Attribute:name+' => '',
+	'Class:Software/Attribute:vendor' => 'Dodávateľ',
+	'Class:Software/Attribute:vendor+' => '',
+	'Class:Software/Attribute:version' => 'Verzia',
+	'Class:Software/Attribute:version+' => '',
+	'Class:Software/Attribute:documents_list' => 'Dokumenty',
+	'Class:Software/Attribute:documents_list+' => 'All the documents linked to this software~~',
+	'Class:Software/Attribute:type' => 'Typ',
+	'Class:Software/Attribute:type+' => '',
+	'Class:Software/Attribute:type/Value:DBServer' => 'DB Server',
+	'Class:Software/Attribute:type/Value:DBServer+' => '',
+	'Class:Software/Attribute:type/Value:Middleware' => 'Middleware',
+	'Class:Software/Attribute:type/Value:Middleware+' => '',
+	'Class:Software/Attribute:type/Value:OtherSoftware' => 'Iný softvér',
+	'Class:Software/Attribute:type/Value:OtherSoftware+' => '',
+	'Class:Software/Attribute:type/Value:PCSoftware' => 'PC softvér',
+	'Class:Software/Attribute:type/Value:PCSoftware+' => '',
+	'Class:Software/Attribute:type/Value:WebServer' => 'Web Server',
+	'Class:Software/Attribute:type/Value:WebServer+' => '',
+	'Class:Software/Attribute:softwareinstance_list' => 'Softvérové inštancie',
+	'Class:Software/Attribute:softwareinstance_list+' => 'All the software instances for this software~~',
+	'Class:Software/Attribute:softwarepatch_list' => 'Softvérové záplaty',
+	'Class:Software/Attribute:softwarepatch_list+' => 'All the patchs for this software~~',
+	'Class:Software/Attribute:softwarelicence_list' => 'Softvérové licencie',
+	'Class:Software/Attribute:softwarelicence_list+' => 'All the licenses for this software~~',
+	'Class:OSPatch' => 'Záplata OS',
+	'Class:OSPatch+' => '',
+	'Class:OSPatch/Attribute:functionalcis_list' => 'Zariadenia',
+	'Class:OSPatch/Attribute:functionalcis_list+' => 'All the systems where this patch is installed~~',
+	'Class:OSPatch/Attribute:osversion_id' => 'Verzia OS',
+	'Class:OSPatch/Attribute:osversion_id+' => '',
+	'Class:SoftwarePatch' => 'Softvérová záplata',
+	'Class:SoftwarePatch+' => '',
+	'Class:SoftwarePatch/Attribute:software_id' => 'Softvér',
+	'Class:SoftwarePatch/Attribute:software_id+' => '',
+	'Class:SoftwarePatch/Attribute:softwareinstances_list' => 'Inštancie softvéru',
+	'Class:SoftwarePatch/Attribute:softwareinstances_list+' => 'All the systems where this software patch is installed~~',
+	'Class:OSLicence' => 'Licencia OS',
+	'Class:OSLicence+' => '',
+	'Class:OSLicence/Attribute:osversion_id' => 'Verzia OS',
+	'Class:OSLicence/Attribute:osversion_id+' => '',
+	'Class:OSLicence/Attribute:virtualmachines_list' => 'Virtuálne zariadenia',
+	'Class:OSLicence/Attribute:virtualmachines_list+' => 'All the virtual machines where this license is used~~',
+	'Class:OSLicence/Attribute:servers_list' => 'Servery',
+	'Class:OSLicence/Attribute:servers_list+' => 'All the servers where this license is used~~',
+	'Class:SoftwareLicence' => 'Softvérová licencia',
+	'Class:SoftwareLicence+' => '',
+	'Class:SoftwareLicence/Attribute:software_id' => 'Softvér',
+	'Class:SoftwareLicence/Attribute:software_id+' => '',
+	'Class:SoftwareLicence/Attribute:softwareinstance_list' => 'Inštancie softvéru',
+	'Class:SoftwareLicence/Attribute:softwareinstance_list+' => 'All the systems where this license is used~~',
+	'Class:lnkDocumentToLicence' => 'väzba Dokument/Licencia',
+	'Class:lnkDocumentToLicence+' => '',
+	'Class:lnkDocumentToLicence/Attribute:licence_id' => 'Licencia',
+	'Class:lnkDocumentToLicence/Attribute:licence_id+' => '',
+	'Class:lnkDocumentToLicence/Attribute:document_id' => 'Dokument',
+	'Class:lnkDocumentToLicence/Attribute:document_id+' => '',
+	'Class:OSVersion' => 'Verzia OS',
+	'Class:OSVersion+' => '',
+	'Class:OSVersion/Attribute:osfamily_id' => 'Kategória OS',
+	'Class:OSVersion/Attribute:osfamily_id+' => '',
+	'Class:OSFamily' => 'Kategória OS',
+	'Class:OSFamily+' => '',
+	'Class:DocumentType' => 'Typ dokumentu',
+	'Class:DocumentType+' => '',
+	'Class:ContactType' => 'Typ kontaktu',
+	'Class:ContactType+' => '',
+	'Class:Brand' => 'Značka',
+	'Class:Brand+' => '',
+	'Class:Brand/Attribute:physicaldevices_list' => 'Zariadenia',
+	'Class:Brand/Attribute:physicaldevices_list+' => 'All the physical devices corresponding to this brand~~',
+	'Class:Model' => 'Model',
+	'Class:Model+' => '',
+	'Class:Model/Attribute:brand_id' => 'Značka',
+	'Class:Model/Attribute:brand_id+' => '',
+	'Class:Model/Attribute:type' => 'Typ zariadena',
+	'Class:Model/Attribute:type+' => '',
+	'Class:Model/Attribute:type/Value:DiskArray' => 'Diskové pole',
+	'Class:Model/Attribute:type/Value:DiskArray+' => '',
+	'Class:Model/Attribute:type/Value:Enclosure' => 'Kryt',
+	'Class:Model/Attribute:type/Value:Enclosure+' => '',
+	'Class:Model/Attribute:type/Value:IPPhone' => 'IP Telefón',
+	'Class:Model/Attribute:type/Value:IPPhone+' => '',
+	'Class:Model/Attribute:type/Value:MobilePhone' => 'Mobilný telefón',
+	'Class:Model/Attribute:type/Value:MobilePhone+' => '',
+	'Class:Model/Attribute:type/Value:NAS' => 'NAS',
+	'Class:Model/Attribute:type/Value:NAS+' => '',
+	'Class:Model/Attribute:type/Value:NetworkDevice' => 'Sieťové zariadenie',
+	'Class:Model/Attribute:type/Value:NetworkDevice+' => '',
+	'Class:Model/Attribute:type/Value:PC' => 'PC',
+	'Class:Model/Attribute:type/Value:PC+' => '',
+	'Class:Model/Attribute:type/Value:PDU' => 'PDU',
+	'Class:Model/Attribute:type/Value:PDU+' => '',
+	'Class:Model/Attribute:type/Value:Peripheral' => 'Periférie',
+	'Class:Model/Attribute:type/Value:Peripheral+' => '',
+	'Class:Model/Attribute:type/Value:PowerSource' => 'Zdroj napájania',
+	'Class:Model/Attribute:type/Value:PowerSource+' => '',
+	'Class:Model/Attribute:type/Value:Printer' => 'Tlačiareň',
+	'Class:Model/Attribute:type/Value:Printer+' => '',
+	'Class:Model/Attribute:type/Value:Rack' => 'stojan (Rack)',
+	'Class:Model/Attribute:type/Value:Rack+' => '',
+	'Class:Model/Attribute:type/Value:SANSwitch' => 'SAN prepínač',
+	'Class:Model/Attribute:type/Value:SANSwitch+' => '',
+	'Class:Model/Attribute:type/Value:Server' => 'Server',
+	'Class:Model/Attribute:type/Value:Server+' => '',
+	'Class:Model/Attribute:type/Value:StorageSystem' => 'Úložiskový systém',
+	'Class:Model/Attribute:type/Value:StorageSystem+' => '',
+	'Class:Model/Attribute:type/Value:Tablet' => 'Tablet',
+	'Class:Model/Attribute:type/Value:Tablet+' => '',
+	'Class:Model/Attribute:type/Value:TapeLibrary' => 'Pásková knižnica',
+	'Class:Model/Attribute:type/Value:TapeLibrary+' => '',
+	'Class:Model/Attribute:type/Value:Telephone' => 'Telefón',
+	'Class:Model/Attribute:type/Value:Telephone+' => '',
+	'Class:Model/Attribute:physicaldevices_list' => 'Zariadenia',
+	'Class:Model/Attribute:physicaldevices_list+' => 'All the physical devices corresponding to this model~~',
+	'Class:NetworkDeviceType' => 'Typ sieťového zariadenia',
+	'Class:NetworkDeviceType+' => '',
+	'Class:NetworkDeviceType/Attribute:networkdevicesdevices_list' => 'Sieťové zariadenia',
+	'Class:NetworkDeviceType/Attribute:networkdevicesdevices_list+' => 'All the network devices corresponding to this type~~',
+	'Class:IOSVersion' => 'Verzia IOSu',
+	'Class:IOSVersion+' => '',
+	'Class:IOSVersion/Attribute:brand_id' => 'Značka',
+	'Class:IOSVersion/Attribute:brand_id+' => '',
+	'Class:lnkDocumentToPatch' => 'väzba - Dokument / Záplata',
+	'Class:lnkDocumentToPatch+' => '',
+	'Class:lnkDocumentToPatch/Attribute:patch_id' => 'Záplata',
+	'Class:lnkDocumentToPatch/Attribute:patch_id+' => '',
+	'Class:lnkDocumentToPatch/Attribute:document_id' => 'Dokument',
+	'Class:lnkDocumentToPatch/Attribute:document_id+' => '',
+	'Class:lnkSoftwareInstanceToSoftwarePatch' => 'väzba - Softvérová inštancia / Softvérová záplata',
+	'Class:lnkSoftwareInstanceToSoftwarePatch+' => '',
+	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id' => 'Softvérová záplata',
+	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id+' => '',
+	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_id' => 'Softvérová inštancia',
+	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_id+' => '',
+	'Class:lnkFunctionalCIToOSPatch' => 'väzba - Komponent / Záplata OS',
+	'Class:lnkFunctionalCIToOSPatch+' => '',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id' => 'Záplata OS',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id+' => '',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_id' => 'Komponent',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_id+' => '',
+	'Class:lnkDocumentToSoftware' => 'väzba Dokument / Softvér',
+	'Class:lnkDocumentToSoftware+' => '',
+	'Class:lnkDocumentToSoftware/Attribute:software_id' => 'Softvér',
+	'Class:lnkDocumentToSoftware/Attribute:software_id+' => '',
+	'Class:lnkDocumentToSoftware/Attribute:document_id' => 'Dokument',
+	'Class:lnkDocumentToSoftware/Attribute:document_id+' => '',
+	'Class:lnkContactToFunctionalCI' => 'väzba - Kontakt / Komponent',
+	'Class:lnkContactToFunctionalCI+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'Komponent',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Kontakt',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '',
+	'Class:lnkDocumentToFunctionalCI' => 'väzba - Dokument / Komponent',
+	'Class:lnkDocumentToFunctionalCI+' => '',
+	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id' => 'Komponent',
+	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id+' => '',
+	'Class:lnkDocumentToFunctionalCI/Attribute:document_id' => 'Dokument',
+	'Class:lnkDocumentToFunctionalCI/Attribute:document_id+' => '',
+	'Class:Subnet' => 'Podsieť',
+	'Class:Subnet+' => '',
+	'Class:Subnet/Attribute:description' => 'Popis',
+	'Class:Subnet/Attribute:description+' => '',
+	'Class:Subnet/Attribute:org_id' => 'Organizácia',
+	'Class:Subnet/Attribute:org_id+' => '',
+	'Class:Subnet/Attribute:ip' => 'IP Adresa',
+	'Class:Subnet/Attribute:ip+' => '',
+	'Class:Subnet/Attribute:ip_mask' => 'Maska IP adresy',
+	'Class:Subnet/Attribute:ip_mask+' => '',
+	'Class:PhysicalInterface' => 'Fyzické rozhranie',
+	'Class:PhysicalInterface+' => '',
+	'Class:PhysicalInterface/Attribute:connectableci_id' => 'Pripojitelné Zariadenie',
+	'Class:PhysicalInterface/Attribute:connectableci_id+' => '',
+	'Class:lnkConnectableCIToNetworkDevice' => 'väzba - Komponent / Sieťové zariadenie',
+	'Class:lnkConnectableCIToNetworkDevice+' => '',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id' => 'Sieťové zariadenie',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id+' => '',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:connectableci_id' => 'Pripojiteľné zariadenie',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:connectableci_id+' => '',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:network_port' => 'Sieťový port',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:network_port+' => '',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:device_port' => 'Port zariadenia',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:device_port+' => '',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type' => 'Typ pripojenia',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type+' => '',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type/Value:downlink' => 'downlink',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type/Value:downlink+' => '',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type/Value:uplink' => 'uplink',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type/Value:uplink+' => '',
+	'Class:lnkApplicationSolutionToFunctionalCI' => 'väzba - Aplikačné riešenie / Komponent',
+	'Class:lnkApplicationSolutionToFunctionalCI+' => '',
+	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_id' => 'Aplikačné riešenie',
+	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_id+' => '',
+	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:functionalci_id' => 'Komponent',
+	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:functionalci_id+' => '',
+	'Class:lnkApplicationSolutionToBusinessProcess' => 'väzba - Aplikačné riešenie / Biznis proces',
+	'Class:lnkApplicationSolutionToBusinessProcess+' => '',
+	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_id' => 'Biznis proces',
+	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_id+' => '',
+	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_id' => 'Aplikačné riešenie',
+	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_id+' => '',
+	'Class:lnkPersonToTeam' => 'väzba - Osoba / Tím',
+	'Class:lnkPersonToTeam+' => '',
+	'Class:lnkPersonToTeam/Attribute:team_id' => 'Tím',
+	'Class:lnkPersonToTeam/Attribute:team_id+' => '',
+	'Class:lnkPersonToTeam/Attribute:person_id' => 'Osoba',
+	'Class:lnkPersonToTeam/Attribute:person_id+' => '',
+	'Class:lnkPersonToTeam/Attribute:role_id' => 'Rola',
+	'Class:lnkPersonToTeam/Attribute:role_id+' => '',
+	'Class:Group' => 'Skupina',
+	'Class:Group+' => '',
+	'Class:Group/Attribute:name' => 'Názov',
+	'Class:Group/Attribute:name+' => '',
+	'Class:Group/Attribute:status' => 'Stav',
+	'Class:Group/Attribute:status+' => '',
+	'Class:Group/Attribute:status/Value:implementation' => 'Implementácia',
+	'Class:Group/Attribute:status/Value:implementation+' => '',
+	'Class:Group/Attribute:status/Value:obsolete' => 'Vyradená',
+	'Class:Group/Attribute:status/Value:obsolete+' => '',
+	'Class:Group/Attribute:status/Value:production' => 'Produkcia',
+	'Class:Group/Attribute:status/Value:production+' => '',
+	'Class:Group/Attribute:org_id' => 'Organizácia',
+	'Class:Group/Attribute:org_id+' => '',
+	'Class:Group/Attribute:description' => 'Popis',
+	'Class:Group/Attribute:description+' => '',
+	'Class:Group/Attribute:type' => 'Typ',
+	'Class:Group/Attribute:type+' => '',
+	'Class:Group/Attribute:parent_id' => 'Nadradená skupina',
+	'Class:Group/Attribute:parent_id+' => '',
+	'Class:Group/Attribute:ci_list' => 'Prislúchajúce zariadenia',
+	'Class:Group/Attribute:ci_list+' => 'All the configuration items linked to this group~~',
+	'Class:lnkGroupToCI' => 'väzba - Skupina / Zariadenie',
+	'Class:lnkGroupToCI+' => '',
+	'Class:lnkGroupToCI/Attribute:group_id' => 'Skupina',
+	'Class:lnkGroupToCI/Attribute:group_id+' => '',
+	'Class:lnkGroupToCI/Attribute:ci_id' => 'Zariadenie',
+	'Class:lnkGroupToCI/Attribute:ci_id+' => '',
+	'Class:lnkGroupToCI/Attribute:reason' => 'Dôvod',
+	'Class:lnkGroupToCI/Attribute:reason+' => '',
+	'Class:Rack' => 'stojan (Rack)',
+	'Class:Rack+' => '',
+	'Class:Rack/Attribute:nb_u' => 'NB U',
+	'Class:Rack/Attribute:nb_u+' => '',
+	'Class:Rack/Attribute:device_list' => 'Zariadenia',
+	'Class:Rack/Attribute:device_list+' => 'All the physical devices racked into this rack~~',
+	'Class:Rack/Attribute:enclosure_list' => 'Kryt',
+	'Class:Rack/Attribute:enclosure_list+' => 'All the enclosures in this rack~~',
+	'Class:Enclosure' => 'Kryt (enclosure)',
+	'Class:Enclosure+' => '',
+	'Class:Enclosure/Attribute:rack_id' => 'stojan (Rack)',
+	'Class:Enclosure/Attribute:rack_id+' => '',
+	'Class:Enclosure/Attribute:nb_u' => 'NB U',
+	'Class:Enclosure/Attribute:nb_u+' => '',
+	'Class:Enclosure/Attribute:device_list' => 'Zariadenia',
+	'Class:Enclosure/Attribute:device_list+' => 'All the devices in this enclosure~~',
+	'Class:PowerSource' => 'Napájací zdroj',
+	'Class:PowerSource+' => '',
+	'Class:PowerSource/Attribute:pdus_list' => 'Napäťové distribučné jednotky (PDU)',
+	'Class:PowerSource/Attribute:pdus_list+' => 'All the PDUs using this power source~~',
+	'Class:PDU' => 'Napäťová distribučná jednotka (PDU)',
+	'Class:PDU+' => '',
+	'Class:PDU/Attribute:rack_id' => 'stojan (Rack)',
+	'Class:PDU/Attribute:rack_id+' => '',
+	'Class:PDU/Attribute:powerstart_id' => 'Power start',
+	'Class:PDU/Attribute:powerstart_id+' => '',
+	'Class:PC' => 'PC',
+	'Class:PC+' => '',
+	'Class:PC/Attribute:osfamily_id' => 'Kategória OS',
+	'Class:PC/Attribute:osfamily_id+' => '',
+	'Class:PC/Attribute:osversion_id' => 'Verzia OS',
+	'Class:PC/Attribute:osversion_id+' => '',
+	'Class:PC/Attribute:cpu' => 'Procesor',
+	'Class:PC/Attribute:cpu+' => '',
+	'Class:PC/Attribute:ram' => 'Operačná pamäť',
+	'Class:PC/Attribute:ram+' => '',
+	'Class:PC/Attribute:type' => 'Typ',
+	'Class:PC/Attribute:type+' => '',
+	'Class:PC/Attribute:type/Value:desktop' => 'Stolový počítač',
+	'Class:PC/Attribute:type/Value:desktop+' => '',
+	'Class:PC/Attribute:type/Value:laptop' => 'Laptop',
+	'Class:PC/Attribute:type/Value:laptop+' => '',
+	'Class:Printer' => 'Tlačiareň',
+	'Class:Printer+' => '',
+	'Class:Phone' => 'Telefón',
+	'Class:Phone+' => '',
+	'Class:MobilePhone' => 'Mobilný telefón',
+	'Class:MobilePhone+' => '',
+	'Class:MobilePhone/Attribute:imei' => 'IMEI',
+	'Class:MobilePhone/Attribute:imei+' => '',
+	'Class:MobilePhone/Attribute:hw_pin' => 'HW PIN',
+	'Class:MobilePhone/Attribute:hw_pin+' => '',
+	'Class:IPPhone' => 'IP telefón',
+	'Class:IPPhone+' => '',
+	'Class:Tablet' => 'Tablet',
+	'Class:Tablet+' => '',
+	'Class:Peripheral' => 'Periférie',
+	'Class:Peripheral+' => '',
+	'Class:ContractType' => 'Typ zmluvy',
+	'Class:ContractType+' => '',
+	'Class:CustomerContract' => 'Zákaznícka zmluva',
+	'Class:CustomerContract+' => '',
+	'Class:CustomerContract/Attribute:services_list' => 'Služby',
+	'Class:CustomerContract/Attribute:services_list+' => 'All the services purchased for this contract~~',
+	'Class:ProviderContract' => 'Poskytovateľská zmluva',
+	'Class:ProviderContract+' => '',
+	'Class:ProviderContract/Attribute:functionalcis_list' => 'Zariadenia',
+	'Class:ProviderContract/Attribute:functionalcis_list+' => 'All the configuration items covered by this provider contract~~',
+	'Class:ProviderContract/Attribute:sla' => 'SLA',
+	'Class:ProviderContract/Attribute:sla+' => '',
+	'Class:ProviderContract/Attribute:coverage' => 'Časy pokrytia',
+	'Class:ProviderContract/Attribute:coverage+' => '',
+	'Class:lnkContactToContract' => 'väzba - Kontakt / zmluva',
+	'Class:lnkContactToContract+' => '',
+	'Class:lnkContactToContract/Attribute:contract_id' => 'zmluva',
+	'Class:lnkContactToContract/Attribute:contract_id+' => '',
+	'Class:lnkContactToContract/Attribute:contact_id' => 'Kontakt',
+	'Class:lnkContactToContract/Attribute:contact_id+' => '',
+	'Class:lnkContractToDocument' => 'väzba - zmluva / Dokument',
+	'Class:lnkContractToDocument+' => '',
+	'Class:lnkContractToDocument/Attribute:contract_id' => 'zmluva',
+	'Class:lnkContractToDocument/Attribute:contract_id+' => '',
+	'Class:lnkContractToDocument/Attribute:document_id' => 'Dokument',
+	'Class:lnkContractToDocument/Attribute:document_id+' => '',
+	'Class:lnkFunctionalCIToProviderContract' => 'väzba - Komponent / Poskytovateľská zmluva',
+	'Class:lnkFunctionalCIToProviderContract+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Poskytovateľská zmluva',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'Zariadenie',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '',
+	'Class:ServiceFamily' => 'Kategória služieb',
+	'Class:ServiceFamily+' => '',
+	'Class:ServiceFamily/Attribute:name' => 'Názov',
+	'Class:ServiceFamily/Attribute:name+' => '',
+	'Class:ServiceFamily/Attribute:services_list' => 'Služby',
+	'Class:ServiceFamily/Attribute:services_list+' => 'All the services in this category~~',
+	'Class:Service' => 'Služby',
+	'Class:Service+' => '',
+	'Class:Service/Attribute:name' => 'Názov',
+	'Class:Service/Attribute:name+' => '',
+	'Class:Service/Attribute:org_id' => 'Poskytovateľ',
+	'Class:Service/Attribute:org_id+' => '',
+	'Class:Service/Attribute:servicefamily_id' => 'Kategória služieb',
+	'Class:Service/Attribute:servicefamily_id+' => '',
+	'Class:Service/Attribute:description' => 'Popis',
+	'Class:Service/Attribute:description+' => '',
+	'Class:Service/Attribute:documents_list' => 'Dokumenty',
+	'Class:Service/Attribute:documents_list+' => 'All the documents linked to the service~~',
+	'Class:Service/Attribute:contacts_list' => 'Kontakty',
+	'Class:Service/Attribute:contacts_list+' => 'All the contacts for this service~~',
+	'Class:Service/Attribute:status' => 'Stav',
+	'Class:Service/Attribute:status+' => '',
+	'Class:Service/Attribute:status/Value:implementation' => 'Implementácia',
+	'Class:Service/Attribute:status/Value:implementation+' => '',
+	'Class:Service/Attribute:status/Value:obsolete' => 'Vyradená',
+	'Class:Service/Attribute:status/Value:obsolete+' => '',
+	'Class:Service/Attribute:status/Value:production' => 'Produkcia',
+	'Class:Service/Attribute:status/Value:production+' => '',
+	'Class:Service/Attribute:customercontracts_list' => 'Zákaznícke zmluvy',
+	'Class:Service/Attribute:customercontracts_list+' => 'All the customer contracts that have purchased this service~~',
+	'Class:Service/Attribute:providercontracts_list' => 'Poskytovateľské zmluvy',
+	'Class:Service/Attribute:providercontracts_list+' => 'All the provider contracts to support this service~~',
+	'Class:Service/Attribute:functionalcis_list' => 'Zariadenia',
+	'Class:Service/Attribute:functionalcis_list+' => 'All the configuration items that are used to provide this service~~',
+	'Class:Service/Attribute:servicesubcategories_list' => 'Podkategórie služieb',
+	'Class:Service/Attribute:servicesubcategories_list+' => 'All the sub categories for this service~~',
+	'Class:lnkDocumentToService' => 'väzba - Dokument / Služba',
+	'Class:lnkDocumentToService+' => '',
+	'Class:lnkDocumentToService/Attribute:service_id' => 'Služba',
+	'Class:lnkDocumentToService/Attribute:service_id+' => '',
+	'Class:lnkDocumentToService/Attribute:document_id' => 'Dokument',
+	'Class:lnkDocumentToService/Attribute:document_id+' => '',
+	'Class:lnkContactToService' => 'väzba - Kontakt / Služba',
+	'Class:lnkContactToService+' => '',
+	'Class:lnkContactToService/Attribute:service_id' => 'Služba',
+	'Class:lnkContactToService/Attribute:service_id+' => '',
+	'Class:lnkContactToService/Attribute:contact_id' => 'Kontakt',
+	'Class:lnkContactToService/Attribute:contact_id+' => '',
+	'Class:ServiceSubcategory' => 'Podkategória služieb',
+	'Class:ServiceSubcategory+' => '',
+	'Class:ServiceSubcategory/Attribute:name' => 'Názov',
+	'Class:ServiceSubcategory/Attribute:name+' => '',
+	'Class:ServiceSubcategory/Attribute:description' => 'Popis',
+	'Class:ServiceSubcategory/Attribute:description+' => '',
+	'Class:ServiceSubcategory/Attribute:service_id' => 'Služba',
+	'Class:ServiceSubcategory/Attribute:service_id+' => '',
+	'Class:ServiceSubcategory/Attribute:request_type' => 'Typ požiadavky',
+	'Class:ServiceSubcategory/Attribute:request_type+' => '',
+	'Class:ServiceSubcategory/Attribute:request_type/Value:incident' => 'Incident',
+	'Class:ServiceSubcategory/Attribute:request_type/Value:incident+' => '',
+	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request' => 'Požiadavka',
+	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request+' => '',
+	'Class:ServiceSubcategory/Attribute:status' => 'Stav',
+	'Class:ServiceSubcategory/Attribute:status+' => '',
+	'Class:ServiceSubcategory/Attribute:status/Value:implementation' => 'Implementácia',
+	'Class:ServiceSubcategory/Attribute:status/Value:implementation+' => '',
+	'Class:ServiceSubcategory/Attribute:status/Value:obsolete' => 'Vyradená',
+	'Class:ServiceSubcategory/Attribute:status/Value:obsolete+' => '',
+	'Class:ServiceSubcategory/Attribute:status/Value:production' => 'Produkcia',
+	'Class:ServiceSubcategory/Attribute:status/Value:production+' => '',
+	'Class:SLA' => 'SLA',
+	'Class:SLA+' => '',
+	'Class:SLA/Attribute:name' => 'Názov',
+	'Class:SLA/Attribute:name+' => '',
+	'Class:SLA/Attribute:description' => 'Popis',
+	'Class:SLA/Attribute:description+' => '',
+	'Class:SLA/Attribute:org_id' => 'Poskytovateľ',
+	'Class:SLA/Attribute:org_id+' => '',
+	'Class:SLA/Attribute:slts_list' => 'SLTs',
+	'Class:SLA/Attribute:slts_list+' => 'All the service level targets for this SLA~~',
+	'Class:SLA/Attribute:customercontracts_list' => 'Zákaznícke zmluvy',
+	'Class:SLA/Attribute:customercontracts_list+' => 'All the customer contracts using this SLA~~',
+	'Class:SLT' => 'SLT',
+	'Class:SLT+' => '',
+	'Class:SLT/Attribute:name' => 'Názov',
+	'Class:SLT/Attribute:name+' => '',
+	'Class:SLT/Attribute:priority' => 'Priorita',
+	'Class:SLT/Attribute:priority+' => '',
+	'Class:SLT/Attribute:priority/Value:1' => 'Kritická',
+	'Class:SLT/Attribute:priority/Value:1+' => '',
+	'Class:SLT/Attribute:priority/Value:2' => 'Vysoká',
+	'Class:SLT/Attribute:priority/Value:2+' => '',
+	'Class:SLT/Attribute:priority/Value:3' => 'Stredná',
+	'Class:SLT/Attribute:priority/Value:3+' => '',
+	'Class:SLT/Attribute:priority/Value:4' => 'Nízka',
+	'Class:SLT/Attribute:priority/Value:4+' => '',
+	'Class:SLT/Attribute:request_type' => 'Typ požiadavky',
+	'Class:SLT/Attribute:request_type+' => '',
+	'Class:SLT/Attribute:request_type/Value:incident' => 'Incident',
+	'Class:SLT/Attribute:request_type/Value:incident+' => '',
+	'Class:SLT/Attribute:request_type/Value:service_request' => 'Požiadavka',
+	'Class:SLT/Attribute:request_type/Value:service_request+' => '',
+	'Class:SLT/Attribute:metric' => 'Metrika',
+	'Class:SLT/Attribute:metric+' => '',
+	'Class:SLT/Attribute:metric/Value:tto' => 'TTO',
+	'Class:SLT/Attribute:metric/Value:tto+' => '',
+	'Class:SLT/Attribute:metric/Value:ttr' => 'TTR',
+	'Class:SLT/Attribute:metric/Value:ttr+' => '',
+	'Class:SLT/Attribute:value' => 'Hodnota',
+	'Class:SLT/Attribute:value+' => '',
+	'Class:SLT/Attribute:unit' => 'Jednotka',
+	'Class:SLT/Attribute:unit+' => '',
+	'Class:SLT/Attribute:unit/Value:hours' => 'Hodiny',
+	'Class:SLT/Attribute:unit/Value:hours+' => '',
+	'Class:SLT/Attribute:unit/Value:minutes' => 'Minúty',
+	'Class:SLT/Attribute:unit/Value:minutes+' => '',
+	'Class:lnkSLAToSLT' => 'väzba - SLA / SLT',
+	'Class:lnkSLAToSLT+' => '',
+	'Class:lnkSLAToSLT/Attribute:sla_id' => 'SLA',
+	'Class:lnkSLAToSLT/Attribute:sla_id+' => '',
+	'Class:lnkSLAToSLT/Attribute:slt_id' => 'SLT',
+	'Class:lnkSLAToSLT/Attribute:slt_id+' => '',
+	'Class:lnkCustomerContractToService' => 'väzba - Zákaznícka zmluva / Služba',
+	'Class:lnkCustomerContractToService+' => '',
+	'Class:lnkCustomerContractToService/Attribute:customercontract_id' => 'Zákaznícka zmluva',
+	'Class:lnkCustomerContractToService/Attribute:customercontract_id+' => '',
+	'Class:lnkCustomerContractToService/Attribute:service_id' => 'Služba',
+	'Class:lnkCustomerContractToService/Attribute:service_id+' => '',
+	'Class:lnkCustomerContractToService/Attribute:sla_id' => 'SLA',
+	'Class:lnkCustomerContractToService/Attribute:sla_id+' => '',
+	'Class:lnkProviderContractToService' => 'väzba - Poskytovateľská zmluva / Služba',
+	'Class:lnkProviderContractToService+' => '',
+	'Class:lnkProviderContractToService/Attribute:service_id' => 'Služba',
+	'Class:lnkProviderContractToService/Attribute:service_id+' => '',
+	'Class:lnkProviderContractToService/Attribute:providercontract_id' => 'Poskytovateľská zmluva',
+	'Class:lnkProviderContractToService/Attribute:providercontract_id+' => '',
+	'Class:lnkFunctionalCIToService' => 'väzba - Komponent / Služba',
+	'Class:lnkFunctionalCIToService+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Služba',
+	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => 'Zariadenie',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_id+' => '',
+	'Class:DeliveryModel' => 'Model dodávky',
+	'Class:DeliveryModel+' => '',
+	'Class:DeliveryModel/Attribute:name' => 'Názov',
+	'Class:DeliveryModel/Attribute:name+' => '',
+	'Class:DeliveryModel/Attribute:org_id' => 'Organizácia',
+	'Class:DeliveryModel/Attribute:org_id+' => '',
+	'Class:DeliveryModel/Attribute:description' => 'Popis',
+	'Class:DeliveryModel/Attribute:description+' => '',
+	'Class:DeliveryModel/Attribute:contacts_list' => 'Kontakty',
+	'Class:DeliveryModel/Attribute:contacts_list+' => 'All the contacts (Teams and Person) for this delivery model~~',
+	'Class:DeliveryModel/Attribute:customers_list' => 'Zákazníci',
+	'Class:DeliveryModel/Attribute:customers_list+' => 'All the customers having this delivering model~~',
+	'Class:lnkDeliveryModelToContact' => 'väzba - Model dodávky / Kontakt',
+	'Class:lnkDeliveryModelToContact+' => '',
+	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id' => 'Model dodávky',
+	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id+' => '',
+	'Class:lnkDeliveryModelToContact/Attribute:contact_id' => 'Kontakt',
+	'Class:lnkDeliveryModelToContact/Attribute:contact_id+' => '',
+	'Class:lnkDeliveryModelToContact/Attribute:role_id' => 'Rola',
+	'Class:lnkDeliveryModelToContact/Attribute:role_id+' => '',
+	'Class:StorageSystem' => 'Úložiskový systém',
+	'Class:StorageSystem+' => '',
+	'Class:StorageSystem/Attribute:logicalvolume_list' => 'Logické disky',
+	'Class:StorageSystem/Attribute:logicalvolume_list+' => 'All the logical volumes in this storage system~~',
+	'Class:SANSwitch' => 'SAN prepínač',
+	'Class:SANSwitch+' => '',
+	'Class:SANSwitch/Attribute:datacenterdevice_list' => 'Zariadenia',
+	'Class:SANSwitch/Attribute:datacenterdevice_list+' => 'All the devices connected to this SAN switch~~',
+	'Class:TapeLibrary' => 'Pásková knižnica',
+	'Class:TapeLibrary+' => '',
+	'Class:TapeLibrary/Attribute:tapes_list' => 'Pásky',
+	'Class:TapeLibrary/Attribute:tapes_list+' => 'All the tapes in the tape library~~',
+	'Class:NAS' => 'NAS',
+	'Class:NAS+' => '',
+	'Class:NAS/Attribute:nasfilesystem_list' => 'Súborové systémy',
+	'Class:NAS/Attribute:nasfilesystem_list+' => 'All the file systems in this NAS~~',
+	'Class:FiberChannelInterface' => 'Optické rozhranie',
+	'Class:FiberChannelInterface+' => '',
+	'Class:FiberChannelInterface/Attribute:speed' => 'Rýchlosť',
+	'Class:FiberChannelInterface/Attribute:speed+' => '',
+	'Class:FiberChannelInterface/Attribute:topology' => 'Topológia',
+	'Class:FiberChannelInterface/Attribute:topology+' => '',
+	'Class:FiberChannelInterface/Attribute:wwn' => 'WWN',
+	'Class:FiberChannelInterface/Attribute:wwn+' => '',
+	'Class:FiberChannelInterface/Attribute:datacenterdevice_id' => 'Zariadenie',
+	'Class:FiberChannelInterface/Attribute:datacenterdevice_id+' => '',
+	'Class:Tape' => 'Páska',
+	'Class:Tape+' => '',
+	'Class:Tape/Attribute:name' => 'Názov',
+	'Class:Tape/Attribute:name+' => '',
+	'Class:Tape/Attribute:description' => 'Popis',
+	'Class:Tape/Attribute:description+' => '',
+	'Class:Tape/Attribute:size' => 'Veľkosť',
+	'Class:Tape/Attribute:size+' => '',
+	'Class:Tape/Attribute:tapelibrary_id' => 'Pásková knižnica',
+	'Class:Tape/Attribute:tapelibrary_id+' => '',
+	'Class:NASFileSystem' => 'NAS Súborový systém',
+	'Class:NASFileSystem+' => '',
+	'Class:NASFileSystem/Attribute:name' => 'Názov',
+	'Class:NASFileSystem/Attribute:name+' => '',
+	'Class:NASFileSystem/Attribute:description' => 'Popis',
+	'Class:NASFileSystem/Attribute:description+' => '',
+	'Class:NASFileSystem/Attribute:raid_level' => 'Raid úroveň',
+	'Class:NASFileSystem/Attribute:raid_level+' => '',
+	'Class:NASFileSystem/Attribute:size' => 'Veľkosť',
+	'Class:NASFileSystem/Attribute:size+' => '',
+	'Class:NASFileSystem/Attribute:nas_id' => 'NAS',
+	'Class:NASFileSystem/Attribute:nas_id+' => '',
+	'Class:LogicalVolume' => 'Logické disky',
+	'Class:LogicalVolume+' => '',
+	'Class:LogicalVolume/Attribute:name' => 'Názov',
+	'Class:LogicalVolume/Attribute:name+' => '',
+	'Class:LogicalVolume/Attribute:lun_id' => 'LUN ID',
+	'Class:LogicalVolume/Attribute:lun_id+' => '',
+	'Class:LogicalVolume/Attribute:description' => 'Popis',
+	'Class:LogicalVolume/Attribute:description+' => '',
+	'Class:LogicalVolume/Attribute:raid_level' => 'Raid úroveň',
+	'Class:LogicalVolume/Attribute:raid_level+' => '',
+	'Class:LogicalVolume/Attribute:size' => 'Veľkosť',
+	'Class:LogicalVolume/Attribute:size+' => '',
+	'Class:LogicalVolume/Attribute:storagesystem_id' => 'Úložiskový systém',
+	'Class:LogicalVolume/Attribute:storagesystem_id+' => '',
+	'Class:LogicalVolume/Attribute:servers_list' => 'Servery',
+	'Class:LogicalVolume/Attribute:servers_list+' => 'All the servers using this volume~~',
+	'Class:LogicalVolume/Attribute:virtualdevices_list' => 'Virtuálne zariadenia',
+	'Class:LogicalVolume/Attribute:virtualdevices_list+' => 'All the virtual devices using this volume~~',
+	'Class:lnkServerToVolume' => 'väzba - Server / Logický Disk',
+	'Class:lnkServerToVolume+' => '',
+	'Class:lnkServerToVolume/Attribute:volume_id' => 'Logický Disk',
+	'Class:lnkServerToVolume/Attribute:volume_id+' => '',
+	'Class:lnkServerToVolume/Attribute:server_id' => 'Server',
+	'Class:lnkServerToVolume/Attribute:server_id+' => '',
+	'Class:lnkServerToVolume/Attribute:size_used' => 'Použité miesto',
+	'Class:lnkServerToVolume/Attribute:size_used+' => '',
+	'Class:lnkSanToDatacenterDevice' => 'väzba - SAN / Zariadenie',
+	'Class:lnkSanToDatacenterDevice+' => '',
+	'Class:lnkSanToDatacenterDevice/Attribute:san_id' => 'SAN prepínač',
+	'Class:lnkSanToDatacenterDevice/Attribute:san_id+' => '',
+	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_id' => 'Zariadenie',
+	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_id+' => '',
+	'Class:lnkSanToDatacenterDevice/Attribute:san_port' => 'SAN port',
+	'Class:lnkSanToDatacenterDevice/Attribute:san_port+' => '',
+	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_port' => '(FC) Port zariadenia',
+	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_port+' => '',
+	'Class:Ticket' => 'Ticket',
+	'Class:Ticket+' => '',
+	'Class:Ticket/Attribute:ref' => 'Referencia',
+	'Class:Ticket/Attribute:ref+' => '',
+	'Class:Ticket/Attribute:org_id' => 'Organizácia',
+	'Class:Ticket/Attribute:org_id+' => '',
+	'Class:Ticket/Attribute:caller_id' => 'Zadávateľ',
+	'Class:Ticket/Attribute:caller_id+' => '',
+	'Class:Ticket/Attribute:team_id' => 'Tím',
+	'Class:Ticket/Attribute:team_id+' => '',
+	'Class:Ticket/Attribute:agent_id' => 'Agent',
+	'Class:Ticket/Attribute:agent_id+' => '',
+	'Class:Ticket/Attribute:title' => 'Nadpis',
+	'Class:Ticket/Attribute:title+' => '',
+	'Class:Ticket/Attribute:description' => 'Popis',
+	'Class:Ticket/Attribute:description+' => '',
+	'Class:Ticket/Attribute:start_date' => 'Dátum začiatku',
+	'Class:Ticket/Attribute:start_date+' => '',
+	'Class:Ticket/Attribute:end_date' => 'Dátum ukončenia',
+	'Class:Ticket/Attribute:end_date+' => '',
+	'Class:Ticket/Attribute:last_update' => 'Posledná aktualizácia',
+	'Class:Ticket/Attribute:last_update+' => '',
+	'Class:Ticket/Attribute:close_date' => 'Dátum uzavretia',
+	'Class:Ticket/Attribute:close_date+' => '',
+	'Class:Ticket/Attribute:private_log' => 'Skrytý záznam',
+	'Class:Ticket/Attribute:private_log+' => '',
+	'Class:Ticket/Attribute:contacts_list' => 'Kontakty',
+	'Class:Ticket/Attribute:contacts_list+' => 'All the contacts linked to this ticket~~',
+	'Class:Ticket/Attribute:functionalcis_list' => 'Komponenty',
+	'Class:Ticket/Attribute:functionalcis_list+' => 'All the configuration items impacted by this ticket. Items marked as "Computed" have been automatically marked as impacted. Items marked as "Not impacted" are excluded from the impact.~~',
+	'Class:Ticket/Attribute:workorders_list' => 'Pracovné príkazy',
+	'Class:Ticket/Attribute:workorders_list+' => 'All the work orders for this ticket~~',
+	'Class:Ticket/Attribute:finalclass' => 'Typ',
+	'Class:Ticket/Attribute:finalclass+' => '',
+	'Class:lnkContactToTicket' => 'väzba - Kontakt / Ticket',
+	'Class:lnkContactToTicket+' => '',
+	'Class:lnkContactToTicket/Attribute:ticket_id' => 'Ticket',
+	'Class:lnkContactToTicket/Attribute:ticket_id+' => '',
+	'Class:lnkContactToTicket/Attribute:contact_id' => 'Kontakt',
+	'Class:lnkContactToTicket/Attribute:contact_id+' => '',
+	'Class:lnkContactToTicket/Attribute:role' => 'Rola',
+	'Class:lnkContactToTicket/Attribute:role+' => '',
+	'Class:lnkFunctionalCIToTicket' => 'väzba - Komponent / Ticket',
+	'Class:lnkFunctionalCIToTicket+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id' => 'Ticket',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id' => 'Komponent',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact' => 'Dopad',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact+' => '',
+	'Class:WorkOrder' => 'Pracovný príkaz',
+	'Class:WorkOrder+' => '',
+	'Class:WorkOrder/Attribute:name' => 'Názov',
+	'Class:WorkOrder/Attribute:name+' => '',
+	'Class:WorkOrder/Attribute:status' => 'Stav',
+	'Class:WorkOrder/Attribute:status+' => '',
+	'Class:WorkOrder/Attribute:status/Value:open' => 'Otvorený',
+	'Class:WorkOrder/Attribute:status/Value:open+' => '',
+	'Class:WorkOrder/Attribute:status/Value:closed' => 'Zatvorený',
+	'Class:WorkOrder/Attribute:status/Value:closed+' => '',
+	'Class:WorkOrder/Attribute:description' => 'Popis',
+	'Class:WorkOrder/Attribute:description+' => '',
+	'Class:WorkOrder/Attribute:ticket_id' => 'Ticket',
+	'Class:WorkOrder/Attribute:ticket_id+' => '',
+	'Class:WorkOrder/Attribute:team_id' => 'Tím',
+	'Class:WorkOrder/Attribute:team_id+' => '',
+	'Class:WorkOrder/Attribute:agent_id' => 'Agent',
+	'Class:WorkOrder/Attribute:agent_id+' => '',
+	'Class:WorkOrder/Attribute:start_date' => 'Dátum začiatku',
+	'Class:WorkOrder/Attribute:start_date+' => '',
+	'Class:WorkOrder/Attribute:end_date' => 'Dátum ukončenia',
+	'Class:WorkOrder/Attribute:end_date+' => '',
+	'Class:WorkOrder/Attribute:log' => 'Záznam',
+	'Class:WorkOrder/Attribute:log+' => '',
+	'Class:WorkOrder/Stimulus:ev_close' => 'Zatvoriť',
+	'Class:WorkOrder/Stimulus:ev_close+' => '',
+	'Class:Hypervisor' => 'Hypervisor',
+	'Class:Hypervisor+' => '',
+	'Class:Hypervisor/Attribute:farm_id' => 'Farma',
+	'Class:Hypervisor/Attribute:farm_id+' => '',
+	'Class:Hypervisor/Attribute:server_id' => 'Server',
+	'Class:Hypervisor/Attribute:server_id+' => '',
+	'Class:Farm' => 'Farma',
+	'Class:Farm+' => '',
+	'Class:Farm/Attribute:hypervisor_list' => 'Hypervisori',
+	'Class:Farm/Attribute:hypervisor_list+' => 'All the hypervisors that compose this farm~~',
+	'Class:VirtualMachine' => 'Virtuálne zariadenie',
+	'Class:VirtualMachine+' => '',
+	'Class:VirtualMachine/Attribute:virtualhost_id' => 'Virtuálny host',
+	'Class:VirtualMachine/Attribute:virtualhost_id+' => '',
+	'Class:VirtualMachine/Attribute:osfamily_id' => 'Kategória OS',
+	'Class:VirtualMachine/Attribute:osfamily_id+' => '',
+	'Class:VirtualMachine/Attribute:osversion_id' => 'Verzia OS',
+	'Class:VirtualMachine/Attribute:osversion_id+' => '',
+	'Class:VirtualMachine/Attribute:oslicence_id' => 'Licencia OS',
+	'Class:VirtualMachine/Attribute:oslicence_id+' => '',
+	'Class:VirtualMachine/Attribute:cpu' => 'Procesor',
+	'Class:VirtualMachine/Attribute:cpu+' => '',
+	'Class:VirtualMachine/Attribute:ram' => 'Operačná pamäť',
+	'Class:VirtualMachine/Attribute:ram+' => '',
+	'Class:VirtualMachine/Attribute:logicalinterface_list' => 'Zoznam sieťových rozhraní',
+	'Class:VirtualMachine/Attribute:logicalinterface_list+' => 'All the logical network interfaces~~',
+	'Class:LogicalInterface' => 'Logické rozhranie',
+	'Class:LogicalInterface+' => '',
+	'Class:LogicalInterface/Attribute:virtualmachine_id' => 'Virtuálne zariadenie',
+	'Class:LogicalInterface/Attribute:virtualmachine_id+' => '',
+	'Class:Change' => 'Zmena',
+	'Class:Change+' => '',
+	'Class:Change/Attribute:status' => 'Stav',
+	'Class:Change/Attribute:status+' => '',
+	'Class:Change/Attribute:status/Value:new' => 'Nová',
+	'Class:Change/Attribute:status/Value:new+' => '',
+	'Class:Change/Attribute:status/Value:assigned' => 'Pridelená',
+	'Class:Change/Attribute:status/Value:assigned+' => '',
+	'Class:Change/Attribute:status/Value:planned' => 'Plánovaná',
+	'Class:Change/Attribute:status/Value:planned+' => '',
+	'Class:Change/Attribute:status/Value:rejected' => 'Zamietnutá',
+	'Class:Change/Attribute:status/Value:rejected+' => '',
+	'Class:Change/Attribute:status/Value:approved' => 'Schválená',
+	'Class:Change/Attribute:status/Value:approved+' => '',
+	'Class:Change/Attribute:status/Value:closed' => 'Zatvorená',
+	'Class:Change/Attribute:status/Value:closed+' => '',
+	'Class:Change/Attribute:category' => 'Kategória',
+	'Class:Change/Attribute:category+' => '',
+	'Class:Change/Attribute:category/Value:application' => 'Aplikácia',
+	'Class:Change/Attribute:category/Value:application+' => '',
+	'Class:Change/Attribute:category/Value:hardware' => 'Hardvér',
+	'Class:Change/Attribute:category/Value:hardware+' => '',
+	'Class:Change/Attribute:category/Value:network' => 'Sieť',
+	'Class:Change/Attribute:category/Value:network+' => '',
+	'Class:Change/Attribute:category/Value:other' => 'Iné',
+	'Class:Change/Attribute:category/Value:other+' => '',
+	'Class:Change/Attribute:category/Value:software' => 'Softvér',
+	'Class:Change/Attribute:category/Value:software+' => '',
+	'Class:Change/Attribute:category/Value:system' => 'Systém',
+	'Class:Change/Attribute:category/Value:system+' => '',
+	'Class:Change/Attribute:reject_reason' => 'Dôvod zamietnutia',
+	'Class:Change/Attribute:reject_reason+' => '',
+	'Class:Change/Attribute:changeManažér_id' => 'Manažér zmien',
+	'Class:Change/Attribute:changemanager_id+' => '',
+	'Class:Change/Attribute:parent_id' => 'Nadradená zmena',
+	'Class:Change/Attribute:parent_id+' => '',
+	'Class:Change/Attribute:creation_date' => 'Dátum vytvorenia',
+	'Class:Change/Attribute:creation_date+' => '',
+	'Class:Change/Attribute:approval_date' => 'Dátum schválenia',
+	'Class:Change/Attribute:approval_date+' => '',
+	'Class:Change/Attribute:fallback_plan' => 'Návratový plán',
+	'Class:Change/Attribute:fallback_plan+' => '',
+	'Class:Change/Attribute:related_request_list' => 'Súvisiace požiadavky',
+	'Class:Change/Attribute:related_request_list+' => 'All the user requests linked to this change~~',
+	'Class:Change/Attribute:child_changes_list' => 'Podriadené zmeny',
+	'Class:Change/Attribute:child_changes_list+' => 'All the sub changes linked to this change~~',
+	'Class:Change/Stimulus:ev_assign' => 'Prideiť',
+	'Class:Change/Stimulus:ev_assign+' => '',
+	'Class:Change/Stimulus:ev_plan' => 'Naplánuj',
+	'Class:Change/Stimulus:ev_plan+' => '',
+	'Class:Change/Stimulus:ev_reject' => 'Zamietnúť',
+	'Class:Change/Stimulus:ev_reject+' => '',
+	'Class:Change/Stimulus:ev_reopen' => 'Znova otvoriť',
+	'Class:Change/Stimulus:ev_reopen+' => '',
+	'Class:Change/Stimulus:ev_approve' => 'Schváliť',
+	'Class:Change/Stimulus:ev_approve+' => '',
+	'Class:Change/Stimulus:ev_finish' => 'Zatvoriť',
+	'Class:Change/Stimulus:ev_finish+' => '',
+	'Class:UserRequest' => 'Požiadavka užívateľa',
+	'Class:UserRequest+' => '',
+	'Class:UserRequest/Attribute:status' => 'Stav',
+	'Class:UserRequest/Attribute:status+' => '',
+	'Class:UserRequest/Attribute:status/Value:new' => 'Nová',
+	'Class:UserRequest/Attribute:status/Value:new+' => '',
+	'Class:UserRequest/Attribute:status/Value:escalated_tto' => 'Eskalované TTO',
+	'Class:UserRequest/Attribute:status/Value:escalated_tto+' => '',
+	'Class:UserRequest/Attribute:status/Value:assigned' => 'Pridelené',
+	'Class:UserRequest/Attribute:status/Value:assigned+' => '',
+	'Class:UserRequest/Attribute:status/Value:escalated_ttr' => 'Eskalované TTR',
+	'Class:UserRequest/Attribute:status/Value:escalated_ttr+' => '',
+	'Class:UserRequest/Attribute:status/Value:waiting_for_approval' => 'Čaká sa na schválenie',
+	'Class:UserRequest/Attribute:status/Value:waiting_for_approval+' => '',
+	'Class:UserRequest/Attribute:status/Value:approved' => 'Schválená',
+	'Class:UserRequest/Attribute:status/Value:approved+' => '',
+	'Class:UserRequest/Attribute:status/Value:rejected' => 'Zamietnutá',
+	'Class:UserRequest/Attribute:status/Value:rejected+' => '',
+	'Class:UserRequest/Attribute:status/Value:pending' => 'Pozdržaná',
+	'Class:UserRequest/Attribute:status/Value:pending+' => '',
+	'Class:UserRequest/Attribute:status/Value:resolved' => 'Vyriešená',
+	'Class:UserRequest/Attribute:status/Value:resolved+' => '',
+	'Class:UserRequest/Attribute:status/Value:closed' => 'Zatvorená',
+	'Class:UserRequest/Attribute:status/Value:closed+' => '',
+	'Class:UserRequest/Attribute:request_type' => 'Typ požiadavky',
+	'Class:UserRequest/Attribute:request_type+' => '',
+	'Class:UserRequest/Attribute:request_type/Value:incident' => 'Incident',
+	'Class:UserRequest/Attribute:request_type/Value:incident+' => '',
+	'Class:UserRequest/Attribute:request_type/Value:service_request' => 'Požiadavka',
+	'Class:UserRequest/Attribute:request_type/Value:service_request+' => '',
+	'Class:UserRequest/Attribute:impact' => 'Dopad',
+	'Class:UserRequest/Attribute:impact+' => '',
+	'Class:UserRequest/Attribute:impact/Value:1' => 'Oddelenie',
+	'Class:UserRequest/Attribute:impact/Value:1+' => '',
+	'Class:UserRequest/Attribute:impact/Value:2' => 'Služba',
+	'Class:UserRequest/Attribute:impact/Value:2+' => '',
+	'Class:UserRequest/Attribute:impact/Value:3' => 'Osoba',
+	'Class:UserRequest/Attribute:impact/Value:3+' => '',
+	'Class:UserRequest/Attribute:priority' => 'Priorita',
+	'Class:UserRequest/Attribute:priority+' => '',
+	'Class:UserRequest/Attribute:priority/Value:1' => 'Kritická',
+	'Class:UserRequest/Attribute:priority/Value:1+' => '',
+	'Class:UserRequest/Attribute:priority/Value:2' => 'Vysoká',
+	'Class:UserRequest/Attribute:priority/Value:2+' => '',
+	'Class:UserRequest/Attribute:priority/Value:3' => 'Stredná',
+	'Class:UserRequest/Attribute:priority/Value:3+' => '',
+	'Class:UserRequest/Attribute:priority/Value:4' => 'Nízka',
+	'Class:UserRequest/Attribute:priority/Value:4+' => '',
+	'Class:UserRequest/Attribute:urgency' => 'Naliehavosť',
+	'Class:UserRequest/Attribute:urgency+' => '',
+	'Class:UserRequest/Attribute:urgency/Value:1' => 'Kritická',
+	'Class:UserRequest/Attribute:urgency/Value:1+' => '',
+	'Class:UserRequest/Attribute:urgency/Value:2' => 'Vysoká',
+	'Class:UserRequest/Attribute:urgency/Value:2+' => '',
+	'Class:UserRequest/Attribute:urgency/Value:3' => 'Stredná',
+	'Class:UserRequest/Attribute:urgency/Value:3+' => '',
+	'Class:UserRequest/Attribute:urgency/Value:4' => 'Nízka',
+	'Class:UserRequest/Attribute:urgency/Value:4+' => '',
+	'Class:UserRequest/Attribute:origin' => 'Pôvod',
+	'Class:UserRequest/Attribute:origin+' => '',
+	'Class:UserRequest/Attribute:origin/Value:mail' => 'Mail',
+	'Class:UserRequest/Attribute:origin/Value:mail+' => '',
+	'Class:UserRequest/Attribute:origin/Value:monitoring' => 'Dohľad',
+	'Class:UserRequest/Attribute:origin/Value:monitoring+' => '',
+	'Class:UserRequest/Attribute:origin/Value:phone' => 'Telefón',
+	'Class:UserRequest/Attribute:origin/Value:phone+' => '',
+	'Class:UserRequest/Attribute:origin/Value:portal' => 'Portál',
+	'Class:UserRequest/Attribute:origin/Value:portal+' => '',
+	'Class:UserRequest/Attribute:approver_id' => 'Schvalovateľ',
+	'Class:UserRequest/Attribute:approver_id+' => '',
+	'Class:UserRequest/Attribute:service_id' => 'Služba',
+	'Class:UserRequest/Attribute:service_id+' => '',
+	'Class:UserRequest/Attribute:servicesubcategory_id' => 'Subkategórie služieb',
+	'Class:UserRequest/Attribute:servicesubcategory_id+' => '',
+	'Class:UserRequest/Attribute:escalation_flag' => 'Eskalačný príznak',
+	'Class:UserRequest/Attribute:escalation_flag+' => '',
+	'Class:UserRequest/Attribute:escalation_flag/Value:no' => 'Nie',
+	'Class:UserRequest/Attribute:escalation_flag/Value:no+' => '',
+	'Class:UserRequest/Attribute:escalation_flag/Value:yes' => 'Áno',
+	'Class:UserRequest/Attribute:escalation_flag/Value:yes+' => '',
+	'Class:UserRequest/Attribute:escalation_reason' => 'Dôvod eskalácie',
+	'Class:UserRequest/Attribute:escalation_reason+' => '',
+	'Class:UserRequest/Attribute:assignment_date' => 'Dátum pridelenia',
+	'Class:UserRequest/Attribute:assignment_date+' => '',
+	'Class:UserRequest/Attribute:resolution_date' => 'Dátum vyriešenia',
+	'Class:UserRequest/Attribute:resolution_date+' => '',
+	'Class:UserRequest/Attribute:last_pending_date' => 'Posledný dátum pozdržania',
+	'Class:UserRequest/Attribute:last_pending_date+' => '',
+	'Class:UserRequest/Attribute:tto' => 'TTO',
+	'Class:UserRequest/Attribute:tto+' => '',
+	'Class:UserRequest/Attribute:ttr' => 'TTR',
+	'Class:UserRequest/Attribute:ttr+' => '',
+	'Class:UserRequest/Attribute:tto_escalation_deadline' => 'Dátum eskalácie TTO',
+	'Class:UserRequest/Attribute:tto_escalation_deadline+' => '',
+	'Class:UserRequest/Attribute:sla_tto_passed' => 'SLA TTO dodržané',
+	'Class:UserRequest/Attribute:sla_tto_passed+' => '',
+	'Class:UserRequest/Attribute:sla_tto_over' => 'SLA TTO prekročené',
+	'Class:UserRequest/Attribute:sla_tto_over+' => '',
+	'Class:UserRequest/Attribute:ttr_escalation_deadline' => 'Dátum eskalácie TTR',
+	'Class:UserRequest/Attribute:ttr_escalation_deadline+' => '',
+	'Class:UserRequest/Attribute:sla_ttr_passed' => 'SLA TTR dodržané',
+	'Class:UserRequest/Attribute:sla_ttr_passed+' => '',
+	'Class:UserRequest/Attribute:sla_ttr_over' => 'SLA TTR prekročené',
+	'Class:UserRequest/Attribute:sla_ttr_over+' => '',
+	'Class:UserRequest/Attribute:time_spent' => 'Oneskorenie vyriešenia',
+	'Class:UserRequest/Attribute:time_spent+' => '',
+	'Class:UserRequest/Attribute:resolution_code' => 'Kód riešenia',
+	'Class:UserRequest/Attribute:resolution_code+' => '',
+	'Class:UserRequest/Attribute:resolution_code/Value:assistance' => 'Asistencia',
+	'Class:UserRequest/Attribute:resolution_code/Value:assistance+' => '',
+	'Class:UserRequest/Attribute:resolution_code/Value:bug fixed' => 'Chyba opravená',
+	'Class:UserRequest/Attribute:resolution_code/Value:bug fixed+' => '',
+	'Class:UserRequest/Attribute:resolution_code/Value:hardware repair' => 'Oprava hardvéru',
+	'Class:UserRequest/Attribute:resolution_code/Value:hardware repair+' => '',
+	'Class:UserRequest/Attribute:resolution_code/Value:other' => 'Iné',
+	'Class:UserRequest/Attribute:resolution_code/Value:other+' => '',
+	'Class:UserRequest/Attribute:resolution_code/Value:software patch' => 'Softvérová záplata',
+	'Class:UserRequest/Attribute:resolution_code/Value:software patch+' => '',
+	'Class:UserRequest/Attribute:resolution_code/Value:system update' => 'Aktualizácia systému',
+	'Class:UserRequest/Attribute:resolution_code/Value:system update+' => '',
+	'Class:UserRequest/Attribute:resolution_code/Value:training' => 'Školenie',
+	'Class:UserRequest/Attribute:resolution_code/Value:training+' => '',
+	'Class:UserRequest/Attribute:solution' => 'Riešenie',
+	'Class:UserRequest/Attribute:solution+' => '',
+	'Class:UserRequest/Attribute:pending_reason' => 'Dôvod pozdržania',
+	'Class:UserRequest/Attribute:pending_reason+' => '',
+	'Class:UserRequest/Attribute:parent_request_id' => 'Nadradená Požiadavka',
+	'Class:UserRequest/Attribute:parent_request_id+' => '',
+	'Class:UserRequest/Attribute:parent_change_id' => 'Nadradená Zmena',
+	'Class:UserRequest/Attribute:parent_change_id+' => '',
+	'Class:UserRequest/Attribute:related_request_list' => 'Podriadené požiadavky',
+	'Class:UserRequest/Attribute:related_request_list+' => 'All the requests that are linked to this parent request~~',
+	'Class:UserRequest/Attribute:public_log' => 'Verejný záznam',
+	'Class:UserRequest/Attribute:public_log+' => '',
+	'Class:UserRequest/Attribute:user_satisfaction' => 'Spokojnosť užívateľa',
+	'Class:UserRequest/Attribute:user_satisfaction+' => '',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:1' => 'Veľmi spokojný',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:1+' => '',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:2' => 'Pomerne spokojný',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:2+' => '',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:3' => 'Skôr nespokojný',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:3+' => '',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:4' => 'Veľmi nespokojný',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:4+' => '',
+	'Class:UserRequest/Attribute:user_comment' => 'Komentár užívateľa',
+	'Class:UserRequest/Attribute:user_comment+' => '',
+	'Class:UserRequest/Stimulus:ev_assign' => 'Prideiť',
+	'Class:UserRequest/Stimulus:ev_assign+' => '',
+	'Class:UserRequest/Stimulus:ev_reassign' => 'Znovu Prideiť',
+	'Class:UserRequest/Stimulus:ev_reassign+' => '',
+	'Class:UserRequest/Stimulus:ev_approve' => 'Schváliť',
+	'Class:UserRequest/Stimulus:ev_approve+' => '',
+	'Class:UserRequest/Stimulus:ev_reject' => 'Zamietnúť',
+	'Class:UserRequest/Stimulus:ev_reject+' => '',
+	'Class:UserRequest/Stimulus:ev_pending' => 'Pozdržať',
+	'Class:UserRequest/Stimulus:ev_pending+' => '',
+	'Class:UserRequest/Stimulus:ev_timeout' => 'Vypršanie času',
+	'Class:UserRequest/Stimulus:ev_timeout+' => '',
+	'Class:UserRequest/Stimulus:ev_autoresolve' => 'Automatické vyriešenie',
+	'Class:UserRequest/Stimulus:ev_autoresolve+' => '',
+	'Class:UserRequest/Stimulus:ev_autoclose' => 'Automatické zatvorenie',
+	'Class:UserRequest/Stimulus:ev_autoclose+' => '',
+	'Class:UserRequest/Stimulus:ev_resolve' => 'Vyriešiť',
+	'Class:UserRequest/Stimulus:ev_resolve+' => '',
+	'Class:UserRequest/Stimulus:ev_close' => 'Zatvoriť',
+	'Class:UserRequest/Stimulus:ev_close+' => '',
+	'Class:UserRequest/Stimulus:ev_reopen' => 'Znova otvoriť',
+	'Class:UserRequest/Stimulus:ev_reopen+' => '',
+	'Class:UserRequest/Stimulus:ev_wait_for_approval' => 'Počkať na schválenie',
+	'Class:UserRequest/Stimulus:ev_wait_for_approval+' => '',
+	'Class:UserExternal' => 'Externý užívateľ',
+	'Class:UserExternal+' => '',
+	'Class:UserLDAP' => 'LDAP užívateľ',
+	'Class:UserLDAP+' => '',
+	'Class:UserLocal' => ITOP_APPLICATION_SHORT.' užívateľ',
+	'Class:UserLocal+' => '',
+	'Class:UserLocal/Attribute:password' => 'Heslo',
+	'Class:UserLocal/Attribute:password+' => '',
+	'Attachments:TabTitle_Count' => 'Prílohy (%1$d)',
+	'Attachments:EmptyTabTitle' => 'Prílohy',
+	'Attachments:FieldsetTitle' => 'Prílohy',
+	'Attachments:DeleteBtn' => 'Odstrániť',
+	'Attachments:History_File_Added' => 'Príloha %1$s pridaná.',
+	'Attachments:History_File_Removed' => 'Príloha %1$s odstránená.',
+	'Attachments:AddAttachment' => 'Pridaj prílohu: ',
+	'Attachments:UploadNotAllowedOnThisSystem' => 'Nahrávanie súboru NIE JE povolené na tomto systéme.',
+	'Attachment:Max_Go' => '(Maximálna Veľkosť súboru : %1$s Go)',
+	'Attachment:Max_Mo' => '(Maximálna Veľkosť súboru : %1$s Mo)',
+	'Attachment:Max_Ko' => '(Maximálna Veľkosť súboru : %1$s Ko)',
+	'Attachments:NoAttachment' => 'Bez prílohy. ',
+	'Relation:impacts/Description' => 'Prvky zasiahnuté',
+	'Relation:impacts/VerbUp' => 'Dopad...',
+	'Relation:impacts/VerbDown' => 'Prvky zasiahnuté ...',
+	'Relation:depends on/Description' => 'Prvky, od ktorých závisí tento prvok',
+	'Relation:depends on/VerbUp' => 'Závisí od...',
+	'Relation:depends on/VerbDown' => 'Dopady...',
+	'Class:Organization/Attribute:parent_name' => 'Nadradená organizácia',
+	'Class:Organization/Attribute:parent_name+' => '',
+	'Class:Organization/Attribute:deliverymodel_name' => 'Názov modelu dodávky',
+	'Class:Organization/Attribute:deliverymodel_name+' => '',
+	'Class:Organization/Attribute:parent_id_friendlyname' => 'Nadradená organizácia',
+	'Class:Organization/Attribute:parent_id_friendlyname+' => '',
+	'Class:Location/Attribute:org_name' => 'Názov organizácie vlastníka',
+	'Class:Location/Attribute:org_name+' => '',
+	'Class:Contact' => 'Kontakt',
+	'Class:Contact+' => '',
+	'Class:Contact/Attribute:name' => 'Meno',
+	'Class:Contact/Attribute:name+' => '',
+	'Class:Contact/Attribute:status' => 'Stav',
+	'Class:Contact/Attribute:status+' => '',
+	'Class:Contact/Attribute:status/Value:active' => 'Aktívny',
+	'Class:Contact/Attribute:status/Value:active+' => '',
+	'Class:Contact/Attribute:status/Value:inactive' => 'Neaktívny',
+	'Class:Contact/Attribute:status/Value:inactive+' => '',
+	'Class:Contact/Attribute:org_id' => 'Organizácia',
+	'Class:Contact/Attribute:org_id+' => '',
+	'Class:Contact/Attribute:org_name' => 'Názov Organizácie',
+	'Class:Contact/Attribute:org_name+' => '',
+	'Class:Contact/Attribute:email' => 'Email',
+	'Class:Contact/Attribute:email+' => '',
+	'Class:Contact/Attribute:phone' => 'Telefón',
+	'Class:Contact/Attribute:phone+' => '',
+	'Class:Contact/Attribute:notify' => 'Upozornenie',
+	'Class:Contact/Attribute:notify+' => '',
+	'Class:Contact/Attribute:notify/Value:no' => 'nie',
+	'Class:Contact/Attribute:notify/Value:no+' => '',
+	'Class:Contact/Attribute:notify/Value:yes' => 'áno',
+	'Class:Contact/Attribute:notify/Value:yes+' => '',
+	'Class:Contact/Attribute:function' => 'Funkcia',
+	'Class:Contact/Attribute:function+' => '',
+	'Class:Contact/Attribute:cis_list' => 'Zariadenia',
+	'Class:Contact/Attribute:cis_list+' => 'All the configuration items linked to this contact~~',
+	'Class:Contact/Attribute:finalclass' => 'Typ kontaktu',
+	'Class:Contact/Attribute:finalclass+' => '',
+	'Class:Person/Attribute:name' => 'Priezvisko',
+	'Class:Person/Attribute:name+' => '',
+	'Class:Person/Attribute:location_name' => 'Názov lokality',
+	'Class:Person/Attribute:location_name+' => '',
+	'Class:Person/Attribute:manager_name' => 'Meno manažéra',
+	'Class:Person/Attribute:manager_name+' => '',
+	'Class:Person/Attribute:manager_id_friendlyname' => 'Ľahko čitateľné meno manažéra',
+	'Class:Person/Attribute:manager_id_friendlyname+' => '',
+	'Class:Document' => 'Dokument',
+	'Class:Document+' => '',
+	'Class:Document/Attribute:name' => 'Názov',
+	'Class:Document/Attribute:name+' => '',
+	'Class:Document/Attribute:org_id' => 'Organizácia',
+	'Class:Document/Attribute:org_id+' => '',
+	'Class:Document/Attribute:org_name' => 'Názov Organizácie',
+	'Class:Document/Attribute:org_name+' => '',
+	'Class:Document/Attribute:documenttype_id' => 'Typ dokumentu',
+	'Class:Document/Attribute:documenttype_id+' => '',
+	'Class:Document/Attribute:documenttype_name' => 'Názov typu dokumentu',
+	'Class:Document/Attribute:documenttype_name+' => '',
+	'Class:Document/Attribute:description' => 'Popis',
+	'Class:Document/Attribute:description+' => '',
+	'Class:Document/Attribute:status' => 'Stav',
+	'Class:Document/Attribute:status+' => '',
+	'Class:Document/Attribute:status/Value:draft' => 'Návrh',
+	'Class:Document/Attribute:status/Value:draft+' => '',
+	'Class:Document/Attribute:status/Value:obsolete' => 'Vyradený',
+	'Class:Document/Attribute:status/Value:obsolete+' => '',
+	'Class:Document/Attribute:status/Value:published' => 'Publikovaný',
+	'Class:Document/Attribute:status/Value:published+' => '',
+	'Class:Document/Attribute:cis_list' => 'Komponenty',
+	'Class:Document/Attribute:cis_list+' => 'All the configuration items linked to this document~~',
+	'Class:Document/Attribute:contracts_list' => 'Zmluvy',
+	'Class:Document/Attribute:contracts_list+' => 'All the contracts linked to this document~~',
+	'Class:Document/Attribute:services_list' => 'Služby',
+	'Class:Document/Attribute:services_list+' => 'All the services linked to this document~~',
+	'Class:Document/Attribute:finalclass' => 'Typ dokumentu',
+	'Class:Document/Attribute:finalclass+' => '',
+	'Class:FunctionalCI' => 'Komponent',
+	'Class:FunctionalCI+' => '',
+	'Class:FunctionalCI/Attribute:name' => 'Názov',
+	'Class:FunctionalCI/Attribute:name+' => '',
+	'Class:FunctionalCI/Attribute:description' => 'Popis',
+	'Class:FunctionalCI/Attribute:description+' => '',
+	'Class:FunctionalCI/Attribute:org_id' => 'Organizácia',
+	'Class:FunctionalCI/Attribute:org_id+' => '',
+	'Class:FunctionalCI/Attribute:organization_name' => 'Názov Organizácie',
+	'Class:FunctionalCI/Attribute:organization_name+' => '',
+	'Class:FunctionalCI/Attribute:business_criticity' => 'Dôležitosť pre biznis',
+	'Class:FunctionalCI/Attribute:business_criticity+' => '',
+	'Class:FunctionalCI/Attribute:business_criticity/Value:high' => 'vysoká',
+	'Class:FunctionalCI/Attribute:business_criticity/Value:high+' => '',
+	'Class:FunctionalCI/Attribute:business_criticity/Value:low' => 'nízka',
+	'Class:FunctionalCI/Attribute:business_criticity/Value:low+' => '',
+	'Class:FunctionalCI/Attribute:business_criticity/Value:medium' => 'stredná',
+	'Class:FunctionalCI/Attribute:business_criticity/Value:medium+' => '',
+	'Class:FunctionalCI/Attribute:move2production' => 'Dátum presunu do produkcie',
+	'Class:FunctionalCI/Attribute:move2production+' => '',
+	'Class:FunctionalCI/Attribute:contacts_list' => 'Kontakty',
+	'Class:FunctionalCI/Attribute:contacts_list+' => 'All the contacts for this configuration item~~',
+	'Class:FunctionalCI/Attribute:documents_list' => 'Zoznam dokumentov',
+	'Class:FunctionalCI/Attribute:documents_list+' => 'All the documents linked to this configuration item~~',
+	'Class:FunctionalCI/Attribute:applicationsolution_list' => 'Zoznam aplikačných riešení',
+	'Class:FunctionalCI/Attribute:applicationsolution_list+' => 'All the application solutions depending on this configuration item~~',
+	'Class:FunctionalCI/Attribute:providercontracts_list' => 'Poskytovateľské zmluvy',
+	'Class:FunctionalCI/Attribute:providercontracts_list+' => 'All the provider contracts for this configuration item~~',
+	'Class:FunctionalCI/Attribute:services_list' => 'Služby',
+	'Class:FunctionalCI/Attribute:services_list+' => '',
+	'Class:FunctionalCI/Attribute:softwares_list' => 'Softvér',
+	'Class:FunctionalCI/Attribute:softwares_list+' => 'All the softwares installed on this configuration item~~',
+	'Class:FunctionalCI/Attribute:tickets_list' => 'Tickety',
+	'Class:FunctionalCI/Attribute:tickets_list+' => '',
+	'Class:FunctionalCI/Attribute:finalclass' => 'Typ komponentu',
+	'Class:FunctionalCI/Attribute:finalclass+' => '',
+	'Class:PhysicalDevice' => 'Fyzické zariadenie',
+	'Class:PhysicalDevice+' => '',
+	'Class:PhysicalDevice/Attribute:serialnumber' => 'Sériové číslo',
+	'Class:PhysicalDevice/Attribute:serialnumber+' => '',
+	'Class:PhysicalDevice/Attribute:location_id' => 'Lokalita',
+	'Class:PhysicalDevice/Attribute:location_id+' => '',
+	'Class:PhysicalDevice/Attribute:location_name' => 'Názov lokality',
+	'Class:PhysicalDevice/Attribute:location_name+' => '',
+	'Class:PhysicalDevice/Attribute:status' => 'Stav',
+	'Class:PhysicalDevice/Attribute:status+' => '',
+	'Class:PhysicalDevice/Attribute:status/Value:implementation' => 'Implementácia',
+	'Class:PhysicalDevice/Attribute:status/Value:implementation+' => '',
+	'Class:PhysicalDevice/Attribute:status/Value:obsolete' => 'vyradené',
+	'Class:PhysicalDevice/Attribute:status/Value:obsolete+' => '',
+	'Class:PhysicalDevice/Attribute:status/Value:production' => 'v produkcií',
+	'Class:PhysicalDevice/Attribute:status/Value:production+' => '',
+	'Class:PhysicalDevice/Attribute:status/Value:stock' => 'na sklade',
+	'Class:PhysicalDevice/Attribute:status/Value:stock+' => '',
+	'Class:PhysicalDevice/Attribute:brand_id' => 'Značka',
+	'Class:PhysicalDevice/Attribute:brand_id+' => '',
+	'Class:PhysicalDevice/Attribute:brand_name' => 'Názov značky',
+	'Class:PhysicalDevice/Attribute:brand_name+' => '',
+	'Class:PhysicalDevice/Attribute:model_id' => 'Model',
+	'Class:PhysicalDevice/Attribute:model_id+' => '',
+	'Class:PhysicalDevice/Attribute:model_name' => 'Názov modelu',
+	'Class:PhysicalDevice/Attribute:model_name+' => '',
+	'Class:PhysicalDevice/Attribute:asset_number' => 'Číslo položky',
+	'Class:PhysicalDevice/Attribute:asset_number+' => '',
+	'Class:PhysicalDevice/Attribute:purchase_date' => 'Dátum zakúpenia',
+	'Class:PhysicalDevice/Attribute:purchase_date+' => '',
+	'Class:PhysicalDevice/Attribute:end_of_warranty' => 'Koniec záruky',
+	'Class:PhysicalDevice/Attribute:end_of_warranty+' => '',
+	'Class:TelephonyCI' => 'Telefónne zariadenie',
+	'Class:TelephonyCI+' => '',
+	'Class:TelephonyCI/Attribute:phonenumber' => 'Telefónne číslo',
+	'Class:TelephonyCI/Attribute:phonenumber+' => '',
+	'Class:ConnectableCI' => 'Pripojiteľné zariadenie',
+	'Class:ConnectableCI+' => '',
+	'Class:ConnectableCI/Attribute:networkdevice_list' => 'Sieťové zariadenia',
+	'Class:ConnectableCI/Attribute:networkdevice_list+' => 'All network devices connected to this device~~',
+	'Class:ConnectableCI/Attribute:physicalinterface_list' => 'Sieťové rozhrania',
+	'Class:ConnectableCI/Attribute:physicalinterface_list+' => 'All the physical network interfaces~~',
+	'Class:DatacenterDevice' => 'Zariadenie dátového centra',
+	'Class:DatacenterDevice+' => '',
+	'Class:DatacenterDevice/Attribute:rack_id' => 'stojan (Rack)',
+	'Class:DatacenterDevice/Attribute:rack_id+' => '',
+	'Class:DatacenterDevice/Attribute:rack_name' => 'Názov stojanu',
+	'Class:DatacenterDevice/Attribute:rack_name+' => '',
+	'Class:DatacenterDevice/Attribute:enclosure_id' => 'Kryt',
+	'Class:DatacenterDevice/Attribute:enclosure_id+' => '',
+	'Class:DatacenterDevice/Attribute:enclosure_name' => 'Názov krytu',
+	'Class:DatacenterDevice/Attribute:enclosure_name+' => '',
+	'Class:DatacenterDevice/Attribute:nb_u' => 'NB U',
+	'Class:DatacenterDevice/Attribute:nb_u+' => '',
+	'Class:DatacenterDevice/Attribute:managementip' => 'Menežmentová IP adresa',
+	'Class:DatacenterDevice/Attribute:managementip+' => '',
+	'Class:DatacenterDevice/Attribute:powerA_id' => 'Zdroj napájania A',
+	'Class:DatacenterDevice/Attribute:powerA_id+' => '',
+	'Class:DatacenterDevice/Attribute:powerA_name' => 'Názov zdroja napájania A',
+	'Class:DatacenterDevice/Attribute:powerA_name+' => '',
+	'Class:DatacenterDevice/Attribute:powerB_id' => 'Zdroj napájania B',
+	'Class:DatacenterDevice/Attribute:powerB_id+' => '',
+	'Class:DatacenterDevice/Attribute:powerB_name' => 'Názov zdroja napájania B',
+	'Class:DatacenterDevice/Attribute:powerB_name+' => '',
+	'Class:DatacenterDevice/Attribute:fiberinterfacelist_list' => 'Zoznam optických rozhraní',
+	'Class:DatacenterDevice/Attribute:fiberinterfacelist_list+' => 'All the fiber channel interfaces for this device~~',
+	'Class:DatacenterDevice/Attribute:san_list' => 'Úložiská (SAN)',
+	'Class:DatacenterDevice/Attribute:san_list+' => 'All the SAN switches connected to this device~~',
+	'Class:NetworkDevice/Attribute:networkdevicetype_name' => 'Názov typu sieťového zariadenia',
+	'Class:NetworkDevice/Attribute:networkdevicetype_name+' => '',
+	'Class:NetworkDevice/Attribute:iosversion_name' => 'Názov IOS verzie',
+	'Class:NetworkDevice/Attribute:iosversion_name+' => '',
+	'Class:Server/Attribute:osfamily_name' => 'Názov kategórie OS',
+	'Class:Server/Attribute:osfamily_name+' => '',
+	'Class:Server/Attribute:osversion_name' => 'Názov verzie OS',
+	'Class:Server/Attribute:osversion_name+' => '',
+	'Class:Server/Attribute:oslicence_name' => 'Názov licence OS',
+	'Class:Server/Attribute:oslicence_name+' => '',
+	'Class:PC/Attribute:osfamily_name' => 'Názov kategórie OS',
+	'Class:PC/Attribute:osfamily_name+' => '',
+	'Class:PC/Attribute:osversion_name' => 'Názov verzie OS',
+	'Class:PC/Attribute:osversion_name+' => '',
+	'Class:PowerConnection' => 'Elektrická prípojka',
+	'Class:PowerConnection+' => '',
+	'Class:PDU/Attribute:rack_name' => 'Názov stojanu (rack)',
+	'Class:PDU/Attribute:rack_name+' => '',
+	'Class:PDU/Attribute:powerstart_name' => 'Názov Power start-u',
+	'Class:PDU/Attribute:powerstart_name+' => '',
+	'Class:Enclosure/Attribute:rack_name' => 'Názov stojanu (rack)',
+	'Class:Enclosure/Attribute:rack_name+' => '',
+	'Class:SoftwareInstance' => 'Softvérová inštancia',
+	'Class:SoftwareInstance+' => '',
+	'Class:SoftwareInstance/Attribute:system_id' => 'Systém',
+	'Class:SoftwareInstance/Attribute:system_id+' => '',
+	'Class:SoftwareInstance/Attribute:system_name' => 'Názov systému',
+	'Class:SoftwareInstance/Attribute:system_name+' => '',
+	'Class:SoftwareInstance/Attribute:software_id' => 'Softvér',
+	'Class:SoftwareInstance/Attribute:software_id+' => '',
+	'Class:SoftwareInstance/Attribute:software_name' => 'Názov softvéru',
+	'Class:SoftwareInstance/Attribute:software_name+' => '',
+	'Class:SoftwareInstance/Attribute:softwarelicence_id' => 'Softvérová licencia',
+	'Class:SoftwareInstance/Attribute:softwarelicence_id+' => '',
+	'Class:SoftwareInstance/Attribute:softwarelicence_name' => 'Názov softvérovej licencie',
+	'Class:SoftwareInstance/Attribute:softwarelicence_name+' => '',
+	'Class:SoftwareInstance/Attribute:path' => 'Cesta',
+	'Class:SoftwareInstance/Attribute:path+' => '',
+	'Class:SoftwareInstance/Attribute:status' => 'Stav',
+	'Class:SoftwareInstance/Attribute:status+' => '',
+	'Class:SoftwareInstance/Attribute:status/Value:active' => 'aktívna',
+	'Class:SoftwareInstance/Attribute:status/Value:active+' => '',
+	'Class:SoftwareInstance/Attribute:status/Value:inactive' => 'neaktívna',
+	'Class:SoftwareInstance/Attribute:status/Value:inactive+' => '',
+	'Class:MiddlewareInstance/Attribute:middleware_name' => 'Názov Middleware-u',
+	'Class:MiddlewareInstance/Attribute:middleware_name+' => '',
+	'Class:DatabaseSchema/Attribute:dbserver_name' => 'Názov DB serveru',
+	'Class:DatabaseSchema/Attribute:dbserver_name+' => '',
+	'Class:WebApplication/Attribute:webserver_name' => 'Názov Web serveru',
+	'Class:WebApplication/Attribute:webserver_name+' => '',
+	'Class:VirtualDevice' => 'Virtuálne zariadenie',
+	'Class:VirtualDevice+' => '',
+	'Class:VirtualDevice/Attribute:status' => 'Stav',
+	'Class:VirtualDevice/Attribute:status+' => '',
+	'Class:VirtualDevice/Attribute:status/Value:implementation' => 'Implementácia',
+	'Class:VirtualDevice/Attribute:status/Value:implementation+' => '',
+	'Class:VirtualDevice/Attribute:status/Value:obsolete' => 'Vyradené',
+	'Class:VirtualDevice/Attribute:status/Value:obsolete+' => '',
+	'Class:VirtualDevice/Attribute:status/Value:production' => 'Produkcia',
+	'Class:VirtualDevice/Attribute:status/Value:production+' => '',
+	'Class:VirtualDevice/Attribute:status/Value:stock' => 'Zásoby',
+	'Class:VirtualDevice/Attribute:status/Value:stock+' => '',
+	'Class:VirtualDevice/Attribute:logicalvolumes_list' => 'Zoznam logických dielov',
+	'Class:VirtualDevice/Attribute:logicalvolumes_list+' => 'All the logical volumes used by this device~~',
+	'Class:VirtualHost' => 'Virtuálny host',
+	'Class:VirtualHost+' => '',
+	'Class:VirtualHost/Attribute:virtualmachine_list' => 'Zoznam virtuálnych strojov',
+	'Class:VirtualHost/Attribute:virtualmachine_list+' => 'All the virtual machines hosted by this host~~',
+	'Class:Hypervisor/Attribute:farm_name' => 'Názov farmy',
+	'Class:Hypervisor/Attribute:farm_name+' => '',
+	'Class:Hypervisor/Attribute:server_name' => 'Názov serveru',
+	'Class:Hypervisor/Attribute:server_name+' => '',
+	'Class:VirtualMachine/Attribute:virtualhost_name' => 'Názov virtuálneho hosta',
+	'Class:VirtualMachine/Attribute:virtualhost_name+' => '',
+	'Class:VirtualMachine/Attribute:osfamily_name' => 'Názov kategórie OS',
+	'Class:VirtualMachine/Attribute:osfamily_name+' => '',
+	'Class:VirtualMachine/Attribute:osversion_name' => 'Názov OS verzie',
+	'Class:VirtualMachine/Attribute:osversion_name+' => '',
+	'Class:VirtualMachine/Attribute:oslicence_name' => 'OS licence Názov',
+	'Class:VirtualMachine/Attribute:oslicence_name+' => '',
+	'Class:LogicalVolume/Attribute:storagesystem_name' => 'Názov úložného systému',
+	'Class:LogicalVolume/Attribute:storagesystem_name+' => '',
+	'Class:lnkServerToVolume/Attribute:volume_name' => 'Názov dielu',
+	'Class:lnkServerToVolume/Attribute:volume_name+' => '',
+	'Class:lnkServerToVolume/Attribute:server_name' => 'Názov serveru',
+	'Class:lnkServerToVolume/Attribute:server_name+' => '',
+	'Class:lnkVirtualDeviceToVolume/Attribute:volume_name' => 'Názov dielu',
+	'Class:lnkVirtualDeviceToVolume/Attribute:volume_name+' => '',
+	'Class:lnkVirtualDeviceToVolume/Attribute:virtualdevice_name' => 'Názov virtuálneho zariadenia',
+	'Class:lnkVirtualDeviceToVolume/Attribute:virtualdevice_name+' => '',
+	'Class:lnkSanToDatacenterDevice/Attribute:san_name' => 'Názov SAN prepínaču',
+	'Class:lnkSanToDatacenterDevice/Attribute:san_name+' => '',
+	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_name' => 'Názov zariadenia',
+	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_name+' => '',
+	'Class:Tape/Attribute:tapelibrary_name' => 'Názov knižnice pásiek',
+	'Class:Tape/Attribute:tapelibrary_name+' => '',
+	'Class:NASFileSystem/Attribute:nas_name' => 'Názov NAS',
+	'Class:NASFileSystem/Attribute:nas_name+' => '',
+	'Class:Patch' => 'Záplata',
+	'Class:Patch+' => '',
+	'Class:Patch/Attribute:name' => 'Názov',
+	'Class:Patch/Attribute:name+' => '',
+	'Class:Patch/Attribute:documents_list' => 'Zoznam dokumentov',
+	'Class:Patch/Attribute:documents_list+' => 'All the documents linked to this patch~~',
+	'Class:Patch/Attribute:description' => 'Popis',
+	'Class:Patch/Attribute:description+' => '',
+	'Class:Patch/Attribute:finalclass' => 'Typ',
+	'Class:Patch/Attribute:finalclass+' => '',
+	'Class:OSPatch/Attribute:osversion_name' => 'Názov OS verzie',
+	'Class:OSPatch/Attribute:osversion_name+' => '',
+	'Class:SoftwarePatch/Attribute:software_name' => 'Názov softvéru',
+	'Class:SoftwarePatch/Attribute:software_name+' => '',
+	'Class:Licence' => 'Licencia',
+	'Class:Licence+' => '',
+	'Class:Licence/Attribute:name' => 'Názov',
+	'Class:Licence/Attribute:name+' => '',
+	'Class:Licence/Attribute:documents_list' => 'Zoznam dokumentov',
+	'Class:Licence/Attribute:documents_list+' => 'All the documents linked to this license~~',
+	'Class:Licence/Attribute:org_id' => 'Organizácia',
+	'Class:Licence/Attribute:org_id+' => '',
+	'Class:Licence/Attribute:organization_name' => 'Názov organizácie',
+	'Class:Licence/Attribute:organization_name+' => '',
+	'Class:Licence/Attribute:usage_limit' => 'Limit používania',
+	'Class:Licence/Attribute:usage_limit+' => '',
+	'Class:Licence/Attribute:description' => 'Popis',
+	'Class:Licence/Attribute:description+' => '',
+	'Class:Licence/Attribute:start_date' => 'Dátum začiatku',
+	'Class:Licence/Attribute:start_date+' => '',
+	'Class:Licence/Attribute:end_date' => 'Dátum ukončenia',
+	'Class:Licence/Attribute:end_date+' => '',
+	'Class:Licence/Attribute:licence_key' => 'Licenčný kľúč',
+	'Class:Licence/Attribute:licence_key+' => '',
+	'Class:Licence/Attribute:perpetual' => 'Pretrvávajúci',
+	'Class:Licence/Attribute:perpetual+' => '',
+	'Class:Licence/Attribute:perpetual/Value:no' => 'Nie',
+	'Class:Licence/Attribute:perpetual/Value:no+' => '',
+	'Class:Licence/Attribute:perpetual/Value:yes' => 'Áno',
+	'Class:Licence/Attribute:perpetual/Value:yes+' => '',
+	'Class:Licence/Attribute:finalclass' => 'Typ',
+	'Class:Licence/Attribute:finalclass+' => '',
+	'Class:OSLicence/Attribute:osversion_name' => 'Názov OS verzie',
+	'Class:OSLicence/Attribute:osversion_name+' => '',
+	'Class:SoftwareLicence/Attribute:software_name' => 'Názov softvéru',
+	'Class:SoftwareLicence/Attribute:software_name+' => '',
+	'Class:lnkDocumentToLicence/Attribute:licence_name' => 'Názov licence',
+	'Class:lnkDocumentToLicence/Attribute:licence_name+' => '',
+	'Class:lnkDocumentToLicence/Attribute:document_name' => 'Názov dokumentu',
+	'Class:lnkDocumentToLicence/Attribute:document_name+' => '',
+	'Class:Typology' => 'Typológia',
+	'Class:Typology+' => '',
+	'Class:Typology/Attribute:name' => 'Názov',
+	'Class:Typology/Attribute:name+' => '',
+	'Class:Typology/Attribute:finalclass' => 'Typ',
+	'Class:Typology/Attribute:finalclass+' => '',
+	'Class:OSVersion/Attribute:osfamily_name' => 'Názov kategórie OS',
+	'Class:OSVersion/Attribute:osfamily_name+' => '',
+	'Class:Model/Attribute:brand_name' => 'Názov značky',
+	'Class:Model/Attribute:brand_name+' => '',
+	'Class:IOSVersion/Attribute:brand_name' => 'Názov značky',
+	'Class:IOSVersion/Attribute:brand_name+' => '',
+	'Class:lnkDocumentToPatch/Attribute:patch_name' => 'Názov záplaty',
+	'Class:lnkDocumentToPatch/Attribute:patch_name+' => '',
+	'Class:lnkDocumentToPatch/Attribute:document_name' => 'Názov dokumentu',
+	'Class:lnkDocumentToPatch/Attribute:document_name+' => '',
+	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_name' => 'Názov softvérovej záplaty',
+	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_name+' => '',
+	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_name' => 'Názov softvérovej inštancie',
+	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_name+' => '',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_name' => 'Názov OS záplaty',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_name+' => '',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_name' => 'Názov funkčných CI',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_name+' => '',
+	'Class:lnkDocumentToSoftware/Attribute:software_name' => 'Názov softvéru',
+	'Class:lnkDocumentToSoftware/Attribute:software_name+' => '',
+	'Class:lnkDocumentToSoftware/Attribute:document_name' => 'Názov dokumentu',
+	'Class:lnkDocumentToSoftware/Attribute:document_name+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Názov funkčných CI',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Názov kontaktu',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '',
+	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_name' => 'Názov funkčných CI',
+	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_name+' => '',
+	'Class:lnkDocumentToFunctionalCI/Attribute:document_name' => 'Názov dokumentu',
+	'Class:lnkDocumentToFunctionalCI/Attribute:document_name+' => '',
+	'Class:Subnet/Attribute:org_name' => 'Názov organizácie',
+	'Class:Subnet/Attribute:org_name+' => '',
+	'Class:NetworkInterface' => 'Sieťové rozhranie',
+	'Class:NetworkInterface+' => '',
+	'Class:NetworkInterface/Attribute:name' => 'Názov',
+	'Class:NetworkInterface/Attribute:name+' => '',
+	'Class:NetworkInterface/Attribute:finalclass' => 'Typ',
+	'Class:NetworkInterface/Attribute:finalclass+' => '',
+	'Class:IPInterface' => 'IP rozhranie',
+	'Class:IPInterface+' => '',
+	'Class:IPInterface/Attribute:ipaddress' => 'IP Adresa',
+	'Class:IPInterface/Attribute:ipaddress+' => '',
+	'Class:IPInterface/Attribute:macaddress' => 'MAC Adresa',
+	'Class:IPInterface/Attribute:macaddress+' => '',
+	'Class:IPInterface/Attribute:comment' => 'Komentár',
+	'Class:IPInterface/Attribute:coment+' => '',
+	'Class:IPInterface/Attribute:ipgateway' => 'Východzia brána IP',
+	'Class:IPInterface/Attribute:ipgateway+' => '',
+	'Class:IPInterface/Attribute:ipmask' => 'Maska IP adresy',
+	'Class:IPInterface/Attribute:ipmask+' => '',
+	'Class:IPInterface/Attribute:speed' => 'Rýchlosť',
+	'Class:IPInterface/Attribute:speed+' => '',
+	'Class:PhysicalInterface/Attribute:connectableci_name' => 'Názov zariadenia',
+	'Class:PhysicalInterface/Attribute:connectableci_name+' => '',
+	'Class:LogicalInterface/Attribute:virtualmachine_name' => 'Názov virtuálneho stroja',
+	'Class:LogicalInterface/Attribute:virtualmachine_name+' => '',
+	'Class:FiberChannelInterface/Attribute:datacenterdevice_name' => 'Názov zariadenia',
+	'Class:FiberChannelInterface/Attribute:datacenterdevice_name+' => '',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_name' => 'Názov sieťového zariadenia',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_name+' => '',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:connectableci_name' => 'Názov pripojeného zariadenia',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:connectableci_name+' => '',
+	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_name' => 'Názov aplikačného riešenia',
+	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_name+' => '',
+	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:functionalci_name' => 'Názov funkčných CI',
+	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:functionalci_name+' => '',
+	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_name' => 'Názov biznisových procesov',
+	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_name+' => '',
+	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_name' => 'Názov aplikačného riešenia',
+	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_name+' => '',
+	'Class:lnkPersonToTeam/Attribute:team_name' => 'Názov tímu',
+	'Class:lnkPersonToTeam/Attribute:team_name+' => '',
+	'Class:lnkPersonToTeam/Attribute:person_name' => 'Meno osoby',
+	'Class:lnkPersonToTeam/Attribute:person_name+' => '',
+	'Class:lnkPersonToTeam/Attribute:role_name' => 'Názov role',
+	'Class:lnkPersonToTeam/Attribute:role_name+' => '',
+	'Class:Group/Attribute:owner_name' => 'Meno vlastníka',
+	'Class:Group/Attribute:owner_name+' => '',
+	'Class:Group/Attribute:parent_name' => 'Meno rodiča',
+	'Class:Group/Attribute:parent_name+' => '',
+	'Class:Group/Attribute:parent_id_friendlyname' => 'Priateľské meno rodičovskej skupiny',
+	'Class:Group/Attribute:parent_id_friendlyname+' => '',
+	'Class:lnkGroupToCI/Attribute:group_name' => 'Názov',
+	'Class:lnkGroupToCI/Attribute:group_name+' => '',
+	'Class:lnkGroupToCI/Attribute:ci_name' => 'Názov',
+	'Class:lnkGroupToCI/Attribute:ci_name+' => '',
+	'Menu:Catalogs' => 'Katalógy',
+	'Menu:Catalogs+' => '',
+	'Menu:Audit' => 'Audity',
+	'Menu:Audit+' => '',
+	'Menu:Organization' => 'Organizácia',
+	'Menu:Organization+' => '',
+	'Menu:Application' => 'Aplikácie',
+	'Menu:Application+' => '',
+	'Menu:DBServer' => 'Databázové servery',
+	'Menu:DBServer+' => '',
+	'Menu:ConfigManagement' => 'Manažment konfigurácie',
+	'Menu:ConfigManagement+' => '',
+	'Menu:ConfigManagementOverview' => 'Prehľad',
+	'Menu:ConfigManagementOverview+' => '',
+	'Menu:Contact' => 'Kontakty',
+	'Menu:Contact+' => '',
+	'Menu:Contact:Count' => '%1$d kontakt/y/ov',
+	'Menu:Person' => 'Osoby',
+	'Menu:Person+' => '',
+	'Menu:Team' => 'Tímy',
+	'Menu:Team+' => '',
+	'Menu:Document' => 'Dokumenty',
+	'Menu:Document+' => '',
+	'Menu:Location' => 'Poloha',
+	'Menu:Location+' => '',
+	'Menu:ConfigManagementCI' => 'Konfiguračné položky',
+	'Menu:ConfigManagementCI+' => '',
+	'Menu:BusinessProcess' => 'Biznisové procesy',
+	'Menu:BusinessProcess+' => '',
+	'Menu:ApplicationSolution' => 'Aplikačné riešenia',
+	'Menu:ApplicationSolution+' => '',
+	'Menu:ConfigManagementSoftware' => 'Aplikačný manažment',
+	'Menu:Licence' => 'Licencie',
+	'Menu:Licence+' => '',
+	'Menu:Patch' => 'Záplaty',
+	'Menu:Patch+' => '',
+	'Menu:ApplicationInstance' => 'Nainštalovaný softvér',
+	'Menu:ApplicationInstance+' => '',
+	'Menu:ConfigManagementHardware' => 'Manažment infraštruktúry',
+	'Menu:Subnet' => 'Podsiete',
+	'Menu:Subnet+' => '',
+	'Menu:NetworkDevice' => 'Sieťové zariadenia',
+	'Menu:NetworkDevice+' => '',
+	'Menu:Server' => 'Servery',
+	'Menu:Server+' => '',
+	'Menu:Printer' => 'Tlačiarne',
+	'Menu:Printer+' => '',
+	'Menu:MobilePhone' => 'Mobilné telefóny',
+	'Menu:MobilePhone+' => '',
+	'Menu:PC' => 'Osobné počítače',
+	'Menu:PC+' => '',
+	'Menu:NewContact' => 'Nový kontakt',
+	'Menu:NewContact+' => '',
+	'Menu:SearchContacts' => 'Vyhľadať kontakty',
+	'Menu:SearchContacts+' => '',
+	'Menu:NewCI' => 'Nové CI',
+	'Menu:NewCI+' => '',
+	'Menu:SearchCIs' => 'Vyhľadať CIs',
+	'Menu:SearchCIs+' => '',
+	'Menu:ConfigManagement:Devices' => 'Zariadenia',
+	'Menu:ConfigManagement:AllDevices' => 'Infraštruktúra',
+	'Menu:ConfigManagement:virtualization' => 'Virtualizácia',
+	'Menu:ConfigManagement:EndUsers' => 'Koncové užívateľské zariadenia',
+	'Menu:ConfigManagement:SWAndApps' => 'Softvér a aplikácie',
+	'Menu:ConfigManagement:Misc' => 'Rôzne',
+	'Menu:Group' => 'Skupiny CI',
+	'Menu:Group+' => '',
+	'Menu:ConfigManagement:Shortcuts' => 'Skratky',
+	'Menu:ConfigManagement:AllContacts' => 'Všetky kontakty: %1$d',
+	'Menu:Typology' => 'Konfiguračná typológia',
+	'Menu:Typology+' => '',
+	'Menu:OSVersion' => 'OS verzie',
+	'Menu:OSVersion+' => '',
+	'Menu:Software' => 'Katalóg softvéru',
+	'Menu:Software+' => '',
+	'UI_WelcomeMenu_AllConfigItems' => 'Zhrnutie',
+	'Menu:ConfigManagement:Typology' => 'Konfiguračná typológia',
+	'Server:baseinfo' => 'Všeobecné informácie',
+	'Server:Date' => 'Dátum',
+	'Server:moreinfo' => 'Viac informácií',
+	'Server:otherinfo' => 'Iné informácie',
+	'Person:info' => 'Všeobecné informácie',
+	'Class:Subnet/Tab:IPUsage' => 'Využívanosť IP adries',
+	'Class:Subnet/Tab:IPUsage-explain' => 'Rozhrania majúce IP adresu v rozsahu: <em>%1$s</em> do <em>%2$s</em>',
+	'Class:Subnet/Tab:FreeIPs' => 'Voľné IP adresy',
+	'Class:Subnet/Tab:FreeIPs-count' => 'Voľných IP adries: %1$s',
+	'Class:Subnet/Tab:FreeIPs-explain' => 'Tu je extrakt 10 voľných IP adries',
+	'Menu:ServiceManagement' => 'Manažment služieb',
+	'Menu:ServiceManagement+' => '',
+	'Menu:Service:Overview' => 'Prehľad',
+	'Menu:Service:Overview+' => '',
+	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'zmluvy podľa úrovne služby',
+	'UI-ServiceManagementMenu-ContractsByStatus' => 'zmluvy podla stavu',
+	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'zmluvy končiace za menej ako 30 dní',
+	'Menu:ServiceType' => 'Typy služieb',
+	'Menu:ServiceType+' => '',
+	'Menu:ProviderContract' => 'Poskytovateľské zmluvy',
+	'Menu:ProviderContract+' => '',
+	'Menu:CustomerContract' => 'Zákaznícke zmluvy',
+	'Menu:CustomerContract+' => '',
+	'Menu:ServiceSubcategory' => 'Subkategórie služieb',
+	'Menu:ServiceSubcategory+' => '',
+	'Menu:Service' => 'Služby',
+	'Menu:Service+' => '',
+	'Menu:ServiceElement' => 'Prvky služby',
+	'Menu:ServiceElement+' => '',
+	'Menu:SLA' => 'SLAs',
+	'Menu:SLA+' => '',
+	'Menu:SLT' => 'SLTs',
+	'Menu:SLT+' => '',
+	'Menu:DeliveryModel' => 'Typy dodávky',
+	'Menu:DeliveryModel+' => '',
+	'Menu:ServiceFamily' => 'Rodiny služieb',
+	'Menu:ServiceFamily+' => '',
+	'Menu:Procedure' => 'Katalóg procedúr',
+	'Menu:Procedure+' => '',
+	'Class:Contract' => 'zmluva',
+	'Class:Contract+' => '',
+	'Class:Contract/Attribute:name' => 'Názov',
+	'Class:Contract/Attribute:name+' => '',
+	'Class:Contract/Attribute:org_id' => 'Zákazník',
+	'Class:Contract/Attribute:org_id+' => '',
+	'Class:Contract/Attribute:organization_name' => 'Meno zákazníka',
+	'Class:Contract/Attribute:organization_name+' => '',
+	'Class:Contract/Attribute:contacts_list' => 'Kontakty',
+	'Class:Contract/Attribute:contacts_list+' => 'All the contacts for this customer contract~~',
+	'Class:Contract/Attribute:documents_list' => 'Zoznam dokumentov',
+	'Class:Contract/Attribute:documents_list+' => 'All the documents for this customer contract~~',
+	'Class:Contract/Attribute:description' => 'Popis',
+	'Class:Contract/Attribute:description+' => '',
+	'Class:Contract/Attribute:start_date' => 'Dátum začiatku',
+	'Class:Contract/Attribute:start_date+' => '',
+	'Class:Contract/Attribute:end_date' => 'Dátum ukončenia',
+	'Class:Contract/Attribute:end_date+' => '',
+	'Class:Contract/Attribute:cost' => 'Cena',
+	'Class:Contract/Attribute:cost+' => '',
+	'Class:Contract/Attribute:cost_currency' => 'Mena ceny',
+	'Class:Contract/Attribute:cost_currency+' => '',
+	'Class:Contract/Attribute:cost_currency/Value:dollars' => 'USD',
+	'Class:Contract/Attribute:cost_currency/Value:dollars+' => '',
+	'Class:Contract/Attribute:cost_currency/Value:euros' => 'EUR',
+	'Class:Contract/Attribute:cost_currency/Value:euros+' => '',
+	'Class:Contract/Attribute:contracttype_id' => 'Typ zmluvy',
+	'Class:Contract/Attribute:contracttype_id+' => '',
+	'Class:Contract/Attribute:contracttype_name' => 'Názov typu zmluvy',
+	'Class:Contract/Attribute:contracttype_name+' => '',
+	'Class:Contract/Attribute:billing_frequency' => 'Frekvencia faktúrovania',
+	'Class:Contract/Attribute:billing_frequency+' => '',
+	'Class:Contract/Attribute:cost_unit' => 'Cenová jednotka',
+	'Class:Contract/Attribute:cost_unit+' => '',
+	'Class:Contract/Attribute:provider_id' => 'Poskytovateľ',
+	'Class:Contract/Attribute:provider_id+' => '',
+	'Class:Contract/Attribute:provider_name' => 'Meno poskytovateľa',
+	'Class:Contract/Attribute:provider_name+' => '',
+	'Class:Contract/Attribute:status' => 'Stav',
+	'Class:Contract/Attribute:status+' => '',
+	'Class:Contract/Attribute:status/Value:implementation' => 'Implementácia',
+	'Class:Contract/Attribute:status/Value:implementation+' => '',
+	'Class:Contract/Attribute:status/Value:obsolete' => 'Vyradený',
+	'Class:Contract/Attribute:status/Value:obsolete+' => '',
+	'Class:Contract/Attribute:status/Value:production' => 'Produkcia',
+	'Class:Contract/Attribute:status/Value:production+' => '',
+	'Class:Contract/Attribute:finalclass' => 'Typ',
+	'Class:Contract/Attribute:finalclass+' => '',
+	'Class:ProviderContract/Attribute:contracttype_id' => 'Typ zmluvy',
+	'Class:ProviderContract/Attribute:contracttype_id+' => '',
+	'Class:ProviderContract/Attribute:contracttype_name' => 'Názov typu zmluvy',
+	'Class:ProviderContract/Attribute:contracttype_name+' => '',
+	'Class:lnkContactToContract/Attribute:contract_name' => 'Názov zmluvy',
+	'Class:lnkContactToContract/Attribute:contract_name+' => '',
+	'Class:lnkContactToContract/Attribute:contact_name' => 'Názov kontaktu',
+	'Class:lnkContactToContract/Attribute:contact_name+' => '',
+	'Class:lnkContractToDocument/Attribute:contract_name' => 'Názov zmluvy',
+	'Class:lnkContractToDocument/Attribute:contract_name+' => '',
+	'Class:lnkContractToDocument/Attribute:document_name' => 'Názov dokumentu',
+	'Class:lnkContractToDocument/Attribute:document_name+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Názov poskytovateľského zmluvy',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'Názov CI',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '',
+	'Class:Service/Attribute:organization_name' => 'Meno poskytovateľa',
+	'Class:Service/Attribute:organization_name+' => '',
+	'Class:Service/Attribute:servicefamily_name' => 'Názov rodiny služieb',
+	'Class:Service/Attribute:servicefamily_name+' => '',
+	'Class:lnkDocumentToService/Attribute:service_name' => 'Názov služby',
+	'Class:lnkDocumentToService/Attribute:service_name+' => '',
+	'Class:lnkDocumentToService/Attribute:document_name' => 'Názov dokumentu',
+	'Class:lnkDocumentToService/Attribute:document_name+' => '',
+	'Class:lnkContactToService/Attribute:service_name' => 'Názov služby',
+	'Class:lnkContactToService/Attribute:service_name+' => '',
+	'Class:lnkContactToService/Attribute:contact_name' => 'Názov kontaktu',
+	'Class:lnkContactToService/Attribute:contact_name+' => '',
+	'Class:ServiceSubcategory/Attribute:service_name' => 'Názov služby',
+	'Class:ServiceSubcategory/Attribute:service_name+' => '',
+	'Class:SLA/Attribute:organization_name' => 'Názov organizácie poskytovateľa',
+	'Class:SLA/Attribute:organization_name+' => '',
+	'Class:lnkSLAToSLT/Attribute:sla_name' => 'SLA Názov',
+	'Class:lnkSLAToSLT/Attribute:sla_name+' => '',
+	'Class:lnkSLAToSLT/Attribute:slt_name' => 'SLT Názov',
+	'Class:lnkSLAToSLT/Attribute:slt_name+' => '',
+	'Class:lnkCustomerContractToService/Attribute:customercontract_name' => 'Názov zákazníckeho zmluvy',
+	'Class:lnkCustomerContractToService/Attribute:customercontract_name+' => '',
+	'Class:lnkCustomerContractToService/Attribute:service_name' => 'Názov služby',
+	'Class:lnkCustomerContractToService/Attribute:service_name+' => '',
+	'Class:lnkCustomerContractToService/Attribute:sla_name' => 'SLA Názov',
+	'Class:lnkCustomerContractToService/Attribute:sla_name+' => '',
+	'Class:lnkProviderContractToService/Attribute:service_name' => 'Názov služby',
+	'Class:lnkProviderContractToService/Attribute:service_name+' => '',
+	'Class:lnkProviderContractToService/Attribute:providercontract_name' => 'Názov poskytovateľského zmluvy',
+	'Class:lnkProviderContractToService/Attribute:providercontract_name+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Názov služby',
+	'Class:lnkFunctionalCIToService/Attribute:service_name+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => 'Názov CI',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_name+' => '',
+	'Class:DeliveryModel/Attribute:organization_name' => 'Názov organizácie',
+	'Class:DeliveryModel/Attribute:organization_name+' => '',
+	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name' => 'Názov typu dodávky',
+	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name+' => '',
+	'Class:lnkDeliveryModelToContact/Attribute:contact_name' => 'Meno kontaktu',
+	'Class:lnkDeliveryModelToContact/Attribute:contact_name+' => '',
+	'Class:lnkDeliveryModelToContact/Attribute:role_name' => 'Názov role',
+	'Class:lnkDeliveryModelToContact/Attribute:role_name+' => '',
+	'Class:Ticket/Attribute:org_name' => 'Názov organizácie',
+	'Class:Ticket/Attribute:org_name+' => '',
+	'Class:Ticket/Attribute:caller_name' => 'Meno volajúceho',
+	'Class:Ticket/Attribute:caller_name+' => '',
+	'Class:Ticket/Attribute:team_name' => 'Názov tímu',
+	'Class:Ticket/Attribute:team_name+' => '',
+	'Class:Ticket/Attribute:agent_name' => 'Meno agenta',
+	'Class:Ticket/Attribute:agent_name+' => '',
+	'Class:lnkContactToTicket/Attribute:ticket_ref' => 'Referencia na Ticket',
+	'Class:lnkContactToTicket/Attribute:ticket_ref+' => '',
+	'Class:lnkContactToTicket/Attribute:contact_email' => 'Email kontaktu',
+	'Class:lnkContactToTicket/Attribute:contact_email+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref' => 'Referencia na Ticket',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name' => 'Názov CI',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name+' => '',
+	'Class:WorkOrder/Attribute:ticket_ref' => 'Referencia na Ticket',
+	'Class:WorkOrder/Attribute:ticket_ref+' => '',
+	'Class:WorkOrder/Attribute:team_name' => 'Názov tímu',
+	'Class:WorkOrder/Attribute:team_name+' => '',
+	'Class:WorkOrder/Attribute:agent_email' => 'Email agenta',
+	'Class:WorkOrder/Attribute:agent_email+' => '',
+	'Ticket:baseinfo' => 'Všeobecné informácia',
+	'Ticket:date' => 'Dátumy',
+	'Ticket:contact' => 'Kontakt',
+	'Ticket:moreinfo' => 'Viac informácií',
+	'Ticket:relation' => 'Vzťahy',
+	'Ticket:log' => 'Komunikácie',
+	'Ticket:Type' => 'Kvalifikácia',
+	'Ticket:support' => 'Podpora',
+	'Ticket:resolution' => 'Riešenie',
+	'Ticket:SLA' => 'SLA report',
+	'WorkOrder:Details' => 'Detaily',
+	'WorkOrder:Moreinfo' => 'Viac informácií',
+	'Menu:ChangeManagement' => 'Manažment zmien',
+	'Menu:Change:Overview' => 'Prehľad',
+	'Menu:Change:Overview+' => '',
+	'Menu:NewChange' => 'Nová zmena',
+	'Menu:NewChange+' => '',
+	'Menu:SearchChanges' => 'Vyhľadať zmeny',
+	'Menu:SearchChanges+' => '',
+	'Menu:Change:Shortcuts' => 'Skratky',
+	'Menu:Change:Shortcuts+' => '',
+	'Menu:WaitingAcceptance' => 'Zmeny očakávajúce prijatie',
+	'Menu:WaitingAcceptance+' => '',
+	'Menu:WaitingApproval' => 'Zmeny očakávajúce schválenie',
+	'Menu:WaitingApproval+' => '',
+	'Menu:Changes' => 'Otvorené zmeny',
+	'Menu:Changes+' => '',
+	'Menu:MyChanges' => 'Zmeny pridelené mne',
+	'Menu:MyChanges+' => '',
+	'UI-ChangeManagementOverview-ChangeByCategory-last-7-days' => 'Zmeny podľa kategórie za posledných 7 dní',
+	'UI-ChangeManagementOverview-Last-7-days' => 'Počet zmien za posledných 7 dní',
+	'UI-ChangeManagementOverview-ChangeByDomain-last-7-days' => 'Zmeny podľa domény za posledných 7 dní',
+	'UI-ChangeManagementOverview-ChangeByStatus-last-7-days' => 'Zmeny podľa stavu za posledných 7 dní',
+	'Class:Change/Attribute:changemanager_email' => 'Email manažéra zmien',
+	'Class:Change/Attribute:changemanager_email+' => '',
+	'Class:Change/Attribute:parent_name' => 'Referencia na rodičovskú zmenu',
+	'Class:Change/Attribute:parent_name+' => '',
+	'Class:Change/Attribute:related_incident_list' => 'Súvisiace incidenty',
+	'Class:Change/Attribute:related_incident_list+' => 'All the incidents linked to this change~~',
+	'Class:Change/Attribute:related_problems_list' => 'Súvisiace problémy',
+	'Class:Change/Attribute:related_problems_list+' => 'All the problems linked to this change~~',
+	'Class:Change/Attribute:parent_id_friendlyname' => 'Priateľské meno rodičovskej zmeny',
+	'Class:Change/Attribute:parent_id_friendlyname+' => '',
+	'Menu:RequestManagement' => 'Helpdesk',
+	'Menu:RequestManagement+' => '',
+	'Menu:RequestManagementProvider' => 'Poskytovateľ Helpdesku',
+	'Menu:RequestManagementProvider+' => '',
+	'Menu:UserRequest:Provider' => 'Otvorené požiadavky prenesené na poskytovateľa',
+	'Menu:UserRequest:Provider+' => '',
+	'Menu:UserRequest:Overview' => 'Prehľad',
+	'Menu:UserRequest:Overview+' => '',
+	'Menu:NewUserRequest' => 'Nové požiadavky užívateľa',
+	'Menu:NewUserRequest+' => '',
+	'Menu:SearchUserRequests' => 'Vyhľadať užívateľské požiadavky',
+	'Menu:SearchUserRequests+' => '',
+	'Menu:UserRequest:Shortcuts' => 'Skratky',
+	'Menu:UserRequest:Shortcuts+' => '',
+	'Menu:UserRequest:MyRequests' => 'požiadavky pridelené mne',
+	'Menu:UserRequest:MyRequests+' => '',
+	'Menu:UserRequest:MySupportRequests' => 'Moje hovory podpory',
+	'Menu:UserRequest:MySupportRequests+' => '',
+	'Menu:UserRequest:EscalatedRequests' => 'Eskalované požiadavky',
+	'Menu:UserRequest:EscalatedRequests+' => '',
+	'Menu:UserRequest:OpenRequests' => 'Všetky otvorené požiadavky',
+	'Menu:UserRequest:OpenRequests+' => '',
+	'UI:WelcomeMenu:MyAssignedCalls' => 'požiadavky pridelené mne',
+	'UI-RequestManagementOverview-RequestByType-last-14-days' => 'požiadavky za posledných 14 dní (po typoch)',
+	'UI-RequestManagementOverview-Last-14-days' => 'požiadavky posledných 14 dní (po dňoch)',
+	'UI-RequestManagementOverview-OpenRequestByStatus' => 'Otvorené požiadavky podľa stavu',
+	'UI-RequestManagementOverview-OpenRequestByAgent' => 'Otvorené požiadavky podľa agenta',
+	'UI-RequestManagementOverview-OpenRequestByType' => 'Otvorené požiadavky podľa typu',
+	'UI-RequestManagementOverview-OpenRequestByCustomer' => 'Otvorené požiadavky podľa organizácie',
+	'Class:UserRequest:KnownErrorList' => 'Známe chyby',
+	'Menu:UserRequest:MyWorkOrders' => 'Pracovné príkazy pridelené mne',
+	'Menu:UserRequest:MyWorkOrders+' => '',
+	'Class:Problem:KnownProblemList' => 'Známe problémy',
+	'Class:UserRequest/Attribute:approver_email' => 'Email schvalovateľa',
+	'Class:UserRequest/Attribute:approver_email+' => '',
+	'Class:UserRequest/Attribute:service_name' => 'Názov služby',
+	'Class:UserRequest/Attribute:service_name+' => '',
+	'Class:UserRequest/Attribute:servicesubcategory_name' => 'Názov subkategórie služieb',
+	'Class:UserRequest/Attribute:servicesubcategory_name+' => '',
+	'Class:UserRequest/Attribute:parent_request_ref' => 'Požiadavka o odporúčanie',
+	'Class:UserRequest/Attribute:parent_request_ref+' => '',
+	'Class:UserRequest/Attribute:parent_problem_id' => 'Rodičovský problém',
+	'Class:UserRequest/Attribute:parent_problem_id+' => '',
+	'Class:UserRequest/Attribute:parent_problem_ref' => 'Referencia na problém',
+	'Class:UserRequest/Attribute:parent_problem_ref+' => '',
+	'Class:UserRequest/Attribute:parent_change_ref' => 'Referencia na zmenu',
+	'Class:UserRequest/Attribute:parent_change_ref+' => '',
+	'Class:UserRequest/Attribute:parent_request_id_friendlyname' => 'Priateľské meno ID požiadavky rodiča',
+	'Class:UserRequest/Attribute:parent_request_id_friendlyname+' => '',
+	'Portal:TitleDetailsFor_Request' => 'Detaily pre požiadavky',
+	'Portal:ButtonUpdate' => 'Aktualizácia',
+	'Portal:ButtonClose' => 'Zatvoriť',
+	'Portal:ButtonReopen' => 'Znova otvoriť',
+	'Portal:ShowServices' => 'Katalóg služieb',
+	'Portal:SelectRequestType' => 'Zvoľ typ požiadavky',
+	'Portal:SelectServiceElementFrom_Service' => 'Zvoľ služby prvku pre %1$s',
+	'Portal:SelectRequestTemplate' => 'Zvoľ predlohu pre %1$s',
+	'Portal:ListServices' => 'Zoznam služieb',
+	'Portal:TitleDetailsFor_Service' => 'Detaily pre službu',
+	'Portal:Button:CreateRequestFromService' => 'Vytvor Požiadavka pre túto službu',
+	'Portal:ListOpenRequests' => 'Vypíš otvorené požiadavky',
+	'Portal:UserRequest:MoreInfo' => 'Viac informácií',
+	'Portal:Details-Service-Element' => 'Prvky služieb',
+	'Portal:NoClosedTicket' => 'Žiadne zatvorené požiadavky',
+	'Portal:NoService' => '',
+	'Portal:ListOpenProblems' => 'Prebiehajúce problémy',
+	'Portal:ShowProblem' => 'Problémy',
+	'Portal:ShowFaqs' => 'Často kladené otázky',
+	'Portal:NoOpenProblem' => 'Žiadny otvorený problém',
+	'Portal:SelectLanguage' => 'Zmeň svoj jazyk',
+	'Portal:LanguageChangedTo_Lang' => 'Jazyk zmenený na',
+	'Portal:ChooseYourFavoriteLanguage' => 'Vyberte si svoj obľúbený jazyk'
 ));
+
+
+
diff --git a/dictionaries/sk.dictionary.itop.ui.php b/dictionaries/sk.dictionary.itop.ui.php
index a7fc91605b..9c5a14906f 100644
--- a/dictionaries/sk.dictionary.itop.ui.php
+++ b/dictionaries/sk.dictionary.itop.ui.php
@@ -14,6 +14,12 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:AuditCategory/Attribute:definition_set+' => '',
 	'Class:AuditCategory/Attribute:rules_list' => 'Pravidlá auditu',
 	'Class:AuditCategory/Attribute:rules_list+' => 'Audit rules for this category~~',
+	'Class:AuditCategory/Attribute:ok_error_tolerance' => 'Warning threshold~~',
+	'Class:AuditCategory/Attribute:ok_error_tolerance+' => 'Percentage of invalid objects below which the result is a warning (orange)~~',
+	'Class:AuditCategory/Attribute:warning_error_tolerance' => 'Error threshold~~',
+	'Class:AuditCategory/Attribute:warning_error_tolerance+' => 'Percentage of invalid objects below which the result is in error (red)~~',
+	'Class:AuditCategory/Attribute:domains_list' => 'Domains~~',
+	'Class:AuditCategory/Attribute:domains_list+' => 'Domains which includes this category~~',
 ));
 
 //
@@ -41,7 +47,42 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:AuditRule/Attribute:category_id' => 'Kategória',
 	'Class:AuditRule/Attribute:category_id+' => '',
 	'Class:AuditRule/Attribute:category_name' => 'Kategória',
-	'Class:AuditRule/Attribute:category_name+' => '',
+	'Class:AuditRule/Attribute:category_name+' => ''
+));
+
+//
+// Class: AuditDomain
+//
+
+Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
+	'Class:AuditDomain' => 'Audit Domain~~',
+	'Class:AuditDomain+' => 'Audit domains allow to group the audit categories.
+Domain usually correspond to who is responsible for checking and fixing errors~~',
+	'Class:AuditDomain/Attribute:name' => 'Name~~',
+	'Class:AuditDomain/Attribute:name+' => 'Its a segmentation of the Audit by who is in charge of fixing it or just interested~~',
+	'Class:AuditDomain/Attribute:description' => 'Description~~',
+	'Class:AuditDomain/Attribute:description+' => '~~',
+	'Class:AuditDomain/Attribute:icon' => 'Icon~~',
+	'Class:AuditDomain/Attribute:icon+' => '~~',
+	'Class:AuditDomain/Attribute:categories_list' => 'Categories~~',
+	'Class:AuditDomain/Attribute:categories_list+' => 'Related audit categories. When running the audit on a domain, all related audit categories are checked and only those.~~',
+));
+
+//
+// Class: lnkAuditCategoryToAuditDomain
+//
+
+Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
+	'Class:lnkAuditCategoryToAuditDomain' => 'Link AuditCategory / AuditDomain~~',
+	'Class:lnkAuditCategoryToAuditDomain+' => '~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:category_id' => 'Category~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:category_id+' => 'Audit Category~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:category_name' => 'Category name~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:category_name+' => 'Audit category name~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:domain_id' => 'Domain~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:domain_id+' => 'Audit domain~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:domain_name' => 'Domain name~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:domain_name+' => 'Audit domain name~~',
 ));
 
 //
@@ -59,6 +100,16 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:Query/Attribute:is_template+' => 'Usable as source for recipient OQL in Notifications~~',
 	'Class:Query/Attribute:is_template/Value:yes' => 'Yes~~',
 	'Class:Query/Attribute:is_template/Value:no' => 'No~~',
+	'Class:Query/Attribute:export_count' => 'Export counter~~',
+	'Class:Query/Attribute:export_count+' => 'Counter reflecting the number of time this query has been executed~~',
+	'Class:Query/Attribute:export_last_date' => 'Last export~~',
+	'Class:Query/Attribute:export_last_date+' => 'Date and time of the last export execution~~',
+	'Class:Query/Attribute:export_last_user_id' => 'User~~',
+	'Class:Query/Attribute:export_last_user_id+' => 'The user who executed the last export~~',
+	'Class:Query/Attribute:export_last_user_contact' => 'Contact~~',
+	'Class:Query/Attribute:export_last_user_contact+' => 'The contact who executed the last export~~',
+	'Query:baseinfo' => 'General information~~',
+	'Query:exportInfo' => 'Export information~~',
 	'Class:QueryOQL/Attribute:fields' => 'Polia',
 	'Class:QueryOQL/Attribute:fields+' => 'Comma separated list of attributes (or alias.attribute) to export~~',
 	'Class:QueryOQL' => 'OQL Dopyt',
@@ -107,7 +158,6 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:User/Attribute:status+' => 'Whether the user account is enabled or disabled.~~',
 	'Class:User/Attribute:status/Value:enabled' => 'Enabled~~',
 	'Class:User/Attribute:status/Value:disabled' => 'Disabled~~',
-
 	'Class:User/Error:LoginMustBeUnique' => 'Prihlasovacie meno musí byť jedinečné - "%1s" sa už používa.',
 	'Class:User/Error:AtLeastOneProfileIsNeeded' => 'Aspoň jeden profil musí byť priradený k profilu.',
 	'Class:User/Error:ProfileNotAllowed' => 'Profile "%1$s" cannot be added it will deny the access to backoffice~~',
@@ -316,6 +366,29 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Expression:Unit:Short:YEAR' => 'y~~',
 ));
 
+//
+// Duplicated into itop-welcome-itil ( will be removed from here...)
+//
+Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
+	'Menu:WelcomeMenu' => 'Vitajte',
+	'Menu:WelcomeMenu+' => '',
+	'Menu:WelcomeMenuPage' => 'Vitajte',
+	'Menu:WelcomeMenuPage+' => '',
+	'Menu:AdminTools' => 'Administrátorské pomôcky',
+	'Menu:AdminTools+' => '',
+	'Menu:AdminTools?' => 'Pomôcky prístupné iba užívateľom majúcim administrátorský profil',
+	'Menu:CSVImportMenu' => 'CSV import',
+	'Menu:CSVImportMenu+' => '',
+	'Menu:DataModelMenu' => 'Dátový model',
+	'Menu:DataModelMenu+' => '',
+	'Menu:ExportMenu' => 'Export',
+	'Menu:ExportMenu+' => '',
+	'Menu:NotificationsMenu' => 'Upozornenia',
+	'Menu:NotificationsMenu+' => '',
+	'Menu:MyShortcuts' => 'Moje skratky',
+	'Menu:DataAdministration' => 'Dátová administrácia',
+	'Menu:DataAdministration+' => '',
+));
 
 //
 // String from the User Interface: menu, messages, buttons, etc...
@@ -325,12 +398,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'BooleanLabel:yes' => 'yes~~',
 	'BooleanLabel:no' => 'no~~',
 	'UI:Login:Title' => ITOP_APPLICATION_SHORT.' login~~',
-	'Menu:WelcomeMenu' => 'Vitajte',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:WelcomeMenu+' => '',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:WelcomeMenuPage' => 'Vitajte',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:WelcomeMenuPage+' => '',// Duplicated into itop-welcome-itil (will be removed from here...)
 	'UI:WelcomeMenu:Title' => 'Vitajte v '.ITOP_APPLICATION_SHORT,
-
 	'UI:WelcomeMenu:LeftBlock' => '<p>'.ITOP_APPLICATION_SHORT.' je kompletne voľne šíriteľný operačný IT program.</p>
 	
 <ul>Zahŕňa:
@@ -342,7 +410,6 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 <li>Dashboard panel pre rýchle získanie prehľadu o Vašom IT.</li>
 </ul>
 <p>Všetky moduly môžu byť nastavené, krok po kroku, nezávisle jeden od druhého.</p>',
-
 	'UI:WelcomeMenu:RightBlock' => '<p>'.ITOP_APPLICATION_SHORT.' orientovaný na poskytovateľa služieb, dovoľuje IT technikom ľahko manažovať viacerých zákazníkov alebo organizácií.
 <ul>iTop, dodáva súbor biznis procesov bohatých na služby, ktoré:
 <li>Zdokonalujú efektivitu IT manažmentu</li> 
@@ -358,7 +425,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 <li>Manažovať najdôležitejšie aktíva Vášho IT: Dokumentáciu.</li>
 </ul>
 </p>',
-	'UI:WelcomeMenu:Text'=> '<div>Congratulations, you landed on '.ITOP_APPLICATION.' '.ITOP_VERSION_NAME.'!</div>
+	'UI:WelcomeMenu:Text' => '<div>Congratulations, you landed on '.ITOP_APPLICATION.' '.ITOP_VERSION_NAME.'!</div>
 
 <div>This version features a brand new modern and accessible backoffice design.</div>
 
@@ -379,6 +446,7 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:Button:GlobalSearch' => 'Globálne Vyhľadávanie',
 	'UI:Button:Search' => ' Vyhľadávanie',
 	'UI:Button:Clear' => ' Clear ~~',
+	'UI:Button:Confirm' => ' Confirm ~~',
 	'UI:Button:SearchInHierarchy' => 'Search in hierarchy~~',
 	'UI:Button:Query' => ' Dopyt ',
 	'UI:Button:Ok' => 'OK',
@@ -419,7 +487,6 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:UserPref:DoNotShowAgain' => 'Do not show again~~',
 	'UI:InputFile:NoFileSelected' => 'No File Selected~~',
 	'UI:InputFile:SelectFile' => 'Select a file~~',
-
 	'UI:SearchToggle' => 'Vyhľadávanie',
 	'UI:ClickToCreateNew' => 'Vytvoriť nové %1$s~~',
 	'UI:SearchFor_Class' => 'Vyhľadávanie pre %1$s objekty',
@@ -439,7 +506,6 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:Error:CannotWriteToTmp_Dir' => 'Nepodarilo sa zapísať dočasný súbor na disk . upload_tmp_dir = "%1$s".',
 	'UI:Error:UploadStoppedByExtension_FileName' => 'Nahrávanie zastavené rozšírením. (Pôvodné meno súboru = "%1$s").',
 	'UI:Error:UploadFailedUnknownCause_Code' => 'Nahranie súboru zlyhalo z neznámej príčiny . ( Kód chyby = "%1$s").',
-
 	'UI:Error:1ParametersMissing' => 'Chyba: následujúci parameter musí byť zadaný pre túto operáciu: %1$s.',
 	'UI:Error:2ParametersMissing' => 'Chyba: následujúce parametre musia byť zadané pre túto operáciu: %1$s a %2$s.',
 	'UI:Error:3ParametersMissing' => 'Chyba: následujúce parametre musia byť zadané pre túto operáciu: %1$s, %2$s a %3$s.',
@@ -461,9 +527,7 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:Error:MaintenanceMode' => 'Application is currently in maintenance~~',
 	'UI:Error:MaintenanceTitle' => 'Maintenance~~',
 	'UI:Error:InvalidToken' => 'Error: the requested operation has already been performed (CSRF token not found)~~',
-
 	'UI:Error:SMTP:UnknownVendor' => 'OAuth SMTP provider %1$s does not exist  (email_transport_smtp.oauth.provider)~~',
-
 	'UI:GroupBy:Count' => 'Počet',
 	'UI:GroupBy:Count+' => '',
 	'UI:CountOfObjects' => '%1$d objekt/y/ov sa nezhoduje s kritériami.',
@@ -492,6 +556,7 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:Menu:OtherActions' => 'Ostatné akcie',
 	'UI:Menu:Transitions' => 'Transitions~~',
 	'UI:Menu:OtherTransitions' => 'Other Transitions~~',
+	'UI:Menu:View' => 'View this object~~',
 	'UI:Menu:New' => 'Nové...',
 	'UI:Menu:Add' => 'Pridať...',
 	'UI:Menu:Manage' => 'Manažovať...',
@@ -500,6 +565,9 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:Menu:Modify' => 'Upraviť...',
 	'UI:Menu:Delete' => 'Vymazať...',
 	'UI:Menu:BulkDelete' => 'Vymazať...',
+	'UI:Menu:BulkDelete_Class' => 'Delete %1$s objects...~~',
+	'UI:Menu:BulkDelete_Link' => 'Delete %1$s...~~',
+	'UI:Menu:BulkDelete_Remote' => 'Delete %1$s...~~',
 	'UI:UndefinedObject' => 'Nedefinovaný objekt',
 	'UI:Document:OpenInNewWindow:Download' => 'Otvoriť v novom okne: %1$s, stiahnuť: %2$s',
 	'UI:SplitDateTime-Date' => 'Dátum',
@@ -532,7 +600,6 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:Login:ResetPassword' => 'Send now!~~',
 	'UI:Login:ResetPwdFailed' => 'Failed to send an email: %1$s~~',
 	'UI:Login:SeparatorOr' => 'Or~~',
-
 	'UI:ResetPwd-Error-WrongLogin' => '\'%1$s\' is not a valid login~~',
 	'UI:ResetPwd-Error-NotPossible' => 'external accounts do not allow password reset.~~',
 	'UI:ResetPwd-Error-FixedPwd' => 'the account does not allow password reset.~~',
@@ -543,50 +610,49 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:ResetPwd-EmailSent' => 'Please check your email box and follow the instructions. If you receive no email, please check the login you typed.~~',
 	'UI:ResetPwd-EmailSubject' => 'Reset your '.ITOP_APPLICATION_SHORT.' password~~',
 	'UI:ResetPwd-EmailBody' => '<body><p>You have requested to reset your '.ITOP_APPLICATION_SHORT.' password.</p><p>Please follow this link (single usage) to <a href="%1$s">enter a new password</a></p>.~~',
-
 	'UI:ResetPwd-Title' => 'Reset password~~',
 	'UI:ResetPwd-Error-InvalidToken' => 'Sorry, either the password has already been reset, or you have received several emails. Please make sure that you use the link provided in the very last email received.~~',
 	'UI:ResetPwd-Error-EnterPassword' => 'Enter a new password for the account \'%1$s\'.~~',
 	'UI:ResetPwd-Ready' => 'The password has been changed.~~',
 	'UI:ResetPwd-Login' => 'Click here to login...~~',
-
-	'UI:Login:About'                               => 'O účte',
-	'UI:Login:ChangeYourPassword'                  => 'Zmeň heslo',
-	'UI:Login:OldPasswordPrompt'                   => 'Staré heslo',
-	'UI:Login:NewPasswordPrompt'                   => 'Nové heslo',
-	'UI:Login:RetypeNewPasswordPrompt'             => 'Znova zadaj nové heslo',
-	'UI:Login:IncorrectOldPassword'                => 'Chyba: staré heslo je nesprávne',
-	'UI:LogOffMenu'                                => 'Odhlásenie',
+	'UI:Login:About' => 'O účte',
+	'UI:Login:ChangeYourPassword' => 'Zmeň heslo',
+	'UI:Login:OldPasswordPrompt' => 'Staré heslo',
+	'UI:Login:NewPasswordPrompt' => 'Nové heslo',
+	'UI:Login:RetypeNewPasswordPrompt' => 'Znova zadaj nové heslo',
+	'UI:Login:IncorrectOldPassword' => 'Chyba: staré heslo je nesprávne',
+	'UI:LogOffMenu' => 'Odhlásenie',
 	'UI:LogOff:ThankYou' => 'Ďakujeme za používanie '.ITOP_APPLICATION_SHORT,
-	'UI:LogOff:ClickHereToLoginAgain'              => 'Kliknite sem pre nové prihlásenie...',
-	'UI:ChangePwdMenu'                             => 'Zmeniť heslo...',
-	'UI:Login:PasswordChanged'                     => 'Heslo úspešne nastavené !',
+	'UI:LogOff:ClickHereToLoginAgain' => 'Kliknite sem pre nové prihlásenie...',
+	'UI:ChangePwdMenu' => 'Zmeniť heslo...',
+	'UI:Login:PasswordChanged' => 'Heslo úspešne nastavené !',
+	'UI:Login:PasswordNotChanged' => 'Error: Password is the same!~~',
 	'UI:AccessRO-All' => ITOP_APPLICATION_SHORT.' je iba na čítanie',
 	'UI:AccessRO-Users' => ITOP_APPLICATION_SHORT.' je iba na čítanie pre uživatelov',
-	'UI:ApplicationEnvironment'                    => 'Aplikačné prostredie: %1$s',
-	'UI:Login:RetypePwdDoesNotMatch'               => 'Nové heslo a znova zadané nové heslo sa nezhodujú !',
+	'UI:ApplicationEnvironment' => 'Aplikačné prostredie: %1$s',
+	'UI:Login:RetypePwdDoesNotMatch' => 'Nové heslo a znova zadané nové heslo sa nezhodujú !',
 	'UI:Button:Login' => 'Vstup do '.ITOP_APPLICATION_SHORT,
 	'UI:Login:Error:AccessRestricted' => 'Prístup do '.ITOP_APPLICATION_SHORT.'u je obmedzený. Kontaktujte prosím '.ITOP_APPLICATION_SHORT.' administrátora.',
 	'UI:Login:Error:AccessAdmin' => 'Prístup je vyhradený len pre ľudí, ktorí majú oprávnenia od administrátora. Kontaktujte prosím '.ITOP_APPLICATION_SHORT.' administrátora.',
-	'UI:Login:Error:WrongOrganizationName'         => 'Unknown organization~~',
+	'UI:Login:Error:WrongOrganizationName' => 'Unknown organization~~',
 	'UI:Login:Error:MultipleContactsHaveSameEmail' => 'Multiple contacts have the same e-mail~~',
-	'UI:Login:Error:NoValidProfiles'               => 'No valid profile provided~~',
-	'UI:CSVImport:MappingSelectOne'                => '-- vyberte jeden --',
-	'UI:CSVImport:MappingNotApplicable'            => '-- ignorujte toto pole --',
-	'UI:CSVImport:NoData'                          => 'Prázdny dátový súbor..., prosím poskytnite nejaké dáta!',
-	'UI:Title:DataPreview'                         => 'Zobrazenie dát',
-	'UI:CSVImport:ErrorOnlyOneColumn'              => 'Chyba: Dáta obsahujú iba jeden stĺpec. Vybrali ste vhodný oddelovací znak ?',
-	'UI:CSVImport:FieldName'                       => 'Pole %1$d',
-	'UI:CSVImport:DataLine1'                       => 'Dátovy riadok 1',
-	'UI:CSVImport:DataLine2'                       => 'Dátovy riadok 2',
-	'UI:CSVImport:idField'                         => 'ID (Primárny kľúč)',
+	'UI:Login:Error:NoValidProfiles' => 'No valid profile provided~~',
+	'UI:CSVImport:MappingSelectOne' => '-- vyberte jeden --',
+	'UI:CSVImport:MappingNotApplicable' => '-- ignorujte toto pole --',
+	'UI:CSVImport:NoData' => 'Prázdny dátový súbor..., prosím poskytnite nejaké dáta!',
+	'UI:Title:DataPreview' => 'Zobrazenie dát',
+	'UI:CSVImport:ErrorOnlyOneColumn' => 'Chyba: Dáta obsahujú iba jeden stĺpec. Vybrali ste vhodný oddelovací znak ?',
+	'UI:CSVImport:FieldName' => 'Pole %1$d',
+	'UI:CSVImport:DataLine1' => 'Dátovy riadok 1',
+	'UI:CSVImport:DataLine2' => 'Dátovy riadok 2',
+	'UI:CSVImport:idField' => 'ID (Primárny kľúč)',
 	'UI:Title:BulkImport' => ITOP_APPLICATION_SHORT.' - hromadná importácia',
-	'UI:Title:BulkImport+'                         => '',
-	'UI:Title:BulkSynchro_nbItem_ofClass_class'    => 'Synchronizácia %1$d objektov triedy %2$s',
-	'UI:CSVImport:ClassesSelectOne'                => '-- vyberte jeden --',
-	'UI:CSVImport:ErrorExtendedAttCode'            => 'Interná chyba: "%1$s" je nesprávny kód pretože "%2$s" nie je externý kľuč triedy "%3$s"',
-	'UI:CSVImport:ObjectsWillStayUnchanged'        => '%1$d objektov ktoré ostanú nezmené.',
-	'UI:CSVImport:ObjectsWillBeModified'           => '%1$d objektov bude upravených.',
+	'UI:Title:BulkImport+' => '',
+	'UI:Title:BulkSynchro_nbItem_ofClass_class' => 'Synchronizácia %1$d objektov triedy %2$s',
+	'UI:CSVImport:ClassesSelectOne' => '-- vyberte jeden --',
+	'UI:CSVImport:ErrorExtendedAttCode' => 'Interná chyba: "%1$s" je nesprávny kód pretože "%2$s" nie je externý kľuč triedy "%3$s"',
+	'UI:CSVImport:ObjectsWillStayUnchanged' => '%1$d objektov ktoré ostanú nezmené.',
+	'UI:CSVImport:ObjectsWillBeModified' => '%1$d objektov bude upravených.',
 	'UI:CSVImport:ObjectsWillBeAdded' => '%1$d objektov bude pridaných.',
 	'UI:CSVImport:ObjectsWillHaveErrors' => '%1$d objektov bude mať chyby.',
 	'UI:CSVImport:ObjectsRemainedUnchanged' => '%1$d objektov zostalo nezmenených.',
@@ -632,11 +698,14 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:UniversalSearchTitle' => ITOP_APPLICATION_SHORT.' - Univerzálne vyhľadávanie',
 	'UI:UniversalSearch:Error' => 'Chyba: %1$s',
 	'UI:UniversalSearch:LabelSelectTheClass' => 'Vyberte triedu na vyhľadávanie: ',
-
 	'UI:CSVReport-Value-Modified' => 'Upravený',
 	'UI:CSVReport-Value-SetIssue' => 'invalid value for attribute~~',
 	'UI:CSVReport-Value-ChangeIssue' => '\'%1$s\' is an invalid value~~',
 	'UI:CSVReport-Value-NoMatch' => 'No match for value \'%1$s\'~~',
+	'UI:CSVReport-Value-NoMatch-PossibleValues' => 'Some possible \'%1$s\' value(s): %2$s~~',
+	'UI:CSVReport-Value-NoMatch-NoObject' => 'There are no \'%1$s\' objects~~',
+	'UI:CSVReport-Value-NoMatch-NoObject-ForCurrentUser' => 'There are no \'%1$s\' objects found with your current profile~~',
+	'UI:CSVReport-Value-NoMatch-SomeObjectNotVisibleForCurrentUser' => 'There are some \'%1$s\' objects not visible with your current profile~~',
 	'UI:CSVReport-Value-Missing' => 'Chýbajúca povinná hodnota',
 	'UI:CSVReport-Value-Ambiguous' => 'Nejednoznačné: nájdených %1$s objektov',
 	'UI:CSVReport-Row-Unchanged' => 'Nezmený',
@@ -650,15 +719,16 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:CSVReport-Value-Issue-Readonly' => 'Atribút \'%1$s\' je len na čítanie a nemožno ho zmeniť (súčasná hodnota: %2$s, navrhovaná hodnota: %3$s)',
 	'UI:CSVReport-Value-Issue-Format' => 'Spracovanie vstupu zlyhalo: %1$s',
 	'UI:CSVReport-Value-Issue-NoMatch' => 'Neočakávaná hodnota pre atribút \'%1$s\': žiadny zhoda nebola nájdená, skontrolujte hláskovanie',
+	'UI:CSVReport-Value-Issue-AllowedValues' => 'Allowed \'%1$s\' value(s): %2$s~~',
 	'UI:CSVReport-Value-Issue-Unknown' => 'Neočakávaná hodnota pre atribút \'%1$s\': %2$s',
 	'UI:CSVReport-Row-Issue-Inconsistent' => 'Atribúty nie sú konzistentné jeden s druhým: %1$s',
 	'UI:CSVReport-Row-Issue-Attribute' => 'Neočakávaná/é hodnota/y atribútu/ov ',
 	'UI:CSVReport-Row-Issue-MissingExtKey' => 'Nemôže byť vytvorený, v dôsledku chýbajúceho kľúča/ov: %1$s',
 	'UI:CSVReport-Row-Issue-DateFormat' => 'Nesprávny formát dátumu',
+	'UI:CSVReport-Row-Issue-ExpectedDateFormat' => 'Expected format: %1$s~~',
 	'UI:CSVReport-Row-Issue-Reconciliation' => 'Zlyhalo schválenie',
 	'UI:CSVReport-Row-Issue-Ambiguous' => 'Nejednoznačné schválenie',
 	'UI:CSVReport-Row-Issue-Internal' => 'Interná chyba: %1$s, %2$s',
-
 	'UI:CSVReport-Icon-Unchanged' => 'Nezmené',
 	'UI:CSVReport-Icon-Modified' => 'Upravené',
 	'UI:CSVReport-Icon-Missing' => 'Chýbajúce',
@@ -673,14 +743,32 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:CSVReport-Stats-Errors' => '%1$.0f %% načitaných objektov má chyby a budú ignorované.',
 	'UI:CSVReport-Stats-Created' => '%1$.0f %% načitaných objektov bude vytvorených.',
 	'UI:CSVReport-Stats-Modified' => '%1$.0f %% načitaných objektov bude upravených.',
-
 	'UI:CSVExport:AdvancedMode' => 'Rozšírený režim',
 	'UI:CSVExport:AdvancedMode+' => '',
 	'UI:CSVExport:LostChars' => 'Kódovanie problému',
 	'UI:CSVExport:LostChars+' => '',
-
 	'UI:Audit:Title' => ITOP_APPLICATION_SHORT.' - CMDB audit',
 	'UI:Audit:InteractiveAudit' => 'Interaktívny audit',
+	'UI:Audit:Interactive:All:Title' => 'Audit results~~',
+	'UI:Audit:Interactive:All:SubTitle' => 'Full audit: includes all rules, all categories, all domains~~',
+	'UI:Audit:Interactive:All:BreadCrumb' => 'Full audit~~',
+	'UI:Audit:Interactive:All:BreadCrumb+' => 'Audit results for all rules~~',
+	'UI:Audit:Interactive:Categories:Title' => 'Audit results for categories: %1$s~~',
+	'UI:Audit:Interactive:Categories:SubTitle' => 'Audit results for all the rules belonging to one of those %1$s categories~~',
+	'UI:Audit:Interactive:Categories:BreadCrumb' => 'Categories~~',
+	'UI:Audit:Interactive:Categories:BreadCrumb+' => 'Audit categories: %1$s~~',
+	'UI:Audit:Interactive:Domain:Title' => 'Audit results for Domain: %1$s~~',
+	'UI:Audit:Interactive:Domain:SubTitle' => 'Audit results for all the rules belonging to a category related to the domain: %1$s~~',
+	'UI:Audit:Interactive:Domain:BreadCrumb' => '%1$s~~',
+	'UI:Audit:Interactive:Domain:BreadCrumb+' => 'Audit for Domain: %1$s~~',
+	'UI:Audit:Interactive:Selection:Title' => 'Selection of an audit~~',
+	'UI:Audit:Interactive:Selection:SubTitle' => 'Select a domain to get the results limited to this domain or select "All categories" to get a full audit (can take time or even fail if too much data to audit)~~',
+	'UI:Audit:Interactive:Selection:BreadCrumb' => 'Selection~~',
+	'UI:Audit:Interactive:Selection:BreadCrumb+' => 'Selection of an Audit to run~~',
+	'UI:Audit:Interactive:Selection:BadgeAll' => 'All categories~~',
+	'UI:Audit:Interactive:Button:Back' => 'Back to the audit~~',
+	'UI:Audit:Interactive:Button:Configuration' => 'Audit configuration~~',
+	'UI:Audit:ViewRules' => 'Check the rules~~',
 	'UI:Audit:HeaderAuditRule' => 'Pravidlo auditu',
 	'UI:Audit:HeaderNbObjects' => '# Objekty',
 	'UI:Audit:HeaderNbErrors' => '# Chyby',
@@ -696,8 +784,6 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:Audit:Dashboard:ObjectsInError' => 'Objects in errors~~',
 	'UI:Audit:Dashboard:ObjectsValidated' => 'Objects validated~~',
 	'UI:Audit:AuditCategory:Subtitle' => '%1$s errors ouf of %2$s - %3$s%%~~',
-
-
 	'UI:RunQuery:Title' => ITOP_APPLICATION_SHORT.' - Určenie OQL Dopytu',
 	'UI:RunQuery:QueryExamples' => 'Príklad dopytu',
 	'UI:RunQuery:QueryResults' => 'Query Results~~',
@@ -736,7 +822,6 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:Schema:Label' => 'Označenie',
 	'UI:Schema:Label+' => '',
 	'UI:Schema:Type' => 'Typ',
-
 	'UI:Schema:Type+' => '',
 	'UI:Schema:Origin' => 'Pôvod',
 	'UI:Schema:Origin+' => '',
@@ -784,6 +869,16 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:Schema:DisplaySelector/Code' => 'Code~~~~',
 	'UI:Schema:Attribute/Filter' => 'Filter~~~~',
 	'UI:Schema:DefaultNullValue' => 'Default null : "%1$s"~~~~',
+	'UI:Schema:Events' => 'Events~~',
+	'UI:Schema:Events:Defined' => 'Defined events~~',
+	'UI:Schema:Events:NoEvent' => 'No event defined~~',
+	'UI:Schema:Events:Listeners' => 'Event listeners~~',
+	'UI:Schema:Events:NoListener' => 'No event listener~~',
+	'UI:Schema:Events:Event' => 'Event~~',
+	'UI:Schema:Events:Description' => 'Description~~',
+	'UI:Schema:Events:Listener' => 'Listener~~',
+	'UI:Schema:Events:Rank' => 'Rank~~',
+	'UI:Schema:Events:Module' => 'Module~~',
 	'UI:LinksWidget:Autocomplete+' => '',
 	'UI:Edit:SearchQuery' => 'Select a predefined query~~',
 	'UI:Edit:TestQuery' => 'Testovací dopyt',
@@ -875,7 +970,6 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:SystemIntrusion' => 'Prístup zamietnutý. Snažili ste sa vykonať operáciu, ktorá Vám nie je povolená.',
 	'UI:FatalErrorMessage' => 'Fatálna chyba, '.ITOP_APPLICATION_SHORT.' nemôže pokračovať.',
 	'UI:Error_Details' => 'Chyba: %1$s.',
-
 	'UI:PageTitle:ProfileProjections' => ITOP_APPLICATION_SHORT.' užívateľský manažment - projekcie profilov',
 	'UI:UserManagement:Class' => 'Trieda',
 	'UI:UserManagement:Class+' => '',
@@ -910,66 +1004,42 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:UserManagement:NoLifeCycleApplicable' => 'N/A',
 	'UI:UserManagement:NoLifeCycleApplicable+' => '',
 	'UI:UserManagement:GrantMatrix' => 'Udelovacia matica',
-
-	'Menu:AdminTools' => 'Administrátorské pomôcky',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:AdminTools+' => '',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:AdminTools?' => 'Pomôcky prístupné iba užívateľom majúcim administrátorský profil',// Duplicated into itop-welcome-itil (will be removed from here...)
 	'Menu:SystemTools' => 'System~~',
-
 	'UI:ChangeManagementMenu' => 'Manažment zmien',
 	'UI:ChangeManagementMenu+' => '',
 	'UI:ChangeManagementMenu:Title' => 'Prehľad zmien',
 	'UI-ChangeManagementMenu-ChangesByType' => 'Zmeny podľa typu',
 	'UI-ChangeManagementMenu-ChangesByStatus' => 'Zmeny podľa stavu',
 	'UI-ChangeManagementMenu-ChangesNotYetAssigned' => 'Zmeny ešte nepriradené',
-
 	'UI:ConfigurationManagementMenu' => 'Konfiguračný manažment',
 	'UI:ConfigurationManagementMenu+' => '',
 	'UI:ConfigurationManagementMenu:Title' => 'Prehľad infraštruktúry',
 	'UI-ConfigurationManagementMenu-InfraByType' => 'Infraštruktúra objektov podľa typu',
 	'UI-ConfigurationManagementMenu-InfraByStatus' => 'Infraštruktúra objektov podľa stavu',
-
 	'UI:ConfigMgmtMenuOverview:Title' => 'Panel pre konfiguračný manažment',
 	'UI-ConfigMgmtMenuOverview-FunctionalCIbyStatus' => 'Konfiguračné položky podľa stavu',
 	'UI-ConfigMgmtMenuOverview-FunctionalCIByType' => 'Konfiguračné položky podľa typu',
-
 	'UI:RequestMgmtMenuOverview:Title' => 'Panel pre manažment žiadostí',
 	'UI-RequestManagementOverview-RequestByService' => 'Užívateľská žiadosť podľa služby',
 	'UI-RequestManagementOverview-RequestByPriority' => 'Užívateľská žiadosť podľa priority',
 	'UI-RequestManagementOverview-RequestUnassigned' => 'Užívateľská žiadosť zatiaľ nepriradená agentovi',
-
 	'UI:IncidentMgmtMenuOverview:Title' => 'Panel pre manažment incidentov',
 	'UI-IncidentManagementOverview-IncidentByService' => 'Incidenty podľa služby',
 	'UI-IncidentManagementOverview-IncidentByPriority' => 'Incidenty podľa priority',
 	'UI-IncidentManagementOverview-IncidentUnassigned' => 'Incidenty zatiaľ nepriradené agentovi',
-
 	'UI:ChangeMgmtMenuOverview:Title' => 'Panel pre manažment zmien',
 	'UI-ChangeManagementOverview-ChangeByType' => 'Zmeny podľa typu',
 	'UI-ChangeManagementOverview-ChangeUnassigned' => 'Zmeny zatiaľ nepriradené agentovi',
 	'UI-ChangeManagementOverview-ChangeWithOutage' => 'Výpadky v dôsledku zmien',
-
 	'UI:ServiceMgmtMenuOverview:Title' => 'Panel manažment služieb',
 	'UI-ServiceManagementOverview-CustomerContractToRenew' => 'Zákaznícke kontrakty na obnovenie v najbližších 30 dňoch',
 	'UI-ServiceManagementOverview-ProviderContractToRenew' => 'Poskytovateľské kontrakty na obnovenie v najbližších 30 dňoch',
-
 	'UI:ContactsMenu' => 'Kontakty',
 	'UI:ContactsMenu+' => '',
 	'UI:ContactsMenu:Title' => 'Prehľad kontaktov',
 	'UI-ContactsMenu-ContactsByLocation' => 'Kontakty podľa polohy',
 	'UI-ContactsMenu-ContactsByType' => 'Kontakty podľa typu',
 	'UI-ContactsMenu-ContactsByStatus' => 'Kontakty podľa stavu',
-
-	'Menu:CSVImportMenu' => 'CSV import',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:CSVImportMenu+' => '',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:DataModelMenu' => 'Dátový model',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:DataModelMenu+' => '',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:ExportMenu' => 'Export',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:ExportMenu+' => '',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:NotificationsMenu' => 'Upozornenia',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:NotificationsMenu+' => '',// Duplicated into itop-welcome-itil (will be removed from here...)
 	'UI:NotificationsMenu:Title' => 'Konfigurácia Upozornení',
 	'UI:NotificationsMenu:Help' => 'Pomoc',
 	'UI:NotificationsMenu:HelpContent' => '<p>In '.ITOP_APPLICATION_SHORT.' upozornenia sú plne upraviteľné. Sú založené na dvoch setoch objektov: <i>spúštače a akcie</i>.</p>
@@ -1002,53 +1072,18 @@ Keď sú priradené spúštačom, každej akcii je dané číslo "príkazu", šp
 	'UI:NotificationsMenu:Actions:ActionWebhook' => 'Webhook actions (outgoing integrations)~~',
 	'UI:NotificationsMenu:Actions:Action' => 'Other actions~~',
 	'UI:NotificationsMenu:AvailableActions' => 'Dostupné akcie',
-
 	'Menu:TagAdminMenu' => 'Tags configuration~~',
 	'Menu:TagAdminMenu+' => 'Tags values management~~',
 	'UI:TagAdminMenu:Title' => 'Tags configuration~~',
 	'UI:TagAdminMenu:NoTags' => 'No Tag field configured~~',
 	'UI:TagSetFieldData:Error' => 'Error: %1$s~~',
-
-	'Menu:AuditCategories' => 'Kategórie auditu',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:AuditCategories+' => '',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:Notifications:Title' => 'Kategórie auditu',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:RunQueriesMenu' => 'Spustiť dopyty',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:RunQueriesMenu+' => '',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:QueryMenu' => 'Dopyt frázy',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:QueryMenu+' => '',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:DataAdministration' => 'Dátová administrácia',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:DataAdministration+' => '',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:UniversalSearchMenu' => 'Univerzálne vyhľadávanie',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UniversalSearchMenu+' => '',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:UserManagementMenu' => 'Užívateľský manažment',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UserManagementMenu+' => '',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:ProfilesMenu' => 'Profily',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:ProfilesMenu+' => '',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:ProfilesMenu:Title' => 'Profily',
-	// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:UserAccountsMenu' => 'Užívateľské účty',
-	// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UserAccountsMenu+' => '',
-	// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UserAccountsMenu:Title' => 'Užívateľské účty',
-	// Duplicated into itop-welcome-itil (will be removed from here...)
-
 	'UI:iTopVersion:Short' => ITOP_APPLICATION_SHORT.' verzia %1$s',
 	'UI:iTopVersion:Long' => ITOP_APPLICATION_SHORT.' verzia %1$s-%2$s postavená na %3$s',
 	'UI:PropertiesTab' => 'Vlastnosti',
-
 	'UI:OpenDocumentInNewWindow_' => 'Otvoriť~~',
 	'UI:DownloadDocument_' => 'Stiahnuť~~',
 	'UI:Document:NoPreview' => 'Žiadny náhľad nie je dostupný pre tento typ dokumentu',
 	'UI:Download-CSV' => 'Stiahnuť %1$s',
-
 	'UI:DeadlineMissedBy_duration' => 'Prekročené o %1$s',
 	'UI:Deadline_LessThan1Min' => '< 1 min',
 	'UI:Deadline_Minutes' => '%1$d min',
@@ -1091,7 +1126,7 @@ Keď sú priradené spúštačom, každej akcii je dané číslo "príkazu", šp
 	'UI:RelationTooltip:ImpactedItems_N_of_M' => '# of impacted items: %1$d / %2$d~~',
 	'UI:RelationTooltip:CriticalThreshold_N_of_M' => 'Critical threshold: %1$d / %2$d~~',
 	'Portal:Title' => ITOP_APPLICATION_SHORT.' užívateľský portál',
-	'Portal:NoRequestMgmt' => 'Drahý/á %1$s, boli ste presmerovaný na túto stránku pretože Váš účet je nastavený na profil \'Užívateľ portálu\'. Nanešťastie, '.ITOP_APPLICATION_SHORT.' nebol nainštalovaný s funkciou \'Manažment žiadostí\'. Prosím kontaktujte Vášho administrátora.',
+	'Portal:NoRequestMgmt' => 'Drahý/á %1$s, boli ste presmerovaný na túto stránku pretože Váš účet je nastavený na profil \'Užívateľ portálu\'.Nanešťastie, '.ITOP_APPLICATION_SHORT.' nebol nainštalovaný s funkciou \'Manažment žiadostí\'.Prosím kontaktujte Vášho administrátora.',
 	'Portal:Refresh' => 'Obnoviť',
 	'Portal:Back' => 'Späť',
 	'Portal:WelcomeUserOrg' => 'Vitajte %1$s, z %2$s',
@@ -1127,9 +1162,13 @@ Keď sú priradené spúštačom, každej akcii je dané číslo "príkazu", šp
 	'Enum:Undefined' => 'Nedefinovaný',
 	'UI:DurationForm_Days_Hours_Minutes_Seconds' => '%1$s Dní %2$s Hodín %3$s Minút %4$s Sekúnd',
 	'UI:ModifyAllPageTitle' => 'Upraviť všetko',
+	'UI:Modify_ObjectsOf_Class' => 'Modifying objects of class %1$s~~',
 	'UI:Modify_N_ObjectsOf_Class' => 'Modifying %1$d objects of class %2$s~~',
 	'UI:Modify_M_ObjectsOf_Class_OutOf_N' => 'Upravovanie %1$d objektov triedy %2$s z %3$d',
 	'UI:Menu:ModifyAll' => 'Upraviť...',
+	'UI:Menu:ModifyAll_Class' => 'Modify %1$s objects...~~',
+	'UI:Menu:ModifyAll_Link' => 'Modify %1$s...~~',
+	'UI:Menu:ModifyAll_Remote' => 'Modify %1$s...~~',
 	'UI:Button:ModifyAll' => 'Upraviť všetko',
 	'UI:Button:PreviewModifications' => 'Náhľad úpravy >>',
 	'UI:ModifiedObject' => 'Objekt Upravený',
@@ -1189,7 +1228,6 @@ Keď sú priradené spúštačom, každej akcii je dané číslo "príkazu", šp
 	'UI:PrintResolution:LetterLandscape' => 'Letter Landscape~~',
 	'UI:Toggle:SwitchToStandardDashboard' => 'Switch to standard dashboard~~',
 	'UI:Toggle:SwitchToCustomDashboard' => 'Switch to custom dashboard~~',
-
 	'UI:ConfigureThisList' => 'Konfigurovať tento zoznam...',
 	'UI:ListConfigurationTitle' => 'Zoznam konfigurácii',
 	'UI:ColumnsAndSortOrder' => 'Stĺpce a triediaci príkaz:',
@@ -1205,10 +1243,8 @@ Keď sú priradené spúštačom, každej akcii je dané číslo "príkazu", šp
 	'UI:ExtField_AsRemoteField' => '%1$s (%2$s)',
 	'UI:Button:MoveUp' => 'Posunúť hore',
 	'UI:Button:MoveDown' => 'Posunúť dole',
-
 	'UI:OQL:UnknownClassAndFix' => 'Neznáma trieda "%1$s". Môžete skúsiť "%2$s" namiesto toho.',
 	'UI:OQL:UnknownClassNoFix' => 'Neznáma trieda "%1$s"',
-
 	'UI:Dashboard:EditCustom' => 'Edit custom version...~~',
 	'UI:Dashboard:CreateCustom' => 'Create a custom version...~~',
 	'UI:Dashboard:DeleteCustom' => 'Delete custom version...~~',
@@ -1219,13 +1255,10 @@ Keď sú priradené spúštačom, každej akcii je dané číslo "príkazu", šp
 	'UI:ImportDashboardText' => 'Zvoľte panel súboru na importovanie:',
 	'UI:Dashboard:Actions' => 'Dashboard actions~~',
 	'UI:Dashboard:NotUpToDateUntilContainerSaved' => 'This dashboard displays information that does not include the on-going changes.~~',
-
-
 	'UI:DashletCreation:Title' => 'Vytvoriť a nový Dashlet',
 	'UI:DashletCreation:Dashboard' => 'Panel',
 	'UI:DashletCreation:DashletType' => 'Typ Dashletu',
 	'UI:DashletCreation:EditNow' => 'Upraviť panel',
-
 	'UI:DashboardEdit:Title' => 'Panel Editor',
 	'UI:DashboardEdit:DashboardTitle' => 'Nadpis',
 	'UI:DashboardEdit:AutoReload' => 'Automatic refresh~~',
@@ -1233,38 +1266,31 @@ Keď sú priradené spúštačom, každej akcii je dané číslo "príkazu", šp
 	'UI:DashboardEdit:AutoReloadSec+' => 'The minimum allowed is %1$d seconds~~',
 	'UI:DashboardEdit:Revert' => 'Revert~~',
 	'UI:DashboardEdit:Apply' => 'Apply~~',
-
 	'UI:DashboardEdit:Layout' => 'Rozloženie',
 	'UI:DashboardEdit:Properties' => 'Vlastnosti panelu',
 	'UI:DashboardEdit:Dashlets' => 'Dostupné Dashlety',
 	'UI:DashboardEdit:DashletProperties' => 'Vlastnosti Dashletu',
-
 	'UI:Form:Property' => 'Vlastnosť',
 	'UI:Form:Value' => 'Hodnota',
-
 	'UI:DashletUnknown:Label' => 'Unknown~~',
 	'UI:DashletUnknown:Description' => 'Unknown dashlet (might have been uninstalled)~~',
 	'UI:DashletUnknown:RenderText:View' => 'Unable to render this dashlet.~~',
 	'UI:DashletUnknown:RenderText:Edit' => 'Unable to render this dashlet (class "%1$s"). Check with your administrator if it is still available.~~',
 	'UI:DashletUnknown:RenderNoDataText:Edit' => 'No preview available for this dashlet (class "%1$s").~~',
 	'UI:DashletUnknown:Prop-XMLConfiguration' => 'Configuration (shown as raw XML)~~',
-
 	'UI:DashletProxy:Label' => 'Proxy~~',
 	'UI:DashletProxy:Description' => 'Proxy dashlet~~',
 	'UI:DashletProxy:RenderNoDataText:Edit' => 'No preview available for this third-party dashlet (class "%1$s").~~',
 	'UI:DashletProxy:Prop-XMLConfiguration' => 'Configuration (shown as raw XML)~~',
-
 	'UI:DashletPlainText:Label' => 'Text',
 	'UI:DashletPlainText:Description' => 'Obyčajný text (žiadne formátovanie)',
 	'UI:DashletPlainText:Prop-Text' => 'Text',
 	'UI:DashletPlainText:Prop-Text:Default' => 'Prosím vložte nejaký text sem...',
-
 	'UI:DashletObjectList:Label' => 'Zoznam objektu',
 	'UI:DashletObjectList:Description' => 'Zoznam objektu dashlet',
 	'UI:DashletObjectList:Prop-Title' => 'Nadpis',
 	'UI:DashletObjectList:Prop-Query' => 'Dopyt',
 	'UI:DashletObjectList:Prop-Menu' => 'Menu',
-
 	'UI:DashletGroupBy:Prop-Title' => 'Nadpis',
 	'UI:DashletGroupBy:Prop-Query' => 'Dopyt',
 	'UI:DashletGroupBy:Prop-Style' => 'Štýl',
@@ -1278,24 +1304,20 @@ Keď sú priradené spúštačom, každej akcii je dané číslo "príkazu", šp
 	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfWeek' => '%1$ (deň v týžni)',
 	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfMonth' => '%1$s (deň v mesiaci)',
 	'UI:DashletGroupBy:MissingGroupBy' => 'Prosím zvoľte pole na ktorom objekty budú zoskupené spolu',
-
 	'UI:DashletGroupByPie:Label' => 'Koláčový graf',
 	'UI:DashletGroupByPie:Description' => 'Koláčový graf',
 	'UI:DashletGroupByBars:Label' => 'Tyčinkový graf',
 	'UI:DashletGroupByBars:Description' => 'Tyčinkový graf',
 	'UI:DashletGroupByTable:Label' => 'Zoskupiť podľa tabuliek (table)',
 	'UI:DashletGroupByTable:Description' => 'Zoznam (zoskupené podľa polí)',
-
-	// New in 2.5
+    // New in 2.5
 	'UI:DashletGroupBy:Prop-Function' => 'Aggregation function~~',
 	'UI:DashletGroupBy:Prop-FunctionAttribute' => 'Function attribute~~',
 	'UI:DashletGroupBy:Prop-OrderDirection' => 'Direction~~',
 	'UI:DashletGroupBy:Prop-OrderField' => 'Order by~~',
 	'UI:DashletGroupBy:Prop-Limit' => 'Limit~~',
-
 	'UI:DashletGroupBy:Order:asc' => 'Ascending~~',
 	'UI:DashletGroupBy:Order:desc' => 'Descending~~',
-
 	'UI:GroupBy:count' => 'Count~~',
 	'UI:GroupBy:count+' => 'Number of elements~~',
 	'UI:GroupBy:sum' => 'Sum~~',
@@ -1306,14 +1328,12 @@ Keď sú priradené spúštačom, každej akcii je dané číslo "príkazu", šp
 	'UI:GroupBy:min+' => 'Minimum of %1$s~~',
 	'UI:GroupBy:max' => 'Maximum~~',
 	'UI:GroupBy:max+' => 'Maximum of %1$s~~',
-	// ---
-
+    // ---
 	'UI:DashletHeaderStatic:Label' => 'Hlavička',
 	'UI:DashletHeaderStatic:Description' => 'Zobrazuje an horizontálny oddelovač',
 	'UI:DashletHeaderStatic:Prop-Title' => 'Nadpis',
 	'UI:DashletHeaderStatic:Prop-Title:Default' => 'Kontakty',
 	'UI:DashletHeaderStatic:Prop-Icon' => 'Ikonka',
-
 	'UI:DashletHeaderDynamic:Label' => 'Hlavička so štatistikami',
 	'UI:DashletHeaderDynamic:Description' => 'Hlavička s vlastnosťami (zoskupené podľa...)',
 	'UI:DashletHeaderDynamic:Prop-Title' => 'Nadpis',
@@ -1324,11 +1344,9 @@ Keď sú priradené spúštačom, každej akcii je dané číslo "príkazu", šp
 	'UI:DashletHeaderDynamic:Prop-Query' => 'Dopyt',
 	'UI:DashletHeaderDynamic:Prop-GroupBy' => 'Zoskupiť podľa',
 	'UI:DashletHeaderDynamic:Prop-Values' => 'Hodnoty',
-
 	'UI:DashletBadge:Label' => 'Odznak',
 	'UI:DashletBadge:Description' => 'Ikonka objektu s novým/vyhľadávanie',
 	'UI:DashletBadge:Prop-Class' => 'Trieda',
-
 	'DayOfWeek-Sunday' => 'Nedeľa',
 	'DayOfWeek-Monday' => 'Pondelok',
 	'DayOfWeek-Tuesday' => 'Utorok',
@@ -1348,8 +1366,7 @@ Keď sú priradené spúštačom, každej akcii je dané číslo "príkazu", šp
 	'Month-10' => 'October~~',
 	'Month-11' => 'November~~',
 	'Month-12' => 'December~~',
-
-	// Short version for the DatePicker
+    // Short version for the DatePicker
 	'DayOfWeek-Sunday-Min' => 'Su~~',
 	'DayOfWeek-Monday-Min' => 'Mo~~',
 	'DayOfWeek-Tuesday-Min' => 'Tu~~',
@@ -1369,13 +1386,13 @@ Keď sú priradené spúštačom, každej akcii je dané číslo "príkazu", šp
 	'Month-10-Short' => 'Oct~~',
 	'Month-11-Short' => 'Nov~~',
 	'Month-12-Short' => 'Dec~~',
-	'Calendar-FirstDayOfWeek' => '0~~',// 0 = Sunday, 1 = Monday, etc...
-
+	'Calendar-FirstDayOfWeek' => '0~~',
+    // 0 = Sunday, 1 = Monday, etc...
 	'UI:Menu:ShortcutList' => 'Vytvorenie skratky...',
+	'UI:Menu:FilterList' => 'Display list with search criteria~~',
 	'UI:ShortcutRenameDlg:Title' => 'Premenovanie skratky',
 	'UI:ShortcutListDlg:Title' => 'Vytvoriť skratku pre zoznam',
 	'UI:ShortcutDelete:Confirm' => 'Prosím potvrďte, že si želáte vymazať skratku/y.',
-	'Menu:MyShortcuts' => 'Moje skratky',// Duplicated into itop-welcome-itil (will be removed from here...)
 	'Class:Shortcut' => 'Skratka',
 	'Class:Shortcut+' => '',
 	'Class:Shortcut/Attribute:name' => 'Názov',
@@ -1389,12 +1406,10 @@ Keď sú priradené spúštačom, každej akcii je dané číslo "príkazu", šp
 	'Class:ShortcutOQL/Attribute:auto_reload/Value:custom' => 'Custom rate~~',
 	'Class:ShortcutOQL/Attribute:auto_reload_sec' => 'Automatic refresh interval (seconds)~~',
 	'Class:ShortcutOQL/Attribute:auto_reload_sec/tip' => 'The minimum allowed is %1$d seconds~~',
-
 	'UI:FillAllMandatoryFields' => 'Prosím vyplňte všetky povinné políčka.',
 	'UI:ValueMustBeSet' => 'Please specify a value~~',
 	'UI:ValueMustBeChanged' => 'Please change the value~~',
 	'UI:ValueInvalidFormat' => 'Invalid format~~',
-
 	'UI:CSVImportConfirmTitle' => 'Please confirm the operation~~',
 	'UI:CSVImportConfirmMessage' => 'Are you sure you want to do this?~~',
 	'UI:CSVImportError_items' => 'Errors: %1$d~~',
@@ -1420,11 +1435,9 @@ Keď sú priradené spúštačom, každej akcii je dané číslo "príkazu", šp
 <tr><td>i</td><td>minutes (2 digits, e.g. 00..59)</td></tr>
 <tr><td>s</td><td>seconds (2 digits, e.g. 00..59)</td></tr>
 </table>~~',
-
 	'UI:Button:Remove' => 'Remove~~',
 	'UI:AddAnExisting_Class' => 'Add objects of type %1$s...~~',
 	'UI:SelectionOf_Class' => 'Selection of objects of type %1$s~~',
-
 	'UI:AboutBox' => 'About '.ITOP_APPLICATION_SHORT.'...~~',
 	'UI:About:Title' => 'About '.ITOP_APPLICATION_SHORT.'~~',
 	'UI:About:DataModel' => 'Data model~~',
@@ -1434,12 +1447,10 @@ Keď sú priradené spúštačom, každej akcii je dané číslo "príkazu", šp
 	'UI:About:ManualExtensionSource' => 'Extension~~',
 	'UI:About:Extension_Version' => 'Version: %1$s~~',
 	'UI:About:RemoteExtensionSource' => 'Data~~',
-
 	'UI:DisconnectedDlgMessage' => 'You are disconnected. You must identify yourself to continue using the application.~~',
 	'UI:DisconnectedDlgTitle' => 'Warning!~~',
 	'UI:LoginAgain' => 'Login again~~',
 	'UI:StayOnThePage' => 'Stay on this page~~',
-
 	'ExcelExporter:ExportMenu' => 'Excel Export...~~',
 	'ExcelExporter:ExportDialogTitle' => 'Excel Export~~',
 	'ExcelExporter:ExportButton' => 'Export~~',
@@ -1452,7 +1463,6 @@ Keď sú priradené spúštačom, každej akcii je dané číslo "príkazu", šp
 	'ExcelExport:Statistics' => 'Statistics~~',
 	'portal:legacy_portal' => 'End-User Portal~~',
 	'portal:backoffice' => ITOP_APPLICATION_SHORT.' Back-Office User Interface~~',
-
 	'UI:CurrentObjectIsLockedBy_User' => 'The object is locked since it is currently being modified by %1$s.~~',
 	'UI:CurrentObjectIsLockedBy_User_Explanation' => 'The object is currently being modified by %1$s. Your modifications cannot be submitted since they would be overwritten.~~',
 	'UI:CurrentObjectIsSoftLockedBy_User' => 'The object is currently being modified by %1$s. You\'ll be able to submit your modifications once they have finished.~~',
@@ -1460,43 +1470,36 @@ Keď sú priradené spúštačom, každej akcii je dané číslo "príkazu", šp
 	'UI:CurrentObjectLockExpired_Explanation' => 'The lock to prevent concurrent modifications of the object has expired. You can no longer submit your modification since other users are now allowed to modify this object.~~',
 	'UI:ConcurrentLockKilled' => 'The lock preventing modifications on the current object has been deleted.~~',
 	'UI:Menu:KillConcurrentLock' => 'Kill the Concurrent Modification Lock !~~',
-
 	'UI:Menu:ExportPDF' => 'Export as PDF...~~',
 	'UI:Menu:PrintableVersion' => 'Printer friendly version~~',
-
 	'UI:BrowseInlineImages' => 'Browse images...~~',
 	'UI:UploadInlineImageLegend' => 'Upload a new image~~',
 	'UI:SelectInlineImageToUpload' => 'Select the image to upload~~',
 	'UI:AvailableInlineImagesLegend' => 'Available images~~',
 	'UI:NoInlineImage' => 'There is no image available on the server. Use the "Browse" button above to select an image from your computer and upload it to the server.~~',
-
 	'UI:ToggleFullScreen' => 'Toggle Maximize / Minimize~~',
 	'UI:Button:ResetImage' => 'Recover the previous image~~',
 	'UI:Button:RemoveImage' => 'Remove the image~~',
 	'UI:Button:UploadImage' => 'Upload an image from the disk~~',
 	'UI:UploadNotSupportedInThisMode' => 'The modification of images or files is not supported in this mode.~~',
-
 	'UI:Button:RemoveDocument' => 'Remove the document~~',
-
-	// Search form
+    // Search form
 	'UI:Search:Toggle' => 'Minimize / Expand~~',
 	'UI:Search:AutoSubmit:DisabledHint' => 'Auto submit has been disabled for this class~~',
 	'UI:Search:Obsolescence:DisabledHint' => 'Based on your preferences, obsolete data are hidden~~',
 	'UI:Search:NoAutoSubmit:ExplainText' => 'Add some criterion on the search box or click the search button to view the objects.~~',
 	'UI:Search:Criterion:MoreMenu:AddCriteria' => 'Add new criteria~~',
-	// - Add new criteria button
+    // - Add new criteria button
 	'UI:Search:AddCriteria:List:RecentlyUsed:Title' => 'Recently used~~',
 	'UI:Search:AddCriteria:List:MostPopular:Title' => 'Most popular~~',
 	'UI:Search:AddCriteria:List:Others:Title' => 'Others~~',
 	'UI:Search:AddCriteria:List:RecentlyUsed:Placeholder' => 'None yet.~~',
-
-	// - Criteria header actions
+    // - Criteria header actions
 	'UI:Search:Criteria:Toggle' => 'Minimize / Expand~~',
 	'UI:Search:Criteria:Remove' => 'Remove~~',
 	'UI:Search:Criteria:Locked' => 'Locked~~',
-
-	// - Criteria titles
-	//   - Default widget
+    // - Criteria titles
+    //   - Default widget
 	'UI:Search:Criteria:Title:Default:Any' => '%1$s: Any~~',
 	'UI:Search:Criteria:Title:Default:Empty' => '%1$s is empty~~',
 	'UI:Search:Criteria:Title:Default:NotEmpty' => '%1$s is not empty~~',
@@ -1518,53 +1521,57 @@ Keď sú priradené spúštačom, každej akcii je dané číslo "príkazu", šp
 	'UI:Search:Criteria:Title:Default:Between:All' => '%1$s: Any~~',
 	'UI:Search:Criteria:Title:Default:Between:From' => '%1$s from %2$s~~',
 	'UI:Search:Criteria:Title:Default:Between:Until' => '%1$s up to %2$s~~',
-	//   - Numeric widget
-	//   None yet
-	//   - DateTime widget
+    //   - Numeric widget
+    //   None yet
+    //   - DateTime widget
 	'UI:Search:Criteria:Title:DateTime:Between' => '%2$s <= 1$s <= %3$s~~',
-	//   - Enum widget
+    //   - Enum widget
 	'UI:Search:Criteria:Title:Enum:In' => '%1$s: %2$s~~',
 	'UI:Search:Criteria:Title:Enum:In:Many' => '%1$s: %2$s and %3$s others~~',
 	'UI:Search:Criteria:Title:Enum:In:All' => '%1$s: Any~~',
-	//   - TagSet widget
+    //   - TagSet widget
 	'UI:Search:Criteria:Title:TagSet:Matches' => '%1$s: %2$s~~',
-	//   - External key widget
+    //   - External key widget
 	'UI:Search:Criteria:Title:ExternalKey:Empty' => '%1$s is defined~~',
 	'UI:Search:Criteria:Title:ExternalKey:NotEmpty' => '%1$s is not defined~~',
 	'UI:Search:Criteria:Title:ExternalKey:Equals' => '%1$s %2$s~~',
 	'UI:Search:Criteria:Title:ExternalKey:In' => '%1$s: %2$s~~',
 	'UI:Search:Criteria:Title:ExternalKey:In:Many' => '%1$s: %2$s and %3$s others~~',
 	'UI:Search:Criteria:Title:ExternalKey:In:All' => '%1$s: Any~~',
-	//   - Hierarchical key widget
+    //   - Hierarchical key widget
 	'UI:Search:Criteria:Title:HierarchicalKey:Empty' => '%1$s is defined~~',
 	'UI:Search:Criteria:Title:HierarchicalKey:NotEmpty' => '%1$s is not defined~~',
 	'UI:Search:Criteria:Title:HierarchicalKey:Equals' => '%1$s %2$s~~',
 	'UI:Search:Criteria:Title:HierarchicalKey:In' => '%1$s: %2$s~~',
 	'UI:Search:Criteria:Title:HierarchicalKey:In:Many' => '%1$s: %2$s and %3$s others~~',
 	'UI:Search:Criteria:Title:HierarchicalKey:In:All' => '%1$s: Any~~',
-
-	// - Criteria operators
-	//   - Default widget
+    // - Criteria operators
+    //   - Default widget
 	'UI:Search:Criteria:Operator:Default:Empty' => 'Is empty~~',
 	'UI:Search:Criteria:Operator:Default:NotEmpty' => 'Is not empty~~',
 	'UI:Search:Criteria:Operator:Default:Equals' => 'Equals~~',
 	'UI:Search:Criteria:Operator:Default:Between' => 'Between~~',
-	//   - String widget
+    //   - String widget
 	'UI:Search:Criteria:Operator:String:Contains' => 'Contains~~',
 	'UI:Search:Criteria:Operator:String:StartsWith' => 'Starts with~~',
 	'UI:Search:Criteria:Operator:String:EndsWith' => 'Ends with~~',
 	'UI:Search:Criteria:Operator:String:RegExp' => 'Regular exp.~~',
-	//   - Numeric widget
-	'UI:Search:Criteria:Operator:Numeric:Equals' => 'Equals~~',// => '=',
-	'UI:Search:Criteria:Operator:Numeric:GreaterThan' => 'Greater~~',// => '>',
-	'UI:Search:Criteria:Operator:Numeric:GreaterThanOrEquals' => 'Greater / equals~~',// > '>=',
-	'UI:Search:Criteria:Operator:Numeric:LessThan' => 'Less~~',// => '<',
-	'UI:Search:Criteria:Operator:Numeric:LessThanOrEquals' => 'Less / equals~~',// > '<=',
-	'UI:Search:Criteria:Operator:Numeric:Different' => 'Different~~',// => '≠',
-	//   - Tag Set Widget
+    //   - Numeric widget
+	'UI:Search:Criteria:Operator:Numeric:Equals' => 'Equals~~',
+    // => '=',
+	'UI:Search:Criteria:Operator:Numeric:GreaterThan' => 'Greater~~',
+    // => '>',
+	'UI:Search:Criteria:Operator:Numeric:GreaterThanOrEquals' => 'Greater / equals~~',
+    // > '>=',
+	'UI:Search:Criteria:Operator:Numeric:LessThan' => 'Less~~',
+    // => '<',
+	'UI:Search:Criteria:Operator:Numeric:LessThanOrEquals' => 'Less / equals~~',
+    // > '<=',
+	'UI:Search:Criteria:Operator:Numeric:Different' => 'Different~~',
+    // => '≠',
+    //   - Tag Set Widget
 	'UI:Search:Criteria:Operator:TagSet:Matches' => 'Matches~~',
-
-	// - Other translations
+    // - Other translations
 	'UI:Search:Value:Filter:Placeholder' => 'Filter...~~',
 	'UI:Search:Value:Search:Placeholder' => 'Search...~~',
 	'UI:Search:Value:Autocomplete:StartTyping' => 'Start typing for possible values.~~',
@@ -1572,8 +1579,7 @@ Keď sú priradené spúštačom, každej akcii je dané číslo "príkazu", šp
 	'UI:Search:Value:Autocomplete:NoResult' => 'No result.~~',
 	'UI:Search:Value:Toggler:CheckAllNone' => 'Check all / none~~',
 	'UI:Search:Value:Toggler:CheckAllNoneFiltered' => 'Check all / none visibles~~',
-
-	// - Widget other translations
+    // - Widget other translations
 	'UI:Search:Criteria:Numeric:From' => 'From~~',
 	'UI:Search:Criteria:Numeric:Until' => 'To~~',
 	'UI:Search:Criteria:Numeric:PlaceholderFrom' => 'Any~~',
@@ -1587,10 +1593,8 @@ Keď sú priradené spúštačom, každej akcii je dané číslo "príkazu", šp
 	'UI:Search:Criteria:DateTime:PlaceholderUntil' => 'Any date~~',
 	'UI:Search:Criteria:DateTime:PlaceholderUntilTime' => 'Any date~~',
 	'UI:Search:Criteria:HierarchicalKey:ChildrenIncluded:Hint' => 'Children of the selected objects will be included.~~',
-
 	'UI:Search:Criteria:Raw:Filtered' => 'Filtered~~',
 	'UI:Search:Criteria:Raw:FilteredOn' => 'Filtered on %1$s~~',
-
 	'UI:StateChanged' => 'State changed~~',
 ));
 
@@ -1601,16 +1605,13 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Expression:Operator:AND' => ' AND ~~',
 	'Expression:Operator:OR' => ' OR ~~',
 	'Expression:Operator:=' => ': ~~',
-
 	'Expression:Unit:Short:DAY' => 'd~~',
 	'Expression:Unit:Short:WEEK' => 'w~~',
 	'Expression:Unit:Short:MONTH' => 'm~~',
 	'Expression:Unit:Short:YEAR' => 'y~~',
-
 	'Expression:Unit:Long:DAY' => 'day(s)~~',
 	'Expression:Unit:Long:HOUR' => 'hour(s)~~',
 	'Expression:Unit:Long:MINUTE' => 'minute(s)~~',
-
 	'Expression:Verb:NOW' => 'now~~',
 	'Expression:Verb:ISNULL' => ': undefined~~',
 ));
@@ -1634,46 +1635,32 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Menu:DataSources' => 'Synchronizované zdroje dát',
 	'Menu:DataSources+' => '',
-	'Menu:WelcomeMenu' => 'Vitajte',
-	'Menu:WelcomeMenu+' => '',
-	'Menu:WelcomeMenuPage' => 'Vitajte',
-	'Menu:WelcomeMenuPage+' => '',
-	'Menu:AdminTools' => 'Administrátorské pomôcky',
-	'Menu:AdminTools+' => '',
-	'Menu:AdminTools?' => 'Pomôcky prístupné iba užívateľom majúcim administrátorský profil',
-	'Menu:DataModelMenu' => 'Dátový model',
-	'Menu:DataModelMenu+' => '',
-	'Menu:ExportMenu' => 'Export',
-	'Menu:ExportMenu+' => '',
-	'Menu:NotificationsMenu' => 'Upozornenia',
-	'Menu:NotificationsMenu+' => '',
 	'Menu:AuditCategories' => 'Kategórie auditu',
 	'Menu:AuditCategories+' => '',
 	'Menu:Notifications:Title' => 'Kategórie auditu',
-	'Menu:RunQueriesMenu'         => 'Spustiť dopyty',
-	'Menu:RunQueriesMenu+'        => '',
-	'Menu:QueryMenu'              => 'Dopyt frázy',
-	'Menu:QueryMenu+'             => '',
-	'Menu:UniversalSearchMenu'    => 'Univerzálne vyhľadávanie',
-	'Menu:UniversalSearchMenu+'   => '',
-	'Menu:UserManagementMenu'     => 'Užívateľský manažment',
-	'Menu:UserManagementMenu+'    => '',
-	'Menu:ProfilesMenu'           => 'Profily',
-	'Menu:ProfilesMenu+'          => '',
-	'Menu:ProfilesMenu:Title'     => 'Profily',
-	'Menu:UserAccountsMenu'       => 'Užívateľské účty',
-	'Menu:UserAccountsMenu+'      => '',
+	'Menu:AuditCategories:Title' => 'Audit configuration~~',
+	'Menu:RunQueriesMenu' => 'Spustiť dopyty',
+	'Menu:RunQueriesMenu+' => '',
+	'Menu:QueryMenu' => 'Dopyt frázy',
+	'Menu:QueryMenu+' => '',
+	'Menu:UniversalSearchMenu' => 'Univerzálne vyhľadávanie',
+	'Menu:UniversalSearchMenu+' => '',
+	'Menu:UserManagementMenu' => 'Užívateľský manažment',
+	'Menu:UserManagementMenu+' => '',
+	'Menu:ProfilesMenu' => 'Profily',
+	'Menu:ProfilesMenu+' => '',
+	'Menu:ProfilesMenu:Title' => 'Profily',
+	'Menu:UserAccountsMenu' => 'Užívateľské účty',
+	'Menu:UserAccountsMenu+' => '',
 	'Menu:UserAccountsMenu:Title' => 'Užívateľské účty',
-	'Menu:MyShortcuts'            => 'Moje skratky',
-	'Menu:UserManagement'         => 'User Management~~',
-	'Menu:Queries'                => 'Queries~~',
-	'Menu:ConfigurationTools'     => 'Configuration~~',
+	'Menu:UserManagement' => 'User Management~~',
+	'Menu:Queries' => 'Queries~~',
+	'Menu:ConfigurationTools' => 'Configuration~~'
 ));
-
 // Additional language entries not present in English dict
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'UI:Toggle:StandardDashboard' => 'Standard~~',
-	'UI:Toggle:CustomDashboard'   => 'Custom~~',
-	'UI:Dashboard:Edit'           => 'Upraviť túto stránku...',
-	'UI:Dashboard:Revert'         => 'Vrátiť sa do originálnej verzie...',
+	'UI:Toggle:CustomDashboard' => 'Custom~~',
+	'UI:Dashboard:Edit' => 'Upraviť túto stránku...',
+	'UI:Dashboard:Revert' => 'Vrátiť sa do originálnej verzie...'
 ));
diff --git a/dictionaries/tr.dictionary.itop.core.php b/dictionaries/tr.dictionary.itop.core.php
index a1408cef62..908beb972b 100644
--- a/dictionaries/tr.dictionary.itop.core.php
+++ b/dictionaries/tr.dictionary.itop.core.php
@@ -31,57 +31,42 @@
 //
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Core:DeletedObjectLabel' => '%1s (Silinmiş)',
-	'Core:DeletedObjectTip'   => 'Nesne%1$s (%2$s) \'de silinmiştir',
-
+	'Core:DeletedObjectTip' => 'Nesne%1$s (%2$s) \'de silinmiştir',
 	'Core:UnknownObjectLabel' => 'Nesne bulunamadı (sınıf: %1$s, id: %2$d)',
-	'Core:UnknownObjectTip'   => 'Nesne bulunamadı.Nesne ve günlük kaydı bir süre önce silinmiş olabilir',
-
+	'Core:UnknownObjectTip' => 'Nesne bulunamadı.Nesne ve günlük kaydı bir süre önce silinmiş olabilir',
 	'Core:UniquenessDefaultError' => 'Uniqueness rule \'%1$s\' in error~~',
-	'Core:CheckConsistencyError'  => 'Consistency rules not followed: %1$s~~',
-	'Core:CheckValueError'        => 'Unexpected value for attribute \'%1$s\' (%2$s) : %3$s~~',
-
-	'Core:AttributeLinkedSet'  => 'Nesnelerin dizisi',
+	'Core:CheckConsistencyError' => 'Consistency rules not followed: %1$s~~',
+	'Core:CheckValueError' => 'Unexpected value for attribute \'%1$s\' (%2$s) : %3$s~~',
+	'Core:AttributeLinkedSet' => 'Nesnelerin dizisi',
 	'Core:AttributeLinkedSet+' => 'Aynı sınıf veya alt sınıfın her türlü nesnesi',
-
 	'Core:AttributeLinkedSetDuplicatesFound' => 'Duplicates in the \'%1$s\' field : %2$s~~',
-
-	'Core:AttributeDashboard'  => 'Dashboard~~',
+	'Core:AttributeDashboard' => 'Dashboard~~',
 	'Core:AttributeDashboard+' => '',
-
-	'Core:AttributePhoneNumber'  => 'Phone number~~',
+	'Core:AttributePhoneNumber' => 'Phone number~~',
 	'Core:AttributePhoneNumber+' => '',
-
 	'Core:AttributeObsolescenceDate' => 'Obsolescence date~~',
 	'Core:AttributeObsolescenceDate+' => '',
-
 	'Core:AttributeTagSet' => 'List of tags~~',
 	'Core:AttributeTagSet+' => '',
 	'Core:AttributeSet:placeholder' => 'click to add~~',
 	'Core:AttributeClassAttCodeSet:ItemLabel:AttributeFromClass' => '%1$s (%2$s)~~',
 	'Core:AttributeClassAttCodeSet:ItemLabel:AttributeFromOneChildClass' => '%1$s (%2$s from %3$s)~~',
 	'Core:AttributeClassAttCodeSet:ItemLabel:AttributeFromSeveralChildClasses' => '%1$s (%2$s from child classes)~~',
-
 	'Core:AttributeCaseLog' => 'Log~~',
 	'Core:AttributeCaseLog+' => '',
-
 	'Core:AttributeMetaEnum' => 'Computed enum~~',
 	'Core:AttributeMetaEnum+' => '',
-
 	'Core:AttributeLinkedSetIndirect' => 'Nesnelerin dizisi (n-n)',
 	'Core:AttributeLinkedSetIndirect+' => 'Aynı sınıftan her türlü nesne [Altsınıf]',
-
 	'Core:AttributeInteger' => 'Tamsayı',
 	'Core:AttributeInteger+' => 'Sayısal değer (negatif olabilir)',
-
 	'Core:AttributeDecimal' => 'Ondalık',
 	'Core:AttributeDecimal+' => 'Ondalık değer (negatif olabilir)',
-
 	'Core:AttributeBoolean' => 'Boolean',
 	'Core:AttributeBoolean+' => '',
 	'Core:AttributeBoolean/Value:null' => '',
 	'Core:AttributeBoolean/Value:yes' => 'Evet',
 	'Core:AttributeBoolean/Value:no' => 'Hayır',
-
 	'Core:AttributeArchiveFlag' => 'Arşiv işareti',
 	'Core:AttributeArchiveFlag/Value:yes' => 'Evet',
 	'Core:AttributeArchiveFlag/Value:yes+' => 'Bu nesne yalnızca arşiv modunda görünürdür',
@@ -90,7 +75,6 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Core:AttributeArchiveFlag/Label+' => '',
 	'Core:AttributeArchiveDate/Label' => 'Arşiv Tarihi',
 	'Core:AttributeArchiveDate/Label+' => '',
-
 	'Core:AttributeObsolescenceFlag' => 'Kullanım dışı işareti',
 	'Core:AttributeObsolescenceFlag/Value:yes' => 'Evet',
 	'Core:AttributeObsolescenceFlag/Value:yes+' => 'Bu nesne, etki analizinden hariç tutulur ve arama sonuçlarından gizlenir',
@@ -99,54 +83,38 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Core:AttributeObsolescenceFlag/Label+' => 'Diğer özelliklerde dinamik olarak hesaplandı',
 	'Core:AttributeObsolescenceDate/Label' => 'Kullanım dışı olma tarihi',
 	'Core:AttributeObsolescenceDate/Label+' => 'Nesnenin eski olarak kabul edildiği yaklaşık tarih',
-
 	'Core:AttributeString' => 'Dize',
 	'Core:AttributeString+' => 'Alfanümerik dize',
-
 	'Core:AttributeClass' => 'Sınıf',
 	'Core:AttributeClass+' => '',
-
 	'Core:AttributeApplicationLanguage' => 'Kullanıcı dili',
 	'Core:AttributeApplicationLanguage+' => 'Dil ve Ülke (TR Türkiye)',
-
 	'Core:AttributeFinalClass' => 'Sınıf (Otomatik)',
 	'Core:AttributeFinalClass+' => 'Nesnenin gerçek sınıfı (çekirdek tarafından otomatik olarak oluşturulur)',
-
 	'Core:AttributePassword' => 'Şifre',
 	'Core:AttributePassword+' => 'Harici bir cihazın şifresi',
-
 	'Core:AttributeEncryptedString' => 'Şifreli dize',
 	'Core:AttributeEncryptedString+' => 'Dize yerel bir anahtarla şifrelenmiş',
 	'Core:AttributeEncryptUnknownLibrary' => 'Encryption library specified (%1$s) unknown~~',
 	'Core:AttributeEncryptFailedToDecrypt' => '** decryption error **~~',
-
 	'Core:AttributeText' => 'Metin',
 	'Core:AttributeText+' => 'Çok satırlı karakter dizesi',
-
 	'Core:AttributeHTML' => 'HTML',
 	'Core:AttributeHTML+' => 'HTML dizesi',
-
 	'Core:AttributeEmailAddress' => 'E-posta Adresi',
 	'Core:AttributeEmailAddress+' => '',
-
 	'Core:AttributeIPAddress' => 'IP adresi',
 	'Core:AttributeIPAddress+' => '',
-
 	'Core:AttributeOQL' => 'OQL',
 	'Core:AttributeOQL+' => 'Nesne sorgusu Dili ifadesi',
-
 	'Core:AttributeEnum' => 'Enum',
 	'Core:AttributeEnum+' => 'Önceden tanımlanmış alfasayısal dizelerin listesi',
-
 	'Core:AttributeTemplateString' => 'Şablon dizesi',
 	'Core:AttributeTemplateString+' => 'Yer sahipleri içeren dize',
-
 	'Core:AttributeTemplateText' => 'Şablon metni',
 	'Core:AttributeTemplateText+' => 'Yer sahipleri içeren metin',
-
 	'Core:AttributeTemplateHTML' => 'Şablon HTML',
 	'Core:AttributeTemplateHTML+' => 'Yer sahipleri içeren HTML',
-
 	'Core:AttributeDateTime' => 'Tarih / Saat',
 	'Core:AttributeDateTime+' => 'Tarih ve Saat (yıl-ay-gün hh:mm:ss)',
 	'Core:AttributeDateTime?SmartSearch' => '
@@ -164,7 +132,6 @@ Operators:<br/>
 <p>
 If the time is omitted, it defaults to 00:00:00
 </p>~~',
-
 	'Core:AttributeDate' => 'Tarih',
 	'Core:AttributeDate+' => 'Tarih (yıl-ay-gün)',
 	'Core:AttributeDate?SmartSearch' => '
@@ -179,43 +146,30 @@ Operators:<br/>
 	<b>&lt;</b><em>date</em><br/>
 	<b>[</b><em>date</em>,<em>date</em><b>]</b>
 </p>~~',
-
 	'Core:AttributeDeadline' => 'Son tarih',
 	'Core:AttributeDeadline+' => 'Geçerli saate göre görüntülenen tarih',
-
 	'Core:AttributeExternalKey' => 'Harici anahtar',
 	'Core:AttributeExternalKey+' => 'Harici (veya yabancı) anahtar',
-
 	'Core:AttributeHierarchicalKey' => 'Hiyerarşik anahtar',
 	'Core:AttributeHierarchicalKey+' => 'Ana kaynağın dış (veya yabancı) anahtarı',
-
 	'Core:AttributeExternalField' => 'Harici alan',
 	'Core:AttributeExternalField+' => 'Harici bir anahtarla eşlenen alan',
-
 	'Core:AttributeURL' => 'URL',
 	'Core:AttributeURL+' => 'Bir metin dizesi olarak mutlak veya göreceli URL',
-
 	'Core:AttributeBlob' => 'Blob',
 	'Core:AttributeBlob+' => 'Herhangi bir ikili içerik (belge)',
-
 	'Core:AttributeOneWayPassword' => 'Tek yönlü şifre',
 	'Core:AttributeOneWayPassword+' => 'Tek Yönlü Şifrelenmiş (Hashed) Şifre',
-
 	'Core:AttributeTable' => 'Tablo',
 	'Core:AttributeTable+' => 'İki boyuta sahip dizine eklenmiş dizi',
-
 	'Core:AttributePropertySet' => 'Özellikler',
 	'Core:AttributePropertySet+' => 'Kaynaklı özelliklerin listesi (isim ve değer)',
-
 	'Core:AttributeFriendlyName' => 'Yaygın Adı',
 	'Core:AttributeFriendlyName+' => 'Otomatik olarak oluşturulan nitelik; Yaygın Ad, birkaç öznitelikten sonra hesaplanır',
-
 	'Core:FriendlyName-Label' => 'Yaygın Adı',
 	'Core:FriendlyName-Description' => 'Yaygın Adı',
-
 	'Core:AttributeTag' => 'Tags~~',
 	'Core:AttributeTag+' => '',
-	
 	'Core:Context=REST/JSON' => 'REST~~',
 	'Core:Context=Synchro' => 'Synchro~~',
 	'Core:Context=Setup' => 'Setup~~',
@@ -493,6 +447,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:Action' => 'Özel işlem',
 	'Class:Action+' => 'Kullanıcının tanımladığı işlemler',
+	'Class:Action/ComplementaryName' => '%1$s: %2$s~~',
 	'Class:Action/Attribute:name' => 'Adı',
 	'Class:Action/Attribute:name+' => '',
 	'Class:Action/Attribute:description' => 'Tanımlama',
@@ -560,6 +515,22 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:ActionEmail/Attribute:importance/Value:normal+' => '',
 	'Class:ActionEmail/Attribute:importance/Value:high' => 'yüksek',
 	'Class:ActionEmail/Attribute:importance/Value:high+' => '',
+	'Class:ActionEmail/Attribute:language' => 'Language~~',
+	'Class:ActionEmail/Attribute:language+' => 'Language to use for placeholders ($xxx$) inside the message (state, importance, priority, etc)~~',
+	'Class:ActionEmail/Attribute:html_template' => 'HTML template~~',
+	'Class:ActionEmail/Attribute:html_template+' => 'Optional HTML template wrapping around the content of the \'Body\' attribute below, useful for tailored email layouts (in the template, content of the \'Body\' attribute will replace the $content$ placeholder)~~',
+	'Class:ActionEmail/Attribute:ignore_notify' => 'Ignore the Notify flag~~',
+	'Class:ActionEmail/Attribute:ignore_notify+' => 'If set to \'Yes\' the \'Notify\' flag on Contacts has no effect.~~',
+	'Class:ActionEmail/Attribute:ignore_notify/Value:no' => 'No~~',
+	'Class:ActionEmail/Attribute:ignore_notify/Value:yes' => 'Yes~~',
+	'ActionEmail:main' => 'Message~~',
+	'ActionEmail:trigger' => 'Triggers~~',
+	'ActionEmail:recipients' => 'Contacts~~',
+	'ActionEmail:preview_tab' => 'Preview~~',
+	'ActionEmail:preview_tab+' => 'Preview of the eMail template~~',
+	'ActionEmail:preview_warning' => 'The actual eMail may look different in the eMail client than this preview in your browser.~~',
+	'ActionEmail:preview_more_info' => 'For more information about the CSS features supported by the different eMail clients, refer to %1$s~~',
+	'ActionEmail:content_placeholder_missing' => 'The placeholder "%1$s" was not found in the HTML template. The content of the field "%2$s" will not be included in the generated emails.~~',
 ));
 
 //
@@ -569,6 +540,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:Trigger' => 'Tetikleyici',
 	'Class:Trigger+' => 'Özel olay yürütücü',
+	'Class:Trigger/ComplementaryName' => '%1$s, %2$s~~',
 	'Class:Trigger/Attribute:description' => 'Tanımlama',
 	'Class:Trigger/Attribute:description+' => 'tek satır tanımlama',
 	'Class:Trigger/Attribute:action_list' => 'Tetiklenen işlemler',
@@ -577,6 +549,8 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:Trigger/Attribute:finalclass+' => '',
 	'Class:Trigger/Attribute:context' => 'Context~~',
 	'Class:Trigger/Attribute:context+' => 'Context to allow the trigger to start~~',
+	'Class:Trigger/Attribute:complement' => 'Additional information~~',
+	'Class:Trigger/Attribute:complement+' => 'Further information as provided in english, by this trigger~~',
 ));
 
 //
@@ -672,6 +646,17 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:TriggerOnObjectMention/Attribute:mentioned_filter+' => 'Limit the list of mentioned objects which will activate the trigger. If empty, any mentioned object (of any class) will activate it.~~',
 ));
 
+//
+// Class: TriggerOnAttributeBlobDownload
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:TriggerOnAttributeBlobDownload' => 'Trigger (on object\'s document download)~~',
+	'Class:TriggerOnAttributeBlobDownload+' => 'Trigger on object\'s document field download of [a child class of] the given class~~',
+	'Class:TriggerOnAttributeBlobDownload/Attribute:target_attcodes' => 'Target fields~~',
+	'Class:TriggerOnAttributeBlobDownload/Attribute:target_attcodes+' => '~~',
+));
+
 //
 // Class: TriggerOnThresholdReached
 //
@@ -708,11 +693,13 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 // Synchro Data Source
 //
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:SynchroDataSource' => 'Synchro Veri Kaynağı',
 	'Class:SynchroDataSource/Attribute:name' => 'İsim',
 	'Class:SynchroDataSource/Attribute:name+' => '',
 	'Class:SynchroDataSource/Attribute:description' => 'Açıklama',
 	'Class:SynchroDataSource/Attribute:status' => 'Durum',
 	'Class:SynchroDataSource/Attribute:scope_class' => 'Hedef sınıf',
+	'Class:SynchroDataSource/Attribute:scope_class+' => 'A Synchro Data Source can only populate a single '.ITOP_APPLICATION_SHORT.' class~~',
 	'Class:SynchroDataSource/Attribute:user_id' => 'Kullanıcı',
 	'Class:SynchroDataSource/Attribute:notify_contact_id' => 'Bildirim iletilecek kişi',
 	'Class:SynchroDataSource/Attribute:notify_contact_id+' => 'Hata durumunda bildirmek yapılacak kişi',
@@ -721,6 +708,8 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:SynchroDataSource/Attribute:url_application' => 'Uygulama\'nın köprüsü',
 	'Class:SynchroDataSource/Attribute:url_application+' => ITOP_APPLICATION_SHORT.'\'un senkronize edildiği harici uygulamadaki '.ITOP_APPLICATION_SHORT.' nesnesine köprü (varsa). Muhtemel yer tutucular: $this->attribute$ ve $replica->primary_key$',
 	'Class:SynchroDataSource/Attribute:reconciliation_policy' => 'Uzlaşma Politikası',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy+' => '"Use the attributes": '.ITOP_APPLICATION_SHORT.' object matches replica values for each Synchro attributes flagged for Reconciliation.
+"Use primary_key": the column primary_key of the replica is expected to contain the identifier of the '.ITOP_APPLICATION_SHORT.' object~~',
 	'Class:SynchroDataSource/Attribute:full_load_periodicity' => 'Tam Yük Aralığı',
 	'Class:SynchroDataSource/Attribute:full_load_periodicity+' => 'Tüm verilerin  yeniden yüklenmesi, en azından burada belirtilen sıklıkta olmalıdır',
 	'Class:SynchroDataSource/Attribute:action_on_zero' => 'Sıfırda eylem',
@@ -740,6 +729,33 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:SynchroDataSource/Attribute:delete_policy_retention+' => 'Silinmeden önce kullanım dışı bir nesne ne kadar tutulacak',
 	'Class:SynchroDataSource/Attribute:database_table_name' => 'Veri tablosu',
 	'Class:SynchroDataSource/Attribute:database_table_name+' => 'Senkronizasyon verilerini saklamak için tablonun adı. Boş bırakılırsa, varsayılan bir isim hesaplanacaktır.',
+	'Class:SynchroDataSource/Attribute:status/Value:implementation' => 'Uygulama',
+	'Class:SynchroDataSource/Attribute:status/Value:obsolete' => 'Kullanım dışı',
+	'Class:SynchroDataSource/Attribute:status/Value:production' => 'Kullanımda',
+	'Class:SynchroDataSource/Attribute:scope_restriction' => 'Kapsam Kısıtlaması',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_attributes' => 'Öznitelikleri kullanın',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_primary_key' => 'Birincil_anahtar alanını kullanın',
+	'Class:SynchroDataSource/Attribute:action_on_zero/Value:create' => 'Oluşturun',
+	'Class:SynchroDataSource/Attribute:action_on_zero/Value:error' => 'Hata',
+	'Class:SynchroDataSource/Attribute:action_on_one/Value:error' => 'Hata',
+	'Class:SynchroDataSource/Attribute:action_on_one/Value:update' => 'Güncelleme',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:create' => 'Oluşturun',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:error' => 'Hata',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:take_first' => 'İlkini al (rastgele?)',
+	'Class:SynchroDataSource/Attribute:delete_policy' => 'Politikayı Sil',
+	'Class:SynchroDataSource/Attribute:delete_policy+' => 'What to do when a replica becomes obsolete:
+"Ignore": do nothing, the associated object remains as is in iTop.
+"Delete": Delete the associated object in iTop (and the replica in the data table).
+"Update": Update the associated object as specified by the Update rules (see below).
+"Update then Delete": apply the "Update rules". When Retention Duration expires, execute a "Delete" ~~',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:delete' => 'Sil',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:ignore' => 'Yoksay',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:update' => 'Güncelle',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:update_then_delete' => 'Güncelle ve sil',
+	'Class:SynchroDataSource/Attribute:attribute_list' => 'Nitelikler listesi',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:administrators' => 'Sadece yöneticiler',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:everybody' => 'Herkes bu tür nesneleri silmek için izinlidir',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:nobody' => 'Kimse',
 	'SynchroDataSource:Description' => 'Açıklama',
 	'SynchroDataSource:Reconciliation' => 'Arama ve amp; Uzlaşma',
 	'SynchroDataSource:Deletion' => 'Silme kuralları',
@@ -764,8 +780,10 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Core:Synchro:NeverRun' => 'Bu senkronizasyon hiç çalışmadı. Henüz günlüğü yok.',
 	'Core:Synchro:SynchroEndedOn_Date' => 'En son senkronizasyon %1$s.',
 	'Core:Synchro:SynchroRunningStartedOn_Date' => 'Senkronizasyon %1$s\'de başladı hala çalışıyor...',
-	'Menu:DataSources' => 'Senkronizasyon Veri Kaynakları', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:DataSources+' => 'Tüm Senkronizasyon Veri Kaynakları', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataSources' => 'Senkronizasyon Veri Kaynakları',
+    // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataSources+' => 'Tüm Senkronizasyon Veri Kaynakları',
+    // Duplicated into itop-welcome-itil (will be removed from here...)
 	'Core:Synchro:label_repl_ignored' => 'Yoksayıldı (%1$s)',
 	'Core:Synchro:label_repl_disappeared' => 'Kayboldu (%1$s)',
 	'Core:Synchro:label_repl_existing' => 'Mevcut (%1$s)',
@@ -829,29 +847,6 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:CMDBChangeOpSetAttributeEncrypted/Attribute:prevstring' => 'Önceki değer',
 	'Class:CMDBChangeOpSetAttributeCaseLog' => 'Dosya kaydı',
 	'Class:CMDBChangeOpSetAttributeCaseLog/Attribute:lastentry' => 'Son giriş',
-	'Class:SynchroDataSource' => 'Synchro Veri Kaynağı',
-	'Class:SynchroDataSource/Attribute:status/Value:implementation' => 'Uygulama',
-	'Class:SynchroDataSource/Attribute:status/Value:obsolete' => 'Kullanım dışı',
-	'Class:SynchroDataSource/Attribute:status/Value:production' => 'Kullanımda',
-	'Class:SynchroDataSource/Attribute:scope_restriction' => 'Kapsam Kısıtlaması',
-	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_attributes' => 'Öznitelikleri kullanın',
-	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_primary_key' => 'Birincil_anahtar alanını kullanın',
-	'Class:SynchroDataSource/Attribute:action_on_zero/Value:create' => 'Oluşturun',
-	'Class:SynchroDataSource/Attribute:action_on_zero/Value:error' => 'Hata',
-	'Class:SynchroDataSource/Attribute:action_on_one/Value:error' => 'Hata',
-	'Class:SynchroDataSource/Attribute:action_on_one/Value:update' => 'Güncelleme',
-	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:create' => 'Oluşturun',
-	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:error' => 'Hata',
-	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:take_first' => 'İlkini al (rastgele?)',
-	'Class:SynchroDataSource/Attribute:delete_policy' => 'Politikayı Sil',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:delete' => 'Sil',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:ignore' => 'Yoksay',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:update' => 'Güncelle',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:update_then_delete' => 'Güncelle ve sil',
-	'Class:SynchroDataSource/Attribute:attribute_list' => 'Nitelikler listesi',
-	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:administrators' => 'Sadece yöneticiler',
-	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:everybody' => 'Herkes bu tür nesneleri silmek için izinlidir',
-	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:nobody' => 'Kimse',
 	'Class:SynchroAttribute' => 'Synchro niteliği',
 	'Class:SynchroAttribute/Attribute:sync_source_id' => 'Synchro Veri Kaynağı',
 	'Class:SynchroAttribute/Attribute:attcode' => 'Öznitelik kodu',
@@ -912,21 +907,18 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:appUserPreferences/Attribute:preferences' => 'Tercihler',
 	'Core:ExecProcess:Code1' => 'Yanlış komut veya komut hataları ile bitti (örneğin, yanlış senaryo adı)',
 	'Core:ExecProcess:Code255' => 'PHP hatası (ayrıştırma veya çalışma zamanı)',
-
-	// Attribute Duration
+    // Attribute Duration
 	'Core:Duration_Seconds' => '%1$ds',
 	'Core:Duration_Minutes_Seconds' => '%1$dmin %2$ds',
 	'Core:Duration_Hours_Minutes_Seconds' => '%1$dh %2$dmin %3$ds',
 	'Core:Duration_Days_Hours_Minutes_Seconds' => '%1$sd %2$dh %3$dmin %4$ds',
-
-	// Explain working time computing
+    // Explain working time computing
 	'Core:ExplainWTC:ElapsedTime' => 'Geçen zaman (\\"%1$s\\" olarak saklanır)',
 	'Core:ExplainWTC:StopWatch-TimeSpent' => '\\"%1$s\\" için harcanan zaman',
 	'Core:ExplainWTC:StopWatch-Deadline' => '\\"%1$s\\" için son tarih %2$d%%',
-
-	// Bulk export
+    // Bulk export
 	'Core:BulkExport:MissingParameter_Param' => 'Eksik parametre \\"%1$s\\"',
-	'Core:BulkExport:InvalidParameter_Query' => '\"Sorgu\" parametresi için geçersiz değer. ID\'ye karşılık gelen sorgu dizimi yok: \"%1$s\".',
+	'Core:BulkExport:InvalidParameter_Query' => '\\"Sorgu\\" parametresi için geçersiz değer. ID\'ye karşılık gelen sorgu dizimi yok: \\"%1$s\\".',
 	'Core:BulkExport:ExportFormatPrompt' => 'Dışarı çıkartma formatı:',
 	'Core:BulkExportOf_Class' => '%1$s dışarı çıkartıldı',
 	'Core:BulkExport:ClickHereToDownload_FileName' => '%1$s \'indirmek için buraya tıklayın',
@@ -976,20 +968,34 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Core:BulkExport:DateTimeFormatDefault_Example' => 'Default format (%1$s), e.g. %2$s~~',
 	'Core:BulkExport:DateTimeFormatCustom_Format' => 'Custom format: %1$s~~',
 	'Core:BulkExport:PDF:PageNumber' => 'Page %1$s~~',
-	'Core:DateTime:Placeholder_d' => 'DD~~', // Day of the month: 2 digits (with leading zero)
-	'Core:DateTime:Placeholder_j' => 'D~~', // Day of the month: 1 or 2 digits (without leading zero)
-	'Core:DateTime:Placeholder_m' => 'MM~~', // Month on 2 digits i.e. 01-12
-	'Core:DateTime:Placeholder_n' => 'M~~', // Month on 1 or 2 digits 1-12
-	'Core:DateTime:Placeholder_Y' => 'YYYY~~', // Year on 4 digits
-	'Core:DateTime:Placeholder_y' => 'YY~~', // Year on 2 digits
-	'Core:DateTime:Placeholder_H' => 'hh~~', // Hour 00..23
-	'Core:DateTime:Placeholder_h' => 'h~~', // Hour 01..12
-	'Core:DateTime:Placeholder_G' => 'hh~~', // Hour 0..23
-	'Core:DateTime:Placeholder_g' => 'h~~', // Hour 1..12
-	'Core:DateTime:Placeholder_a' => 'am/pm~~', // am/pm (lowercase)
-	'Core:DateTime:Placeholder_A' => 'AM/PM~~', // AM/PM (uppercase)
-	'Core:DateTime:Placeholder_i' => 'mm~~', // minutes, 2 digits: 00..59
-	'Core:DateTime:Placeholder_s' => 'ss~~', // seconds, 2 digits 00..59
+	'Core:DateTime:Placeholder_d' => 'DD~~',
+    // Day of the month: 2 digits (with leading zero)
+	'Core:DateTime:Placeholder_j' => 'D~~',
+    // Day of the month: 1 or 2 digits (without leading zero)
+	'Core:DateTime:Placeholder_m' => 'MM~~',
+    // Month on 2 digits i.e. 01-12
+	'Core:DateTime:Placeholder_n' => 'M~~',
+    // Month on 1 or 2 digits 1-12
+	'Core:DateTime:Placeholder_Y' => 'YYYY~~',
+    // Year on 4 digits
+	'Core:DateTime:Placeholder_y' => 'YY~~',
+    // Year on 2 digits
+	'Core:DateTime:Placeholder_H' => 'hh~~',
+    // Hour 00..23
+	'Core:DateTime:Placeholder_h' => 'h~~',
+    // Hour 01..12
+	'Core:DateTime:Placeholder_G' => 'hh~~',
+    // Hour 0..23
+	'Core:DateTime:Placeholder_g' => 'h~~',
+    // Hour 1..12
+	'Core:DateTime:Placeholder_a' => 'am/pm~~',
+    // am/pm (lowercase)
+	'Core:DateTime:Placeholder_A' => 'AM/PM~~',
+    // AM/PM (uppercase)
+	'Core:DateTime:Placeholder_i' => 'mm~~',
+    // minutes, 2 digits: 00..59
+	'Core:DateTime:Placeholder_s' => 'ss~~',
+    // seconds, 2 digits 00..59
 	'Core:Validator:Default' => 'Yanlış format',
 	'Core:Validator:Mandatory' => 'Lütfen bu alanı doldurun',
 	'Core:Validator:MustBeInteger' => 'Bir tamsayı olmalı',
@@ -1002,7 +1008,6 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:TagSetFieldData' => '%2$s for class %1$s~~',
 	'Class:TagSetFieldData+' => '',
-
 	'Class:TagSetFieldData/Attribute:code' => 'Code~~',
 	'Class:TagSetFieldData/Attribute:code+' => 'Internal code. Must contain at least 3 alphanumeric characters~~',
 	'Class:TagSetFieldData/Attribute:label' => 'Label~~',
@@ -1012,7 +1017,6 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:TagSetFieldData/Attribute:finalclass' => 'Tag class~~',
 	'Class:TagSetFieldData/Attribute:obj_class' => 'Object class~~',
 	'Class:TagSetFieldData/Attribute:obj_attcode' => 'Field code~~',
-
 	'Core:TagSetFieldData:ErrorDeleteUsedTag' => 'Used tags cannot be deleted~~',
 	'Core:TagSetFieldData:ErrorDuplicateTagCodeOrLabel' => 'Tags codes or labels must be unique~~',
 	'Core:TagSetFieldData:ErrorTagCodeSyntax' => 'Tags code must contain between 3 and %1$d alphanumeric characters~~',
@@ -1099,8 +1103,8 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:AsyncTask/Attribute:last_error+' => '',
 	'Class:AsyncTask/Attribute:last_attempt' => 'Last attempt~~',
 	'Class:AsyncTask/Attribute:last_attempt+' => '',
-    'Class:AsyncTask:InvalidConfig_Class_Keys' => 'Invalid format for the configuration of "async_task_retries[%1$s]". Expecting an array with the following keys: %2$s~~',
-    'Class:AsyncTask:InvalidConfig_Class_InvalidKey_Keys' => 'Invalid format for the configuration of "async_task_retries[%1$s]": unexpected key "%2$s". Expecting only the following keys: %3$s~~',
+	'Class:AsyncTask:InvalidConfig_Class_Keys' => 'Invalid format for the configuration of "async_task_retries[%1$s]". Expecting an array with the following keys: %2$s~~',
+	'Class:AsyncTask:InvalidConfig_Class_InvalidKey_Keys' => 'Invalid format for the configuration of "async_task_retries[%1$s]": unexpected key "%2$s". Expecting only the following keys: %3$s~~',
 ));
 
 //
diff --git a/dictionaries/tr.dictionary.itop.ui.php b/dictionaries/tr.dictionary.itop.ui.php
index 0faacb139d..bd371f53b2 100644
--- a/dictionaries/tr.dictionary.itop.ui.php
+++ b/dictionaries/tr.dictionary.itop.ui.php
@@ -25,6 +25,12 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:AuditCategory/Attribute:definition_set+' => 'Denetlenecek nesneler için OQL ifadesi',
 	'Class:AuditCategory/Attribute:rules_list' => 'Denetlem kuralları',
 	'Class:AuditCategory/Attribute:rules_list+' => 'Kategori için denetleme kuralları',
+	'Class:AuditCategory/Attribute:ok_error_tolerance' => 'Warning threshold~~',
+	'Class:AuditCategory/Attribute:ok_error_tolerance+' => 'Percentage of invalid objects below which the result is a warning (orange)~~',
+	'Class:AuditCategory/Attribute:warning_error_tolerance' => 'Error threshold~~',
+	'Class:AuditCategory/Attribute:warning_error_tolerance+' => 'Percentage of invalid objects below which the result is in error (red)~~',
+	'Class:AuditCategory/Attribute:domains_list' => 'Domains~~',
+	'Class:AuditCategory/Attribute:domains_list+' => 'Domains which includes this category~~',
 ));
 
 //
@@ -52,7 +58,42 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:AuditRule/Attribute:category_id' => 'Kategori',
 	'Class:AuditRule/Attribute:category_id+' => 'Kuralın kategorisi',
 	'Class:AuditRule/Attribute:category_name' => 'Kategori',
-	'Class:AuditRule/Attribute:category_name+' => 'Kural için kategori adı',
+	'Class:AuditRule/Attribute:category_name+' => 'Kural için kategori adı'
+));
+
+//
+// Class: AuditDomain
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:AuditDomain' => 'Audit Domain~~',
+	'Class:AuditDomain+' => 'Audit domains allow to group the audit categories.
+Domain usually correspond to who is responsible for checking and fixing errors~~',
+	'Class:AuditDomain/Attribute:name' => 'Name~~',
+	'Class:AuditDomain/Attribute:name+' => 'Its a segmentation of the Audit by who is in charge of fixing it or just interested~~',
+	'Class:AuditDomain/Attribute:description' => 'Description~~',
+	'Class:AuditDomain/Attribute:description+' => '~~',
+	'Class:AuditDomain/Attribute:icon' => 'Icon~~',
+	'Class:AuditDomain/Attribute:icon+' => '~~',
+	'Class:AuditDomain/Attribute:categories_list' => 'Categories~~',
+	'Class:AuditDomain/Attribute:categories_list+' => 'Related audit categories. When running the audit on a domain, all related audit categories are checked and only those.~~',
+));
+
+//
+// Class: lnkAuditCategoryToAuditDomain
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:lnkAuditCategoryToAuditDomain' => 'Link AuditCategory / AuditDomain~~',
+	'Class:lnkAuditCategoryToAuditDomain+' => '~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:category_id' => 'Category~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:category_id+' => 'Audit Category~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:category_name' => 'Category name~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:category_name+' => 'Audit category name~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:domain_id' => 'Domain~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:domain_id+' => 'Audit domain~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:domain_name' => 'Domain name~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:domain_name+' => 'Audit domain name~~',
 ));
 
 //
@@ -70,6 +111,16 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:Query/Attribute:is_template+' => 'Usable as source for recipient OQL in Notifications~~',
 	'Class:Query/Attribute:is_template/Value:yes' => 'Yes~~',
 	'Class:Query/Attribute:is_template/Value:no' => 'No~~',
+	'Class:Query/Attribute:export_count' => 'Export counter~~',
+	'Class:Query/Attribute:export_count+' => 'Counter reflecting the number of time this query has been executed~~',
+	'Class:Query/Attribute:export_last_date' => 'Last export~~',
+	'Class:Query/Attribute:export_last_date+' => 'Date and time of the last export execution~~',
+	'Class:Query/Attribute:export_last_user_id' => 'User~~',
+	'Class:Query/Attribute:export_last_user_id+' => 'The user who executed the last export~~',
+	'Class:Query/Attribute:export_last_user_contact' => 'Contact~~',
+	'Class:Query/Attribute:export_last_user_contact+' => 'The contact who executed the last export~~',
+	'Query:baseinfo' => 'General information~~',
+	'Query:exportInfo' => 'Export information~~',
 	'Class:QueryOQL/Attribute:fields' => 'Alanlar',
 	'Class:QueryOQL/Attribute:fields+' => 'Dışarı aktarmak için virgülle ayrılmış nitelikler listesi (veya alias.attribute)',
 	'Class:QueryOQL' => 'OQL Query',
@@ -118,7 +169,6 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:User/Attribute:status+' => 'Whether the user account is enabled or disabled.~~',
 	'Class:User/Attribute:status/Value:enabled' => 'Enabled~~',
 	'Class:User/Attribute:status/Value:disabled' => 'Disabled~~',
-
 	'Class:User/Error:LoginMustBeUnique' => 'Kullanıcı adı tekil olmalı - "%1s" mevcut bir kullanıcıya ait.',
 	'Class:User/Error:AtLeastOneProfileIsNeeded' => 'En az bir profil kullanıcıya atanmalı',
 	'Class:User/Error:ProfileNotAllowed' => 'Profile "%1$s" cannot be added it will deny the access to backoffice~~',
@@ -327,6 +377,29 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Expression:Unit:Short:YEAR' => 'y~~',
 ));
 
+//
+// Duplicated into itop-welcome-itil ( will be removed from here...)
+//
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Menu:WelcomeMenu' => 'Hoşgeldiniz',
+	'Menu:WelcomeMenu+' => ITOP_APPLICATION_SHORT.'\'a Hoşgeldiniz',
+	'Menu:WelcomeMenuPage' => 'Hoşgeldiniz',
+	'Menu:WelcomeMenuPage+' => ITOP_APPLICATION_SHORT.'\'a Hoşgeldiniz',
+	'Menu:AdminTools' => 'Yönetim Araçları',
+	'Menu:AdminTools+' => 'Yönetim Araçları',
+	'Menu:AdminTools?' => 'Yönetici profiline izin verilen araçlar',
+	'Menu:CSVImportMenu' => 'CSV dışardan al',
+	'Menu:CSVImportMenu+' => 'Çoklu yaratım veya güncelleme',
+	'Menu:DataModelMenu' => 'Veri Modeli',
+	'Menu:DataModelMenu+' => 'Veri Modeli Özeti',
+	'Menu:ExportMenu' => 'Dışarı ver',
+	'Menu:ExportMenu+' => 'Sorgu sonucunu HTML, CSV veya XML olarak dışarı aktar',
+	'Menu:NotificationsMenu' => 'Uyarılar',
+	'Menu:NotificationsMenu+' => 'Uyarıların yapılandırılması',
+	'Menu:MyShortcuts' => 'My Shortcuts~~',
+	'Menu:DataAdministration' => 'Veri Yönetimi',
+	'Menu:DataAdministration+' => 'Veri Yönetimi',
+));
 
 //
 // String from the User Interface: menu, messages, buttons, etc...
@@ -336,12 +409,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'BooleanLabel:yes' => 'evet',
 	'BooleanLabel:no' => 'hayır',
 	'UI:Login:Title' => ITOP_APPLICATION_SHORT.' login~~',
-	'Menu:WelcomeMenu' => 'Hoşgeldiniz',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:WelcomeMenu+' => ITOP_APPLICATION_SHORT.'\'a Hoşgeldiniz', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:WelcomeMenuPage' => 'Hoşgeldiniz',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:WelcomeMenuPage+' => ITOP_APPLICATION_SHORT.'\'a Hoşgeldiniz', // Duplicated into itop-welcome-itil (will be removed from here...)
 	'UI:WelcomeMenu:Title' => ITOP_APPLICATION_SHORT.'\'a Hoşgeldiniz',
-
 	'UI:WelcomeMenu:LeftBlock' => '<p>iTop açık kaynak Bilişim İşlem Potalıdır.</p>
 <ul>Kapsamı:
 <li>Bilişim altyapısının tanımlandığı ve dokümante edildiği Konfigürasyon Yönetimi CMDB (Configuration management database)modülü.</li>
@@ -352,7 +420,6 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 <li>Özet gösterge ekranları</li>
 </ul>
 <p>Tüm modüller bağımsız olarak, adım adım kurulabilir.</p>',
-
 	'UI:WelcomeMenu:RightBlock' => '<p>iTop servis sağlayıcı maktığı ile hazırlanmış olup, birden fazla müşteri ve kuruma kolaylıkla hizmet vermeye imkan sağlar.
 <ul>iTop, zengin iş süreçleri tanımlama imkanıyla:
 <li>Bilişim yönetim etkinliğini</li>
@@ -368,7 +435,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 <li>İşletmenin en önemli kaynağı olan dokümantasyonu yönetmesine imkan sağlar.</li>
 </ul>
 </p>',
-	'UI:WelcomeMenu:Text'=> '<div>Congratulations, you landed on '.ITOP_APPLICATION.' '.ITOP_VERSION_NAME.'!</div>
+	'UI:WelcomeMenu:Text' => '<div>Congratulations, you landed on '.ITOP_APPLICATION.' '.ITOP_VERSION_NAME.'!</div>
 
 <div>This version features a brand new modern and accessible backoffice design.</div>
 
@@ -389,6 +456,7 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:Button:GlobalSearch' => 'Arama',
 	'UI:Button:Search' => ' Arama ',
 	'UI:Button:Clear' => ' Clear ~~',
+	'UI:Button:Confirm' => ' Confirm ~~',
 	'UI:Button:SearchInHierarchy' => 'Search in hierarchy~~',
 	'UI:Button:Query' => ' Sorgu ',
 	'UI:Button:Ok' => 'Tamam',
@@ -429,7 +497,6 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:UserPref:DoNotShowAgain' => 'Do not show again~~',
 	'UI:InputFile:NoFileSelected' => 'No File Selected~~',
 	'UI:InputFile:SelectFile' => 'Select a file~~',
-
 	'UI:SearchToggle' => 'Ara',
 	'UI:ClickToCreateNew' => 'Yeni %1$s yarat~~',
 	'UI:SearchFor_Class' => '%1$s Arama',
@@ -449,7 +516,6 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:Error:CannotWriteToTmp_Dir' => 'Geçici dosya diske yazılamadı. upload_tmp_dir = "%1$s".',
 	'UI:Error:UploadStoppedByExtension_FileName' => 'Dosya yükleme dosya uzantısı nedeniyle duruduruldu. (Dosya adı = "%1$s").',
 	'UI:Error:UploadFailedUnknownCause_Code' => 'Dosya yükleme bilinmeyen bir sebeple başarısız oldu. (Hata kodu = "%1$s").',
-
 	'UI:Error:1ParametersMissing' => 'Hata: Bu operasyon için %1$s parametresi tanımlanmalı.',
 	'UI:Error:2ParametersMissing' => 'Hata: Bu operasyon için %1$s ve %2$s parametreleri tanımlanmalı.',
 	'UI:Error:3ParametersMissing' => 'Hata: Bu operasyon için %1$s, %2$s ve %3$s parametreleri tanımlanmalı.',
@@ -471,9 +537,7 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:Error:MaintenanceMode' => 'Application is currently in maintenance~~',
 	'UI:Error:MaintenanceTitle' => 'Maintenance~~',
 	'UI:Error:InvalidToken' => 'Error: the requested operation has already been performed (CSRF token not found)~~',
-
 	'UI:Error:SMTP:UnknownVendor' => 'OAuth SMTP provider %1$s does not exist  (email_transport_smtp.oauth.provider)~~',
-
 	'UI:GroupBy:Count' => 'Say',
 	'UI:GroupBy:Count+' => 'Eleman sayısı',
 	'UI:CountOfObjects' => 'Kritere uyan %1$d nesne bulundu.',
@@ -502,6 +566,7 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:Menu:OtherActions' => 'Diğer İşlemler',
 	'UI:Menu:Transitions' => 'Transitions~~',
 	'UI:Menu:OtherTransitions' => 'Other Transitions~~',
+	'UI:Menu:View' => 'View this object~~',
 	'UI:Menu:New' => 'Yeni...',
 	'UI:Menu:Add' => 'Ekle...',
 	'UI:Menu:Manage' => 'Yönet...',
@@ -510,6 +575,9 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:Menu:Modify' => 'Düzenle...',
 	'UI:Menu:Delete' => 'Sil...',
 	'UI:Menu:BulkDelete' => 'Sil...',
+	'UI:Menu:BulkDelete_Class' => 'Delete %1$s objects...~~',
+	'UI:Menu:BulkDelete_Link' => 'Delete %1$s...~~',
+	'UI:Menu:BulkDelete_Remote' => 'Delete %1$s...~~',
 	'UI:UndefinedObject' => 'tanımsız',
 	'UI:Document:OpenInNewWindow:Download' => 'Yeni pencerede aç: %1$s, Karşıdan yükle: %2$s',
 	'UI:SplitDateTime-Date' => 'Tarih',
@@ -542,7 +610,6 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:Login:ResetPassword' => 'Şimdi gönder!',
 	'UI:Login:ResetPwdFailed' => 'Bir e-posta gönderilemedi: %1$s',
 	'UI:Login:SeparatorOr' => 'Or~~',
-
 	'UI:ResetPwd-Error-WrongLogin' => '\'%1$s\' geçerli bir giriş değil',
 	'UI:ResetPwd-Error-NotPossible' => 'Harici hesapların şifre sıfırlama izni yoktur.',
 	'UI:ResetPwd-Error-FixedPwd' => 'Hesabın şifre sıfırlama izni yoktur.',
@@ -552,68 +619,50 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:ResetPwd-Error-Send' => 'E-posta ulaştırma teknik sorunu. Lütfen yöneticinize başvurun.',
 	'UI:ResetPwd-EmailSent' => 'Lütfen e-posta kutunuzu kontrol edin ve talimatları izleyin...',
 	'UI:ResetPwd-EmailSubject' => ITOP_APPLICATION_SHORT.'şifrenizi sıfırlayın',
-	'UI:ResetPwd-EmailBody' => '<body><p>'.ITOP_APPLICATION_SHORT.' şifrenizin sıfırlanması talebinde bulundunuz.</p><p> Yeni şifre oluşturmak için lütfen aşağıdaki tek kullanımlık bağlantıyı <a href=\"%1$s\">takip ediniz.</a></p>',
-
+	'UI:ResetPwd-EmailBody' => '<body><p>'.ITOP_APPLICATION_SHORT.' şifrenizin sıfırlanması talebinde bulundunuz.</p><p> Yeni şifre oluşturmak için lütfen aşağıdaki tek kullanımlık bağlantıyı <a href=\\"%1$s\\">takip ediniz.</a></p>',
 	'UI:ResetPwd-Title' => 'Şifre sıfırla',
 	'UI:ResetPwd-Error-InvalidToken' => 'Üzgünüz, ya parola zaten sıfırlandı ya da birkaç e-posta aldınız. Lütfen aldığınız en son e-postada verilen bağlantıyı kullandığınızdan emin olun',
 	'UI:ResetPwd-Error-EnterPassword' => '\'%1$s\' hesabı için yeni bir şifre girin.',
 	'UI:ResetPwd-Ready' => 'Şifre değiştirildi.',
 	'UI:ResetPwd-Login' => 'Giriş yapmak için buraya tıklayın...',
-
-	'UI:ResetPwd-Error-WrongLogin' => '\'%1$s\' is not a valid login~~',
-	'UI:ResetPwd-Error-NotPossible' => 'external accounts do not allow password reset.~~',
-	'UI:ResetPwd-Error-FixedPwd' => 'the account does not allow password reset.~~',
-	'UI:ResetPwd-Error-NoContact' => 'the account is not associated to a person.~~',
-	'UI:ResetPwd-Error-NoEmailAtt' => 'the account is not associated to a person having an email attribute. Please Contact your administrator.~~',
-	'UI:ResetPwd-Error-NoEmail' => 'missing an email address. Please Contact your administrator.~~',
-	'UI:ResetPwd-Error-Send' => 'email transport technical issue. Please Contact your administrator.~~',
-	'UI:ResetPwd-EmailSent' => 'Please check your email box and follow the instructions. If you receive no email, please check the login you typed.~~',
-	'UI:ResetPwd-EmailSubject' => 'Reset your iTop password~~',
-	'UI:ResetPwd-EmailBody' => '<body><p>You have requested to reset your iTop password.</p><p>Please follow this link (single usage) to <a href="%1$s">enter a new password</a></p>.~~',
-
-	'UI:ResetPwd-Title' => 'Reset password~~',
-	'UI:ResetPwd-Error-InvalidToken' => 'Sorry, either the password has already been reset, or you have received several emails. Please make sure that you use the link provided in the very last email received.~~',
-	'UI:ResetPwd-Error-EnterPassword' => 'Enter a new password for the account \'%1$s\'.~~',
-	'UI:ResetPwd-Ready' => 'The password has been changed.~~',
-	'UI:ResetPwd-Login' => 'Click here to login...~~',
-
-	'UI:Login:About'                               => '~~',
-	'UI:Login:ChangeYourPassword'                  => 'Şifre Değiştir',
-	'UI:Login:OldPasswordPrompt'                   => 'Mevcut şifre',
-	'UI:Login:NewPasswordPrompt'                   => 'Yeni şifre',
-	'UI:Login:RetypeNewPasswordPrompt'             => 'Yeni şifre tekrar',
-	'UI:Login:IncorrectOldPassword'                => 'Hata: mevcut şifre hatalı',
-	'UI:LogOffMenu'                                => 'Çıkış',
+	'UI:Login:About' => '~~',
+	'UI:Login:ChangeYourPassword' => 'Şifre Değiştir',
+	'UI:Login:OldPasswordPrompt' => 'Mevcut şifre',
+	'UI:Login:NewPasswordPrompt' => 'Yeni şifre',
+	'UI:Login:RetypeNewPasswordPrompt' => 'Yeni şifre tekrar',
+	'UI:Login:IncorrectOldPassword' => 'Hata: mevcut şifre hatalı',
+	'UI:LogOffMenu' => 'Çıkış',
 	'UI:LogOff:ThankYou' => ITOP_APPLICATION_SHORT.' Kullanıdığınız için teşekkürler',
-	'UI:LogOff:ClickHereToLoginAgain'              => 'Tekrar bağlanmak için tıklayınız...',
-	'UI:ChangePwdMenu'                             => 'Şifre değiştir...',
+	'UI:LogOff:ClickHereToLoginAgain' => 'Tekrar bağlanmak için tıklayınız...',
+	'UI:ChangePwdMenu' => 'Şifre değiştir...',
 	'UI:Login:PasswordChanged' => 'Şifre başarıyla ayarlandı!',
+	'UI:Login:PasswordNotChanged' => 'Error: Password is the same!~~',
 	'UI:AccessRO-All' => ITOP_APPLICATION_SHORT.' salt okunurdur',
 	'UI:AccessRO-Users' => ITOP_APPLICATION_SHORT.' sadece son kullanıcılar için okunurdur',
 	'UI:ApplicationEnvironment' => 'Uygulama Ortamı: %1$s',
 	'UI:Login:RetypePwdDoesNotMatch' => 'Yeni şifre eşlenmedi !',
 	'UI:Button:Login' => ITOP_APPLICATION_SHORT.'\'a Giriş',
 	'UI:Login:Error:AccessRestricted' => ITOP_APPLICATION_SHORT.' erişim sınırlandırıldı. Sistem yöneticisi ile irtibata geçiniz',
-	'UI:Login:Error:AccessAdmin'                   => 'Erişim sistem yönetci hesaplaları ile mümkün. Sistem yöneticisi ile irtibata geçiniz.',
-	'UI:Login:Error:WrongOrganizationName'         => 'Unknown organization~~',
+	'UI:Login:Error:AccessAdmin' => 'Erişim sistem yönetci hesaplaları ile mümkün. Sistem yöneticisi ile irtibata geçiniz.',
+	'UI:Login:Error:WrongOrganizationName' => 'Unknown organization~~',
 	'UI:Login:Error:MultipleContactsHaveSameEmail' => 'Multiple contacts have the same e-mail~~',
-	'UI:Login:Error:NoValidProfiles'               => 'No valid profile provided~~',
-	'UI:CSVImport:MappingSelectOne'                => '-- Birini seçiniz --',
-	'UI:CSVImport:MappingNotApplicable'            => '-- alanı ihmal et --',
-	'UI:CSVImport:NoData'                          => 'Boş veri seti..., veri giriniz!',
-	'UI:Title:DataPreview'                         => 'Veri öngörüntüleme',
-	'UI:CSVImport:ErrorOnlyOneColumn'              => 'Hata: Veri sadece bir kolon içeriyor. Doğru ayıraç karakteri seçtiniz mi ?',
-	'UI:CSVImport:FieldName'                       => 'Alan %1$d',
-	'UI:CSVImport:DataLine1'                       => 'Veri Satırı 1',
-	'UI:CSVImport:DataLine2'                       => 'Veri Satırı 2',
-	'UI:CSVImport:idField'                         => 'id (Tekil anahtar)',
+	'UI:Login:Error:NoValidProfiles' => 'No valid profile provided~~',
+	'UI:CSVImport:MappingSelectOne' => '-- Birini seçiniz --',
+	'UI:CSVImport:MappingNotApplicable' => '-- alanı ihmal et --',
+	'UI:CSVImport:NoData' => 'Boş veri seti..., veri giriniz!',
+	'UI:Title:DataPreview' => 'Veri öngörüntüleme',
+	'UI:CSVImport:ErrorOnlyOneColumn' => 'Hata: Veri sadece bir kolon içeriyor. Doğru ayıraç karakteri seçtiniz mi ?',
+	'UI:CSVImport:FieldName' => 'Alan %1$d',
+	'UI:CSVImport:DataLine1' => 'Veri Satırı 1',
+	'UI:CSVImport:DataLine2' => 'Veri Satırı 2',
+	'UI:CSVImport:idField' => 'id (Tekil anahtar)',
 	'UI:Title:BulkImport' => ITOP_APPLICATION_SHORT.' - Toplu giriş',
-	'UI:Title:BulkImport+'                         => 'CSV içeri aktarma aracı',
+	'UI:Title:BulkImport+' => 'CSV içeri aktarma aracı',
 	'UI:Title:BulkSynchro_nbItem_ofClass_class' => '%1$d sınıfının %2$s \'nin senkronizasyonu',
-	'UI:CSVImport:ClassesSelectOne'                => '-- Birini seçiniz --',
-	'UI:CSVImport:ErrorExtendedAttCode'            => 'Hata: "%1$s" hatalı kod, çünkü "%2$s" ile "%3$s" tekil ilişkide değil',
-	'UI:CSVImport:ObjectsWillStayUnchanged'        => '%1$d adet nesne değişmeyecek.',
-	'UI:CSVImport:ObjectsWillBeModified'           => '%1$d adet nesne değiştirilecek.',
+	'UI:CSVImport:ClassesSelectOne' => '-- Birini seçiniz --',
+	'UI:CSVImport:ErrorExtendedAttCode' => 'Hata: "%1$s" hatalı kod, çünkü "%2$s" ile "%3$s" tekil ilişkide değil',
+	'UI:CSVImport:ObjectsWillStayUnchanged' => '%1$d adet nesne değişmeyecek.',
+	'UI:CSVImport:ObjectsWillBeModified' => '%1$d adet nesne değiştirilecek.',
 	'UI:CSVImport:ObjectsWillBeAdded' => '%1$d adet nesne eklenecek.',
 	'UI:CSVImport:ObjectsWillHaveErrors' => '%1$d adet nesnede hata oluştu.',
 	'UI:CSVImport:ObjectsRemainedUnchanged' => '%1$d adet nesne değişmedi.',
@@ -659,11 +708,14 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:UniversalSearchTitle' => ITOP_APPLICATION_SHORT.' - Genel arama',
 	'UI:UniversalSearch:Error' => 'Hata: %1$s',
 	'UI:UniversalSearch:LabelSelectTheClass' => 'Aranacak sınıfı seçiniz: ',
-
 	'UI:CSVReport-Value-Modified' => 'Değiştiridi',
 	'UI:CSVReport-Value-SetIssue' => 'invalid value for attribute~~',
 	'UI:CSVReport-Value-ChangeIssue' => '\'%1$s\' is an invalid value~~',
 	'UI:CSVReport-Value-NoMatch' => 'No match for value \'%1$s\'~~',
+	'UI:CSVReport-Value-NoMatch-PossibleValues' => 'Some possible \'%1$s\' value(s): %2$s~~',
+	'UI:CSVReport-Value-NoMatch-NoObject' => 'There are no \'%1$s\' objects~~',
+	'UI:CSVReport-Value-NoMatch-NoObject-ForCurrentUser' => 'There are no \'%1$s\' objects found with your current profile~~',
+	'UI:CSVReport-Value-NoMatch-SomeObjectNotVisibleForCurrentUser' => 'There are some \'%1$s\' objects not visible with your current profile~~',
 	'UI:CSVReport-Value-Missing' => 'Eksik Zorunlu Değer',
 	'UI:CSVReport-Value-Ambiguous' => 'Belirsiz: %1$s nesnelerini buldum',
 	'UI:CSVReport-Row-Unchanged' => 'Değiştirilmedi',
@@ -677,15 +729,16 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:CSVReport-Value-Issue-Readonly' => 'Öznitelik \'%1$s\' salt okunurdur ve değiştirilemez (geçerli değer:%2$s, Önerilen Değer:%3$s)',
 	'UI:CSVReport-Value-Issue-Format' => 'Giriş yapamadı: %1$s',
 	'UI:CSVReport-Value-Issue-NoMatch' => 'Öznitelik için Beklenmeyen Değer \'%1$s\': Eşleşme bulunamadı, yazım kontrolü',
+	'UI:CSVReport-Value-Issue-AllowedValues' => 'Allowed \'%1$s\' value(s): %2$s~~',
 	'UI:CSVReport-Value-Issue-Unknown' => 'Öznitelik için Beklenmeyen Değer \'%1$s\': %2$s',
 	'UI:CSVReport-Row-Issue-Inconsistent' => 'Nitelikler birbirleriyle tutarlı değil: %1$s',
 	'UI:CSVReport-Row-Issue-Attribute' => 'Beklenmeyen özellik değeri (ler)',
 	'UI:CSVReport-Row-Issue-MissingExtKey' => 'Kayıp harici anahtar (lar) nedeniyle oluşturulamadı: %1$s',
 	'UI:CSVReport-Row-Issue-DateFormat' => 'Yanlış Tarih Biçimi',
+	'UI:CSVReport-Row-Issue-ExpectedDateFormat' => 'Expected format: %1$s~~',
 	'UI:CSVReport-Row-Issue-Reconciliation' => 'Uzlaşamadı',
 	'UI:CSVReport-Row-Issue-Ambiguous' => 'Belirsiz uzlaşma',
 	'UI:CSVReport-Row-Issue-Internal' => 'Dahili Hata: %1$s, %2$s',
-
 	'UI:CSVReport-Icon-Unchanged' => 'Değiştirilmemiş',
 	'UI:CSVReport-Icon-Modified' => 'Değiştirilmiş',
 	'UI:CSVReport-Icon-Missing' => 'Kayıp',
@@ -700,14 +753,32 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:CSVReport-Stats-Errors' => '%1$.0f yüklü nesnelerin %% hataları var ve göz ardı edilecek.',
 	'UI:CSVReport-Stats-Created' => 'Yüklenen nesnelerin %1$.0f %% oluşturulacaktır.',
 	'UI:CSVReport-Stats-Modified' => 'Yüklenen nesnelerin %1$.0f %% değiştirilecektir.',
-
 	'UI:CSVExport:AdvancedMode' => 'Gelişmiş Mod',
 	'UI:CSVExport:AdvancedMode+' => 'Gelişmiş modda, dışa aktarmaya birkaç sütun eklenir: nesnenin kimliği, harici anahtarların kimliği ve bunların uzlaşma özellikleri',
 	'UI:CSVExport:LostChars' => 'Kodlama sorunu',
 	'UI:CSVExport:LostChars+' => 'İndirilen dosya %1$s\'ye kodlanır. '.ITOP_APPLICATION_SHORT.', bu formatla uyumlu olmayan bazı karakterleri tespit etti. Bu karakterler ya bir ikame ile değiştirilecektir (örneğin, vurgulanmış karakterleri aksanı kaybedilen) veya atılacaklardır. Verileri web tarayıcınızdan kopyalayabilir / yapıştırabilirsiniz. Alternatif olarak, kodlamayı değiştirmek için yöneticinize başvurabilirsiniz (bkz. Parametre \'csv_file_default_charset \').',
-
 	'UI:Audit:Title' => ITOP_APPLICATION_SHORT.' - CMDB Denetleme',
 	'UI:Audit:InteractiveAudit' => 'Etkileşimli Denetleme',
+	'UI:Audit:Interactive:All:Title' => 'Audit results~~',
+	'UI:Audit:Interactive:All:SubTitle' => 'Full audit: includes all rules, all categories, all domains~~',
+	'UI:Audit:Interactive:All:BreadCrumb' => 'Full audit~~',
+	'UI:Audit:Interactive:All:BreadCrumb+' => 'Audit results for all rules~~',
+	'UI:Audit:Interactive:Categories:Title' => 'Audit results for categories: %1$s~~',
+	'UI:Audit:Interactive:Categories:SubTitle' => 'Audit results for all the rules belonging to one of those %1$s categories~~',
+	'UI:Audit:Interactive:Categories:BreadCrumb' => 'Categories~~',
+	'UI:Audit:Interactive:Categories:BreadCrumb+' => 'Audit categories: %1$s~~',
+	'UI:Audit:Interactive:Domain:Title' => 'Audit results for Domain: %1$s~~',
+	'UI:Audit:Interactive:Domain:SubTitle' => 'Audit results for all the rules belonging to a category related to the domain: %1$s~~',
+	'UI:Audit:Interactive:Domain:BreadCrumb' => '%1$s~~',
+	'UI:Audit:Interactive:Domain:BreadCrumb+' => 'Audit for Domain: %1$s~~',
+	'UI:Audit:Interactive:Selection:Title' => 'Selection of an audit~~',
+	'UI:Audit:Interactive:Selection:SubTitle' => 'Select a domain to get the results limited to this domain or select "All categories" to get a full audit (can take time or even fail if too much data to audit)~~',
+	'UI:Audit:Interactive:Selection:BreadCrumb' => 'Selection~~',
+	'UI:Audit:Interactive:Selection:BreadCrumb+' => 'Selection of an Audit to run~~',
+	'UI:Audit:Interactive:Selection:BadgeAll' => 'All categories~~',
+	'UI:Audit:Interactive:Button:Back' => 'Back to the audit~~',
+	'UI:Audit:Interactive:Button:Configuration' => 'Audit configuration~~',
+	'UI:Audit:ViewRules' => 'Check the rules~~',
 	'UI:Audit:HeaderAuditRule' => 'Denetleme Kuralı',
 	'UI:Audit:HeaderNbObjects' => 'Nesne Sayısı',
 	'UI:Audit:HeaderNbErrors' => 'Hata sayısı',
@@ -723,8 +794,6 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:Audit:Dashboard:ObjectsInError' => 'Objects in errors~~',
 	'UI:Audit:Dashboard:ObjectsValidated' => 'Objects validated~~',
 	'UI:Audit:AuditCategory:Subtitle' => '%1$s errors ouf of %2$s - %3$s%%~~',
-
-
 	'UI:RunQuery:Title' => ITOP_APPLICATION_SHORT.' - OQL Sorgu değerlendirme',
 	'UI:RunQuery:QueryExamples' => 'Sorgu örnekleri',
 	'UI:RunQuery:QueryResults' => 'Query Results~~',
@@ -763,7 +832,6 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:Schema:Label' => 'Etiket',
 	'UI:Schema:Label+' => 'Özellik etiketi',
 	'UI:Schema:Type' => 'Tip',
-
 	'UI:Schema:Type+' => 'Özellik veri tipi',
 	'UI:Schema:Origin' => 'Kaynak',
 	'UI:Schema:Origin+' => 'Özelliğin tanımlandığı ana sınıf',
@@ -811,6 +879,16 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:Schema:DisplaySelector/Code' => 'Code~~',
 	'UI:Schema:Attribute/Filter' => 'Filter~~',
 	'UI:Schema:DefaultNullValue' => 'Default null : "%1$s"~~',
+	'UI:Schema:Events' => 'Events~~',
+	'UI:Schema:Events:Defined' => 'Defined events~~',
+	'UI:Schema:Events:NoEvent' => 'No event defined~~',
+	'UI:Schema:Events:Listeners' => 'Event listeners~~',
+	'UI:Schema:Events:NoListener' => 'No event listener~~',
+	'UI:Schema:Events:Event' => 'Event~~',
+	'UI:Schema:Events:Description' => 'Description~~',
+	'UI:Schema:Events:Listener' => 'Listener~~',
+	'UI:Schema:Events:Rank' => 'Rank~~',
+	'UI:Schema:Events:Module' => 'Module~~',
 	'UI:LinksWidget:Autocomplete+' => 'İlk 3 karakteri giriniz...',
 	'UI:Edit:SearchQuery' => 'Select a predefined query~~',
 	'UI:Edit:TestQuery' => 'Test sorgusu',
@@ -902,7 +980,6 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:SystemIntrusion' => 'Bu işlem için yetkiniz yok',
 	'UI:FatalErrorMessage' => 'Kritik Hata, iTop devam edemiyor.',
 	'UI:Error_Details' => 'Hata: %1$s.',
-
 	'UI:PageTitle:ProfileProjections' => ITOP_APPLICATION_SHORT.' Kullanıcı Yönetimi - profil koruması',
 	'UI:UserManagement:Class' => 'Sınıf',
 	'UI:UserManagement:Class+' => 'Nesnin sınıfı',
@@ -937,66 +1014,42 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:UserManagement:NoLifeCycleApplicable' => 'N/A',
 	'UI:UserManagement:NoLifeCycleApplicable+' => 'Bu nesne için yaşam döngüsü tanımsız',
 	'UI:UserManagement:GrantMatrix' => 'Yetkiler',
-
-	'Menu:AdminTools' => 'Yönetim Araçları',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:AdminTools+' => 'Yönetim Araçları',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:AdminTools?' => 'Yönetici profiline izin verilen araçlar',// Duplicated into itop-welcome-itil (will be removed from here...)
 	'Menu:SystemTools' => 'System~~',
-
 	'UI:ChangeManagementMenu' => 'Değişiklik Yönetimi',
 	'UI:ChangeManagementMenu+' => 'Değişiklik Yönetimi',
 	'UI:ChangeManagementMenu:Title' => 'Değişiklik Özeti',
 	'UI-ChangeManagementMenu-ChangesByType' => 'Değişiklik tipine göre',
 	'UI-ChangeManagementMenu-ChangesByStatus' => 'Değişiklik durumuna göre',
 	'UI-ChangeManagementMenu-ChangesNotYetAssigned' => 'Atanmamış Değişiklikler',
-
 	'UI:ConfigurationManagementMenu' => 'Konfigürasyon Yönetimi',
 	'UI:ConfigurationManagementMenu+' => 'Konfigürasyon Yönetimi',
 	'UI:ConfigurationManagementMenu:Title' => 'Altyapı Özeti',
 	'UI-ConfigurationManagementMenu-InfraByType' => 'Infrastructure objects by type',
 	'UI-ConfigurationManagementMenu-InfraByStatus' => 'Infrastructure objects by status',
-
 	'UI:ConfigMgmtMenuOverview:Title' => 'Konfigürasyon Yönetimi Gösterge Tablosu',
 	'UI-ConfigMgmtMenuOverview-FunctionalCIbyStatus' => 'Durumlarına göre Konfigürasyon Kalemleri(KK)',
 	'UI-ConfigMgmtMenuOverview-FunctionalCIByType' => 'Tiplerine göre Konfigürasyon Kalemleri(KK)',
-
 	'UI:RequestMgmtMenuOverview:Title' => 'Çağrı Yönetimi Gösterge Tablosu',
 	'UI-RequestManagementOverview-RequestByService' => 'Hizmetlere göre çağrılar',
 	'UI-RequestManagementOverview-RequestByPriority' => 'Önceliklere göre çağrılar',
 	'UI-RequestManagementOverview-RequestUnassigned' => 'Henüz atanmamış çağrılar',
-
 	'UI:IncidentMgmtMenuOverview:Title' => 'Arıza Gösterge Tablosu',
 	'UI-IncidentManagementOverview-IncidentByService' => 'Servislere göre arızalar',
 	'UI-IncidentManagementOverview-IncidentByPriority' => 'Önceliklere göre arızalar',
 	'UI-IncidentManagementOverview-IncidentUnassigned' => 'Henüz atanmamış arızalar',
-
 	'UI:ChangeMgmtMenuOverview:Title' => 'Değişiklik Yönetimi Gösterge Tablosu',
 	'UI-ChangeManagementOverview-ChangeByType' => 'Tiplerine göre değişiklikler',
 	'UI-ChangeManagementOverview-ChangeUnassigned' => 'Henüz atanmamış değişiklikler',
 	'UI-ChangeManagementOverview-ChangeWithOutage' => 'Değişiklik nedeniyle devre dışı',
-
 	'UI:ServiceMgmtMenuOverview:Title' => 'Hizmet Yönetimi Gösterge Tablosu',
 	'UI-ServiceManagementOverview-CustomerContractToRenew' => '30 gün içinde biten Müşteri Sözleşmeleri',
 	'UI-ServiceManagementOverview-ProviderContractToRenew' => '30 gün içinde biten Tedarikçi Sözleşmeleri',
-
 	'UI:ContactsMenu' => 'İrtibatlar',
 	'UI:ContactsMenu+' => 'İrtibatlar',
 	'UI:ContactsMenu:Title' => 'İrtibatlar Özetleri',
 	'UI-ContactsMenu-ContactsByLocation' => 'Yerleşkeye göre irtibatlar',
 	'UI-ContactsMenu-ContactsByType' => 'Tipine göre irtibatlar',
 	'UI-ContactsMenu-ContactsByStatus' => 'Durumuna göre irtibatlar',
-
-	'Menu:CSVImportMenu' => 'CSV dışardan al',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:CSVImportMenu+' => 'Çoklu yaratım veya güncelleme',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:DataModelMenu' => 'Veri Modeli',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:DataModelMenu+' => 'Veri Modeli Özeti',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:ExportMenu' => 'Dışarı ver',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:ExportMenu+' => 'Sorgu sonucunu HTML, CSV veya XML olarak dışarı aktar',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:NotificationsMenu' => 'Uyarılar',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:NotificationsMenu+' => 'Uyarıların yapılandırılması',// Duplicated into itop-welcome-itil (will be removed from here...)
 	'UI:NotificationsMenu:Title' => 'Uyarıların yapılandırılması',
 	'UI:NotificationsMenu:Help' => 'Yardım',
 	'UI:NotificationsMenu:HelpContent' => '<p>In '.ITOP_APPLICATION_SHORT.' uyarı mekanizması ihtiyaca göre uyarlanabilir. Uyarılar iki tip nesne üzerine kurulmuştur: <i>tetikleme (triggers) ve işlemler (actions)</i>.</p>
@@ -1027,60 +1080,18 @@ Tetikleme gerçekleştiriğinde işlemler tanımlanan sıra numarası ile gerçe
 	'UI:NotificationsMenu:Actions:ActionWebhook' => 'Webhook actions (outgoing integrations)~~',
 	'UI:NotificationsMenu:Actions:Action' => 'Other actions~~',
 	'UI:NotificationsMenu:AvailableActions' => 'Kullanılabilir işlemler',
-
 	'Menu:TagAdminMenu' => 'Tags configuration~~',
 	'Menu:TagAdminMenu+' => 'Tags values management~~',
 	'UI:TagAdminMenu:Title' => 'Tags configuration~~',
 	'UI:TagAdminMenu:NoTags' => 'No Tag field configured~~',
 	'UI:TagSetFieldData:Error' => 'Error: %1$s~~',
-
-	'Menu:AuditCategories' => 'Denetleme Kategorileri',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:AuditCategories+' => 'Denetleme Kategorileri',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:Notifications:Title' => 'Denetleme Kategorileri',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:RunQueriesMenu' => 'Sorgu çalıştır',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:RunQueriesMenu+' => 'Sorgu çalıştır',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:AuditCategories' => 'Denetleme Kategorileri', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:AuditCategories+' => 'Denetleme Kategorileri', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:Notifications:Title' => 'Denetleme Kategorileri', // Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:RunQueriesMenu' => 'Sorgu çalıştır', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:RunQueriesMenu+' => 'Sorgu çalıştır', // Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:QueryMenu' => 'Sorgu deyişleri kitabı', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:QueryMenu+' => 'Sorgu deyişleri kitabı', // Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:DataAdministration' => 'Veri Yönetimi',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:DataAdministration+' => 'Veri Yönetimi',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:UniversalSearchMenu' => 'Genel sorgu',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UniversalSearchMenu+' => 'Herhangi bir arama...',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:UserManagementMenu' => 'Kullanıcı Yönetimi',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UserManagementMenu+' => 'Kullanıcı Yönetimi',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:ProfilesMenu' => 'Profiller',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:ProfilesMenu+' => 'Profiller',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:ProfilesMenu:Title' => 'Profiller',
-	// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:UserAccountsMenu' => 'Kullanıcı Hesapları',
-	// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UserAccountsMenu+' => 'Kullanıcı Hesapları',
-	// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UserAccountsMenu:Title' => 'Kullanıcı Hesapları',
-	// Duplicated into itop-welcome-itil (will be removed from here...)
-
 	'UI:iTopVersion:Short' => '%1$s versiyonu %2$s',
 	'UI:iTopVersion:Long' => '%1$s  %4$s tarihli versiyonu %2$s-%3$s',
 	'UI:PropertiesTab' => 'Özellikler',
-
 	'UI:OpenDocumentInNewWindow_' => 'Açmak~~',
 	'UI:DownloadDocument_' => 'Indirmek~~',
 	'UI:Document:NoPreview' => 'Bu tip doküman için öngösterim mevcut değil',
 	'UI:Download-CSV' => 'İndir %1$s',
-
 	'UI:DeadlineMissedBy_duration' => '%1$s ile kaçırıldı',
 	'UI:Deadline_LessThan1Min' => '< 1 dk.',
 	'UI:Deadline_Minutes' => '%1$d dk.',
@@ -1159,9 +1170,13 @@ Tetikleme gerçekleştiriğinde işlemler tanımlanan sıra numarası ile gerçe
 	'Enum:Undefined' => 'Tanımsız',
 	'UI:DurationForm_Days_Hours_Minutes_Seconds' => '%1$s Gün %2$s Saat %3$s Dakika %4$s Saniye',
 	'UI:ModifyAllPageTitle' => 'Hepsini değiştir',
+	'UI:Modify_ObjectsOf_Class' => 'Modifying objects of class %1$s~~',
 	'UI:Modify_N_ObjectsOf_Class' => '%1$d Sınıfının Değiştirilmesi %2$s',
 	'UI:Modify_M_ObjectsOf_Class_OutOf_N' => '%1$d nesnelerinin %3$s \'dışında %1$d nesnelerini değiştirme',
 	'UI:Menu:ModifyAll' => 'Değiştir...',
+	'UI:Menu:ModifyAll_Class' => 'Modify %1$s objects...~~',
+	'UI:Menu:ModifyAll_Link' => 'Modify %1$s...~~',
+	'UI:Menu:ModifyAll_Remote' => 'Modify %1$s...~~',
 	'UI:Button:ModifyAll' => 'Hepsini değiştir',
 	'UI:Button:PreviewModifications' => 'Değişiklikleri görüntüle >>',
 	'UI:ModifiedObject' => 'Nesne değiştirildi',
@@ -1221,13 +1236,13 @@ Tetikleme gerçekleştiriğinde işlemler tanımlanan sıra numarası ile gerçe
 	'UI:PrintResolution:LetterLandscape' => 'Letter Landscape~~',
 	'UI:Toggle:SwitchToStandardDashboard' => 'Switch to standard dashboard~~',
 	'UI:Toggle:SwitchToCustomDashboard' => 'Switch to custom dashboard~~',
-
 	'UI:ConfigureThisList' => 'Bu listeyi yapılandırın...',
 	'UI:ListConfigurationTitle' => 'Liste Yapılandırması',
 	'UI:ColumnsAndSortOrder' => 'Liste Yapılandırması:',
 	'UI:UseDefaultSettings' => 'Varsayılan ayarları kullanın',
 	'UI:UseSpecificSettings' => 'Aşağıdaki ayarları kullanın:',
-	'UI:Display_X_ItemsPerPage' => 'Sayfa başına %1$s öğe göster',
+	'UI:Display_X_ItemsPerPage_prefix' => 'Display~~',
+	'UI:Display_X_ItemsPerPage_suffix' => 'items per page~~',
 	'UI:UseSavetheSettings' => 'Ayarları kaydedin',
 	'UI:OnlyForThisList' => 'Sadece bu liste için',
 	'UI:ForAllLists' => 'Tüm listeler için varsayılan',
@@ -1236,21 +1251,8 @@ Tetikleme gerçekleştiriğinde işlemler tanımlanan sıra numarası ile gerçe
 	'UI:ExtField_AsRemoteField' => '%1$s (%2$s)',
 	'UI:Button:MoveUp' => 'Yukarıya taşı',
 	'UI:Button:MoveDown' => 'Aşağıya taşı',
-
 	'UI:OQL:UnknownClassAndFix' => 'Bilinmeyen sınıf \\"%1$s\\". Bunun yerine \\"%2$s\\" deneyebilirsiniz.',
 	'UI:OQL:UnknownClassNoFix' => 'Bilinmeyen sınıf \\"%1$s\\"~~',
-
-	'UI:OnlyForThisList' => 'Only for this list~~',
-	'UI:ForAllLists' => 'Default for all lists~~',
-	'UI:ExtKey_AsLink' => '%1$s (Link)~~',
-	'UI:ExtKey_AsFriendlyName' => '%1$s (Friendly Name)~~',
-	'UI:ExtField_AsRemoteField' => '%1$s (%2$s)~~',
-	'UI:Button:MoveUp' => 'Move Up~~',
-	'UI:Button:MoveDown' => 'Move Down~~',
-
-	'UI:OQL:UnknownClassAndFix' => 'Unknown class \\"%1$s\\". You may try \\"%2$s\\" instead.~~',
-	'UI:OQL:UnknownClassNoFix' => 'Unknown class \\"%1$s\\"~~',
-
 	'UI:Dashboard:EditCustom' => 'Bu sayfayı düzenleyin...',
 	'UI:Dashboard:CreateCustom' => 'Create a custom version...~~',
 	'UI:Dashboard:DeleteCustom' => 'Delete custom version...~~',
@@ -1261,17 +1263,10 @@ Tetikleme gerçekleştiriğinde işlemler tanımlanan sıra numarası ile gerçe
 	'UI:ImportDashboardText' => 'İçe aktarılacak bir gösterge paneli dosyası seçin:',
 	'UI:Dashboard:Actions' => 'Dashboard actions~~',
 	'UI:Dashboard:NotUpToDateUntilContainerSaved' => 'This dashboard displays information that does not include the on-going changes.~~',
-
 	'UI:DashletCreation:Title' => 'Yeni bir gösterge paneli öğesi oluşturun',
 	'UI:DashletCreation:Dashboard' => 'Gösterge paneli',
 	'UI:DashletCreation:DashletType' => 'Gösterge paneli öğesi tipi',
 	'UI:DashletCreation:EditNow' => 'Gösterge panelini düzenleyin',
-
-	'UI:DashletCreation:Title' => 'Create a new Dashlet~~',
-	'UI:DashletCreation:Dashboard' => 'Dashboard~~',
-	'UI:DashletCreation:DashletType' => 'Dashlet Type~~',
-	'UI:DashletCreation:EditNow' => 'Edit the Dashboard~~',
-
 	'UI:DashboardEdit:Title' => 'Gösterge paneli editörü',
 	'UI:DashboardEdit:DashboardTitle' => 'Başlık',
 	'UI:DashboardEdit:AutoReload' => 'Otomatik yenileme',
@@ -1279,38 +1274,31 @@ Tetikleme gerçekleştiriğinde işlemler tanımlanan sıra numarası ile gerçe
 	'UI:DashboardEdit:AutoReloadSec+' => 'İzin verilen minimum %1$d saniyedir',
 	'UI:DashboardEdit:Revert' => 'Revert~~',
 	'UI:DashboardEdit:Apply' => 'Apply~~',
-
 	'UI:DashboardEdit:Layout' => 'Düzen',
 	'UI:DashboardEdit:Properties' => 'Gösterge paneli özellikleri',
 	'UI:DashboardEdit:Dashlets' => 'Mevcut gösterge paneli öğeleri',
 	'UI:DashboardEdit:DashletProperties' => 'Gösterge paneli öğesi özellikleri',
-
 	'UI:Form:Property' => 'Mülkiyet',
 	'UI:Form:Value' => 'Değer',
-
 	'UI:DashletUnknown:Label' => 'Unknown~~',
 	'UI:DashletUnknown:Description' => 'Unknown dashlet (might have been uninstalled)~~',
 	'UI:DashletUnknown:RenderText:View' => 'Unable to render this dashlet.~~',
 	'UI:DashletUnknown:RenderText:Edit' => 'Unable to render this dashlet (class "%1$s"). Check with your administrator if it is still available.~~',
 	'UI:DashletUnknown:RenderNoDataText:Edit' => 'No preview available for this dashlet (class "%1$s").~~',
 	'UI:DashletUnknown:Prop-XMLConfiguration' => 'Configuration (shown as raw XML)~~',
-
 	'UI:DashletProxy:Label' => 'Proxy~~',
 	'UI:DashletProxy:Description' => 'Proxy dashlet~~',
 	'UI:DashletProxy:RenderNoDataText:Edit' => 'No preview available for this third-party dashlet (class "%1$s").~~',
 	'UI:DashletProxy:Prop-XMLConfiguration' => 'Configuration (shown as raw XML)~~',
-
 	'UI:DashletPlainText:Label' => 'Metin',
 	'UI:DashletPlainText:Description' => 'Düz metin (biçimlendirme yok)',
 	'UI:DashletPlainText:Prop-Text' => 'Metin',
 	'UI:DashletPlainText:Prop-Text:Default' => 'Lütfen buraya bir metin girin...',
-
 	'UI:DashletObjectList:Label' => 'Nesne Listesi',
 	'UI:DashletObjectList:Description' => 'Nesne Listesi Gösterge Paneli Öğesi',
 	'UI:DashletObjectList:Prop-Title' => 'Başlık',
 	'UI:DashletObjectList:Prop-Query' => 'Sorgu',
 	'UI:DashletObjectList:Prop-Menu' => 'Menü',
-
 	'UI:DashletGroupBy:Prop-Title' => 'Başlık',
 	'UI:DashletGroupBy:Prop-Query' => 'Sorgu',
 	'UI:DashletGroupBy:Prop-Style' => 'Stil',
@@ -1324,24 +1312,20 @@ Tetikleme gerçekleştiriğinde işlemler tanımlanan sıra numarası ile gerçe
 	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfWeek' => '%1$s (hafta Günü)~~',
 	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfMonth' => '%1$s (ayın günü)~~',
 	'UI:DashletGroupBy:MissingGroupBy' => 'Lütfen nesnelerin birlikte gruplandırılacağı alanı seçin',
-
 	'UI:DashletGroupByPie:Label' => 'Pasta grafiği',
 	'UI:DashletGroupByPie:Description' => 'Pasta grafiği',
 	'UI:DashletGroupByBars:Label' => 'Çubuk grafiği',
 	'UI:DashletGroupByBars:Description' => 'Çubuk grafiği',
 	'UI:DashletGroupByTable:Label' => 'Grup (tablo)',
 	'UI:DashletGroupByTable:Description' => 'Liste (bir alan tarafından gruplandırılmış)',
-
-	// New in 2.5
+    // New in 2.5
 	'UI:DashletGroupBy:Prop-Function' => 'Aggregation function~~',
 	'UI:DashletGroupBy:Prop-FunctionAttribute' => 'Function attribute~~',
 	'UI:DashletGroupBy:Prop-OrderDirection' => 'Direction~~',
 	'UI:DashletGroupBy:Prop-OrderField' => 'Order by~~',
 	'UI:DashletGroupBy:Prop-Limit' => 'Limit~~',
-
 	'UI:DashletGroupBy:Order:asc' => 'Ascending~~',
 	'UI:DashletGroupBy:Order:desc' => 'Descending~~',
-
 	'UI:GroupBy:count' => 'Count~~',
 	'UI:GroupBy:count+' => 'Number of elements~~',
 	'UI:GroupBy:sum' => 'Sum~~',
@@ -1352,14 +1336,12 @@ Tetikleme gerçekleştiriğinde işlemler tanımlanan sıra numarası ile gerçe
 	'UI:GroupBy:min+' => 'Minimum of %1$s~~',
 	'UI:GroupBy:max' => 'Maximum~~',
 	'UI:GroupBy:max+' => 'Maximum of %1$s~~',
-	// ---
-
+    // ---
 	'UI:DashletHeaderStatic:Label' => 'Başlık',
 	'UI:DashletHeaderStatic:Description' => 'Yatay bir ayıracı görüntüler',
 	'UI:DashletHeaderStatic:Prop-Title' => 'Başlık',
 	'UI:DashletHeaderStatic:Prop-Title:Default' => 'Kişiler',
 	'UI:DashletHeaderStatic:Prop-Icon' => 'Simge',
-
 	'UI:DashletHeaderDynamic:Label' => 'İstatistikli Başlık',
 	'UI:DashletHeaderDynamic:Description' => 'İstatistiklerle başlık (Gruplandırılmış ...)',
 	'UI:DashletHeaderDynamic:Prop-Title' => 'Başlık',
@@ -1370,11 +1352,9 @@ Tetikleme gerçekleştiriğinde işlemler tanımlanan sıra numarası ile gerçe
 	'UI:DashletHeaderDynamic:Prop-Query' => 'Sorgu',
 	'UI:DashletHeaderDynamic:Prop-GroupBy' => 'Grup tarafından',
 	'UI:DashletHeaderDynamic:Prop-Values' => 'Değerler',
-
 	'UI:DashletBadge:Label' => 'Rozeti',
 	'UI:DashletBadge:Description' => 'Yeni / arama ile nesne simgesi',
 	'UI:DashletBadge:Prop-Class' => 'Sınıf',
-
 	'DayOfWeek-Sunday' => 'Pazar',
 	'DayOfWeek-Monday' => 'Pazartesi',
 	'DayOfWeek-Tuesday' => 'Salı günü',
@@ -1394,8 +1374,7 @@ Tetikleme gerçekleştiriğinde işlemler tanımlanan sıra numarası ile gerçe
 	'Month-10' => 'Ekim',
 	'Month-11' => 'Kasım',
 	'Month-12' => 'Aralık',
-
-	// Short version for the DatePicker
+    // Short version for the DatePicker
 	'DayOfWeek-Sunday-Min' => 'Paz',
 	'DayOfWeek-Monday-Min' => 'Pzt',
 	'DayOfWeek-Tuesday-Min' => 'Sal',
@@ -1415,13 +1394,13 @@ Tetikleme gerçekleştiriğinde işlemler tanımlanan sıra numarası ile gerçe
 	'Month-10-Short' => 'Eki',
 	'Month-11-Short' => 'Kas',
 	'Month-12-Short' => 'Ara',
-	'Calendar-FirstDayOfWeek' => '0', // 0 = Sunday, 1 = Monday, etc...
-
+	'Calendar-FirstDayOfWeek' => '0',
+    // 0 = Sunday, 1 = Monday, etc...
 	'UI:Menu:ShortcutList' => 'Bir kısayol oluşturun...',
+	'UI:Menu:FilterList' => 'Display list with search criteria~~',
 	'UI:ShortcutRenameDlg:Title' => 'Kısayolu yeniden adlandırın',
 	'UI:ShortcutListDlg:Title' => 'Liste için bir kısayol oluşturun',
 	'UI:ShortcutDelete:Confirm' => 'Lütfen kısayolları silmek istediğinizi onaylayın.',
-	'Menu:MyShortcuts' => 'Kısayollarım', // Duplicated into itop-welcome-itil (will be removed from here...)
 	'Class:Shortcut' => 'Kısayol',
 	'Class:Shortcut+' => '~~',
 	'Class:Shortcut/Attribute:name' => 'İsim',
@@ -1435,12 +1414,10 @@ Tetikleme gerçekleştiriğinde işlemler tanımlanan sıra numarası ile gerçe
 	'Class:ShortcutOQL/Attribute:auto_reload/Value:custom' => 'Özel Oran',
 	'Class:ShortcutOQL/Attribute:auto_reload_sec' => 'Otomatik Yenileme Aralığı (Saniye)',
 	'Class:ShortcutOQL/Attribute:auto_reload_sec/tip' => 'İzin verilen minimum %1$d saniyedir',
-
 	'UI:FillAllMandatoryFields' => 'Lütfen tüm zorunlu alanları doldurun.',
 	'UI:ValueMustBeSet' => 'Lütfen bir değer belirtin',
 	'UI:ValueMustBeChanged' => 'Lütfen değeri değiştirin',
 	'UI:ValueInvalidFormat' => 'Geçersiz format',
-
 	'UI:CSVImportConfirmTitle' => 'Lütfen operasyonu onaylayın',
 	'UI:CSVImportConfirmMessage' => 'Bunu yapmak istediğinden emin misin?',
 	'UI:CSVImportError_items' => 'Hatalar: %1$d',
@@ -1466,11 +1443,9 @@ Tetikleme gerçekleştiriğinde işlemler tanımlanan sıra numarası ile gerçe
 <tr><td>i</td><td>minutes (2 digits, e.g. 00..59)</td></tr>
 <tr><td>s</td><td>seconds (2 digits, e.g. 00..59)</td></tr>
 </table>~~',
-
 	'UI:Button:Remove' => 'Kaldır',
 	'UI:AddAnExisting_Class' => '%1$s tipi nesneleri ekleyin...',
 	'UI:SelectionOf_Class' => '%1$s türünün nesnelerinin seçimi',
-
 	'UI:AboutBox' => 'About'.ITOP_APPLICATION_SHORT.'...',
 	'UI:About:Title' => 'About '.ITOP_APPLICATION_SHORT,
 	'UI:About:DataModel' => 'Veri modeli',
@@ -1480,12 +1455,10 @@ Tetikleme gerçekleştiriğinde işlemler tanımlanan sıra numarası ile gerçe
 	'UI:About:ManualExtensionSource' => 'Extension~~',
 	'UI:About:Extension_Version' => 'Version: %1$s~~',
 	'UI:About:RemoteExtensionSource' => 'Data~~',
-
 	'UI:DisconnectedDlgMessage' => 'Oturumunuz kapandı. Uygulamayı kullanmaya devam etmek giriş yapmalısınız.',
 	'UI:DisconnectedDlgTitle' => 'Uyarı!',
 	'UI:LoginAgain' => 'Tekrar giriş yapın',
 	'UI:StayOnThePage' => 'Bu sayfada kalın',
-
 	'ExcelExporter:ExportMenu' => 'Dışarı Excel aktar...',
 	'ExcelExporter:ExportDialogTitle' => 'Dışarı Excel aktar',
 	'ExcelExporter:ExportButton' => 'Dışarı aktar',
@@ -1498,7 +1471,6 @@ Tetikleme gerçekleştiriğinde işlemler tanımlanan sıra numarası ile gerçe
 	'ExcelExport:Statistics' => 'İstatistikler',
 	'portal:legacy_portal' => 'Son Kullanıcı Arayüzü',
 	'portal:backoffice' => ITOP_APPLICATION_SHORT.'Arka Ofis Kullanıcı Arayüzü',
-
 	'UI:CurrentObjectIsLockedBy_User' => 'Nesne %1$s tarafından değiştirildiğinden beri kilitli.',
 	'UI:CurrentObjectIsLockedBy_User_Explanation' => 'Nesne  şu anda %1$s tarafından değiştiriliyor. Değişiklikleriniz üzerine yazıldığı için gönderilemez.',
 	'UI:CurrentObjectIsSoftLockedBy_User' => 'The object is currently being modified by %1$s. You\'ll be able to submit your modifications once they have finished.~~',
@@ -1506,43 +1478,36 @@ Tetikleme gerçekleştiriğinde işlemler tanımlanan sıra numarası ile gerçe
 	'UI:CurrentObjectLockExpired_Explanation' => 'Nesnenin eşzamanlı modifikasyonlarını önleyen kilit sona ermiştir. Diğer kullanıcıların artık bu nesneyi değiştirmesine izin verildiğinden, artık değişikliklerinizi gönderemezsiniz.',
 	'UI:ConcurrentLockKilled' => 'Geçerli nesnedeki modifikasyonları önleyen kilitleme silindi',
 	'UI:Menu:KillConcurrentLock' => 'Eşzamanlı değişiklik kilidini kaldır!',
-
 	'UI:Menu:ExportPDF' => 'PDF olarak dışarı aktar...',
 	'UI:Menu:PrintableVersion' => 'Printer friendly version~~',
-
 	'UI:BrowseInlineImages' => 'Browse images...~~',
 	'UI:UploadInlineImageLegend' => 'Upload a new image~~',
 	'UI:SelectInlineImageToUpload' => 'Select the image to upload~~',
 	'UI:AvailableInlineImagesLegend' => 'Available images~~',
 	'UI:NoInlineImage' => 'There is no image available on the server. Use the "Browse" button above to select an image from your computer and upload it to the server.~~',
-
 	'UI:ToggleFullScreen' => 'Toggle Maximize / Minimize~~',
 	'UI:Button:ResetImage' => 'Recover the previous image~~',
 	'UI:Button:RemoveImage' => 'Remove the image~~',
 	'UI:Button:UploadImage' => 'Upload an image from the disk~~',
 	'UI:UploadNotSupportedInThisMode' => 'The modification of images or files is not supported in this mode.~~',
-
 	'UI:Button:RemoveDocument' => 'Remove the document~~',
-
-	// Search form
+    // Search form
 	'UI:Search:Toggle' => 'Minimize / Expand~~',
 	'UI:Search:AutoSubmit:DisabledHint' => 'Auto submit has been disabled for this class~~',
 	'UI:Search:Obsolescence:DisabledHint' => 'Based on your preferences, obsolete data are hidden~~',
 	'UI:Search:NoAutoSubmit:ExplainText' => 'Add some criterion on the search box or click the search button to view the objects.~~',
 	'UI:Search:Criterion:MoreMenu:AddCriteria' => 'Add new criteria~~',
-	// - Add new criteria button
+    // - Add new criteria button
 	'UI:Search:AddCriteria:List:RecentlyUsed:Title' => 'Recently used~~',
 	'UI:Search:AddCriteria:List:MostPopular:Title' => 'Most popular~~',
 	'UI:Search:AddCriteria:List:Others:Title' => 'Others~~',
 	'UI:Search:AddCriteria:List:RecentlyUsed:Placeholder' => 'None yet.~~',
-
-	// - Criteria header actions
+    // - Criteria header actions
 	'UI:Search:Criteria:Toggle' => 'Minimize / Expand~~',
 	'UI:Search:Criteria:Remove' => 'Remove~~',
 	'UI:Search:Criteria:Locked' => 'Locked~~',
-
-	// - Criteria titles
-	//   - Default widget
+    // - Criteria titles
+    //   - Default widget
 	'UI:Search:Criteria:Title:Default:Any' => '%1$s: Any~~',
 	'UI:Search:Criteria:Title:Default:Empty' => '%1$s is empty~~',
 	'UI:Search:Criteria:Title:Default:NotEmpty' => '%1$s is not empty~~',
@@ -1564,53 +1529,57 @@ Tetikleme gerçekleştiriğinde işlemler tanımlanan sıra numarası ile gerçe
 	'UI:Search:Criteria:Title:Default:Between:All' => '%1$s: Any~~',
 	'UI:Search:Criteria:Title:Default:Between:From' => '%1$s from %2$s~~',
 	'UI:Search:Criteria:Title:Default:Between:Until' => '%1$s up to %2$s~~',
-	//   - Numeric widget
-	//   None yet
-	//   - DateTime widget
+    //   - Numeric widget
+    //   None yet
+    //   - DateTime widget
 	'UI:Search:Criteria:Title:DateTime:Between' => '%2$s <= 1$s <= %3$s~~',
-	//   - Enum widget
+    //   - Enum widget
 	'UI:Search:Criteria:Title:Enum:In' => '%1$s: %2$s~~',
 	'UI:Search:Criteria:Title:Enum:In:Many' => '%1$s: %2$s and %3$s others~~',
 	'UI:Search:Criteria:Title:Enum:In:All' => '%1$s: Any~~',
-	//   - TagSet widget
+    //   - TagSet widget
 	'UI:Search:Criteria:Title:TagSet:Matches' => '%1$s: %2$s~~',
-	//   - External key widget
+    //   - External key widget
 	'UI:Search:Criteria:Title:ExternalKey:Empty' => '%1$s is defined~~',
 	'UI:Search:Criteria:Title:ExternalKey:NotEmpty' => '%1$s is not defined~~',
 	'UI:Search:Criteria:Title:ExternalKey:Equals' => '%1$s %2$s~~',
 	'UI:Search:Criteria:Title:ExternalKey:In' => '%1$s: %2$s~~',
 	'UI:Search:Criteria:Title:ExternalKey:In:Many' => '%1$s: %2$s and %3$s others~~',
 	'UI:Search:Criteria:Title:ExternalKey:In:All' => '%1$s: Any~~',
-	//   - Hierarchical key widget
+    //   - Hierarchical key widget
 	'UI:Search:Criteria:Title:HierarchicalKey:Empty' => '%1$s is defined~~',
 	'UI:Search:Criteria:Title:HierarchicalKey:NotEmpty' => '%1$s is not defined~~',
 	'UI:Search:Criteria:Title:HierarchicalKey:Equals' => '%1$s %2$s~~',
 	'UI:Search:Criteria:Title:HierarchicalKey:In' => '%1$s: %2$s~~',
 	'UI:Search:Criteria:Title:HierarchicalKey:In:Many' => '%1$s: %2$s and %3$s others~~',
 	'UI:Search:Criteria:Title:HierarchicalKey:In:All' => '%1$s: Any~~',
-
-	// - Criteria operators
-	//   - Default widget
+    // - Criteria operators
+    //   - Default widget
 	'UI:Search:Criteria:Operator:Default:Empty' => 'Is empty~~',
 	'UI:Search:Criteria:Operator:Default:NotEmpty' => 'Is not empty~~',
 	'UI:Search:Criteria:Operator:Default:Equals' => 'Equals~~',
 	'UI:Search:Criteria:Operator:Default:Between' => 'Between~~',
-	//   - String widget
+    //   - String widget
 	'UI:Search:Criteria:Operator:String:Contains' => 'Contains~~',
 	'UI:Search:Criteria:Operator:String:StartsWith' => 'Starts with~~',
 	'UI:Search:Criteria:Operator:String:EndsWith' => 'Ends with~~',
 	'UI:Search:Criteria:Operator:String:RegExp' => 'Regular exp.~~',
-	//   - Numeric widget
-	'UI:Search:Criteria:Operator:Numeric:Equals' => 'Equals~~',// => '=',
-	'UI:Search:Criteria:Operator:Numeric:GreaterThan' => 'Greater~~',// => '>',
-	'UI:Search:Criteria:Operator:Numeric:GreaterThanOrEquals' => 'Greater / equals~~',// > '>=',
-	'UI:Search:Criteria:Operator:Numeric:LessThan' => 'Less~~',// => '<',
-	'UI:Search:Criteria:Operator:Numeric:LessThanOrEquals' => 'Less / equals~~',// > '<=',
-	'UI:Search:Criteria:Operator:Numeric:Different' => 'Different~~',// => '≠',
-	//   - Tag Set Widget
+    //   - Numeric widget
+	'UI:Search:Criteria:Operator:Numeric:Equals' => 'Equals~~',
+    // => '=',
+	'UI:Search:Criteria:Operator:Numeric:GreaterThan' => 'Greater~~',
+    // => '>',
+	'UI:Search:Criteria:Operator:Numeric:GreaterThanOrEquals' => 'Greater / equals~~',
+    // > '>=',
+	'UI:Search:Criteria:Operator:Numeric:LessThan' => 'Less~~',
+    // => '<',
+	'UI:Search:Criteria:Operator:Numeric:LessThanOrEquals' => 'Less / equals~~',
+    // > '<=',
+	'UI:Search:Criteria:Operator:Numeric:Different' => 'Different~~',
+    // => '≠',
+    //   - Tag Set Widget
 	'UI:Search:Criteria:Operator:TagSet:Matches' => 'Matches~~',
-
-	// - Other translations
+    // - Other translations
 	'UI:Search:Value:Filter:Placeholder' => 'Filter...~~',
 	'UI:Search:Value:Search:Placeholder' => 'Search...~~',
 	'UI:Search:Value:Autocomplete:StartTyping' => 'Start typing for possible values.~~',
@@ -1618,8 +1587,7 @@ Tetikleme gerçekleştiriğinde işlemler tanımlanan sıra numarası ile gerçe
 	'UI:Search:Value:Autocomplete:NoResult' => 'No result.~~',
 	'UI:Search:Value:Toggler:CheckAllNone' => 'Check all / none~~',
 	'UI:Search:Value:Toggler:CheckAllNoneFiltered' => 'Check all / none visibles~~',
-
-	// - Widget other translations
+    // - Widget other translations
 	'UI:Search:Criteria:Numeric:From' => 'From~~',
 	'UI:Search:Criteria:Numeric:Until' => 'To~~',
 	'UI:Search:Criteria:Numeric:PlaceholderFrom' => 'Any~~',
@@ -1633,10 +1601,8 @@ Tetikleme gerçekleştiriğinde işlemler tanımlanan sıra numarası ile gerçe
 	'UI:Search:Criteria:DateTime:PlaceholderUntil' => 'Any date~~',
 	'UI:Search:Criteria:DateTime:PlaceholderUntilTime' => 'Any date~~',
 	'UI:Search:Criteria:HierarchicalKey:ChildrenIncluded:Hint' => 'Children of the selected objects will be included.~~',
-
 	'UI:Search:Criteria:Raw:Filtered' => 'Filtered~~',
 	'UI:Search:Criteria:Raw:FilteredOn' => 'Filtered on %1$s~~',
-
 	'UI:StateChanged' => 'State changed~~',
 ));
 
@@ -1647,16 +1613,13 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Expression:Operator:AND' => ' AND ~~',
 	'Expression:Operator:OR' => ' OR ~~',
 	'Expression:Operator:=' => ': ~~',
-
 	'Expression:Unit:Short:DAY' => 'd~~',
 	'Expression:Unit:Short:WEEK' => 'w~~',
 	'Expression:Unit:Short:MONTH' => 'm~~',
 	'Expression:Unit:Short:YEAR' => 'y~~',
-
 	'Expression:Unit:Long:DAY' => 'day(s)~~',
 	'Expression:Unit:Long:HOUR' => 'hour(s)~~',
 	'Expression:Unit:Long:MINUTE' => 'minute(s)~~',
-
 	'Expression:Verb:NOW' => 'now~~',
 	'Expression:Verb:ISNULL' => ': undefined~~',
 ));
@@ -1680,47 +1643,33 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Menu:DataSources' => 'Synchronization Data Sources~~',
 	'Menu:DataSources+' => 'All Synchronization Data Sources~~',
-	'Menu:WelcomeMenu' => 'Hoşgeldiniz',
-	'Menu:WelcomeMenu+' => ITOP_APPLICATION_SHORT.'\'a Hoşgeldiniz',
-	'Menu:WelcomeMenuPage' => 'Hoşgeldiniz',
-	'Menu:WelcomeMenuPage+' => ITOP_APPLICATION_SHORT.'\'a Hoşgeldiniz',
-	'Menu:AdminTools' => 'Yönetim Araçları',
-	'Menu:AdminTools+' => 'Yönetim Araçları',
-	'Menu:AdminTools?' => 'Yönetici profiline izin verilen araçlar',
-	'Menu:DataModelMenu' => 'Veri Modeli',
-	'Menu:DataModelMenu+' => 'Veri Modeli Özeti',
-	'Menu:ExportMenu' => 'Dışarı ver',
-	'Menu:ExportMenu+' => 'Sorgu sonucunu HTML, CSV veya XML olarak dışarı aktar',
-	'Menu:NotificationsMenu' => 'Uyarılar',
-	'Menu:NotificationsMenu+' => 'Uyarıların yapılandırılması',
 	'Menu:AuditCategories' => 'Denetleme Kategorileri',
 	'Menu:AuditCategories+' => 'Denetleme Kategorileri',
 	'Menu:Notifications:Title' => 'Denetleme Kategorileri',
-	'Menu:RunQueriesMenu'         => 'Sorgu çalıştır',
-	'Menu:RunQueriesMenu+'        => 'Sorgu çalıştır',
-	'Menu:QueryMenu'              => 'Query phrasebook~~',
-	'Menu:QueryMenu+'             => 'Query phrasebook~~',
-	'Menu:UniversalSearchMenu'    => 'Genel sorgu',
-	'Menu:UniversalSearchMenu+'   => 'Herhangi bir arama...',
-	'Menu:UserManagementMenu'     => 'Kullanıcı Yönetimi',
-	'Menu:UserManagementMenu+'    => 'Kullanıcı Yönetimi',
-	'Menu:ProfilesMenu'           => 'Profiller',
-	'Menu:ProfilesMenu+'          => 'Profiller',
-	'Menu:ProfilesMenu:Title'     => 'Profiller',
-	'Menu:UserAccountsMenu'       => 'Kullanıcı Hesapları',
-	'Menu:UserAccountsMenu+'      => 'Kullanıcı Hesapları',
+	'Menu:AuditCategories:Title' => 'Audit configuration~~',
+	'Menu:RunQueriesMenu' => 'Sorgu çalıştır',
+	'Menu:RunQueriesMenu+' => 'Sorgu çalıştır',
+	'Menu:QueryMenu' => 'Query phrasebook~~',
+	'Menu:QueryMenu+' => 'Query phrasebook~~',
+	'Menu:UniversalSearchMenu' => 'Genel sorgu',
+	'Menu:UniversalSearchMenu+' => 'Herhangi bir arama...',
+	'Menu:UserManagementMenu' => 'Kullanıcı Yönetimi',
+	'Menu:UserManagementMenu+' => 'Kullanıcı Yönetimi',
+	'Menu:ProfilesMenu' => 'Profiller',
+	'Menu:ProfilesMenu+' => 'Profiller',
+	'Menu:ProfilesMenu:Title' => 'Profiller',
+	'Menu:UserAccountsMenu' => 'Kullanıcı Hesapları',
+	'Menu:UserAccountsMenu+' => 'Kullanıcı Hesapları',
 	'Menu:UserAccountsMenu:Title' => 'Kullanıcı Hesapları',
-	'Menu:MyShortcuts'            => 'My Shortcuts~~',
-	'Menu:UserManagement'         => 'User Management~~',
-	'Menu:Queries'                => 'Queries~~',
-	'Menu:ConfigurationTools'     => 'Configuration~~',
+	'Menu:UserManagement' => 'User Management~~',
+	'Menu:Queries' => 'Queries~~',
+	'Menu:ConfigurationTools' => 'Configuration~~'
 ));
-
 // Additional language entries not present in English dict
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'UI:Toggle:StandardDashboard' => 'Standard~~',
-	'UI:Toggle:CustomDashboard'   => 'Custom~~',
-	'UI:Display_X_ItemsPerPage'   => 'Display %1$s items per page~~',
-	'UI:Dashboard:Edit'           => 'Edit This Page...~~',
-	'UI:Dashboard:Revert'         => 'Revert To Original Version...~~',
+	'UI:Toggle:CustomDashboard' => 'Custom~~',
+	'UI:Display_X_ItemsPerPage' => 'Display %1$s items per page~~',
+	'UI:Dashboard:Edit' => 'Edit This Page...~~',
+	'UI:Dashboard:Revert' => 'Revert To Original Version...~~'
 ));
diff --git a/dictionaries/ui/application/bulk/cs.dictionary.itop.bulk.php b/dictionaries/ui/application/bulk/cs.dictionary.itop.bulk.php
new file mode 100644
index 0000000000..fd89935393
--- /dev/null
+++ b/dictionaries/ui/application/bulk/cs.dictionary.itop.bulk.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+Dict::Add('CS CZ', 'Czech', 'Čeština', array(
+
+	// Bulk modify
+	'UI:Bulk:modify:IncompatibleAttribute' => 'This attribute can\'t be edited in bulk context~~',
+
+));
\ No newline at end of file
diff --git a/dictionaries/ui/application/bulk/da.dictionary.itop.bulk.php b/dictionaries/ui/application/bulk/da.dictionary.itop.bulk.php
new file mode 100644
index 0000000000..734589e152
--- /dev/null
+++ b/dictionaries/ui/application/bulk/da.dictionary.itop.bulk.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+Dict::Add('DA DA', 'Danish', 'Dansk', array(
+
+	// Bulk modify
+	'UI:Bulk:modify:IncompatibleAttribute' => 'This attribute can\'t be edited in bulk context~~',
+
+));
\ No newline at end of file
diff --git a/dictionaries/ui/application/bulk/de.dictionary.itop.bulk.php b/dictionaries/ui/application/bulk/de.dictionary.itop.bulk.php
new file mode 100644
index 0000000000..4391576b28
--- /dev/null
+++ b/dictionaries/ui/application/bulk/de.dictionary.itop.bulk.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+
+	// Bulk modify
+	'UI:Bulk:modify:IncompatibleAttribute' => 'Dieses Attribut kann in einer Massenänderung nicht bearbeitet werden.',
+
+));
\ No newline at end of file
diff --git a/dictionaries/ui/application/bulk/es_cr.dictionary.itop.bulk.php b/dictionaries/ui/application/bulk/es_cr.dictionary.itop.bulk.php
new file mode 100644
index 0000000000..7b6a0e2d00
--- /dev/null
+++ b/dictionaries/ui/application/bulk/es_cr.dictionary.itop.bulk.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
+
+	// Bulk modify
+	'UI:Bulk:modify:IncompatibleAttribute' => 'This attribute can\'t be edited in bulk context~~',
+
+));
\ No newline at end of file
diff --git a/dictionaries/ui/application/bulk/fr.dictionary.itop.bulk.php b/dictionaries/ui/application/bulk/fr.dictionary.itop.bulk.php
index 2da6a81e93..dfd94566d7 100644
--- a/dictionaries/ui/application/bulk/fr.dictionary.itop.bulk.php
+++ b/dictionaries/ui/application/bulk/fr.dictionary.itop.bulk.php
@@ -16,7 +16,6 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  */
-
 Dict::Add('FR FR', 'French', 'Français', array(
 
 	// Bulk modify
diff --git a/dictionaries/ui/application/bulk/hu.dictionary.itop.bulk.php b/dictionaries/ui/application/bulk/hu.dictionary.itop.bulk.php
new file mode 100644
index 0000000000..d8e408d336
--- /dev/null
+++ b/dictionaries/ui/application/bulk/hu.dictionary.itop.bulk.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
+
+	// Bulk modify
+	'UI:Bulk:modify:IncompatibleAttribute' => 'This attribute can\'t be edited in bulk context~~',
+
+));
\ No newline at end of file
diff --git a/dictionaries/ui/application/bulk/it.dictionary.itop.bulk.php b/dictionaries/ui/application/bulk/it.dictionary.itop.bulk.php
new file mode 100644
index 0000000000..6ce9b15da3
--- /dev/null
+++ b/dictionaries/ui/application/bulk/it.dictionary.itop.bulk.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+
+	// Bulk modify
+	'UI:Bulk:modify:IncompatibleAttribute' => 'This attribute can\'t be edited in bulk context~~',
+
+));
\ No newline at end of file
diff --git a/dictionaries/ui/application/bulk/ja.dictionary.itop.bulk.php b/dictionaries/ui/application/bulk/ja.dictionary.itop.bulk.php
new file mode 100644
index 0000000000..89c93a1613
--- /dev/null
+++ b/dictionaries/ui/application/bulk/ja.dictionary.itop.bulk.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+
+	// Bulk modify
+	'UI:Bulk:modify:IncompatibleAttribute' => 'This attribute can\'t be edited in bulk context~~',
+
+));
\ No newline at end of file
diff --git a/dictionaries/ui/application/bulk/nl.dictionary.itop.bulk.php b/dictionaries/ui/application/bulk/nl.dictionary.itop.bulk.php
new file mode 100644
index 0000000000..ccf0126c95
--- /dev/null
+++ b/dictionaries/ui/application/bulk/nl.dictionary.itop.bulk.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+
+	// Bulk modify
+	'UI:Bulk:modify:IncompatibleAttribute' => 'This attribute can\'t be edited in bulk context~~',
+
+));
\ No newline at end of file
diff --git a/dictionaries/ui/application/bulk/pl.dictionary.itop.bulk.php b/dictionaries/ui/application/bulk/pl.dictionary.itop.bulk.php
new file mode 100644
index 0000000000..a4a5fea130
--- /dev/null
+++ b/dictionaries/ui/application/bulk/pl.dictionary.itop.bulk.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+Dict::Add('PL PL', 'Polish', 'Polski', array(
+
+	// Bulk modify
+	'UI:Bulk:modify:IncompatibleAttribute' => 'This attribute can\'t be edited in bulk context~~',
+
+));
\ No newline at end of file
diff --git a/dictionaries/ui/application/bulk/pt_br.dictionary.itop.bulk.php b/dictionaries/ui/application/bulk/pt_br.dictionary.itop.bulk.php
new file mode 100644
index 0000000000..6a7462029b
--- /dev/null
+++ b/dictionaries/ui/application/bulk/pt_br.dictionary.itop.bulk.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+
+	// Bulk modify
+	'UI:Bulk:modify:IncompatibleAttribute' => 'This attribute can\'t be edited in bulk context~~',
+
+));
\ No newline at end of file
diff --git a/dictionaries/ui/application/bulk/ru.dictionary.itop.bulk.php b/dictionaries/ui/application/bulk/ru.dictionary.itop.bulk.php
new file mode 100644
index 0000000000..c3af7c737d
--- /dev/null
+++ b/dictionaries/ui/application/bulk/ru.dictionary.itop.bulk.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+Dict::Add('RU RU', 'Russian', 'Русский', array(
+
+	// Bulk modify
+	'UI:Bulk:modify:IncompatibleAttribute' => 'This attribute can\'t be edited in bulk context~~',
+
+));
\ No newline at end of file
diff --git a/dictionaries/ui/application/bulk/sk.dictionary.itop.bulk.php b/dictionaries/ui/application/bulk/sk.dictionary.itop.bulk.php
new file mode 100644
index 0000000000..83d79d0457
--- /dev/null
+++ b/dictionaries/ui/application/bulk/sk.dictionary.itop.bulk.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
+
+	// Bulk modify
+	'UI:Bulk:modify:IncompatibleAttribute' => 'This attribute can\'t be edited in bulk context~~',
+
+));
\ No newline at end of file
diff --git a/dictionaries/ui/application/bulk/tr.dictionary.itop.bulk.php b/dictionaries/ui/application/bulk/tr.dictionary.itop.bulk.php
new file mode 100644
index 0000000000..ce68a43643
--- /dev/null
+++ b/dictionaries/ui/application/bulk/tr.dictionary.itop.bulk.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+
+	// Bulk modify
+	'UI:Bulk:modify:IncompatibleAttribute' => 'This attribute can\'t be edited in bulk context~~',
+
+));
\ No newline at end of file
diff --git a/dictionaries/ui/application/bulk/zh_cn.dictionary.itop.bulk.php b/dictionaries/ui/application/bulk/zh_cn.dictionary.itop.bulk.php
new file mode 100644
index 0000000000..3ef611de51
--- /dev/null
+++ b/dictionaries/ui/application/bulk/zh_cn.dictionary.itop.bulk.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+
+	// Bulk modify
+	'UI:Bulk:modify:IncompatibleAttribute' => 'This attribute can\'t be edited in bulk context~~',
+
+));
\ No newline at end of file
diff --git a/dictionaries/ui/application/display-block/cs.dictionary.itop.display-block.php b/dictionaries/ui/application/display-block/cs.dictionary.itop.display-block.php
new file mode 100644
index 0000000000..3c410f0165
--- /dev/null
+++ b/dictionaries/ui/application/display-block/cs.dictionary.itop.display-block.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+Dict::Add('CS CZ', 'Czech', 'Čeština', array(
+	'UI:DisplayBlock:List:AddEntry:Tooltip' => 'Add an entry in the list~~',
+));
\ No newline at end of file
diff --git a/dictionaries/ui/application/display-block/da.dictionary.itop.display-block.php b/dictionaries/ui/application/display-block/da.dictionary.itop.display-block.php
new file mode 100644
index 0000000000..895ab340d0
--- /dev/null
+++ b/dictionaries/ui/application/display-block/da.dictionary.itop.display-block.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+Dict::Add('DA DA', 'Danish', 'Dansk', array(
+	'UI:DisplayBlock:List:AddEntry:Tooltip' => 'Add an entry in the list~~',
+));
\ No newline at end of file
diff --git a/dictionaries/ui/application/display-block/de.dictionary.itop.display-block.php b/dictionaries/ui/application/display-block/de.dictionary.itop.display-block.php
new file mode 100644
index 0000000000..83d4be3953
--- /dev/null
+++ b/dictionaries/ui/application/display-block/de.dictionary.itop.display-block.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'UI:DisplayBlock:List:AddEntry:Tooltip' => 'Einen Eintrag zur Liste hinzufügen',
+));
\ No newline at end of file
diff --git a/dictionaries/ui/application/display-block/es_cr.dictionary.itop.display-block.php b/dictionaries/ui/application/display-block/es_cr.dictionary.itop.display-block.php
new file mode 100644
index 0000000000..2ed52e412c
--- /dev/null
+++ b/dictionaries/ui/application/display-block/es_cr.dictionary.itop.display-block.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
+	'UI:DisplayBlock:List:AddEntry:Tooltip' => 'Add an entry in the list~~',
+));
\ No newline at end of file
diff --git a/dictionaries/ui/application/display-block/fr.dictionary.itop.display-block.php b/dictionaries/ui/application/display-block/fr.dictionary.itop.display-block.php
index 84df1a6d75..3c98cd3139 100644
--- a/dictionaries/ui/application/display-block/fr.dictionary.itop.display-block.php
+++ b/dictionaries/ui/application/display-block/fr.dictionary.itop.display-block.php
@@ -16,7 +16,6 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  */
-
 Dict::Add('FR FR', 'French', 'Français', array(
 	'UI:DisplayBlock:List:AddEntry:Tooltip' => 'Ajouter une entrée dans la liste',
 ));
\ No newline at end of file
diff --git a/dictionaries/ui/application/display-block/hu.dictionary.itop.display-block.php b/dictionaries/ui/application/display-block/hu.dictionary.itop.display-block.php
new file mode 100644
index 0000000000..7cffb1e894
--- /dev/null
+++ b/dictionaries/ui/application/display-block/hu.dictionary.itop.display-block.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
+	'UI:DisplayBlock:List:AddEntry:Tooltip' => 'Add an entry in the list~~',
+));
\ No newline at end of file
diff --git a/dictionaries/ui/application/display-block/it.dictionary.itop.display-block.php b/dictionaries/ui/application/display-block/it.dictionary.itop.display-block.php
new file mode 100644
index 0000000000..6a9d85de4c
--- /dev/null
+++ b/dictionaries/ui/application/display-block/it.dictionary.itop.display-block.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'UI:DisplayBlock:List:AddEntry:Tooltip' => 'Add an entry in the list~~',
+));
\ No newline at end of file
diff --git a/dictionaries/ui/application/display-block/ja.dictionary.itop.display-block.php b/dictionaries/ui/application/display-block/ja.dictionary.itop.display-block.php
new file mode 100644
index 0000000000..635f6a640e
--- /dev/null
+++ b/dictionaries/ui/application/display-block/ja.dictionary.itop.display-block.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'UI:DisplayBlock:List:AddEntry:Tooltip' => 'Add an entry in the list~~',
+));
\ No newline at end of file
diff --git a/dictionaries/ui/application/display-block/nl.dictionary.itop.display-block.php b/dictionaries/ui/application/display-block/nl.dictionary.itop.display-block.php
new file mode 100644
index 0000000000..8dd869a4c4
--- /dev/null
+++ b/dictionaries/ui/application/display-block/nl.dictionary.itop.display-block.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'UI:DisplayBlock:List:AddEntry:Tooltip' => 'Add an entry in the list~~',
+));
\ No newline at end of file
diff --git a/dictionaries/ui/application/display-block/pl.dictionary.itop.display-block.php b/dictionaries/ui/application/display-block/pl.dictionary.itop.display-block.php
new file mode 100644
index 0000000000..afc24891ab
--- /dev/null
+++ b/dictionaries/ui/application/display-block/pl.dictionary.itop.display-block.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+Dict::Add('PL PL', 'Polish', 'Polski', array(
+	'UI:DisplayBlock:List:AddEntry:Tooltip' => 'Add an entry in the list~~',
+));
\ No newline at end of file
diff --git a/dictionaries/ui/application/display-block/pt_br.dictionary.itop.display-block.php b/dictionaries/ui/application/display-block/pt_br.dictionary.itop.display-block.php
new file mode 100644
index 0000000000..b7cc9c5a5b
--- /dev/null
+++ b/dictionaries/ui/application/display-block/pt_br.dictionary.itop.display-block.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'UI:DisplayBlock:List:AddEntry:Tooltip' => 'Add an entry in the list~~',
+));
\ No newline at end of file
diff --git a/dictionaries/ui/application/display-block/ru.dictionary.itop.display-block.php b/dictionaries/ui/application/display-block/ru.dictionary.itop.display-block.php
new file mode 100644
index 0000000000..b827333467
--- /dev/null
+++ b/dictionaries/ui/application/display-block/ru.dictionary.itop.display-block.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+Dict::Add('RU RU', 'Russian', 'Русский', array(
+	'UI:DisplayBlock:List:AddEntry:Tooltip' => 'Add an entry in the list~~',
+));
\ No newline at end of file
diff --git a/dictionaries/ui/application/display-block/sk.dictionary.itop.display-block.php b/dictionaries/ui/application/display-block/sk.dictionary.itop.display-block.php
new file mode 100644
index 0000000000..ee9de6b4f4
--- /dev/null
+++ b/dictionaries/ui/application/display-block/sk.dictionary.itop.display-block.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
+	'UI:DisplayBlock:List:AddEntry:Tooltip' => 'Add an entry in the list~~',
+));
\ No newline at end of file
diff --git a/dictionaries/ui/application/display-block/tr.dictionary.itop.display-block.php b/dictionaries/ui/application/display-block/tr.dictionary.itop.display-block.php
new file mode 100644
index 0000000000..b186ddba0f
--- /dev/null
+++ b/dictionaries/ui/application/display-block/tr.dictionary.itop.display-block.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'UI:DisplayBlock:List:AddEntry:Tooltip' => 'Add an entry in the list~~',
+));
\ No newline at end of file
diff --git a/dictionaries/ui/application/display-block/zh_cn.dictionary.itop.display-block.php b/dictionaries/ui/application/display-block/zh_cn.dictionary.itop.display-block.php
new file mode 100644
index 0000000000..1f894fd61d
--- /dev/null
+++ b/dictionaries/ui/application/display-block/zh_cn.dictionary.itop.display-block.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'UI:DisplayBlock:List:AddEntry:Tooltip' => 'Add an entry in the list~~',
+));
\ No newline at end of file
diff --git a/dictionaries/ui/application/links/cs.dictionary.itop.links.php b/dictionaries/ui/application/links/cs.dictionary.itop.links.php
new file mode 100644
index 0000000000..9555639553
--- /dev/null
+++ b/dictionaries/ui/application/links/cs.dictionary.itop.links.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+Dict::Add('CS CZ', 'Czech', 'Čeština', array(
+
+	// Placeholders
+ // $%1s : host object class name
+ // $%2s : host object friendlyname
+ // $%3s : current tab name
+ // $%4s : remote object class name
+ // $%5s : remote object friendlyname
+	'UI:Links:Object:New:Modal:Title' => 'Create an object~~',
+
+	// Create
+	'UI:Links:Create:Button' => 'Create~~',
+	'UI:Links:Create:Button+' => 'Create a %4$s~~',
+	'UI:Links:Create:Modal:Title' => 'Create a %4$s in %2$s~~',
+
+	// Add
+	'UI:Links:Add:Button' => 'Add~~',
+	'UI:Links:Add:Button+' => 'Add a %4$s~~',
+	'UI:Links:Add:Modal:Title' => 'Add a %4$s to %2$s~~',
+
+	// Modify link
+	'UI:Links:ModifyLink:Button' => 'Modify~~',
+	'UI:Links:ModifyLink:Button+' => 'Modify this link~~',
+	'UI:Links:ModifyLink:Modal:Title' => 'Modify the link between %2$s and %5$s~~',
+
+	// Modify object
+	'UI:Links:ModifyObject:Button' => 'Modify~~',
+	'UI:Links:ModifyObject:Button+' => 'Modify this object~~',
+	'UI:Links:ModifyObject:Modal:Title' => '%5$s~~',
+
+	// Remove
+	'UI:Links:Remove:Button' => 'Remove~~',
+	'UI:Links:Remove:Button+' => 'Remove this %4$s~~',
+	'UI:Links:Remove:Modal:Title' => 'Remove a %4$s from its %1$s~~',
+	'UI:Links:Remove:Modal:Message' => 'Do you really want to remove %5$s from %2$s?~~',
+
+	// Delete
+	'UI:Links:Delete:Button' => 'Delete~~',
+	'UI:Links:Delete:Button+' => 'Delete this %4$s~~',
+	'UI:Links:Delete:Modal:Title' => 'Delete a %4$s~~',
+	'UI:Links:Delete:Modal:Message' => 'Do you really want to delete %5$s?~~',
+
+	// Bulk
+	'UI:Links:Bulk:LinkWillBeCreatedForAllObjects' => 'Add to all objects~~',
+	'UI:Links:Bulk:LinkWillBeDeletedFromAllObjects' => 'Remove from all objects~~',
+	'UI:Links:Bulk:LinkWillBeCreatedFor1Object' => 'Add to one object~~',
+	'UI:Links:Bulk:LinkWillBeDeletedFrom1Object' => 'Remove from one object~~',
+	'UI:Links:Bulk:LinkWillBeCreatedForXObjects' => 'Add {count} objects~~',
+	'UI:Links:Bulk:LinkWillBeDeletedFromXObjects' => 'Remove {count} objects~~',
+	'UI:Links:Bulk:LinkExistForAllObjects' => 'All objets are already linked~~',
+	'UI:Links:Bulk:LinkExistForOneObject' => 'One object is linked~~',
+	'UI:Links:Bulk:LinkExistForXObjects' => '{count} objects are linked~~',
+
+	// New item
+	'UI:Links:NewItem' => 'New item~~',
+));
\ No newline at end of file
diff --git a/dictionaries/ui/application/links/da.dictionary.itop.links.php b/dictionaries/ui/application/links/da.dictionary.itop.links.php
new file mode 100644
index 0000000000..fd5c072633
--- /dev/null
+++ b/dictionaries/ui/application/links/da.dictionary.itop.links.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+Dict::Add('DA DA', 'Danish', 'Dansk', array(
+
+	// Placeholders
+ // $%1s : host object class name
+ // $%2s : host object friendlyname
+ // $%3s : current tab name
+ // $%4s : remote object class name
+ // $%5s : remote object friendlyname
+	'UI:Links:Object:New:Modal:Title' => 'Create an object~~',
+
+	// Create
+	'UI:Links:Create:Button' => 'Create~~',
+	'UI:Links:Create:Button+' => 'Create a %4$s~~',
+	'UI:Links:Create:Modal:Title' => 'Create a %4$s in %2$s~~',
+
+	// Add
+	'UI:Links:Add:Button' => 'Add~~',
+	'UI:Links:Add:Button+' => 'Add a %4$s~~',
+	'UI:Links:Add:Modal:Title' => 'Add a %4$s to %2$s~~',
+
+	// Modify link
+	'UI:Links:ModifyLink:Button' => 'Modify~~',
+	'UI:Links:ModifyLink:Button+' => 'Modify this link~~',
+	'UI:Links:ModifyLink:Modal:Title' => 'Modify the link between %2$s and %5$s~~',
+
+	// Modify object
+	'UI:Links:ModifyObject:Button' => 'Modify~~',
+	'UI:Links:ModifyObject:Button+' => 'Modify this object~~',
+	'UI:Links:ModifyObject:Modal:Title' => '%5$s~~',
+
+	// Remove
+	'UI:Links:Remove:Button' => 'Remove~~',
+	'UI:Links:Remove:Button+' => 'Remove this %4$s~~',
+	'UI:Links:Remove:Modal:Title' => 'Remove a %4$s from its %1$s~~',
+	'UI:Links:Remove:Modal:Message' => 'Do you really want to remove %5$s from %2$s?~~',
+
+	// Delete
+	'UI:Links:Delete:Button' => 'Delete~~',
+	'UI:Links:Delete:Button+' => 'Delete this %4$s~~',
+	'UI:Links:Delete:Modal:Title' => 'Delete a %4$s~~',
+	'UI:Links:Delete:Modal:Message' => 'Do you really want to delete %5$s?~~',
+
+	// Bulk
+	'UI:Links:Bulk:LinkWillBeCreatedForAllObjects' => 'Add to all objects~~',
+	'UI:Links:Bulk:LinkWillBeDeletedFromAllObjects' => 'Remove from all objects~~',
+	'UI:Links:Bulk:LinkWillBeCreatedFor1Object' => 'Add to one object~~',
+	'UI:Links:Bulk:LinkWillBeDeletedFrom1Object' => 'Remove from one object~~',
+	'UI:Links:Bulk:LinkWillBeCreatedForXObjects' => 'Add {count} objects~~',
+	'UI:Links:Bulk:LinkWillBeDeletedFromXObjects' => 'Remove {count} objects~~',
+	'UI:Links:Bulk:LinkExistForAllObjects' => 'All objets are already linked~~',
+	'UI:Links:Bulk:LinkExistForOneObject' => 'One object is linked~~',
+	'UI:Links:Bulk:LinkExistForXObjects' => '{count} objects are linked~~',
+
+	// New item
+	'UI:Links:NewItem' => 'New item~~',
+));
\ No newline at end of file
diff --git a/dictionaries/ui/application/links/de.dictionary.itop.links.php b/dictionaries/ui/application/links/de.dictionary.itop.links.php
new file mode 100644
index 0000000000..5ce138d605
--- /dev/null
+++ b/dictionaries/ui/application/links/de.dictionary.itop.links.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+
+	// Placeholders
+ // $%1s : host object class name
+ // $%2s : host object friendlyname
+ // $%3s : current tab name
+ // $%4s : remote object class name
+ // $%5s : remote object friendlyname
+	'UI:Links:Object:New:Modal:Title' => 'Ein Objekt erstellen',
+
+	// Create
+	'UI:Links:Create:Button' => 'Erstellen',
+	'UI:Links:Create:Button+' => '%4$s erstellen',
+	'UI:Links:Create:Modal:Title' => '%4$s in %2$s erstellen',
+
+	// Add
+	'UI:Links:Add:Button' => 'Hinzufügen',
+	'UI:Links:Add:Button+' => '%4$s hinzufügen',
+	'UI:Links:Add:Modal:Title' => '%4$s zu %2$s hinzufügen',
+
+	// Modify link
+	'UI:Links:ModifyLink:Button' => 'Bearbeiten',
+	'UI:Links:ModifyLink:Button+' => 'Diese Verknüpfung bearbeiten',
+	'UI:Links:ModifyLink:Modal:Title' => 'Verknüpfung zwischen %2$s und %5$s bearbeiten',
+
+	// Modify object
+	'UI:Links:ModifyObject:Button' => 'Bearbeiten',
+	'UI:Links:ModifyObject:Button+' => 'Dieses Objekt bearbeiten',
+	'UI:Links:ModifyObject:Modal:Title' => '%5$s',
+
+	// Remove
+	'UI:Links:Remove:Button' => 'entfernen',
+	'UI:Links:Remove:Button+' => '%4$s entfernen',
+	'UI:Links:Remove:Modal:Title' => '%4$s aus %1$s entfernen',
+	'UI:Links:Remove:Modal:Message' => 'Möchten Sie wirklich %5$s aus %2$s entfernen',
+
+	// Delete
+	'UI:Links:Delete:Button' => 'Löschen',
+	'UI:Links:Delete:Button+' => '%4$s löschen',
+	'UI:Links:Delete:Modal:Title' => 'Löschen von %4$s',
+	'UI:Links:Delete:Modal:Message' => 'Wollen Sie %5$s wirklich löschen?',
+
+	// Bulk
+	'UI:Links:Bulk:LinkWillBeCreatedForAllObjects' => 'Zu allen Objekten hinzufügen',
+	'UI:Links:Bulk:LinkWillBeDeletedFromAllObjects' => 'Aus allen Objekten entfernen',
+	'UI:Links:Bulk:LinkWillBeCreatedFor1Object' => 'Zu einem Objekt hinzufügen',
+	'UI:Links:Bulk:LinkWillBeDeletedFrom1Object' => 'Aus einem Objekt entfernen',
+	'UI:Links:Bulk:LinkWillBeCreatedForXObjects' => 'Hinzufügen von {count} Objekten',
+	'UI:Links:Bulk:LinkWillBeDeletedFromXObjects' => 'Entfernen von {count} Objekten',
+	'UI:Links:Bulk:LinkExistForAllObjects' => 'Alle Objekte sind bereits verknüpft',
+	'UI:Links:Bulk:LinkExistForOneObject' => 'Ein Objekt ist verknüpft',
+	'UI:Links:Bulk:LinkExistForXObjects' => '{count} Objekte sind verknüpft',
+
+	// New item
+	'UI:Links:NewItem' => 'Neues Element',
+));
\ No newline at end of file
diff --git a/dictionaries/ui/application/links/es_cr.dictionary.itop.links.php b/dictionaries/ui/application/links/es_cr.dictionary.itop.links.php
new file mode 100644
index 0000000000..30f58a87fd
--- /dev/null
+++ b/dictionaries/ui/application/links/es_cr.dictionary.itop.links.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
+
+	// Placeholders
+ // $%1s : host object class name
+ // $%2s : host object friendlyname
+ // $%3s : current tab name
+ // $%4s : remote object class name
+ // $%5s : remote object friendlyname
+	'UI:Links:Object:New:Modal:Title' => 'Create an object~~',
+
+	// Create
+	'UI:Links:Create:Button' => 'Create~~',
+	'UI:Links:Create:Button+' => 'Create a %4$s~~',
+	'UI:Links:Create:Modal:Title' => 'Create a %4$s in %2$s~~',
+
+	// Add
+	'UI:Links:Add:Button' => 'Add~~',
+	'UI:Links:Add:Button+' => 'Add a %4$s~~',
+	'UI:Links:Add:Modal:Title' => 'Add a %4$s to %2$s~~',
+
+	// Modify link
+	'UI:Links:ModifyLink:Button' => 'Modify~~',
+	'UI:Links:ModifyLink:Button+' => 'Modify this link~~',
+	'UI:Links:ModifyLink:Modal:Title' => 'Modify the link between %2$s and %5$s~~',
+
+	// Modify object
+	'UI:Links:ModifyObject:Button' => 'Modify~~',
+	'UI:Links:ModifyObject:Button+' => 'Modify this object~~',
+	'UI:Links:ModifyObject:Modal:Title' => '%5$s~~',
+
+	// Remove
+	'UI:Links:Remove:Button' => 'Remove~~',
+	'UI:Links:Remove:Button+' => 'Remove this %4$s~~',
+	'UI:Links:Remove:Modal:Title' => 'Remove a %4$s from its %1$s~~',
+	'UI:Links:Remove:Modal:Message' => 'Do you really want to remove %5$s from %2$s?~~',
+
+	// Delete
+	'UI:Links:Delete:Button' => 'Delete~~',
+	'UI:Links:Delete:Button+' => 'Delete this %4$s~~',
+	'UI:Links:Delete:Modal:Title' => 'Delete a %4$s~~',
+	'UI:Links:Delete:Modal:Message' => 'Do you really want to delete %5$s?~~',
+
+	// Bulk
+	'UI:Links:Bulk:LinkWillBeCreatedForAllObjects' => 'Add to all objects~~',
+	'UI:Links:Bulk:LinkWillBeDeletedFromAllObjects' => 'Remove from all objects~~',
+	'UI:Links:Bulk:LinkWillBeCreatedFor1Object' => 'Add to one object~~',
+	'UI:Links:Bulk:LinkWillBeDeletedFrom1Object' => 'Remove from one object~~',
+	'UI:Links:Bulk:LinkWillBeCreatedForXObjects' => 'Add {count} objects~~',
+	'UI:Links:Bulk:LinkWillBeDeletedFromXObjects' => 'Remove {count} objects~~',
+	'UI:Links:Bulk:LinkExistForAllObjects' => 'All objets are already linked~~',
+	'UI:Links:Bulk:LinkExistForOneObject' => 'One object is linked~~',
+	'UI:Links:Bulk:LinkExistForXObjects' => '{count} objects are linked~~',
+
+	// New item
+	'UI:Links:NewItem' => 'New item~~',
+));
\ No newline at end of file
diff --git a/dictionaries/ui/application/links/fr.dictionary.itop.links.php b/dictionaries/ui/application/links/fr.dictionary.itop.links.php
index 395ef46de2..14337dc632 100644
--- a/dictionaries/ui/application/links/fr.dictionary.itop.links.php
+++ b/dictionaries/ui/application/links/fr.dictionary.itop.links.php
@@ -16,61 +16,58 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  */
-
 Dict::Add('FR FR', 'French', 'Français', array(
 
-
 	// Placeholders
-	// $%1s : host object class name
-	// $%2s : host object firendlyname
-	// $%3s : current tab name
-	// $%4s : remote object class name
-	// $%5s : remote object friendlyname
-
-	'UI:Links:Object:New:Modal:Title'               => 'Créer un objet',
+ // $%1s : host object class name
+ // $%2s : host object firendlyname
+ // $%3s : current tab name
+ // $%4s : remote object class name
+ // $%5s : remote object friendlyname
+	'UI:Links:Object:New:Modal:Title' => 'Créer un objet',
 
 	// Create
-	'UI:Links:Create:Button'                        => 'Créer',
-	'UI:Links:Create:Button+'                       => 'Créer un(e) %4$s',
-	'UI:Links:Create:Modal:Title'                   => 'Ajouter un(e) %4$s à %2$s',
+	'UI:Links:Create:Button' => 'Créer',
+	'UI:Links:Create:Button+' => 'Créer un(e) %4$s',
+	'UI:Links:Create:Modal:Title' => 'Ajouter un(e) %4$s à %2$s',
 
 	// Add
-	'UI:Links:Add:Button'                           => 'Ajouter',
-	'UI:Links:Add:Button+'                          => 'Ajouter un %4$s',
-	'UI:Links:Add:Modal:Title'                      => 'Ajouter un %4$s à %2$s',
+	'UI:Links:Add:Button' => 'Ajouter',
+	'UI:Links:Add:Button+' => 'Ajouter un %4$s',
+	'UI:Links:Add:Modal:Title' => 'Ajouter un %4$s à %2$s',
 
 	// Modify link
-	'UI:Links:ModifyLink:Button'                    => 'Modifier',
-	'UI:Links:ModifyLink:Button+'                   => 'Modifier cette relation',
-	'UI:Links:ModifyLink:Modal:Title'               => 'Modifier la relation entre %2$s et %5$s',
+	'UI:Links:ModifyLink:Button' => 'Modifier',
+	'UI:Links:ModifyLink:Button+' => 'Modifier cette relation',
+	'UI:Links:ModifyLink:Modal:Title' => 'Modifier la relation entre %2$s et %5$s',
 
 	// Modify object
-	'UI:Links:ModifyObject:Button'                  => 'Modifier',
-	'UI:Links:ModifyObject:Button+'                 => 'Modifier cet objet',
-	'UI:Links:ModifyObject:Modal:Title'             => '%5$s',
+	'UI:Links:ModifyObject:Button' => 'Modifier',
+	'UI:Links:ModifyObject:Button+' => 'Modifier cet objet',
+	'UI:Links:ModifyObject:Modal:Title' => '%5$s',
 
 	// Remove
-	'UI:Links:Remove:Button'                        => 'Retirer',
-	'UI:Links:Remove:Button+'                       => 'Retirer ce %4$s',
-	'UI:Links:Remove:Modal:Title'                   => 'Retirer un %4$s de %1$s',
-	'UI:Links:Remove:Modal:Message'                 => 'Voulez-vous vraiment retirer %5$s de %2$s ?',
+	'UI:Links:Remove:Button' => 'Retirer',
+	'UI:Links:Remove:Button+' => 'Retirer ce %4$s',
+	'UI:Links:Remove:Modal:Title' => 'Retirer un %4$s de %1$s',
+	'UI:Links:Remove:Modal:Message' => 'Voulez-vous vraiment retirer %5$s de %2$s ?',
 
 	// Delete
-	'UI:Links:Delete:Button'                        => 'Supprimer',
-	'UI:Links:Delete:Button+'                       => 'Supprimer cet(te) %4$s',
-	'UI:Links:Delete:Modal:Title'                   => 'Supprimer un(e) %4$s',
-	'UI:Links:Delete:Modal:Message'                 => 'Voulez-vous vraiment supprimer %5$s ?',
+	'UI:Links:Delete:Button' => 'Supprimer',
+	'UI:Links:Delete:Button+' => 'Supprimer cet(te) %4$s',
+	'UI:Links:Delete:Modal:Title' => 'Supprimer un(e) %4$s',
+	'UI:Links:Delete:Modal:Message' => 'Voulez-vous vraiment supprimer %5$s ?',
 
 	// Bulk
-	'UI:Links:Bulk:LinkWillBeCreatedForAllObjects'  => 'Ajouter à tous les objets',
+	'UI:Links:Bulk:LinkWillBeCreatedForAllObjects' => 'Ajouter à tous les objets',
 	'UI:Links:Bulk:LinkWillBeDeletedFromAllObjects' => 'Enlever de tous les objets',
-	'UI:Links:Bulk:LinkWillBeCreatedFor1Object'     => 'Ajouter à un objet',
-	'UI:Links:Bulk:LinkWillBeDeletedFrom1Object'    => 'Enlever de un objet',
-	'UI:Links:Bulk:LinkWillBeCreatedForXObjects'    => 'Ajouter à {count} objets',
-	'UI:Links:Bulk:LinkWillBeDeletedFromXObjects'   => 'Enlever de {count} objets',
-	'UI:Links:Bulk:LinkExistForAllObjects'          => 'Tous les objets sont déjà liés',
-	'UI:Links:Bulk:LinkExistForOneObject'           => 'Un objet est lié',
-	'UI:Links:Bulk:LinkExistForXObjects'            => '{count} objets sont liés',
+	'UI:Links:Bulk:LinkWillBeCreatedFor1Object' => 'Ajouter à un objet',
+	'UI:Links:Bulk:LinkWillBeDeletedFrom1Object' => 'Enlever de un objet',
+	'UI:Links:Bulk:LinkWillBeCreatedForXObjects' => 'Ajouter à {count} objets',
+	'UI:Links:Bulk:LinkWillBeDeletedFromXObjects' => 'Enlever de {count} objets',
+	'UI:Links:Bulk:LinkExistForAllObjects' => 'Tous les objets sont déjà liés',
+	'UI:Links:Bulk:LinkExistForOneObject' => 'Un objet est lié',
+	'UI:Links:Bulk:LinkExistForXObjects' => '{count} objets sont liés',
 
 	// New item
 	'UI:Links:NewItem' => 'Nouvel element',
diff --git a/dictionaries/ui/application/links/hu.dictionary.itop.links.php b/dictionaries/ui/application/links/hu.dictionary.itop.links.php
new file mode 100644
index 0000000000..092d5ef175
--- /dev/null
+++ b/dictionaries/ui/application/links/hu.dictionary.itop.links.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
+
+	// Placeholders
+ // $%1s : host object class name
+ // $%2s : host object friendlyname
+ // $%3s : current tab name
+ // $%4s : remote object class name
+ // $%5s : remote object friendlyname
+	'UI:Links:Object:New:Modal:Title' => 'Create an object~~',
+
+	// Create
+	'UI:Links:Create:Button' => 'Create~~',
+	'UI:Links:Create:Button+' => 'Create a %4$s~~',
+	'UI:Links:Create:Modal:Title' => 'Create a %4$s in %2$s~~',
+
+	// Add
+	'UI:Links:Add:Button' => 'Add~~',
+	'UI:Links:Add:Button+' => 'Add a %4$s~~',
+	'UI:Links:Add:Modal:Title' => 'Add a %4$s to %2$s~~',
+
+	// Modify link
+	'UI:Links:ModifyLink:Button' => 'Modify~~',
+	'UI:Links:ModifyLink:Button+' => 'Modify this link~~',
+	'UI:Links:ModifyLink:Modal:Title' => 'Modify the link between %2$s and %5$s~~',
+
+	// Modify object
+	'UI:Links:ModifyObject:Button' => 'Modify~~',
+	'UI:Links:ModifyObject:Button+' => 'Modify this object~~',
+	'UI:Links:ModifyObject:Modal:Title' => '%5$s~~',
+
+	// Remove
+	'UI:Links:Remove:Button' => 'Remove~~',
+	'UI:Links:Remove:Button+' => 'Remove this %4$s~~',
+	'UI:Links:Remove:Modal:Title' => 'Remove a %4$s from its %1$s~~',
+	'UI:Links:Remove:Modal:Message' => 'Do you really want to remove %5$s from %2$s?~~',
+
+	// Delete
+	'UI:Links:Delete:Button' => 'Delete~~',
+	'UI:Links:Delete:Button+' => 'Delete this %4$s~~',
+	'UI:Links:Delete:Modal:Title' => 'Delete a %4$s~~',
+	'UI:Links:Delete:Modal:Message' => 'Do you really want to delete %5$s?~~',
+
+	// Bulk
+	'UI:Links:Bulk:LinkWillBeCreatedForAllObjects' => 'Add to all objects~~',
+	'UI:Links:Bulk:LinkWillBeDeletedFromAllObjects' => 'Remove from all objects~~',
+	'UI:Links:Bulk:LinkWillBeCreatedFor1Object' => 'Add to one object~~',
+	'UI:Links:Bulk:LinkWillBeDeletedFrom1Object' => 'Remove from one object~~',
+	'UI:Links:Bulk:LinkWillBeCreatedForXObjects' => 'Add {count} objects~~',
+	'UI:Links:Bulk:LinkWillBeDeletedFromXObjects' => 'Remove {count} objects~~',
+	'UI:Links:Bulk:LinkExistForAllObjects' => 'All objets are already linked~~',
+	'UI:Links:Bulk:LinkExistForOneObject' => 'One object is linked~~',
+	'UI:Links:Bulk:LinkExistForXObjects' => '{count} objects are linked~~',
+
+	// New item
+	'UI:Links:NewItem' => 'New item~~',
+));
\ No newline at end of file
diff --git a/dictionaries/ui/application/links/it.dictionary.itop.links.php b/dictionaries/ui/application/links/it.dictionary.itop.links.php
new file mode 100644
index 0000000000..85e65e1051
--- /dev/null
+++ b/dictionaries/ui/application/links/it.dictionary.itop.links.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+
+	// Placeholders
+ // $%1s : host object class name
+ // $%2s : host object friendlyname
+ // $%3s : current tab name
+ // $%4s : remote object class name
+ // $%5s : remote object friendlyname
+	'UI:Links:Object:New:Modal:Title' => 'Create an object~~',
+
+	// Create
+	'UI:Links:Create:Button' => 'Create~~',
+	'UI:Links:Create:Button+' => 'Create a %4$s~~',
+	'UI:Links:Create:Modal:Title' => 'Create a %4$s in %2$s~~',
+
+	// Add
+	'UI:Links:Add:Button' => 'Add~~',
+	'UI:Links:Add:Button+' => 'Add a %4$s~~',
+	'UI:Links:Add:Modal:Title' => 'Add a %4$s to %2$s~~',
+
+	// Modify link
+	'UI:Links:ModifyLink:Button' => 'Modify~~',
+	'UI:Links:ModifyLink:Button+' => 'Modify this link~~',
+	'UI:Links:ModifyLink:Modal:Title' => 'Modify the link between %2$s and %5$s~~',
+
+	// Modify object
+	'UI:Links:ModifyObject:Button' => 'Modify~~',
+	'UI:Links:ModifyObject:Button+' => 'Modify this object~~',
+	'UI:Links:ModifyObject:Modal:Title' => '%5$s~~',
+
+	// Remove
+	'UI:Links:Remove:Button' => 'Remove~~',
+	'UI:Links:Remove:Button+' => 'Remove this %4$s~~',
+	'UI:Links:Remove:Modal:Title' => 'Remove a %4$s from its %1$s~~',
+	'UI:Links:Remove:Modal:Message' => 'Do you really want to remove %5$s from %2$s?~~',
+
+	// Delete
+	'UI:Links:Delete:Button' => 'Delete~~',
+	'UI:Links:Delete:Button+' => 'Delete this %4$s~~',
+	'UI:Links:Delete:Modal:Title' => 'Delete a %4$s~~',
+	'UI:Links:Delete:Modal:Message' => 'Do you really want to delete %5$s?~~',
+
+	// Bulk
+	'UI:Links:Bulk:LinkWillBeCreatedForAllObjects' => 'Add to all objects~~',
+	'UI:Links:Bulk:LinkWillBeDeletedFromAllObjects' => 'Remove from all objects~~',
+	'UI:Links:Bulk:LinkWillBeCreatedFor1Object' => 'Add to one object~~',
+	'UI:Links:Bulk:LinkWillBeDeletedFrom1Object' => 'Remove from one object~~',
+	'UI:Links:Bulk:LinkWillBeCreatedForXObjects' => 'Add {count} objects~~',
+	'UI:Links:Bulk:LinkWillBeDeletedFromXObjects' => 'Remove {count} objects~~',
+	'UI:Links:Bulk:LinkExistForAllObjects' => 'All objets are already linked~~',
+	'UI:Links:Bulk:LinkExistForOneObject' => 'One object is linked~~',
+	'UI:Links:Bulk:LinkExistForXObjects' => '{count} objects are linked~~',
+
+	// New item
+	'UI:Links:NewItem' => 'New item~~',
+));
\ No newline at end of file
diff --git a/dictionaries/ui/application/links/ja.dictionary.itop.links.php b/dictionaries/ui/application/links/ja.dictionary.itop.links.php
new file mode 100644
index 0000000000..4578efa613
--- /dev/null
+++ b/dictionaries/ui/application/links/ja.dictionary.itop.links.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+
+	// Placeholders
+ // $%1s : host object class name
+ // $%2s : host object friendlyname
+ // $%3s : current tab name
+ // $%4s : remote object class name
+ // $%5s : remote object friendlyname
+	'UI:Links:Object:New:Modal:Title' => 'Create an object~~',
+
+	// Create
+	'UI:Links:Create:Button' => 'Create~~',
+	'UI:Links:Create:Button+' => 'Create a %4$s~~',
+	'UI:Links:Create:Modal:Title' => 'Create a %4$s in %2$s~~',
+
+	// Add
+	'UI:Links:Add:Button' => 'Add~~',
+	'UI:Links:Add:Button+' => 'Add a %4$s~~',
+	'UI:Links:Add:Modal:Title' => 'Add a %4$s to %2$s~~',
+
+	// Modify link
+	'UI:Links:ModifyLink:Button' => 'Modify~~',
+	'UI:Links:ModifyLink:Button+' => 'Modify this link~~',
+	'UI:Links:ModifyLink:Modal:Title' => 'Modify the link between %2$s and %5$s~~',
+
+	// Modify object
+	'UI:Links:ModifyObject:Button' => 'Modify~~',
+	'UI:Links:ModifyObject:Button+' => 'Modify this object~~',
+	'UI:Links:ModifyObject:Modal:Title' => '%5$s~~',
+
+	// Remove
+	'UI:Links:Remove:Button' => 'Remove~~',
+	'UI:Links:Remove:Button+' => 'Remove this %4$s~~',
+	'UI:Links:Remove:Modal:Title' => 'Remove a %4$s from its %1$s~~',
+	'UI:Links:Remove:Modal:Message' => 'Do you really want to remove %5$s from %2$s?~~',
+
+	// Delete
+	'UI:Links:Delete:Button' => 'Delete~~',
+	'UI:Links:Delete:Button+' => 'Delete this %4$s~~',
+	'UI:Links:Delete:Modal:Title' => 'Delete a %4$s~~',
+	'UI:Links:Delete:Modal:Message' => 'Do you really want to delete %5$s?~~',
+
+	// Bulk
+	'UI:Links:Bulk:LinkWillBeCreatedForAllObjects' => 'Add to all objects~~',
+	'UI:Links:Bulk:LinkWillBeDeletedFromAllObjects' => 'Remove from all objects~~',
+	'UI:Links:Bulk:LinkWillBeCreatedFor1Object' => 'Add to one object~~',
+	'UI:Links:Bulk:LinkWillBeDeletedFrom1Object' => 'Remove from one object~~',
+	'UI:Links:Bulk:LinkWillBeCreatedForXObjects' => 'Add {count} objects~~',
+	'UI:Links:Bulk:LinkWillBeDeletedFromXObjects' => 'Remove {count} objects~~',
+	'UI:Links:Bulk:LinkExistForAllObjects' => 'All objets are already linked~~',
+	'UI:Links:Bulk:LinkExistForOneObject' => 'One object is linked~~',
+	'UI:Links:Bulk:LinkExistForXObjects' => '{count} objects are linked~~',
+
+	// New item
+	'UI:Links:NewItem' => 'New item~~',
+));
\ No newline at end of file
diff --git a/dictionaries/ui/application/links/nl.dictionary.itop.links.php b/dictionaries/ui/application/links/nl.dictionary.itop.links.php
new file mode 100644
index 0000000000..2f41127eb4
--- /dev/null
+++ b/dictionaries/ui/application/links/nl.dictionary.itop.links.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+
+	// Placeholders
+ // $%1s : host object class name
+ // $%2s : host object friendlyname
+ // $%3s : current tab name
+ // $%4s : remote object class name
+ // $%5s : remote object friendlyname
+	'UI:Links:Object:New:Modal:Title' => 'Create an object~~',
+
+	// Create
+	'UI:Links:Create:Button' => 'Create~~',
+	'UI:Links:Create:Button+' => 'Create a %4$s~~',
+	'UI:Links:Create:Modal:Title' => 'Create a %4$s in %2$s~~',
+
+	// Add
+	'UI:Links:Add:Button' => 'Add~~',
+	'UI:Links:Add:Button+' => 'Add a %4$s~~',
+	'UI:Links:Add:Modal:Title' => 'Add a %4$s to %2$s~~',
+
+	// Modify link
+	'UI:Links:ModifyLink:Button' => 'Modify~~',
+	'UI:Links:ModifyLink:Button+' => 'Modify this link~~',
+	'UI:Links:ModifyLink:Modal:Title' => 'Modify the link between %2$s and %5$s~~',
+
+	// Modify object
+	'UI:Links:ModifyObject:Button' => 'Modify~~',
+	'UI:Links:ModifyObject:Button+' => 'Modify this object~~',
+	'UI:Links:ModifyObject:Modal:Title' => '%5$s~~',
+
+	// Remove
+	'UI:Links:Remove:Button' => 'Remove~~',
+	'UI:Links:Remove:Button+' => 'Remove this %4$s~~',
+	'UI:Links:Remove:Modal:Title' => 'Remove a %4$s from its %1$s~~',
+	'UI:Links:Remove:Modal:Message' => 'Do you really want to remove %5$s from %2$s?~~',
+
+	// Delete
+	'UI:Links:Delete:Button' => 'Delete~~',
+	'UI:Links:Delete:Button+' => 'Delete this %4$s~~',
+	'UI:Links:Delete:Modal:Title' => 'Delete a %4$s~~',
+	'UI:Links:Delete:Modal:Message' => 'Do you really want to delete %5$s?~~',
+
+	// Bulk
+	'UI:Links:Bulk:LinkWillBeCreatedForAllObjects' => 'Add to all objects~~',
+	'UI:Links:Bulk:LinkWillBeDeletedFromAllObjects' => 'Remove from all objects~~',
+	'UI:Links:Bulk:LinkWillBeCreatedFor1Object' => 'Add to one object~~',
+	'UI:Links:Bulk:LinkWillBeDeletedFrom1Object' => 'Remove from one object~~',
+	'UI:Links:Bulk:LinkWillBeCreatedForXObjects' => 'Add {count} objects~~',
+	'UI:Links:Bulk:LinkWillBeDeletedFromXObjects' => 'Remove {count} objects~~',
+	'UI:Links:Bulk:LinkExistForAllObjects' => 'All objets are already linked~~',
+	'UI:Links:Bulk:LinkExistForOneObject' => 'One object is linked~~',
+	'UI:Links:Bulk:LinkExistForXObjects' => '{count} objects are linked~~',
+
+	// New item
+	'UI:Links:NewItem' => 'New item~~',
+));
\ No newline at end of file
diff --git a/dictionaries/ui/application/links/pl.dictionary.itop.links.php b/dictionaries/ui/application/links/pl.dictionary.itop.links.php
new file mode 100644
index 0000000000..1f76dd0431
--- /dev/null
+++ b/dictionaries/ui/application/links/pl.dictionary.itop.links.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+Dict::Add('PL PL', 'Polish', 'Polski', array(
+
+	// Placeholders
+ // $%1s : host object class name
+ // $%2s : host object friendlyname
+ // $%3s : current tab name
+ // $%4s : remote object class name
+ // $%5s : remote object friendlyname
+	'UI:Links:Object:New:Modal:Title' => 'Create an object~~',
+
+	// Create
+	'UI:Links:Create:Button' => 'Create~~',
+	'UI:Links:Create:Button+' => 'Create a %4$s~~',
+	'UI:Links:Create:Modal:Title' => 'Create a %4$s in %2$s~~',
+
+	// Add
+	'UI:Links:Add:Button' => 'Add~~',
+	'UI:Links:Add:Button+' => 'Add a %4$s~~',
+	'UI:Links:Add:Modal:Title' => 'Add a %4$s to %2$s~~',
+
+	// Modify link
+	'UI:Links:ModifyLink:Button' => 'Modify~~',
+	'UI:Links:ModifyLink:Button+' => 'Modify this link~~',
+	'UI:Links:ModifyLink:Modal:Title' => 'Modify the link between %2$s and %5$s~~',
+
+	// Modify object
+	'UI:Links:ModifyObject:Button' => 'Modify~~',
+	'UI:Links:ModifyObject:Button+' => 'Modify this object~~',
+	'UI:Links:ModifyObject:Modal:Title' => '%5$s~~',
+
+	// Remove
+	'UI:Links:Remove:Button' => 'Remove~~',
+	'UI:Links:Remove:Button+' => 'Remove this %4$s~~',
+	'UI:Links:Remove:Modal:Title' => 'Remove a %4$s from its %1$s~~',
+	'UI:Links:Remove:Modal:Message' => 'Do you really want to remove %5$s from %2$s?~~',
+
+	// Delete
+	'UI:Links:Delete:Button' => 'Delete~~',
+	'UI:Links:Delete:Button+' => 'Delete this %4$s~~',
+	'UI:Links:Delete:Modal:Title' => 'Delete a %4$s~~',
+	'UI:Links:Delete:Modal:Message' => 'Do you really want to delete %5$s?~~',
+
+	// Bulk
+	'UI:Links:Bulk:LinkWillBeCreatedForAllObjects' => 'Add to all objects~~',
+	'UI:Links:Bulk:LinkWillBeDeletedFromAllObjects' => 'Remove from all objects~~',
+	'UI:Links:Bulk:LinkWillBeCreatedFor1Object' => 'Add to one object~~',
+	'UI:Links:Bulk:LinkWillBeDeletedFrom1Object' => 'Remove from one object~~',
+	'UI:Links:Bulk:LinkWillBeCreatedForXObjects' => 'Add {count} objects~~',
+	'UI:Links:Bulk:LinkWillBeDeletedFromXObjects' => 'Remove {count} objects~~',
+	'UI:Links:Bulk:LinkExistForAllObjects' => 'All objets are already linked~~',
+	'UI:Links:Bulk:LinkExistForOneObject' => 'One object is linked~~',
+	'UI:Links:Bulk:LinkExistForXObjects' => '{count} objects are linked~~',
+
+	// New item
+	'UI:Links:NewItem' => 'New item~~',
+));
\ No newline at end of file
diff --git a/dictionaries/ui/application/links/pt_br.dictionary.itop.links.php b/dictionaries/ui/application/links/pt_br.dictionary.itop.links.php
new file mode 100644
index 0000000000..dc127ca33b
--- /dev/null
+++ b/dictionaries/ui/application/links/pt_br.dictionary.itop.links.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+
+	// Placeholders
+ // $%1s : host object class name
+ // $%2s : host object friendlyname
+ // $%3s : current tab name
+ // $%4s : remote object class name
+ // $%5s : remote object friendlyname
+	'UI:Links:Object:New:Modal:Title' => 'Create an object~~',
+
+	// Create
+	'UI:Links:Create:Button' => 'Create~~',
+	'UI:Links:Create:Button+' => 'Create a %4$s~~',
+	'UI:Links:Create:Modal:Title' => 'Create a %4$s in %2$s~~',
+
+	// Add
+	'UI:Links:Add:Button' => 'Add~~',
+	'UI:Links:Add:Button+' => 'Add a %4$s~~',
+	'UI:Links:Add:Modal:Title' => 'Add a %4$s to %2$s~~',
+
+	// Modify link
+	'UI:Links:ModifyLink:Button' => 'Modify~~',
+	'UI:Links:ModifyLink:Button+' => 'Modify this link~~',
+	'UI:Links:ModifyLink:Modal:Title' => 'Modify the link between %2$s and %5$s~~',
+
+	// Modify object
+	'UI:Links:ModifyObject:Button' => 'Modify~~',
+	'UI:Links:ModifyObject:Button+' => 'Modify this object~~',
+	'UI:Links:ModifyObject:Modal:Title' => '%5$s~~',
+
+	// Remove
+	'UI:Links:Remove:Button' => 'Remove~~',
+	'UI:Links:Remove:Button+' => 'Remove this %4$s~~',
+	'UI:Links:Remove:Modal:Title' => 'Remove a %4$s from its %1$s~~',
+	'UI:Links:Remove:Modal:Message' => 'Do you really want to remove %5$s from %2$s?~~',
+
+	// Delete
+	'UI:Links:Delete:Button' => 'Delete~~',
+	'UI:Links:Delete:Button+' => 'Delete this %4$s~~',
+	'UI:Links:Delete:Modal:Title' => 'Delete a %4$s~~',
+	'UI:Links:Delete:Modal:Message' => 'Do you really want to delete %5$s?~~',
+
+	// Bulk
+	'UI:Links:Bulk:LinkWillBeCreatedForAllObjects' => 'Add to all objects~~',
+	'UI:Links:Bulk:LinkWillBeDeletedFromAllObjects' => 'Remove from all objects~~',
+	'UI:Links:Bulk:LinkWillBeCreatedFor1Object' => 'Add to one object~~',
+	'UI:Links:Bulk:LinkWillBeDeletedFrom1Object' => 'Remove from one object~~',
+	'UI:Links:Bulk:LinkWillBeCreatedForXObjects' => 'Add {count} objects~~',
+	'UI:Links:Bulk:LinkWillBeDeletedFromXObjects' => 'Remove {count} objects~~',
+	'UI:Links:Bulk:LinkExistForAllObjects' => 'All objets are already linked~~',
+	'UI:Links:Bulk:LinkExistForOneObject' => 'One object is linked~~',
+	'UI:Links:Bulk:LinkExistForXObjects' => '{count} objects are linked~~',
+
+	// New item
+	'UI:Links:NewItem' => 'New item~~',
+));
\ No newline at end of file
diff --git a/dictionaries/ui/application/links/ru.dictionary.itop.links.php b/dictionaries/ui/application/links/ru.dictionary.itop.links.php
new file mode 100644
index 0000000000..cc4f47fdc6
--- /dev/null
+++ b/dictionaries/ui/application/links/ru.dictionary.itop.links.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+Dict::Add('RU RU', 'Russian', 'Русский', array(
+
+	// Placeholders
+ // $%1s : host object class name
+ // $%2s : host object friendlyname
+ // $%3s : current tab name
+ // $%4s : remote object class name
+ // $%5s : remote object friendlyname
+	'UI:Links:Object:New:Modal:Title' => 'Create an object~~',
+
+	// Create
+	'UI:Links:Create:Button' => 'Create~~',
+	'UI:Links:Create:Button+' => 'Create a %4$s~~',
+	'UI:Links:Create:Modal:Title' => 'Create a %4$s in %2$s~~',
+
+	// Add
+	'UI:Links:Add:Button' => 'Add~~',
+	'UI:Links:Add:Button+' => 'Add a %4$s~~',
+	'UI:Links:Add:Modal:Title' => 'Add a %4$s to %2$s~~',
+
+	// Modify link
+	'UI:Links:ModifyLink:Button' => 'Modify~~',
+	'UI:Links:ModifyLink:Button+' => 'Modify this link~~',
+	'UI:Links:ModifyLink:Modal:Title' => 'Modify the link between %2$s and %5$s~~',
+
+	// Modify object
+	'UI:Links:ModifyObject:Button' => 'Modify~~',
+	'UI:Links:ModifyObject:Button+' => 'Modify this object~~',
+	'UI:Links:ModifyObject:Modal:Title' => '%5$s~~',
+
+	// Remove
+	'UI:Links:Remove:Button' => 'Remove~~',
+	'UI:Links:Remove:Button+' => 'Remove this %4$s~~',
+	'UI:Links:Remove:Modal:Title' => 'Remove a %4$s from its %1$s~~',
+	'UI:Links:Remove:Modal:Message' => 'Do you really want to remove %5$s from %2$s?~~',
+
+	// Delete
+	'UI:Links:Delete:Button' => 'Delete~~',
+	'UI:Links:Delete:Button+' => 'Delete this %4$s~~',
+	'UI:Links:Delete:Modal:Title' => 'Delete a %4$s~~',
+	'UI:Links:Delete:Modal:Message' => 'Do you really want to delete %5$s?~~',
+
+	// Bulk
+	'UI:Links:Bulk:LinkWillBeCreatedForAllObjects' => 'Add to all objects~~',
+	'UI:Links:Bulk:LinkWillBeDeletedFromAllObjects' => 'Remove from all objects~~',
+	'UI:Links:Bulk:LinkWillBeCreatedFor1Object' => 'Add to one object~~',
+	'UI:Links:Bulk:LinkWillBeDeletedFrom1Object' => 'Remove from one object~~',
+	'UI:Links:Bulk:LinkWillBeCreatedForXObjects' => 'Add {count} objects~~',
+	'UI:Links:Bulk:LinkWillBeDeletedFromXObjects' => 'Remove {count} objects~~',
+	'UI:Links:Bulk:LinkExistForAllObjects' => 'All objets are already linked~~',
+	'UI:Links:Bulk:LinkExistForOneObject' => 'One object is linked~~',
+	'UI:Links:Bulk:LinkExistForXObjects' => '{count} objects are linked~~',
+
+	// New item
+	'UI:Links:NewItem' => 'New item~~',
+));
\ No newline at end of file
diff --git a/dictionaries/ui/application/links/sk.dictionary.itop.links.php b/dictionaries/ui/application/links/sk.dictionary.itop.links.php
new file mode 100644
index 0000000000..1c8597346a
--- /dev/null
+++ b/dictionaries/ui/application/links/sk.dictionary.itop.links.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
+
+	// Placeholders
+ // $%1s : host object class name
+ // $%2s : host object friendlyname
+ // $%3s : current tab name
+ // $%4s : remote object class name
+ // $%5s : remote object friendlyname
+	'UI:Links:Object:New:Modal:Title' => 'Create an object~~',
+
+	// Create
+	'UI:Links:Create:Button' => 'Create~~',
+	'UI:Links:Create:Button+' => 'Create a %4$s~~',
+	'UI:Links:Create:Modal:Title' => 'Create a %4$s in %2$s~~',
+
+	// Add
+	'UI:Links:Add:Button' => 'Add~~',
+	'UI:Links:Add:Button+' => 'Add a %4$s~~',
+	'UI:Links:Add:Modal:Title' => 'Add a %4$s to %2$s~~',
+
+	// Modify link
+	'UI:Links:ModifyLink:Button' => 'Modify~~',
+	'UI:Links:ModifyLink:Button+' => 'Modify this link~~',
+	'UI:Links:ModifyLink:Modal:Title' => 'Modify the link between %2$s and %5$s~~',
+
+	// Modify object
+	'UI:Links:ModifyObject:Button' => 'Modify~~',
+	'UI:Links:ModifyObject:Button+' => 'Modify this object~~',
+	'UI:Links:ModifyObject:Modal:Title' => '%5$s~~',
+
+	// Remove
+	'UI:Links:Remove:Button' => 'Remove~~',
+	'UI:Links:Remove:Button+' => 'Remove this %4$s~~',
+	'UI:Links:Remove:Modal:Title' => 'Remove a %4$s from its %1$s~~',
+	'UI:Links:Remove:Modal:Message' => 'Do you really want to remove %5$s from %2$s?~~',
+
+	// Delete
+	'UI:Links:Delete:Button' => 'Delete~~',
+	'UI:Links:Delete:Button+' => 'Delete this %4$s~~',
+	'UI:Links:Delete:Modal:Title' => 'Delete a %4$s~~',
+	'UI:Links:Delete:Modal:Message' => 'Do you really want to delete %5$s?~~',
+
+	// Bulk
+	'UI:Links:Bulk:LinkWillBeCreatedForAllObjects' => 'Add to all objects~~',
+	'UI:Links:Bulk:LinkWillBeDeletedFromAllObjects' => 'Remove from all objects~~',
+	'UI:Links:Bulk:LinkWillBeCreatedFor1Object' => 'Add to one object~~',
+	'UI:Links:Bulk:LinkWillBeDeletedFrom1Object' => 'Remove from one object~~',
+	'UI:Links:Bulk:LinkWillBeCreatedForXObjects' => 'Add {count} objects~~',
+	'UI:Links:Bulk:LinkWillBeDeletedFromXObjects' => 'Remove {count} objects~~',
+	'UI:Links:Bulk:LinkExistForAllObjects' => 'All objets are already linked~~',
+	'UI:Links:Bulk:LinkExistForOneObject' => 'One object is linked~~',
+	'UI:Links:Bulk:LinkExistForXObjects' => '{count} objects are linked~~',
+
+	// New item
+	'UI:Links:NewItem' => 'New item~~',
+));
\ No newline at end of file
diff --git a/dictionaries/ui/application/links/tr.dictionary.itop.links.php b/dictionaries/ui/application/links/tr.dictionary.itop.links.php
new file mode 100644
index 0000000000..207c90ba2f
--- /dev/null
+++ b/dictionaries/ui/application/links/tr.dictionary.itop.links.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+
+	// Placeholders
+ // $%1s : host object class name
+ // $%2s : host object friendlyname
+ // $%3s : current tab name
+ // $%4s : remote object class name
+ // $%5s : remote object friendlyname
+	'UI:Links:Object:New:Modal:Title' => 'Create an object~~',
+
+	// Create
+	'UI:Links:Create:Button' => 'Create~~',
+	'UI:Links:Create:Button+' => 'Create a %4$s~~',
+	'UI:Links:Create:Modal:Title' => 'Create a %4$s in %2$s~~',
+
+	// Add
+	'UI:Links:Add:Button' => 'Add~~',
+	'UI:Links:Add:Button+' => 'Add a %4$s~~',
+	'UI:Links:Add:Modal:Title' => 'Add a %4$s to %2$s~~',
+
+	// Modify link
+	'UI:Links:ModifyLink:Button' => 'Modify~~',
+	'UI:Links:ModifyLink:Button+' => 'Modify this link~~',
+	'UI:Links:ModifyLink:Modal:Title' => 'Modify the link between %2$s and %5$s~~',
+
+	// Modify object
+	'UI:Links:ModifyObject:Button' => 'Modify~~',
+	'UI:Links:ModifyObject:Button+' => 'Modify this object~~',
+	'UI:Links:ModifyObject:Modal:Title' => '%5$s~~',
+
+	// Remove
+	'UI:Links:Remove:Button' => 'Remove~~',
+	'UI:Links:Remove:Button+' => 'Remove this %4$s~~',
+	'UI:Links:Remove:Modal:Title' => 'Remove a %4$s from its %1$s~~',
+	'UI:Links:Remove:Modal:Message' => 'Do you really want to remove %5$s from %2$s?~~',
+
+	// Delete
+	'UI:Links:Delete:Button' => 'Delete~~',
+	'UI:Links:Delete:Button+' => 'Delete this %4$s~~',
+	'UI:Links:Delete:Modal:Title' => 'Delete a %4$s~~',
+	'UI:Links:Delete:Modal:Message' => 'Do you really want to delete %5$s?~~',
+
+	// Bulk
+	'UI:Links:Bulk:LinkWillBeCreatedForAllObjects' => 'Add to all objects~~',
+	'UI:Links:Bulk:LinkWillBeDeletedFromAllObjects' => 'Remove from all objects~~',
+	'UI:Links:Bulk:LinkWillBeCreatedFor1Object' => 'Add to one object~~',
+	'UI:Links:Bulk:LinkWillBeDeletedFrom1Object' => 'Remove from one object~~',
+	'UI:Links:Bulk:LinkWillBeCreatedForXObjects' => 'Add {count} objects~~',
+	'UI:Links:Bulk:LinkWillBeDeletedFromXObjects' => 'Remove {count} objects~~',
+	'UI:Links:Bulk:LinkExistForAllObjects' => 'All objets are already linked~~',
+	'UI:Links:Bulk:LinkExistForOneObject' => 'One object is linked~~',
+	'UI:Links:Bulk:LinkExistForXObjects' => '{count} objects are linked~~',
+
+	// New item
+	'UI:Links:NewItem' => 'New item~~',
+));
\ No newline at end of file
diff --git a/dictionaries/ui/application/links/zh_cn.dictionary.itop.links.php b/dictionaries/ui/application/links/zh_cn.dictionary.itop.links.php
new file mode 100644
index 0000000000..79ea4a817c
--- /dev/null
+++ b/dictionaries/ui/application/links/zh_cn.dictionary.itop.links.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+
+	// Placeholders
+ // $%1s : host object class name
+ // $%2s : host object friendlyname
+ // $%3s : current tab name
+ // $%4s : remote object class name
+ // $%5s : remote object friendlyname
+	'UI:Links:Object:New:Modal:Title' => 'Create an object~~',
+
+	// Create
+	'UI:Links:Create:Button' => 'Create~~',
+	'UI:Links:Create:Button+' => 'Create a %4$s~~',
+	'UI:Links:Create:Modal:Title' => 'Create a %4$s in %2$s~~',
+
+	// Add
+	'UI:Links:Add:Button' => 'Add~~',
+	'UI:Links:Add:Button+' => 'Add a %4$s~~',
+	'UI:Links:Add:Modal:Title' => 'Add a %4$s to %2$s~~',
+
+	// Modify link
+	'UI:Links:ModifyLink:Button' => 'Modify~~',
+	'UI:Links:ModifyLink:Button+' => 'Modify this link~~',
+	'UI:Links:ModifyLink:Modal:Title' => 'Modify the link between %2$s and %5$s~~',
+
+	// Modify object
+	'UI:Links:ModifyObject:Button' => 'Modify~~',
+	'UI:Links:ModifyObject:Button+' => 'Modify this object~~',
+	'UI:Links:ModifyObject:Modal:Title' => '%5$s~~',
+
+	// Remove
+	'UI:Links:Remove:Button' => 'Remove~~',
+	'UI:Links:Remove:Button+' => 'Remove this %4$s~~',
+	'UI:Links:Remove:Modal:Title' => 'Remove a %4$s from its %1$s~~',
+	'UI:Links:Remove:Modal:Message' => 'Do you really want to remove %5$s from %2$s?~~',
+
+	// Delete
+	'UI:Links:Delete:Button' => 'Delete~~',
+	'UI:Links:Delete:Button+' => 'Delete this %4$s~~',
+	'UI:Links:Delete:Modal:Title' => 'Delete a %4$s~~',
+	'UI:Links:Delete:Modal:Message' => 'Do you really want to delete %5$s?~~',
+
+	// Bulk
+	'UI:Links:Bulk:LinkWillBeCreatedForAllObjects' => 'Add to all objects~~',
+	'UI:Links:Bulk:LinkWillBeDeletedFromAllObjects' => 'Remove from all objects~~',
+	'UI:Links:Bulk:LinkWillBeCreatedFor1Object' => 'Add to one object~~',
+	'UI:Links:Bulk:LinkWillBeDeletedFrom1Object' => 'Remove from one object~~',
+	'UI:Links:Bulk:LinkWillBeCreatedForXObjects' => 'Add {count} objects~~',
+	'UI:Links:Bulk:LinkWillBeDeletedFromXObjects' => 'Remove {count} objects~~',
+	'UI:Links:Bulk:LinkExistForAllObjects' => 'All objets are already linked~~',
+	'UI:Links:Bulk:LinkExistForOneObject' => 'One object is linked~~',
+	'UI:Links:Bulk:LinkExistForXObjects' => '{count} objects are linked~~',
+
+	// New item
+	'UI:Links:NewItem' => 'New item~~',
+));
\ No newline at end of file
diff --git a/dictionaries/ui/application/object/cs.dictionary.itop.object.php b/dictionaries/ui/application/object/cs.dictionary.itop.object.php
new file mode 100644
index 0000000000..011fc573a3
--- /dev/null
+++ b/dictionaries/ui/application/object/cs.dictionary.itop.object.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+Dict::Add('CS CZ', 'Czech', 'Čeština', array(
+	'UI:Object:Modal:Title' => 'Create an object~~',
+));
\ No newline at end of file
diff --git a/dictionaries/ui/application/object/da.dictionary.itop.object.php b/dictionaries/ui/application/object/da.dictionary.itop.object.php
new file mode 100644
index 0000000000..40dfeb55fb
--- /dev/null
+++ b/dictionaries/ui/application/object/da.dictionary.itop.object.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+Dict::Add('DA DA', 'Danish', 'Dansk', array(
+	'UI:Object:Modal:Title' => 'Create an object~~',
+));
\ No newline at end of file
diff --git a/dictionaries/ui/application/object/de.dictionary.itop.object.php b/dictionaries/ui/application/object/de.dictionary.itop.object.php
new file mode 100644
index 0000000000..68dd8b494c
--- /dev/null
+++ b/dictionaries/ui/application/object/de.dictionary.itop.object.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'UI:Object:Modal:Title' => 'Ein Objekt erstellen',
+));
\ No newline at end of file
diff --git a/dictionaries/ui/application/object/es_cr.dictionary.itop.object.php b/dictionaries/ui/application/object/es_cr.dictionary.itop.object.php
new file mode 100644
index 0000000000..5a8e751bdc
--- /dev/null
+++ b/dictionaries/ui/application/object/es_cr.dictionary.itop.object.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
+	'UI:Object:Modal:Title' => 'Create an object~~',
+));
\ No newline at end of file
diff --git a/dictionaries/ui/application/object/fr.dictionary.itop.object.php b/dictionaries/ui/application/object/fr.dictionary.itop.object.php
new file mode 100644
index 0000000000..da15236ab6
--- /dev/null
+++ b/dictionaries/ui/application/object/fr.dictionary.itop.object.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+Dict::Add('FR FR', 'French', 'Français', array(
+	'UI:Object:Modal:Title' => 'Create an object~~',
+));
\ No newline at end of file
diff --git a/dictionaries/ui/application/object/hu.dictionary.itop.object.php b/dictionaries/ui/application/object/hu.dictionary.itop.object.php
new file mode 100644
index 0000000000..2ead4a47b6
--- /dev/null
+++ b/dictionaries/ui/application/object/hu.dictionary.itop.object.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
+	'UI:Object:Modal:Title' => 'Create an object~~',
+));
\ No newline at end of file
diff --git a/dictionaries/ui/application/object/it.dictionary.itop.object.php b/dictionaries/ui/application/object/it.dictionary.itop.object.php
new file mode 100644
index 0000000000..ad91e6f0a1
--- /dev/null
+++ b/dictionaries/ui/application/object/it.dictionary.itop.object.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'UI:Object:Modal:Title' => 'Create an object~~',
+));
\ No newline at end of file
diff --git a/dictionaries/ui/application/object/ja.dictionary.itop.object.php b/dictionaries/ui/application/object/ja.dictionary.itop.object.php
new file mode 100644
index 0000000000..d82f655a7b
--- /dev/null
+++ b/dictionaries/ui/application/object/ja.dictionary.itop.object.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'UI:Object:Modal:Title' => 'Create an object~~',
+));
\ No newline at end of file
diff --git a/dictionaries/ui/application/object/nl.dictionary.itop.object.php b/dictionaries/ui/application/object/nl.dictionary.itop.object.php
new file mode 100644
index 0000000000..eb271666f7
--- /dev/null
+++ b/dictionaries/ui/application/object/nl.dictionary.itop.object.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'UI:Object:Modal:Title' => 'Create an object~~',
+));
\ No newline at end of file
diff --git a/dictionaries/ui/application/object/pl.dictionary.itop.object.php b/dictionaries/ui/application/object/pl.dictionary.itop.object.php
new file mode 100644
index 0000000000..b7fd4c4368
--- /dev/null
+++ b/dictionaries/ui/application/object/pl.dictionary.itop.object.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+Dict::Add('PL PL', 'Polish', 'Polski', array(
+	'UI:Object:Modal:Title' => 'Create an object~~',
+));
\ No newline at end of file
diff --git a/dictionaries/ui/application/object/pt_br.dictionary.itop.object.php b/dictionaries/ui/application/object/pt_br.dictionary.itop.object.php
new file mode 100644
index 0000000000..a043d66782
--- /dev/null
+++ b/dictionaries/ui/application/object/pt_br.dictionary.itop.object.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'UI:Object:Modal:Title' => 'Create an object~~',
+));
\ No newline at end of file
diff --git a/dictionaries/ui/application/object/ru.dictionary.itop.object.php b/dictionaries/ui/application/object/ru.dictionary.itop.object.php
new file mode 100644
index 0000000000..23e558c51e
--- /dev/null
+++ b/dictionaries/ui/application/object/ru.dictionary.itop.object.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+Dict::Add('RU RU', 'Russian', 'Русский', array(
+	'UI:Object:Modal:Title' => 'Create an object~~',
+));
\ No newline at end of file
diff --git a/dictionaries/ui/application/object/sk.dictionary.itop.object.php b/dictionaries/ui/application/object/sk.dictionary.itop.object.php
new file mode 100644
index 0000000000..819aeef344
--- /dev/null
+++ b/dictionaries/ui/application/object/sk.dictionary.itop.object.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
+	'UI:Object:Modal:Title' => 'Create an object~~',
+));
\ No newline at end of file
diff --git a/dictionaries/ui/application/object/tr.dictionary.itop.object.php b/dictionaries/ui/application/object/tr.dictionary.itop.object.php
new file mode 100644
index 0000000000..ca4108aba8
--- /dev/null
+++ b/dictionaries/ui/application/object/tr.dictionary.itop.object.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'UI:Object:Modal:Title' => 'Create an object~~',
+));
\ No newline at end of file
diff --git a/dictionaries/ui/application/object/zh_cn.dictionary.itop.object.php b/dictionaries/ui/application/object/zh_cn.dictionary.itop.object.php
new file mode 100644
index 0000000000..90f8477669
--- /dev/null
+++ b/dictionaries/ui/application/object/zh_cn.dictionary.itop.object.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'UI:Object:Modal:Title' => 'Create an object~~',
+));
\ No newline at end of file
diff --git a/dictionaries/ui/components/breadcrumbs/cs.dictionary.itop.breadcrumbs.php b/dictionaries/ui/components/breadcrumbs/cs.dictionary.itop.breadcrumbs.php
index 8324bf7f60..6dd8748dff 100644
--- a/dictionaries/ui/components/breadcrumbs/cs.dictionary.itop.breadcrumbs.php
+++ b/dictionaries/ui/components/breadcrumbs/cs.dictionary.itop.breadcrumbs.php
@@ -16,7 +16,6 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  */
-
 // Global search
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'UI:Component:Breadcrumbs:PreviousItemsListToggler:Label' => 'Previous pages~~',
diff --git a/dictionaries/ui/components/breadcrumbs/da.dictionary.itop.breadcrumbs.php b/dictionaries/ui/components/breadcrumbs/da.dictionary.itop.breadcrumbs.php
index ddcf5c8dd3..e48158d6db 100644
--- a/dictionaries/ui/components/breadcrumbs/da.dictionary.itop.breadcrumbs.php
+++ b/dictionaries/ui/components/breadcrumbs/da.dictionary.itop.breadcrumbs.php
@@ -16,7 +16,6 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  */
-
 // Global search
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'UI:Component:Breadcrumbs:PreviousItemsListToggler:Label' => 'Previous pages~~',
diff --git a/dictionaries/ui/components/breadcrumbs/de.dictionary.itop.breadcrumbs.php b/dictionaries/ui/components/breadcrumbs/de.dictionary.itop.breadcrumbs.php
index a99811a251..ac8dd2d2be 100644
--- a/dictionaries/ui/components/breadcrumbs/de.dictionary.itop.breadcrumbs.php
+++ b/dictionaries/ui/components/breadcrumbs/de.dictionary.itop.breadcrumbs.php
@@ -16,8 +16,7 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  */
-
 // Global search
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'UI:Component:Breadcrumbs:PreviousItemsListToggler:Label' => 'Vorherige Seiten',
-));
+));
\ No newline at end of file
diff --git a/dictionaries/ui/components/breadcrumbs/es_cr.dictionary.itop.breadcrumbs.php b/dictionaries/ui/components/breadcrumbs/es_cr.dictionary.itop.breadcrumbs.php
index bebd6d89d2..b14c1df583 100644
--- a/dictionaries/ui/components/breadcrumbs/es_cr.dictionary.itop.breadcrumbs.php
+++ b/dictionaries/ui/components/breadcrumbs/es_cr.dictionary.itop.breadcrumbs.php
@@ -16,7 +16,6 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  */
-
 // Global search
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'UI:Component:Breadcrumbs:PreviousItemsListToggler:Label' => 'Páginas anteriores',
diff --git a/dictionaries/ui/components/breadcrumbs/fr.dictionary.itop.breadcrumbs.php b/dictionaries/ui/components/breadcrumbs/fr.dictionary.itop.breadcrumbs.php
index 42c4d46f10..5f1adb06c1 100644
--- a/dictionaries/ui/components/breadcrumbs/fr.dictionary.itop.breadcrumbs.php
+++ b/dictionaries/ui/components/breadcrumbs/fr.dictionary.itop.breadcrumbs.php
@@ -16,7 +16,6 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  */
-
 // Global search
 Dict::Add('FR FR', 'French', 'Français', array(
 	'UI:Component:Breadcrumbs:PreviousItemsListToggler:Label' => 'Pages précédentes',
diff --git a/dictionaries/ui/components/breadcrumbs/hu.dictionary.itop.breadcrumbs.php b/dictionaries/ui/components/breadcrumbs/hu.dictionary.itop.breadcrumbs.php
index ae43dbb0c0..42951c918f 100644
--- a/dictionaries/ui/components/breadcrumbs/hu.dictionary.itop.breadcrumbs.php
+++ b/dictionaries/ui/components/breadcrumbs/hu.dictionary.itop.breadcrumbs.php
@@ -16,8 +16,7 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  */
-
 // Global search
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'UI:Component:Breadcrumbs:PreviousItemsListToggler:Label' => 'Előző oldalak',
-));
+));
\ No newline at end of file
diff --git a/dictionaries/ui/components/breadcrumbs/it.dictionary.itop.breadcrumbs.php b/dictionaries/ui/components/breadcrumbs/it.dictionary.itop.breadcrumbs.php
index d0a58c131b..d1c28846d4 100644
--- a/dictionaries/ui/components/breadcrumbs/it.dictionary.itop.breadcrumbs.php
+++ b/dictionaries/ui/components/breadcrumbs/it.dictionary.itop.breadcrumbs.php
@@ -16,7 +16,6 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  */
-
 // Global search
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'UI:Component:Breadcrumbs:PreviousItemsListToggler:Label' => 'Previous pages~~',
diff --git a/dictionaries/ui/components/breadcrumbs/ja.dictionary.itop.breadcrumbs.php b/dictionaries/ui/components/breadcrumbs/ja.dictionary.itop.breadcrumbs.php
index 8dad8e0da5..abdf6c78a2 100644
--- a/dictionaries/ui/components/breadcrumbs/ja.dictionary.itop.breadcrumbs.php
+++ b/dictionaries/ui/components/breadcrumbs/ja.dictionary.itop.breadcrumbs.php
@@ -16,7 +16,6 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  */
-
 // Global search
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'UI:Component:Breadcrumbs:PreviousItemsListToggler:Label' => 'Previous pages~~',
diff --git a/dictionaries/ui/components/breadcrumbs/nl.dictionary.itop.breadcrumbs.php b/dictionaries/ui/components/breadcrumbs/nl.dictionary.itop.breadcrumbs.php
index 29eb4219ae..84dea792d6 100644
--- a/dictionaries/ui/components/breadcrumbs/nl.dictionary.itop.breadcrumbs.php
+++ b/dictionaries/ui/components/breadcrumbs/nl.dictionary.itop.breadcrumbs.php
@@ -16,7 +16,6 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  */
-
 // Global search
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'UI:Component:Breadcrumbs:PreviousItemsListToggler:Label' => 'Vorige pagina\'s',
diff --git a/dictionaries/ui/components/breadcrumbs/pt_br.dictionary.itop.breadcrumbs.php b/dictionaries/ui/components/breadcrumbs/pt_br.dictionary.itop.breadcrumbs.php
index e634e92e26..3ffeccb436 100644
--- a/dictionaries/ui/components/breadcrumbs/pt_br.dictionary.itop.breadcrumbs.php
+++ b/dictionaries/ui/components/breadcrumbs/pt_br.dictionary.itop.breadcrumbs.php
@@ -16,7 +16,6 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  */
-
 // Global search
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'UI:Component:Breadcrumbs:PreviousItemsListToggler:Label' => 'Páginas anteriores',
diff --git a/dictionaries/ui/components/breadcrumbs/ru.dictionary.itop.breadcrumbs.php b/dictionaries/ui/components/breadcrumbs/ru.dictionary.itop.breadcrumbs.php
index 9a7452c82c..0191124d00 100644
--- a/dictionaries/ui/components/breadcrumbs/ru.dictionary.itop.breadcrumbs.php
+++ b/dictionaries/ui/components/breadcrumbs/ru.dictionary.itop.breadcrumbs.php
@@ -16,7 +16,6 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  */
-
 // Global search
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'UI:Component:Breadcrumbs:PreviousItemsListToggler:Label' => 'Previous pages~~',
diff --git a/dictionaries/ui/components/breadcrumbs/sk.dictionary.itop.breadcrumbs.php b/dictionaries/ui/components/breadcrumbs/sk.dictionary.itop.breadcrumbs.php
index cdc0651ad8..d801b68422 100644
--- a/dictionaries/ui/components/breadcrumbs/sk.dictionary.itop.breadcrumbs.php
+++ b/dictionaries/ui/components/breadcrumbs/sk.dictionary.itop.breadcrumbs.php
@@ -16,7 +16,6 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  */
-
 // Global search
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'UI:Component:Breadcrumbs:PreviousItemsListToggler:Label' => 'Previous pages~~',
diff --git a/dictionaries/ui/components/breadcrumbs/tr.dictionary.itop.breadcrumbs.php b/dictionaries/ui/components/breadcrumbs/tr.dictionary.itop.breadcrumbs.php
index dddf6aea75..f50dc3a4c2 100644
--- a/dictionaries/ui/components/breadcrumbs/tr.dictionary.itop.breadcrumbs.php
+++ b/dictionaries/ui/components/breadcrumbs/tr.dictionary.itop.breadcrumbs.php
@@ -16,7 +16,6 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  */
-
 // Global search
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'UI:Component:Breadcrumbs:PreviousItemsListToggler:Label' => 'Previous pages~~',
diff --git a/dictionaries/ui/components/breadcrumbs/zh_cn.dictionary.itop.breadcrumbs.php b/dictionaries/ui/components/breadcrumbs/zh_cn.dictionary.itop.breadcrumbs.php
index 1ba57ddd4b..c7eb486713 100644
--- a/dictionaries/ui/components/breadcrumbs/zh_cn.dictionary.itop.breadcrumbs.php
+++ b/dictionaries/ui/components/breadcrumbs/zh_cn.dictionary.itop.breadcrumbs.php
@@ -16,7 +16,6 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  */
-
 // Global search
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'UI:Component:Breadcrumbs:PreviousItemsListToggler:Label' => '上一页',
diff --git a/dictionaries/ui/components/datatable/cs.dictionary.itop.datatable.php b/dictionaries/ui/components/datatable/cs.dictionary.itop.datatable.php
index 15443f25c8..44485f2b84 100644
--- a/dictionaries/ui/components/datatable/cs.dictionary.itop.datatable.php
+++ b/dictionaries/ui/components/datatable/cs.dictionary.itop.datatable.php
@@ -18,14 +18,18 @@
  */
 // Display DataTable
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
-	'UI:Datatables:Language:Processing'        => 'Please wait...~~',
-	'UI:Datatables:Language:LengthMenu'        => '_MENU_ per page~~',
-	'UI:Datatables:Language:ZeroRecords'       => 'No result~~',
-	'UI:Datatables:Language:Info'              => '_TOTAL_ item(s)~~',
-	'UI:Datatables:Language:InfoEmpty'         => 'No information~~',
-	'UI:Datatables:Language:EmptyTable'        => 'No data available in this table~~',
-	'UI:Datatables:Language:Error'             => 'An error occured while running the query~~',
+	'UI:Datatables:Language:Processing' => 'Please wait...~~',
+	'UI:Datatables:Language:LengthMenu' => '_MENU_ per page~~',
+	'UI:Datatables:Language:ZeroRecords' => 'No result~~',
+	'UI:Datatables:Language:Info' => '_TOTAL_ item(s)~~',
+	'UI:Datatables:Language:InfoEmpty' => 'No information~~',
+	'UI:Datatables:Language:EmptyTable' => 'No data available in this table~~',
+	'UI:Datatables:Language:Error' => 'An error occured while running the query~~',
 	'UI:Datatables:Language:DisplayLength:All' => 'All~~',
-	'UI:Datatables:Language:Sort:Ascending'    => 'enable for an ascending sort~~',
-	'UI:Datatables:Language:Sort:Descending'   => 'enable for a descending sort~~',
+	'UI:Datatables:Language:Sort:Ascending' => 'enable for an ascending sort~~',
+	'UI:Datatables:Language:Sort:Descending' => 'enable for a descending sort~~',
+	'UI:Datatables:Column:RowActions:Label' => '~~',
+	'UI:Datatables:Column:RowActions:Description' => '~~',
+	'UI:Datatables:RowActions:ConfirmationDialog' => 'Action Confirmation~~',
+	'UI:Datatables:RowActions:ConfirmationMessage' => 'Do you confirm action ?~~',
 ));
\ No newline at end of file
diff --git a/dictionaries/ui/components/datatable/da.dictionary.itop.datatable.php b/dictionaries/ui/components/datatable/da.dictionary.itop.datatable.php
index d21f0ca116..26e4a94015 100644
--- a/dictionaries/ui/components/datatable/da.dictionary.itop.datatable.php
+++ b/dictionaries/ui/components/datatable/da.dictionary.itop.datatable.php
@@ -18,14 +18,18 @@
  */
 // Display DataTable
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
-	'UI:Datatables:Language:Processing'        => 'Please wait...~~',
-	'UI:Datatables:Language:LengthMenu'        => '_MENU_ per page~~',
-	'UI:Datatables:Language:ZeroRecords'       => 'No result~~',
-	'UI:Datatables:Language:Info'              => '_TOTAL_ item(s)~~',
-	'UI:Datatables:Language:InfoEmpty'         => 'No information~~',
-	'UI:Datatables:Language:EmptyTable'        => 'No data available in this table~~',
-	'UI:Datatables:Language:Error'             => 'An error occured while running the query~~',
+	'UI:Datatables:Language:Processing' => 'Please wait...~~',
+	'UI:Datatables:Language:LengthMenu' => '_MENU_ per page~~',
+	'UI:Datatables:Language:ZeroRecords' => 'No result~~',
+	'UI:Datatables:Language:Info' => '_TOTAL_ item(s)~~',
+	'UI:Datatables:Language:InfoEmpty' => 'No information~~',
+	'UI:Datatables:Language:EmptyTable' => 'No data available in this table~~',
+	'UI:Datatables:Language:Error' => 'An error occured while running the query~~',
 	'UI:Datatables:Language:DisplayLength:All' => 'All~~',
-	'UI:Datatables:Language:Sort:Ascending'    => 'enable for an ascending sort~~',
-	'UI:Datatables:Language:Sort:Descending'   => 'enable for a descending sort~~',
+	'UI:Datatables:Language:Sort:Ascending' => 'enable for an ascending sort~~',
+	'UI:Datatables:Language:Sort:Descending' => 'enable for a descending sort~~',
+	'UI:Datatables:Column:RowActions:Label' => '~~',
+	'UI:Datatables:Column:RowActions:Description' => '~~',
+	'UI:Datatables:RowActions:ConfirmationDialog' => 'Action Confirmation~~',
+	'UI:Datatables:RowActions:ConfirmationMessage' => 'Do you confirm action ?~~',
 ));
\ No newline at end of file
diff --git a/dictionaries/ui/components/datatable/de.dictionary.itop.datatable.php b/dictionaries/ui/components/datatable/de.dictionary.itop.datatable.php
index fefbe67be4..aec1add910 100644
--- a/dictionaries/ui/components/datatable/de.dictionary.itop.datatable.php
+++ b/dictionaries/ui/components/datatable/de.dictionary.itop.datatable.php
@@ -18,14 +18,18 @@
  */
 // Display DataTable
 Dict::Add('DE DE', 'German', 'Deutsch', array(
-	'UI:Datatables:Language:Processing'        => 'Bitte warten...',
-	'UI:Datatables:Language:LengthMenu'        => '_MENU_ pro Seite',
-	'UI:Datatables:Language:ZeroRecords'       => 'Kein Ergebnis',
-	'UI:Datatables:Language:Info'              => '_TOTAL_ Objekte',
-	'UI:Datatables:Language:InfoEmpty'         => 'Keine Information',
-	'UI:Datatables:Language:EmptyTable'        => 'Keine Daten in dieser Tabelle verfügbar',
-	'UI:Datatables:Language:Error'             => 'Bei der Ausführung des Query ist ein Fehler aufgetreten',
+	'UI:Datatables:Language:Processing' => 'Bitte warten...',
+	'UI:Datatables:Language:LengthMenu' => '_MENU_ pro Seite',
+	'UI:Datatables:Language:ZeroRecords' => 'Kein Ergebnis',
+	'UI:Datatables:Language:Info' => '_TOTAL_ Objekte',
+	'UI:Datatables:Language:InfoEmpty' => 'Keine Information',
+	'UI:Datatables:Language:EmptyTable' => 'Keine Daten in dieser Tabelle verfügbar',
+	'UI:Datatables:Language:Error' => 'Bei der Ausführung des Query ist ein Fehler aufgetreten',
 	'UI:Datatables:Language:DisplayLength:All' => 'Alle',
-	'UI:Datatables:Language:Sort:Ascending'    => 'Aktivieren für aufsteigende Sortierung',
-	'UI:Datatables:Language:Sort:Descending'   => 'Aktivieren für absteigende Sortierung',
-));
+	'UI:Datatables:Language:Sort:Ascending' => 'Aktivieren für aufsteigende Sortierung',
+	'UI:Datatables:Language:Sort:Descending' => 'Aktivieren für absteigende Sortierung',
+	'UI:Datatables:Column:RowActions:Label' => '',
+	'UI:Datatables:Column:RowActions:Description' => '',
+	'UI:Datatables:RowActions:ConfirmationDialog' => 'Aktion bestätigen',
+	'UI:Datatables:RowActions:ConfirmationMessage' => 'Möchten Sie diese Aktion ausführen?',
+));
\ No newline at end of file
diff --git a/dictionaries/ui/components/datatable/es_cr.dictionary.itop.datatable.php b/dictionaries/ui/components/datatable/es_cr.dictionary.itop.datatable.php
index 7668b17e4b..c59d25b11d 100644
--- a/dictionaries/ui/components/datatable/es_cr.dictionary.itop.datatable.php
+++ b/dictionaries/ui/components/datatable/es_cr.dictionary.itop.datatable.php
@@ -18,14 +18,18 @@
  */
 // Display DataTable
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
-	'UI:Datatables:Language:Processing'        => 'Por favor espere...',
-	'UI:Datatables:Language:LengthMenu'        => '_MENU_ por página',
-	'UI:Datatables:Language:ZeroRecords'       => 'Sin Resultados',
-	'UI:Datatables:Language:Info'              => '_TOTAL_ elemento(s)',
-	'UI:Datatables:Language:InfoEmpty'         => 'Sin información',
-	'UI:Datatables:Language:EmptyTable'        => 'Sin datos disponibles en esta tabla',
-	'UI:Datatables:Language:Error'             => 'Un error ocurrió mientras se ejecutaba la consulta',
+	'UI:Datatables:Language:Processing' => 'Por favor espere...',
+	'UI:Datatables:Language:LengthMenu' => '_MENU_ por página',
+	'UI:Datatables:Language:ZeroRecords' => 'Sin Resultados',
+	'UI:Datatables:Language:Info' => '_TOTAL_ elemento(s)',
+	'UI:Datatables:Language:InfoEmpty' => 'Sin información',
+	'UI:Datatables:Language:EmptyTable' => 'Sin datos disponibles en esta tabla',
+	'UI:Datatables:Language:Error' => 'Un error ocurrió mientras se ejecutaba la consulta',
 	'UI:Datatables:Language:DisplayLength:All' => 'Todos',
-	'UI:Datatables:Language:Sort:Ascending'    => 'habilitar ordenamiento ascendente',
-	'UI:Datatables:Language:Sort:Descending'   => 'habilitar ordenamiento descendente',
+	'UI:Datatables:Language:Sort:Ascending' => 'habilitar ordenamiento ascendente',
+	'UI:Datatables:Language:Sort:Descending' => 'habilitar ordenamiento descendente',
+	'UI:Datatables:Column:RowActions:Label' => '~~',
+	'UI:Datatables:Column:RowActions:Description' => '~~',
+	'UI:Datatables:RowActions:ConfirmationDialog' => 'Action Confirmation~~',
+	'UI:Datatables:RowActions:ConfirmationMessage' => 'Do you confirm action ?~~',
 ));
\ No newline at end of file
diff --git a/dictionaries/ui/components/datatable/fr.dictionary.itop.datatable.php b/dictionaries/ui/components/datatable/fr.dictionary.itop.datatable.php
index 618c021d75..003a62430d 100644
--- a/dictionaries/ui/components/datatable/fr.dictionary.itop.datatable.php
+++ b/dictionaries/ui/components/datatable/fr.dictionary.itop.datatable.php
@@ -18,16 +18,18 @@
  */
 // Display DataTable
 Dict::Add('FR FR', 'French', 'Français', array(
-	'UI:Datatables:Language:Processing'           => 'Patientez ...',
-	'UI:Datatables:Language:LengthMenu'           => '_MENU_ par page',
-	'UI:Datatables:Language:ZeroRecords'          => 'Pas de résultat',
-	'UI:Datatables:Language:Info'                 => '_TOTAL_ élément(s)',
-	'UI:Datatables:Language:InfoEmpty'            => 'Pas d\'information',
-	'UI:Datatables:Language:EmptyTable'           => 'Pas de résultat',
-	'UI:Datatables:Language:Error'                => 'Erreur lors du chargement des données',
-	'UI:Datatables:Language:DisplayLength:All'    => 'Tous',
-	'UI:Datatables:Language:Sort:Ascending'       => 'tri croissant',
-	'UI:Datatables:Language:Sort:Descending'      => 'tri décroissant',
-	'UI:Datatables:Column:RowActions:Label'       => '',
+	'UI:Datatables:Language:Processing' => 'Patientez ...',
+	'UI:Datatables:Language:LengthMenu' => '_MENU_ par page',
+	'UI:Datatables:Language:ZeroRecords' => 'Pas de résultat',
+	'UI:Datatables:Language:Info' => '_TOTAL_ élément(s)',
+	'UI:Datatables:Language:InfoEmpty' => 'Pas d\'information',
+	'UI:Datatables:Language:EmptyTable' => 'Pas de résultat',
+	'UI:Datatables:Language:Error' => 'Erreur lors du chargement des données',
+	'UI:Datatables:Language:DisplayLength:All' => 'Tous',
+	'UI:Datatables:Language:Sort:Ascending' => 'tri croissant',
+	'UI:Datatables:Language:Sort:Descending' => 'tri décroissant',
+	'UI:Datatables:Column:RowActions:Label' => '',
 	'UI:Datatables:Column:RowActions:Description' => '',
+	'UI:Datatables:RowActions:ConfirmationDialog' => 'Action Confirmation~~',
+	'UI:Datatables:RowActions:ConfirmationMessage' => 'Do you confirm action ?~~',
 ));
\ No newline at end of file
diff --git a/dictionaries/ui/components/datatable/hu.dictionary.itop.datatable.php b/dictionaries/ui/components/datatable/hu.dictionary.itop.datatable.php
index 2d7483cf01..b86dddb7e1 100644
--- a/dictionaries/ui/components/datatable/hu.dictionary.itop.datatable.php
+++ b/dictionaries/ui/components/datatable/hu.dictionary.itop.datatable.php
@@ -18,14 +18,18 @@
  */
 // Display DataTable
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-	'UI:Datatables:Language:Processing'        => 'Kérem várjon...',
-	'UI:Datatables:Language:LengthMenu'        => '_MENU_ oldalanként',
-    'UI:Datatables:Language:ZeroRecords'       => 'Nincs eredmény',
-	'UI:Datatables:Language:Info'              => '_TOTAL_ elem',
-	'UI:Datatables:Language:InfoEmpty'         => 'Nincs információ',
-	'UI:Datatables:Language:EmptyTable'        => 'Ebben a táblában nincsenek adatok',
-    'UI:Datatables:Language:Error'             => 'Hiba történt a lekérdezéskor',
+	'UI:Datatables:Language:Processing' => 'Kérem várjon...',
+	'UI:Datatables:Language:LengthMenu' => '_MENU_ oldalanként',
+	'UI:Datatables:Language:ZeroRecords' => 'Nincs eredmény',
+	'UI:Datatables:Language:Info' => '_TOTAL_ elem',
+	'UI:Datatables:Language:InfoEmpty' => 'Nincs információ',
+	'UI:Datatables:Language:EmptyTable' => 'Ebben a táblában nincsenek adatok',
+	'UI:Datatables:Language:Error' => 'Hiba történt a lekérdezéskor',
 	'UI:Datatables:Language:DisplayLength:All' => 'Összes',
-    'UI:Datatables:Language:Sort:Ascending'    => 'Növekvő rendezés',
-    'UI:Datatables:Language:Sort:Descending'   => 'Csökkenő rendezés',
-));
+	'UI:Datatables:Language:Sort:Ascending' => 'Növekvő rendezés',
+	'UI:Datatables:Language:Sort:Descending' => 'Csökkenő rendezés',
+	'UI:Datatables:Column:RowActions:Label' => '~~',
+	'UI:Datatables:Column:RowActions:Description' => '~~',
+	'UI:Datatables:RowActions:ConfirmationDialog' => 'Action Confirmation~~',
+	'UI:Datatables:RowActions:ConfirmationMessage' => 'Do you confirm action ?~~',
+));
\ No newline at end of file
diff --git a/dictionaries/ui/components/datatable/it.dictionary.itop.datatable.php b/dictionaries/ui/components/datatable/it.dictionary.itop.datatable.php
index 99d74ca4fd..1652d4c03c 100644
--- a/dictionaries/ui/components/datatable/it.dictionary.itop.datatable.php
+++ b/dictionaries/ui/components/datatable/it.dictionary.itop.datatable.php
@@ -18,14 +18,18 @@
  */
 // Display DataTable
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'UI:Datatables:Language:Processing'        => 'Please wait...~~',
-	'UI:Datatables:Language:LengthMenu'        => '_MENU_ per page~~',
-	'UI:Datatables:Language:ZeroRecords'       => 'No result~~',
-	'UI:Datatables:Language:Info'              => '_TOTAL_ item(s)~~',
-	'UI:Datatables:Language:InfoEmpty'         => 'No information~~',
-	'UI:Datatables:Language:EmptyTable'        => 'No data available in this table~~',
-	'UI:Datatables:Language:Error'             => 'An error occured while running the query~~',
+	'UI:Datatables:Language:Processing' => 'Please wait...~~',
+	'UI:Datatables:Language:LengthMenu' => '_MENU_ per page~~',
+	'UI:Datatables:Language:ZeroRecords' => 'No result~~',
+	'UI:Datatables:Language:Info' => '_TOTAL_ item(s)~~',
+	'UI:Datatables:Language:InfoEmpty' => 'No information~~',
+	'UI:Datatables:Language:EmptyTable' => 'No data available in this table~~',
+	'UI:Datatables:Language:Error' => 'An error occured while running the query~~',
 	'UI:Datatables:Language:DisplayLength:All' => 'All~~',
-	'UI:Datatables:Language:Sort:Ascending'    => 'enable for an ascending sort~~',
-	'UI:Datatables:Language:Sort:Descending'   => 'enable for a descending sort~~',
+	'UI:Datatables:Language:Sort:Ascending' => 'enable for an ascending sort~~',
+	'UI:Datatables:Language:Sort:Descending' => 'enable for a descending sort~~',
+	'UI:Datatables:Column:RowActions:Label' => '~~',
+	'UI:Datatables:Column:RowActions:Description' => '~~',
+	'UI:Datatables:RowActions:ConfirmationDialog' => 'Action Confirmation~~',
+	'UI:Datatables:RowActions:ConfirmationMessage' => 'Do you confirm action ?~~',
 ));
\ No newline at end of file
diff --git a/dictionaries/ui/components/datatable/ja.dictionary.itop.datatable.php b/dictionaries/ui/components/datatable/ja.dictionary.itop.datatable.php
index b7acef5034..4bb8901a29 100644
--- a/dictionaries/ui/components/datatable/ja.dictionary.itop.datatable.php
+++ b/dictionaries/ui/components/datatable/ja.dictionary.itop.datatable.php
@@ -18,14 +18,18 @@
  */
 // Display DataTable
 Dict::Add('JA JP', 'Japanese', '日本語', array(
-	'UI:Datatables:Language:Processing'        => 'Please wait...~~',
-	'UI:Datatables:Language:LengthMenu'        => '_MENU_ per page~~',
-	'UI:Datatables:Language:ZeroRecords'       => 'No result~~',
-	'UI:Datatables:Language:Info'              => '_TOTAL_ item(s)~~',
-	'UI:Datatables:Language:InfoEmpty'         => 'No information~~',
-	'UI:Datatables:Language:EmptyTable'        => 'No data available in this table~~',
-	'UI:Datatables:Language:Error'             => 'An error occured while running the query~~',
+	'UI:Datatables:Language:Processing' => 'Please wait...~~',
+	'UI:Datatables:Language:LengthMenu' => '_MENU_ per page~~',
+	'UI:Datatables:Language:ZeroRecords' => 'No result~~',
+	'UI:Datatables:Language:Info' => '_TOTAL_ item(s)~~',
+	'UI:Datatables:Language:InfoEmpty' => 'No information~~',
+	'UI:Datatables:Language:EmptyTable' => 'No data available in this table~~',
+	'UI:Datatables:Language:Error' => 'An error occured while running the query~~',
 	'UI:Datatables:Language:DisplayLength:All' => 'All~~',
-	'UI:Datatables:Language:Sort:Ascending'    => 'enable for an ascending sort~~',
-	'UI:Datatables:Language:Sort:Descending'   => 'enable for a descending sort~~',
+	'UI:Datatables:Language:Sort:Ascending' => 'enable for an ascending sort~~',
+	'UI:Datatables:Language:Sort:Descending' => 'enable for a descending sort~~',
+	'UI:Datatables:Column:RowActions:Label' => '~~',
+	'UI:Datatables:Column:RowActions:Description' => '~~',
+	'UI:Datatables:RowActions:ConfirmationDialog' => 'Action Confirmation~~',
+	'UI:Datatables:RowActions:ConfirmationMessage' => 'Do you confirm action ?~~',
 ));
\ No newline at end of file
diff --git a/dictionaries/ui/components/datatable/nl.dictionary.itop.datatable.php b/dictionaries/ui/components/datatable/nl.dictionary.itop.datatable.php
index 90ab9f0b67..b2b9a3b0c3 100644
--- a/dictionaries/ui/components/datatable/nl.dictionary.itop.datatable.php
+++ b/dictionaries/ui/components/datatable/nl.dictionary.itop.datatable.php
@@ -18,14 +18,18 @@
  */
 // Display DataTable
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'UI:Datatables:Language:Processing'        => 'Even geduld…',
-	'UI:Datatables:Language:LengthMenu'        => '_MENU_ per pagina',
-	'UI:Datatables:Language:ZeroRecords'       => 'Geen resultaten',
-	'UI:Datatables:Language:Info'              => '_TOTAL_ item(s)',
-	'UI:Datatables:Language:InfoEmpty'         => 'Geen informatie',
-	'UI:Datatables:Language:EmptyTable'        => 'Geen data in deze tabel',
-	'UI:Datatables:Language:Error'             => 'Er was een fout bij het uitvoeren van de query.',
+	'UI:Datatables:Language:Processing' => 'Even geduld…',
+	'UI:Datatables:Language:LengthMenu' => '_MENU_ per pagina',
+	'UI:Datatables:Language:ZeroRecords' => 'Geen resultaten',
+	'UI:Datatables:Language:Info' => '_TOTAL_ item(s)',
+	'UI:Datatables:Language:InfoEmpty' => 'Geen informatie',
+	'UI:Datatables:Language:EmptyTable' => 'Geen data in deze tabel',
+	'UI:Datatables:Language:Error' => 'Er was een fout bij het uitvoeren van de query.',
 	'UI:Datatables:Language:DisplayLength:All' => 'Alles',
-	'UI:Datatables:Language:Sort:Ascending'    => 'Oplopend sorteren',
-	'UI:Datatables:Language:Sort:Descending'   => 'Aflopend sorteren',
+	'UI:Datatables:Language:Sort:Ascending' => 'Oplopend sorteren',
+	'UI:Datatables:Language:Sort:Descending' => 'Aflopend sorteren',
+	'UI:Datatables:Column:RowActions:Label' => '~~',
+	'UI:Datatables:Column:RowActions:Description' => '~~',
+	'UI:Datatables:RowActions:ConfirmationDialog' => 'Action Confirmation~~',
+	'UI:Datatables:RowActions:ConfirmationMessage' => 'Do you confirm action ?~~',
 ));
\ No newline at end of file
diff --git a/dictionaries/ui/components/datatable/pl.dictionary.itop.datatable.php b/dictionaries/ui/components/datatable/pl.dictionary.itop.datatable.php
index 77114b08fe..6bd8d11cd2 100644
--- a/dictionaries/ui/components/datatable/pl.dictionary.itop.datatable.php
+++ b/dictionaries/ui/components/datatable/pl.dictionary.itop.datatable.php
@@ -18,14 +18,18 @@
  */
 // Display DataTable
 Dict::Add('PL PL', 'Polish', 'Polski', array(
-	'UI:Datatables:Language:Processing'        => 'Proszę czekać...',
-	'UI:Datatables:Language:LengthMenu'        => '_MENU_ na stronę',
-	'UI:Datatables:Language:ZeroRecords'       => 'Brak wyników',
-	'UI:Datatables:Language:Info'              => '_TOTAL_ element(y)',
-	'UI:Datatables:Language:InfoEmpty'         => 'Brak informacji',
-	'UI:Datatables:Language:EmptyTable'        => 'Brak danych w tej tabeli',
-	'UI:Datatables:Language:Error'             => 'Wystąpił błąd podczas uruchamiania zapytania',
+	'UI:Datatables:Language:Processing' => 'Proszę czekać...',
+	'UI:Datatables:Language:LengthMenu' => '_MENU_ na stronę',
+	'UI:Datatables:Language:ZeroRecords' => 'Brak wyników',
+	'UI:Datatables:Language:Info' => '_TOTAL_ element(y)',
+	'UI:Datatables:Language:InfoEmpty' => 'Brak informacji',
+	'UI:Datatables:Language:EmptyTable' => 'Brak danych w tej tabeli',
+	'UI:Datatables:Language:Error' => 'Wystąpił błąd podczas uruchamiania zapytania',
 	'UI:Datatables:Language:DisplayLength:All' => 'Wszystkie',
-	'UI:Datatables:Language:Sort:Ascending'    => 'włącz sortowanie rosnąco',
-	'UI:Datatables:Language:Sort:Descending'   => 'włącz sortowanie malejąco',
+	'UI:Datatables:Language:Sort:Ascending' => 'włącz sortowanie rosnąco',
+	'UI:Datatables:Language:Sort:Descending' => 'włącz sortowanie malejąco',
+	'UI:Datatables:Column:RowActions:Label' => '~~',
+	'UI:Datatables:Column:RowActions:Description' => '~~',
+	'UI:Datatables:RowActions:ConfirmationDialog' => 'Action Confirmation~~',
+	'UI:Datatables:RowActions:ConfirmationMessage' => 'Do you confirm action ?~~',
 ));
\ No newline at end of file
diff --git a/dictionaries/ui/components/datatable/pt_br.dictionary.itop.datatable.php b/dictionaries/ui/components/datatable/pt_br.dictionary.itop.datatable.php
index beef98251f..a49011b696 100644
--- a/dictionaries/ui/components/datatable/pt_br.dictionary.itop.datatable.php
+++ b/dictionaries/ui/components/datatable/pt_br.dictionary.itop.datatable.php
@@ -18,14 +18,18 @@
  */
 // Display DataTable
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'UI:Datatables:Language:Processing'        => 'Aguarde...',
-	'UI:Datatables:Language:LengthMenu'        => '_MENU_ por página',
-	'UI:Datatables:Language:ZeroRecords'       => 'Nenhum resultado',
-	'UI:Datatables:Language:Info'              => '_TOTAL_ item(ns)',
-	'UI:Datatables:Language:InfoEmpty'         => 'Nenhuma informação',
-	'UI:Datatables:Language:EmptyTable'        => 'Não há dados disponíveis nesta tabela',
-	'UI:Datatables:Language:Error'             => 'Ocorreu um erro ao executar a consulta',
+	'UI:Datatables:Language:Processing' => 'Aguarde...',
+	'UI:Datatables:Language:LengthMenu' => '_MENU_ por página',
+	'UI:Datatables:Language:ZeroRecords' => 'Nenhum resultado',
+	'UI:Datatables:Language:Info' => '_TOTAL_ item(ns)',
+	'UI:Datatables:Language:InfoEmpty' => 'Nenhuma informação',
+	'UI:Datatables:Language:EmptyTable' => 'Não há dados disponíveis nesta tabela',
+	'UI:Datatables:Language:Error' => 'Ocorreu um erro ao executar a consulta',
 	'UI:Datatables:Language:DisplayLength:All' => 'Tudo',
-	'UI:Datatables:Language:Sort:Ascending'    => 'Ordem ascendente',
-	'UI:Datatables:Language:Sort:Descending'   => 'Ordem descendente',
+	'UI:Datatables:Language:Sort:Ascending' => 'Ordem ascendente',
+	'UI:Datatables:Language:Sort:Descending' => 'Ordem descendente',
+	'UI:Datatables:Column:RowActions:Label' => '~~',
+	'UI:Datatables:Column:RowActions:Description' => '~~',
+	'UI:Datatables:RowActions:ConfirmationDialog' => 'Action Confirmation~~',
+	'UI:Datatables:RowActions:ConfirmationMessage' => 'Do you confirm action ?~~',
 ));
\ No newline at end of file
diff --git a/dictionaries/ui/components/datatable/ru.dictionary.itop.datatable.php b/dictionaries/ui/components/datatable/ru.dictionary.itop.datatable.php
index 80dc047e97..d3716e780f 100755
--- a/dictionaries/ui/components/datatable/ru.dictionary.itop.datatable.php
+++ b/dictionaries/ui/components/datatable/ru.dictionary.itop.datatable.php
@@ -18,14 +18,18 @@
  */
 // Display DataTable
 Dict::Add('RU RU', 'Russian', 'Русский', array(
-	'UI:Datatables:Language:Processing'        => 'Пожалуйста, подождите...',
-	'UI:Datatables:Language:LengthMenu'        => '_MENU_ объектов на страницу',
-	'UI:Datatables:Language:ZeroRecords'       => 'Нет объектов для отображения',
-	'UI:Datatables:Language:Info'              => '_TOTAL_ элементов',
-	'UI:Datatables:Language:InfoEmpty'         => 'Нет информации',
-	'UI:Datatables:Language:EmptyTable'        => 'Нет данных для отображения',
-	'UI:Datatables:Language:Error'             => 'An error occured while running the query~~',
+	'UI:Datatables:Language:Processing' => 'Пожалуйста, подождите...',
+	'UI:Datatables:Language:LengthMenu' => '_MENU_ объектов на страницу',
+	'UI:Datatables:Language:ZeroRecords' => 'Нет объектов для отображения',
+	'UI:Datatables:Language:Info' => '_TOTAL_ элементов',
+	'UI:Datatables:Language:InfoEmpty' => 'Нет информации',
+	'UI:Datatables:Language:EmptyTable' => 'Нет данных для отображения',
+	'UI:Datatables:Language:Error' => 'An error occured while running the query~~',
 	'UI:Datatables:Language:DisplayLength:All' => 'Все',
-	'UI:Datatables:Language:Sort:Ascending'    => 'Включить для сортировки по возрастанию',
-	'UI:Datatables:Language:Sort:Descending'   => 'Включить для сортировки по убыванию',
+	'UI:Datatables:Language:Sort:Ascending' => 'Включить для сортировки по возрастанию',
+	'UI:Datatables:Language:Sort:Descending' => 'Включить для сортировки по убыванию',
+	'UI:Datatables:Column:RowActions:Label' => '~~',
+	'UI:Datatables:Column:RowActions:Description' => '~~',
+	'UI:Datatables:RowActions:ConfirmationDialog' => 'Action Confirmation~~',
+	'UI:Datatables:RowActions:ConfirmationMessage' => 'Do you confirm action ?~~',
 ));
\ No newline at end of file
diff --git a/dictionaries/ui/components/datatable/sk.dictionary.itop.datatable.php b/dictionaries/ui/components/datatable/sk.dictionary.itop.datatable.php
index bb889e9ebb..107e7ee28a 100644
--- a/dictionaries/ui/components/datatable/sk.dictionary.itop.datatable.php
+++ b/dictionaries/ui/components/datatable/sk.dictionary.itop.datatable.php
@@ -18,14 +18,18 @@
  */
 // Display DataTable
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
-	'UI:Datatables:Language:Processing'        => 'Please wait...~~',
-	'UI:Datatables:Language:LengthMenu'        => '_MENU_ per page~~',
-	'UI:Datatables:Language:ZeroRecords'       => 'No result~~',
-	'UI:Datatables:Language:Info'              => '_TOTAL_ item(s)~~',
-	'UI:Datatables:Language:InfoEmpty'         => 'No information~~',
-	'UI:Datatables:Language:EmptyTable'        => 'No data available in this table~~',
-	'UI:Datatables:Language:Error'             => 'An error occured while running the query~~',
+	'UI:Datatables:Language:Processing' => 'Please wait...~~',
+	'UI:Datatables:Language:LengthMenu' => '_MENU_ per page~~',
+	'UI:Datatables:Language:ZeroRecords' => 'No result~~',
+	'UI:Datatables:Language:Info' => '_TOTAL_ item(s)~~',
+	'UI:Datatables:Language:InfoEmpty' => 'No information~~',
+	'UI:Datatables:Language:EmptyTable' => 'No data available in this table~~',
+	'UI:Datatables:Language:Error' => 'An error occured while running the query~~',
 	'UI:Datatables:Language:DisplayLength:All' => 'All~~',
-	'UI:Datatables:Language:Sort:Ascending'    => 'enable for an ascending sort~~',
-	'UI:Datatables:Language:Sort:Descending'   => 'enable for a descending sort~~',
+	'UI:Datatables:Language:Sort:Ascending' => 'enable for an ascending sort~~',
+	'UI:Datatables:Language:Sort:Descending' => 'enable for a descending sort~~',
+	'UI:Datatables:Column:RowActions:Label' => '~~',
+	'UI:Datatables:Column:RowActions:Description' => '~~',
+	'UI:Datatables:RowActions:ConfirmationDialog' => 'Action Confirmation~~',
+	'UI:Datatables:RowActions:ConfirmationMessage' => 'Do you confirm action ?~~',
 ));
\ No newline at end of file
diff --git a/dictionaries/ui/components/datatable/tr.dictionary.itop.datatable.php b/dictionaries/ui/components/datatable/tr.dictionary.itop.datatable.php
index e18dd74745..452d88e250 100644
--- a/dictionaries/ui/components/datatable/tr.dictionary.itop.datatable.php
+++ b/dictionaries/ui/components/datatable/tr.dictionary.itop.datatable.php
@@ -18,14 +18,18 @@
  */
 // Display DataTable
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'UI:Datatables:Language:Processing'        => 'Please wait...~~',
-	'UI:Datatables:Language:LengthMenu'        => '_MENU_ per page~~',
-	'UI:Datatables:Language:ZeroRecords'       => 'No result~~',
-	'UI:Datatables:Language:Info'              => '_TOTAL_ item(s)~~',
-	'UI:Datatables:Language:InfoEmpty'         => 'No information~~',
-	'UI:Datatables:Language:EmptyTable'        => 'No data available in this table~~',
-	'UI:Datatables:Language:Error'             => 'An error occured while running the query~~',
+	'UI:Datatables:Language:Processing' => 'Please wait...~~',
+	'UI:Datatables:Language:LengthMenu' => '_MENU_ per page~~',
+	'UI:Datatables:Language:ZeroRecords' => 'No result~~',
+	'UI:Datatables:Language:Info' => '_TOTAL_ item(s)~~',
+	'UI:Datatables:Language:InfoEmpty' => 'No information~~',
+	'UI:Datatables:Language:EmptyTable' => 'No data available in this table~~',
+	'UI:Datatables:Language:Error' => 'An error occured while running the query~~',
 	'UI:Datatables:Language:DisplayLength:All' => 'All~~',
-	'UI:Datatables:Language:Sort:Ascending'    => 'enable for an ascending sort~~',
-	'UI:Datatables:Language:Sort:Descending'   => 'enable for a descending sort~~',
+	'UI:Datatables:Language:Sort:Ascending' => 'enable for an ascending sort~~',
+	'UI:Datatables:Language:Sort:Descending' => 'enable for a descending sort~~',
+	'UI:Datatables:Column:RowActions:Label' => '~~',
+	'UI:Datatables:Column:RowActions:Description' => '~~',
+	'UI:Datatables:RowActions:ConfirmationDialog' => 'Action Confirmation~~',
+	'UI:Datatables:RowActions:ConfirmationMessage' => 'Do you confirm action ?~~',
 ));
\ No newline at end of file
diff --git a/dictionaries/ui/components/datatable/zh_cn.dictionary.itop.datatable.php b/dictionaries/ui/components/datatable/zh_cn.dictionary.itop.datatable.php
index 597833bf55..ec977871d7 100644
--- a/dictionaries/ui/components/datatable/zh_cn.dictionary.itop.datatable.php
+++ b/dictionaries/ui/components/datatable/zh_cn.dictionary.itop.datatable.php
@@ -18,14 +18,18 @@
  */
 // Display DataTable
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'UI:Datatables:Language:Processing'        => '请稍候...',
-	'UI:Datatables:Language:LengthMenu'        => '_MENU_ 每页',
-	'UI:Datatables:Language:ZeroRecords'       => '未找到相关结果',
-	'UI:Datatables:Language:Info'              => '_TOTAL_ 项',
-	'UI:Datatables:Language:InfoEmpty'         => '未找到相关信息',
-	'UI:Datatables:Language:EmptyTable'        => '表格中暂无数据',
-	'UI:Datatables:Language:Error'             => '运行查询时出错',
+	'UI:Datatables:Language:Processing' => '请稍候...',
+	'UI:Datatables:Language:LengthMenu' => '_MENU_ 每页',
+	'UI:Datatables:Language:ZeroRecords' => '未找到相关结果',
+	'UI:Datatables:Language:Info' => '_TOTAL_ 项',
+	'UI:Datatables:Language:InfoEmpty' => '未找到相关信息',
+	'UI:Datatables:Language:EmptyTable' => '表格中暂无数据',
+	'UI:Datatables:Language:Error' => '运行查询时出错',
 	'UI:Datatables:Language:DisplayLength:All' => '全部',
-	'UI:Datatables:Language:Sort:Ascending'    => '采用顺序排序',
-	'UI:Datatables:Language:Sort:Descending'   => '采用倒序排序',
+	'UI:Datatables:Language:Sort:Ascending' => '采用顺序排序',
+	'UI:Datatables:Language:Sort:Descending' => '采用倒序排序',
+	'UI:Datatables:Column:RowActions:Label' => '~~',
+	'UI:Datatables:Column:RowActions:Description' => '~~',
+	'UI:Datatables:RowActions:ConfirmationDialog' => 'Action Confirmation~~',
+	'UI:Datatables:RowActions:ConfirmationMessage' => 'Do you confirm action ?~~',
 ));
\ No newline at end of file
diff --git a/dictionaries/ui/components/field/hu.dictionary.itop.field.php b/dictionaries/ui/components/field/hu.dictionary.itop.field.php
index 50237d0bc2..200f14f577 100644
--- a/dictionaries/ui/components/field/hu.dictionary.itop.field.php
+++ b/dictionaries/ui/components/field/hu.dictionary.itop.field.php
@@ -19,4 +19,4 @@
 // Global search
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'UI:Component:Field:BulkModify:UnknownValues:Tooltip' => 'Ismeretlen értékek',
-));
+));
\ No newline at end of file
diff --git a/dictionaries/ui/components/global-search/hu.dictionary.itop.global-search.php b/dictionaries/ui/components/global-search/hu.dictionary.itop.global-search.php
index b1c6500004..354bffb95b 100644
--- a/dictionaries/ui/components/global-search/hu.dictionary.itop.global-search.php
+++ b/dictionaries/ui/components/global-search/hu.dictionary.itop.global-search.php
@@ -24,4 +24,4 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'UI:Component:GlobalSearch:LastQueries:NoQuery:Placeholder' => 'Még nem futtatott semmilyen keresést',
 	'UI:Component:GlobalSearch:HistoryDisabled' => 'Az előzmények le lettek tiltva',
 	'UI:Component:GlobalSearch:KeyboardShortcut:OpenDrawer' => 'Globális keresés megnyitása',
-));
+));
\ No newline at end of file
diff --git a/dictionaries/ui/components/input/cs.dictionary.itop.input.php b/dictionaries/ui/components/input/cs.dictionary.itop.input.php
index 76cf7913a6..b302ac8512 100644
--- a/dictionaries/ui/components/input/cs.dictionary.itop.input.php
+++ b/dictionaries/ui/components/input/cs.dictionary.itop.input.php
@@ -16,7 +16,6 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  */
-
 // Input
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'UI:Component:Input:Password:DoesNotMatch' => 'Passwords do not match~~',
diff --git a/dictionaries/ui/components/input/da.dictionary.itop.input.php b/dictionaries/ui/components/input/da.dictionary.itop.input.php
index b210e442d3..2dd2920426 100644
--- a/dictionaries/ui/components/input/da.dictionary.itop.input.php
+++ b/dictionaries/ui/components/input/da.dictionary.itop.input.php
@@ -16,7 +16,6 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  */
-
 // Input
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'UI:Component:Input:Password:DoesNotMatch' => 'Passwords do not match~~',
diff --git a/dictionaries/ui/components/input/de.dictionary.itop.input.php b/dictionaries/ui/components/input/de.dictionary.itop.input.php
index e670f3d0ef..0dc7da934f 100644
--- a/dictionaries/ui/components/input/de.dictionary.itop.input.php
+++ b/dictionaries/ui/components/input/de.dictionary.itop.input.php
@@ -16,8 +16,7 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  */
-
 // Input
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'UI:Component:Input:Password:DoesNotMatch' => 'Passwörter stimmen nicht überein',
-));
+));
\ No newline at end of file
diff --git a/dictionaries/ui/components/input/es_cr.dictionary.itop.input.php b/dictionaries/ui/components/input/es_cr.dictionary.itop.input.php
index 84808c3e40..b7163dcf80 100644
--- a/dictionaries/ui/components/input/es_cr.dictionary.itop.input.php
+++ b/dictionaries/ui/components/input/es_cr.dictionary.itop.input.php
@@ -16,7 +16,6 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  */
-
 // Input
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'UI:Component:Input:Password:DoesNotMatch' => 'No coincide la contraseña',
diff --git a/dictionaries/ui/components/input/fr.dictionary.itop.input.php b/dictionaries/ui/components/input/fr.dictionary.itop.input.php
index 29711cc40e..a8188b519e 100644
--- a/dictionaries/ui/components/input/fr.dictionary.itop.input.php
+++ b/dictionaries/ui/components/input/fr.dictionary.itop.input.php
@@ -16,7 +16,6 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  */
-
 // Input
 Dict::Add('FR FR', 'French', 'Français', array(
 	'UI:Component:Input:Password:DoesNotMatch' => 'Passwords do not match~~',
diff --git a/dictionaries/ui/components/input/hu.dictionary.itop.input.php b/dictionaries/ui/components/input/hu.dictionary.itop.input.php
index e19fda029c..5dc7486798 100644
--- a/dictionaries/ui/components/input/hu.dictionary.itop.input.php
+++ b/dictionaries/ui/components/input/hu.dictionary.itop.input.php
@@ -16,8 +16,7 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  */
-
 // Input
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'UI:Component:Input:Password:DoesNotMatch' => 'A jelszavak nem egyeznek',
-));
+));
\ No newline at end of file
diff --git a/dictionaries/ui/components/input/it.dictionary.itop.input.php b/dictionaries/ui/components/input/it.dictionary.itop.input.php
index 239d8b0a87..3fdafbbd2b 100644
--- a/dictionaries/ui/components/input/it.dictionary.itop.input.php
+++ b/dictionaries/ui/components/input/it.dictionary.itop.input.php
@@ -16,7 +16,6 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  */
-
 // Input
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'UI:Component:Input:Password:DoesNotMatch' => 'Passwords do not match~~',
diff --git a/dictionaries/ui/components/input/ja.dictionary.itop.input.php b/dictionaries/ui/components/input/ja.dictionary.itop.input.php
index b1adfd4e71..d0a3ece050 100644
--- a/dictionaries/ui/components/input/ja.dictionary.itop.input.php
+++ b/dictionaries/ui/components/input/ja.dictionary.itop.input.php
@@ -16,7 +16,6 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  */
-
 // Input
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'UI:Component:Input:Password:DoesNotMatch' => 'Passwords do not match~~',
diff --git a/dictionaries/ui/components/input/nl.dictionary.itop.input.php b/dictionaries/ui/components/input/nl.dictionary.itop.input.php
index a9261eff14..d5ed026f65 100644
--- a/dictionaries/ui/components/input/nl.dictionary.itop.input.php
+++ b/dictionaries/ui/components/input/nl.dictionary.itop.input.php
@@ -16,7 +16,6 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  */
-
 // Input
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'UI:Component:Input:Password:DoesNotMatch' => 'Wachtwoorden komen niet overeen',
diff --git a/dictionaries/ui/components/input/pt_br.dictionary.itop.input.php b/dictionaries/ui/components/input/pt_br.dictionary.itop.input.php
index 7c72f30df5..0a2056c7c3 100644
--- a/dictionaries/ui/components/input/pt_br.dictionary.itop.input.php
+++ b/dictionaries/ui/components/input/pt_br.dictionary.itop.input.php
@@ -16,7 +16,6 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  */
-
 // Input
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'UI:Component:Input:Password:DoesNotMatch' => 'Senhas não correspondem',
diff --git a/dictionaries/ui/components/input/ru.dictionary.itop.input.php b/dictionaries/ui/components/input/ru.dictionary.itop.input.php
index 79dec6721c..566f11d1d1 100644
--- a/dictionaries/ui/components/input/ru.dictionary.itop.input.php
+++ b/dictionaries/ui/components/input/ru.dictionary.itop.input.php
@@ -16,7 +16,6 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  */
-
 // Input
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'UI:Component:Input:Password:DoesNotMatch' => 'Passwords do not match~~',
diff --git a/dictionaries/ui/components/input/sk.dictionary.itop.input.php b/dictionaries/ui/components/input/sk.dictionary.itop.input.php
index 8b86edb510..210e6a35f5 100644
--- a/dictionaries/ui/components/input/sk.dictionary.itop.input.php
+++ b/dictionaries/ui/components/input/sk.dictionary.itop.input.php
@@ -16,7 +16,6 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  */
-
 // Input
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'UI:Component:Input:Password:DoesNotMatch' => 'Passwords do not match~~',
diff --git a/dictionaries/ui/components/input/tr.dictionary.itop.input.php b/dictionaries/ui/components/input/tr.dictionary.itop.input.php
index f9508eb90e..d6a2d60450 100644
--- a/dictionaries/ui/components/input/tr.dictionary.itop.input.php
+++ b/dictionaries/ui/components/input/tr.dictionary.itop.input.php
@@ -16,7 +16,6 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  */
-
 // Input
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'UI:Component:Input:Password:DoesNotMatch' => 'Passwords do not match~~',
diff --git a/dictionaries/ui/components/input/zh_cn.dictionary.itop.input.php b/dictionaries/ui/components/input/zh_cn.dictionary.itop.input.php
index f98db5f373..98b6443faa 100644
--- a/dictionaries/ui/components/input/zh_cn.dictionary.itop.input.php
+++ b/dictionaries/ui/components/input/zh_cn.dictionary.itop.input.php
@@ -16,7 +16,6 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  */
-
 // Input
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'UI:Component:Input:Password:DoesNotMatch' => '密码不匹配',
diff --git a/dictionaries/ui/components/modal/cs.dictionary.itop.modal.php b/dictionaries/ui/components/modal/cs.dictionary.itop.modal.php
new file mode 100644
index 0000000000..a02f74b5b1
--- /dev/null
+++ b/dictionaries/ui/components/modal/cs.dictionary.itop.modal.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+Dict::Add('CS CZ', 'Czech', 'Čeština', array(
+	'UI:Modal:Confirmation:DefaultTitle' => 'Confirmation~~',
+	'UI:Modal:Informative:Title' => 'Informative Modal~~',
+	'UI:Modal:InformativeError:Title' => 'Error~~',
+	'UI:Modal:InformativeWarning:Title' => 'Warning~~',
+	'UI:Modal:InformativeInformation:Title' => 'Information~~',
+	'UI:Modal:InformativeSuccess:Title' => 'Success~~',
+));
\ No newline at end of file
diff --git a/dictionaries/ui/components/modal/da.dictionary.itop.modal.php b/dictionaries/ui/components/modal/da.dictionary.itop.modal.php
new file mode 100644
index 0000000000..6deb1e766a
--- /dev/null
+++ b/dictionaries/ui/components/modal/da.dictionary.itop.modal.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+Dict::Add('DA DA', 'Danish', 'Dansk', array(
+	'UI:Modal:Confirmation:DefaultTitle' => 'Confirmation~~',
+	'UI:Modal:Informative:Title' => 'Informative Modal~~',
+	'UI:Modal:InformativeError:Title' => 'Error~~',
+	'UI:Modal:InformativeWarning:Title' => 'Warning~~',
+	'UI:Modal:InformativeInformation:Title' => 'Information~~',
+	'UI:Modal:InformativeSuccess:Title' => 'Success~~',
+));
\ No newline at end of file
diff --git a/dictionaries/ui/components/modal/de.dictionary.itop.modal.php b/dictionaries/ui/components/modal/de.dictionary.itop.modal.php
new file mode 100644
index 0000000000..29e4b6fa89
--- /dev/null
+++ b/dictionaries/ui/components/modal/de.dictionary.itop.modal.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'UI:Modal:Confirmation:DefaultTitle' => 'Bestätigung',
+	'UI:Modal:Informative:Title' => 'Informations-Modal',
+	'UI:Modal:InformativeError:Title' => 'Fehler',
+	'UI:Modal:InformativeWarning:Title' => 'Warnung',
+	'UI:Modal:InformativeInformation:Title' => 'Information',
+	'UI:Modal:InformativeSuccess:Title' => 'Erfolgreich',
+));
\ No newline at end of file
diff --git a/dictionaries/ui/components/modal/es_cr.dictionary.itop.modal.php b/dictionaries/ui/components/modal/es_cr.dictionary.itop.modal.php
new file mode 100644
index 0000000000..f6be8195be
--- /dev/null
+++ b/dictionaries/ui/components/modal/es_cr.dictionary.itop.modal.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
+	'UI:Modal:Confirmation:DefaultTitle' => 'Confirmation~~',
+	'UI:Modal:Informative:Title' => 'Informative Modal~~',
+	'UI:Modal:InformativeError:Title' => 'Error~~',
+	'UI:Modal:InformativeWarning:Title' => 'Warning~~',
+	'UI:Modal:InformativeInformation:Title' => 'Information~~',
+	'UI:Modal:InformativeSuccess:Title' => 'Success~~',
+));
\ No newline at end of file
diff --git a/dictionaries/ui/components/modal/fr.dictionary.itop.modal.php b/dictionaries/ui/components/modal/fr.dictionary.itop.modal.php
index b4d8b6caa6..9236800ca1 100644
--- a/dictionaries/ui/components/modal/fr.dictionary.itop.modal.php
+++ b/dictionaries/ui/components/modal/fr.dictionary.itop.modal.php
@@ -16,12 +16,12 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  */
-
 Dict::Add('FR FR', 'French', 'Français', array(
+	'UI:Modal:Confirmation:DefaultTitle' => 'Confirmation~~',
 	'UI:Modal:DefaultConfirmationTitle' => 'Confirmation',
 	'UI:Modal:Informative:Title' => 'Modale d\'information',
 	'UI:Modal:InformativeError:Title' => 'Erreur',
 	'UI:Modal:InformativeWarning:Title' => 'Avertissement',
 	'UI:Modal:InformativeInformation:Title' => 'Information',
-	'UI:Modal:InformativeSuccess:Title' => 'Succès',
+	'UI:Modal:InformativeSuccess:Title' => 'Succès'
 ));
\ No newline at end of file
diff --git a/dictionaries/ui/components/modal/hu.dictionary.itop.modal.php b/dictionaries/ui/components/modal/hu.dictionary.itop.modal.php
new file mode 100644
index 0000000000..6fc4c7c447
--- /dev/null
+++ b/dictionaries/ui/components/modal/hu.dictionary.itop.modal.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
+	'UI:Modal:Confirmation:DefaultTitle' => 'Confirmation~~',
+	'UI:Modal:Informative:Title' => 'Informative Modal~~',
+	'UI:Modal:InformativeError:Title' => 'Error~~',
+	'UI:Modal:InformativeWarning:Title' => 'Warning~~',
+	'UI:Modal:InformativeInformation:Title' => 'Information~~',
+	'UI:Modal:InformativeSuccess:Title' => 'Success~~',
+));
\ No newline at end of file
diff --git a/dictionaries/ui/components/modal/it.dictionary.itop.modal.php b/dictionaries/ui/components/modal/it.dictionary.itop.modal.php
new file mode 100644
index 0000000000..df7b89677c
--- /dev/null
+++ b/dictionaries/ui/components/modal/it.dictionary.itop.modal.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'UI:Modal:Confirmation:DefaultTitle' => 'Confirmation~~',
+	'UI:Modal:Informative:Title' => 'Informative Modal~~',
+	'UI:Modal:InformativeError:Title' => 'Error~~',
+	'UI:Modal:InformativeWarning:Title' => 'Warning~~',
+	'UI:Modal:InformativeInformation:Title' => 'Information~~',
+	'UI:Modal:InformativeSuccess:Title' => 'Success~~',
+));
\ No newline at end of file
diff --git a/dictionaries/ui/components/modal/ja.dictionary.itop.modal.php b/dictionaries/ui/components/modal/ja.dictionary.itop.modal.php
new file mode 100644
index 0000000000..dcc3100bfb
--- /dev/null
+++ b/dictionaries/ui/components/modal/ja.dictionary.itop.modal.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'UI:Modal:Confirmation:DefaultTitle' => 'Confirmation~~',
+	'UI:Modal:Informative:Title' => 'Informative Modal~~',
+	'UI:Modal:InformativeError:Title' => 'Error~~',
+	'UI:Modal:InformativeWarning:Title' => 'Warning~~',
+	'UI:Modal:InformativeInformation:Title' => 'Information~~',
+	'UI:Modal:InformativeSuccess:Title' => 'Success~~',
+));
\ No newline at end of file
diff --git a/dictionaries/ui/components/modal/nl.dictionary.itop.modal.php b/dictionaries/ui/components/modal/nl.dictionary.itop.modal.php
new file mode 100644
index 0000000000..ccb5d5ee0d
--- /dev/null
+++ b/dictionaries/ui/components/modal/nl.dictionary.itop.modal.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'UI:Modal:Confirmation:DefaultTitle' => 'Confirmation~~',
+	'UI:Modal:Informative:Title' => 'Informative Modal~~',
+	'UI:Modal:InformativeError:Title' => 'Error~~',
+	'UI:Modal:InformativeWarning:Title' => 'Warning~~',
+	'UI:Modal:InformativeInformation:Title' => 'Information~~',
+	'UI:Modal:InformativeSuccess:Title' => 'Success~~',
+));
\ No newline at end of file
diff --git a/dictionaries/ui/components/modal/pl.dictionary.itop.modal.php b/dictionaries/ui/components/modal/pl.dictionary.itop.modal.php
new file mode 100644
index 0000000000..f30ef3fd76
--- /dev/null
+++ b/dictionaries/ui/components/modal/pl.dictionary.itop.modal.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+Dict::Add('PL PL', 'Polish', 'Polski', array(
+	'UI:Modal:Confirmation:DefaultTitle' => 'Confirmation~~',
+	'UI:Modal:Informative:Title' => 'Informative Modal~~',
+	'UI:Modal:InformativeError:Title' => 'Error~~',
+	'UI:Modal:InformativeWarning:Title' => 'Warning~~',
+	'UI:Modal:InformativeInformation:Title' => 'Information~~',
+	'UI:Modal:InformativeSuccess:Title' => 'Success~~',
+));
\ No newline at end of file
diff --git a/dictionaries/ui/components/modal/pt_br.dictionary.itop.modal.php b/dictionaries/ui/components/modal/pt_br.dictionary.itop.modal.php
new file mode 100644
index 0000000000..6f349263d5
--- /dev/null
+++ b/dictionaries/ui/components/modal/pt_br.dictionary.itop.modal.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'UI:Modal:Confirmation:DefaultTitle' => 'Confirmation~~',
+	'UI:Modal:Informative:Title' => 'Informative Modal~~',
+	'UI:Modal:InformativeError:Title' => 'Error~~',
+	'UI:Modal:InformativeWarning:Title' => 'Warning~~',
+	'UI:Modal:InformativeInformation:Title' => 'Information~~',
+	'UI:Modal:InformativeSuccess:Title' => 'Success~~',
+));
\ No newline at end of file
diff --git a/dictionaries/ui/components/modal/ru.dictionary.itop.modal.php b/dictionaries/ui/components/modal/ru.dictionary.itop.modal.php
new file mode 100644
index 0000000000..fbbd4bb6e1
--- /dev/null
+++ b/dictionaries/ui/components/modal/ru.dictionary.itop.modal.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+Dict::Add('RU RU', 'Russian', 'Русский', array(
+	'UI:Modal:Confirmation:DefaultTitle' => 'Confirmation~~',
+	'UI:Modal:Informative:Title' => 'Informative Modal~~',
+	'UI:Modal:InformativeError:Title' => 'Error~~',
+	'UI:Modal:InformativeWarning:Title' => 'Warning~~',
+	'UI:Modal:InformativeInformation:Title' => 'Information~~',
+	'UI:Modal:InformativeSuccess:Title' => 'Success~~',
+));
\ No newline at end of file
diff --git a/dictionaries/ui/components/modal/sk.dictionary.itop.modal.php b/dictionaries/ui/components/modal/sk.dictionary.itop.modal.php
new file mode 100644
index 0000000000..22165e23d7
--- /dev/null
+++ b/dictionaries/ui/components/modal/sk.dictionary.itop.modal.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
+	'UI:Modal:Confirmation:DefaultTitle' => 'Confirmation~~',
+	'UI:Modal:Informative:Title' => 'Informative Modal~~',
+	'UI:Modal:InformativeError:Title' => 'Error~~',
+	'UI:Modal:InformativeWarning:Title' => 'Warning~~',
+	'UI:Modal:InformativeInformation:Title' => 'Information~~',
+	'UI:Modal:InformativeSuccess:Title' => 'Success~~',
+));
\ No newline at end of file
diff --git a/dictionaries/ui/components/modal/tr.dictionary.itop.modal.php b/dictionaries/ui/components/modal/tr.dictionary.itop.modal.php
new file mode 100644
index 0000000000..29a53caebb
--- /dev/null
+++ b/dictionaries/ui/components/modal/tr.dictionary.itop.modal.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'UI:Modal:Confirmation:DefaultTitle' => 'Confirmation~~',
+	'UI:Modal:Informative:Title' => 'Informative Modal~~',
+	'UI:Modal:InformativeError:Title' => 'Error~~',
+	'UI:Modal:InformativeWarning:Title' => 'Warning~~',
+	'UI:Modal:InformativeInformation:Title' => 'Information~~',
+	'UI:Modal:InformativeSuccess:Title' => 'Success~~',
+));
\ No newline at end of file
diff --git a/dictionaries/ui/components/modal/zh_cn.dictionary.itop.modal.php b/dictionaries/ui/components/modal/zh_cn.dictionary.itop.modal.php
new file mode 100644
index 0000000000..dbd5cac0c6
--- /dev/null
+++ b/dictionaries/ui/components/modal/zh_cn.dictionary.itop.modal.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'UI:Modal:Confirmation:DefaultTitle' => 'Confirmation~~',
+	'UI:Modal:Informative:Title' => 'Informative Modal~~',
+	'UI:Modal:InformativeError:Title' => 'Error~~',
+	'UI:Modal:InformativeWarning:Title' => 'Warning~~',
+	'UI:Modal:InformativeInformation:Title' => 'Information~~',
+	'UI:Modal:InformativeSuccess:Title' => 'Success~~',
+));
\ No newline at end of file
diff --git a/dictionaries/ui/components/quick-create/hu.dictionary.itop.quick-create.php b/dictionaries/ui/components/quick-create/hu.dictionary.itop.quick-create.php
index c24485546e..cdfe1943d5 100644
--- a/dictionaries/ui/components/quick-create/hu.dictionary.itop.quick-create.php
+++ b/dictionaries/ui/components/quick-create/hu.dictionary.itop.quick-create.php
@@ -24,4 +24,4 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'UI:Component:QuickCreate:LastClasses:NoClass:Placeholder' => 'Még nem hozott létre objektumot',
 	'UI:Component:QuickCreate:HistoryDisabled' => 'Az előzmények le lettek tiltva',
 	'UI:Component:QuickCreate:KeyboardShortcut:OpenDrawer' => 'Gyors létrehozás megnyitása',
-));
+));
\ No newline at end of file
diff --git a/dictionaries/ui/layouts/activity-panel/hu.dictionary.itop.activity-panel.php b/dictionaries/ui/layouts/activity-panel/hu.dictionary.itop.activity-panel.php
index 15b129cdd4..ad4e7efa86 100644
--- a/dictionaries/ui/layouts/activity-panel/hu.dictionary.itop.activity-panel.php
+++ b/dictionaries/ui/layouts/activity-panel/hu.dictionary.itop.activity-panel.php
@@ -50,9 +50,9 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'UI:Layout:ActivityPanel:NotificationEntry:MessageLink:Tooltip' => 'Kattintson a gombra az értesítések tábla megnyitásához és további információkért.',
 
 	// Placeholder
-    'UI:Layout:ActivityPanel:NoEntry:Placeholder:Hint' => 'Itt nyugalom van, még nincs aktivitás.',
+	'UI:Layout:ActivityPanel:NoEntry:Placeholder:Hint' => 'Itt nyugalom van, még nincs aktivitás.',
 
 	// Closed cover
 	'UI:Layout:ActivityPanel:ClosedCover:Title' => 'Tevékenység panel',
 	'UI:Layout:ActivityPanel:ClosedCover:Tooltip' => 'Kattintson a gombra a tevékenység panel megnyitásához',
-));
+));
\ No newline at end of file
diff --git a/dictionaries/ui/layouts/navigation-menu/de.dictionary.itop.navigation-menu.php b/dictionaries/ui/layouts/navigation-menu/de.dictionary.itop.navigation-menu.php
index 3abf226aa7..b2e0c3e51f 100644
--- a/dictionaries/ui/layouts/navigation-menu/de.dictionary.itop.navigation-menu.php
+++ b/dictionaries/ui/layouts/navigation-menu/de.dictionary.itop.navigation-menu.php
@@ -31,4 +31,4 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'UI:Layout:NavigationMenu:UserMenu:Toggler:Label' => 'Benutzermenü öffnen',
 	'UI:Layout:NavigationMenu:KeyboardShortcut:FocusFilter' => 'Filtere Menüeinträge',
 
-));
+));
\ No newline at end of file
diff --git a/dictionaries/ui/layouts/navigation-menu/hu.dictionary.itop.navigation-menu.php b/dictionaries/ui/layouts/navigation-menu/hu.dictionary.itop.navigation-menu.php
index e868278d4e..d44e595cb5 100644
--- a/dictionaries/ui/layouts/navigation-menu/hu.dictionary.itop.navigation-menu.php
+++ b/dictionaries/ui/layouts/navigation-menu/hu.dictionary.itop.navigation-menu.php
@@ -26,9 +26,9 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'UI:Layout:NavigationMenu:MenuFilter:Input:Tooltip' => 'Írja be a kulcsszavakat a menük szűréséhez',
 	'UI:Layout:NavigationMenu:MenuFilter:Input:Hint' => 'Az összes menücsoport találatai megjelennek',
 	'UI:Layout:NavigationMenu:MenuFilter:Placeholder:Hint' => 'Nincs eredmény erre a menüszűrőre',
-    'UI:Layout:NavigationMenu:UserInfo:WelcomeMessage:Text' => 'Üdv, %1$s!',
+	'UI:Layout:NavigationMenu:UserInfo:WelcomeMessage:Text' => 'Üdv, %1$s!',
 	'UI:Layout:NavigationMenu:UserInfo:Picture:AltText' => '%1$s névjegyképe',
 	'UI:Layout:NavigationMenu:UserMenu:Toggler:Label' => 'Felhasználói menü megnyitása',
 	'UI:Layout:NavigationMenu:KeyboardShortcut:FocusFilter' => 'Menüpontok szűrése',
 
-));
+));
\ No newline at end of file
diff --git a/dictionaries/ui/layouts/navigation-menu/ru.dictionary.itop.navigation-menu.php b/dictionaries/ui/layouts/navigation-menu/ru.dictionary.itop.navigation-menu.php
index f24dd71a24..cef82bfc05 100755
--- a/dictionaries/ui/layouts/navigation-menu/ru.dictionary.itop.navigation-menu.php
+++ b/dictionaries/ui/layouts/navigation-menu/ru.dictionary.itop.navigation-menu.php
@@ -30,4 +30,5 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'UI:Layout:NavigationMenu:UserInfo:Picture:AltText' => 'Фотография',
 	'UI:Layout:NavigationMenu:UserMenu:Toggler:Label' => 'Open user menu~~',
 	'UI:Layout:NavigationMenu:KeyboardShortcut:FocusFilter' => 'Фильтр пунктов меню',
+
 ));
\ No newline at end of file
diff --git a/dictionaries/ui/layouts/navigation-menu/zh_cn.dictionary.itop.navigation-menu.php b/dictionaries/ui/layouts/navigation-menu/zh_cn.dictionary.itop.navigation-menu.php
index 8d0f6e6aad..32ee12c6ce 100644
--- a/dictionaries/ui/layouts/navigation-menu/zh_cn.dictionary.itop.navigation-menu.php
+++ b/dictionaries/ui/layouts/navigation-menu/zh_cn.dictionary.itop.navigation-menu.php
@@ -19,16 +19,16 @@
 // Navigation menu
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'UI:Layout:NavigationMenu:CompanyLogo:AltText' => '公司logo',
-	'UI:Layout:NavigationMenu:Silo:Label' => '请选择要过滤的组织',
+	'UI:Layout:NavigationMenu:Silo:Label' => '请选择要筛选的组织',
 	'UI:Layout:NavigationMenu:Toggler:Tooltip' => '展开/折叠',
-	'UI:Layout:NavigationMenu:Toggler:TooltipWithSiloLabel' => '展开/折叠 (过滤在 %1$s)',
-	'UI:Layout:NavigationMenu:MenuFilter:Input:Placeholder' => '过滤器...',
-	'UI:Layout:NavigationMenu:MenuFilter:Input:Tooltip' => '请输入要过滤的关键字',
+	'UI:Layout:NavigationMenu:Toggler:TooltipWithSiloLabel' => '展开/折叠 (筛选 %1$s)',
+	'UI:Layout:NavigationMenu:MenuFilter:Input:Placeholder' => '筛选器...',
+	'UI:Layout:NavigationMenu:MenuFilter:Input:Tooltip' => '请输入要筛选的关键字',
 	'UI:Layout:NavigationMenu:MenuFilter:Input:Hint' => '将会显示所有匹配的菜单',
-	'UI:Layout:NavigationMenu:MenuFilter:Placeholder:Hint' => '此菜单暂无过滤结果',
+	'UI:Layout:NavigationMenu:MenuFilter:Placeholder:Hint' => '此菜单暂无筛选结果',
 	'UI:Layout:NavigationMenu:UserInfo:WelcomeMessage:Text' => 'Hi %1$s!',
 	'UI:Layout:NavigationMenu:UserInfo:Picture:AltText' => '%1$s 的联系人头像',
 	'UI:Layout:NavigationMenu:UserMenu:Toggler:Label' => '打开用户菜单',
-	'UI:Layout:NavigationMenu:KeyboardShortcut:FocusFilter' => '过滤菜单',
+	'UI:Layout:NavigationMenu:KeyboardShortcut:FocusFilter' => '筛选菜单',
 
 ));
\ No newline at end of file
diff --git a/dictionaries/ui/layouts/object-details/cs.dictionary.itop.object-details.php b/dictionaries/ui/layouts/object-details/cs.dictionary.itop.object-details.php
index 1c2dfcd859..14ab9d9f04 100644
--- a/dictionaries/ui/layouts/object-details/cs.dictionary.itop.object-details.php
+++ b/dictionaries/ui/layouts/object-details/cs.dictionary.itop.object-details.php
@@ -8,4 +8,5 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', [
 	'UI:Layout:ObjectDetails:KeyboardShortcut:DeleteObject' => 'Delete displayed object~~',
 	'UI:Layout:ObjectDetails:KeyboardShortcut:NewObject' => 'Create a new object (with same class as displayed object)~~',
 	'UI:Layout:ObjectDetails:KeyboardShortcut:SaveObject' => 'Save displayed object~~',
+	'UI:Layout:ObjectDetails:New:Modal:Title' => 'Creation of an object~~',
 ]);
diff --git a/dictionaries/ui/layouts/object-details/da.dictionary.itop.object-details.php b/dictionaries/ui/layouts/object-details/da.dictionary.itop.object-details.php
index df4bd0698f..3e490f5541 100644
--- a/dictionaries/ui/layouts/object-details/da.dictionary.itop.object-details.php
+++ b/dictionaries/ui/layouts/object-details/da.dictionary.itop.object-details.php
@@ -8,4 +8,5 @@ Dict::Add('DA DA', 'Danish', 'Dansk', [
 	'UI:Layout:ObjectDetails:KeyboardShortcut:DeleteObject' => 'Delete displayed object~~',
 	'UI:Layout:ObjectDetails:KeyboardShortcut:NewObject' => 'Create a new object (with same class as displayed object)~~',
 	'UI:Layout:ObjectDetails:KeyboardShortcut:SaveObject' => 'Save displayed object~~',
+	'UI:Layout:ObjectDetails:New:Modal:Title' => 'Creation of an object~~',
 ]);
diff --git a/dictionaries/ui/layouts/object-details/de.dictionary.itop.object-details.php b/dictionaries/ui/layouts/object-details/de.dictionary.itop.object-details.php
index 1ee70ccd26..88984c8066 100644
--- a/dictionaries/ui/layouts/object-details/de.dictionary.itop.object-details.php
+++ b/dictionaries/ui/layouts/object-details/de.dictionary.itop.object-details.php
@@ -8,4 +8,5 @@ Dict::Add('DE DE', 'German', 'Deutsch', [
 	'UI:Layout:ObjectDetails:KeyboardShortcut:DeleteObject' => 'Lösche das angezeigte Objekt',
 	'UI:Layout:ObjectDetails:KeyboardShortcut:NewObject' => 'Erzeuge eine neues Objekt (der gleichen Klasse, wie das angezeigte Objekt)',
 	'UI:Layout:ObjectDetails:KeyboardShortcut:SaveObject' => 'Speichere das angezeigte Objekt',
+	'UI:Layout:ObjectDetails:New:Modal:Title' => 'Erstellung eines Objekts',
 ]);
diff --git a/dictionaries/ui/layouts/object-details/es_cr.dictionary.itop.object-details.php b/dictionaries/ui/layouts/object-details/es_cr.dictionary.itop.object-details.php
index 7c41833523..0d0ab9d2c5 100644
--- a/dictionaries/ui/layouts/object-details/es_cr.dictionary.itop.object-details.php
+++ b/dictionaries/ui/layouts/object-details/es_cr.dictionary.itop.object-details.php
@@ -8,4 +8,5 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'UI:Layout:ObjectDetails:KeyboardShortcut:DeleteObject' => 'Borrar objeto mostrado',
 	'UI:Layout:ObjectDetails:KeyboardShortcut:NewObject' => 'Crear un nuevo objeto (con la misma clase que el objeto mostrado)',
 	'UI:Layout:ObjectDetails:KeyboardShortcut:SaveObject' => 'Guardar objeto mostrado',
-]);
\ No newline at end of file
+	'UI:Layout:ObjectDetails:New:Modal:Title' => 'Creation of an object~~',
+]);
diff --git a/dictionaries/ui/layouts/object-details/hu.dictionary.itop.object-details.php b/dictionaries/ui/layouts/object-details/hu.dictionary.itop.object-details.php
index 956a3469cf..21de306ae6 100644
--- a/dictionaries/ui/layouts/object-details/hu.dictionary.itop.object-details.php
+++ b/dictionaries/ui/layouts/object-details/hu.dictionary.itop.object-details.php
@@ -4,8 +4,9 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 Dict::Add('HU HU', 'Hungarian', 'Magyar', [
-    'UI:Layout:ObjectDetails:KeyboardShortcut:EditObject' => 'Megjelenített objektum szerkesztése',
+	'UI:Layout:ObjectDetails:KeyboardShortcut:EditObject' => 'Megjelenített objektum szerkesztése',
 	'UI:Layout:ObjectDetails:KeyboardShortcut:DeleteObject' => 'Megjelenített objektum törlése',
 	'UI:Layout:ObjectDetails:KeyboardShortcut:NewObject' => 'Új objektum létrehozása (a megjelenített objektummal azonos osztályú)',
-    'UI:Layout:ObjectDetails:KeyboardShortcut:SaveObject' => 'Megjelenített objektum mentése',
+	'UI:Layout:ObjectDetails:KeyboardShortcut:SaveObject' => 'Megjelenített objektum mentése',
+	'UI:Layout:ObjectDetails:New:Modal:Title' => 'Creation of an object~~',
 ]);
diff --git a/dictionaries/ui/layouts/object-details/it.dictionary.itop.object-details.php b/dictionaries/ui/layouts/object-details/it.dictionary.itop.object-details.php
index 0c39f1ffc4..144275bdec 100644
--- a/dictionaries/ui/layouts/object-details/it.dictionary.itop.object-details.php
+++ b/dictionaries/ui/layouts/object-details/it.dictionary.itop.object-details.php
@@ -8,4 +8,5 @@ Dict::Add('IT IT', 'Italian', 'Italiano', [
 	'UI:Layout:ObjectDetails:KeyboardShortcut:DeleteObject' => 'Delete displayed object~~',
 	'UI:Layout:ObjectDetails:KeyboardShortcut:NewObject' => 'Create a new object (with same class as displayed object)~~',
 	'UI:Layout:ObjectDetails:KeyboardShortcut:SaveObject' => 'Save displayed object~~',
+	'UI:Layout:ObjectDetails:New:Modal:Title' => 'Creation of an object~~',
 ]);
diff --git a/dictionaries/ui/layouts/object-details/ja.dictionary.itop.object-details.php b/dictionaries/ui/layouts/object-details/ja.dictionary.itop.object-details.php
index 2d7de800d6..aa1d1a03c5 100644
--- a/dictionaries/ui/layouts/object-details/ja.dictionary.itop.object-details.php
+++ b/dictionaries/ui/layouts/object-details/ja.dictionary.itop.object-details.php
@@ -8,4 +8,5 @@ Dict::Add('JA JP', 'Japanese', '日本語', [
 	'UI:Layout:ObjectDetails:KeyboardShortcut:DeleteObject' => 'Delete displayed object~~',
 	'UI:Layout:ObjectDetails:KeyboardShortcut:NewObject' => 'Create a new object (with same class as displayed object)~~',
 	'UI:Layout:ObjectDetails:KeyboardShortcut:SaveObject' => 'Save displayed object~~',
+	'UI:Layout:ObjectDetails:New:Modal:Title' => 'Creation of an object~~',
 ]);
diff --git a/dictionaries/ui/layouts/object-details/nl.dictionary.itop.object-details.php b/dictionaries/ui/layouts/object-details/nl.dictionary.itop.object-details.php
index 7ab525d7f5..77783b7181 100644
--- a/dictionaries/ui/layouts/object-details/nl.dictionary.itop.object-details.php
+++ b/dictionaries/ui/layouts/object-details/nl.dictionary.itop.object-details.php
@@ -8,4 +8,5 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', [
 	'UI:Layout:ObjectDetails:KeyboardShortcut:DeleteObject' => 'Verwijder huidig object',
 	'UI:Layout:ObjectDetails:KeyboardShortcut:NewObject' => 'Maak een nieuw object (van dezelfde klasse als het getoonde object)',
 	'UI:Layout:ObjectDetails:KeyboardShortcut:SaveObject' => 'Bewaar huidig object',
+	'UI:Layout:ObjectDetails:New:Modal:Title' => 'Creation of an object~~',
 ]);
diff --git a/dictionaries/ui/layouts/object-details/pl.dictionary.itop.object-details.php b/dictionaries/ui/layouts/object-details/pl.dictionary.itop.object-details.php
index 99bf654eeb..ac1562b337 100644
--- a/dictionaries/ui/layouts/object-details/pl.dictionary.itop.object-details.php
+++ b/dictionaries/ui/layouts/object-details/pl.dictionary.itop.object-details.php
@@ -8,4 +8,5 @@ Dict::Add('PL PL', 'Polish', 'Polski', [
 	'UI:Layout:ObjectDetails:KeyboardShortcut:DeleteObject' => 'Usuń wyświetlany obiekt',
 	'UI:Layout:ObjectDetails:KeyboardShortcut:NewObject' => 'Utwórz nowy obiekt (z tą samą klasą co wyświetlany obiekt)',
 	'UI:Layout:ObjectDetails:KeyboardShortcut:SaveObject' => 'Zapisz wyświetlany obiekt',
+	'UI:Layout:ObjectDetails:New:Modal:Title' => 'Creation of an object~~',
 ]);
diff --git a/dictionaries/ui/layouts/object-details/pt_br.dictionary.itop.object-details.php b/dictionaries/ui/layouts/object-details/pt_br.dictionary.itop.object-details.php
index 01765a2838..638ac8778d 100644
--- a/dictionaries/ui/layouts/object-details/pt_br.dictionary.itop.object-details.php
+++ b/dictionaries/ui/layouts/object-details/pt_br.dictionary.itop.object-details.php
@@ -8,4 +8,5 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', [
 	'UI:Layout:ObjectDetails:KeyboardShortcut:DeleteObject' => 'Excluir objeto atual',
 	'UI:Layout:ObjectDetails:KeyboardShortcut:NewObject' => 'Criar um novo objeto (com a mesma classe do objeto atual)',
 	'UI:Layout:ObjectDetails:KeyboardShortcut:SaveObject' => 'Salvar objeto atual',
+	'UI:Layout:ObjectDetails:New:Modal:Title' => 'Creation of an object~~',
 ]);
diff --git a/dictionaries/ui/layouts/object-details/ru.dictionary.itop.object-details.php b/dictionaries/ui/layouts/object-details/ru.dictionary.itop.object-details.php
index 99a6babfeb..1ba45d1a47 100644
--- a/dictionaries/ui/layouts/object-details/ru.dictionary.itop.object-details.php
+++ b/dictionaries/ui/layouts/object-details/ru.dictionary.itop.object-details.php
@@ -8,4 +8,5 @@ Dict::Add('RU RU', 'Russian', 'Русский', [
 	'UI:Layout:ObjectDetails:KeyboardShortcut:DeleteObject' => 'Удалить просматриваемый объект',
 	'UI:Layout:ObjectDetails:KeyboardShortcut:NewObject' => 'Создать новый объект (того же класса, что и просматриваемый объект)',
 	'UI:Layout:ObjectDetails:KeyboardShortcut:SaveObject' => 'Сохранить просматриваемый объект',
+	'UI:Layout:ObjectDetails:New:Modal:Title' => 'Creation of an object~~',
 ]);
diff --git a/dictionaries/ui/layouts/object-details/sk.dictionary.itop.object-details.php b/dictionaries/ui/layouts/object-details/sk.dictionary.itop.object-details.php
index 8a67cf37b8..0b724dfdb4 100644
--- a/dictionaries/ui/layouts/object-details/sk.dictionary.itop.object-details.php
+++ b/dictionaries/ui/layouts/object-details/sk.dictionary.itop.object-details.php
@@ -8,4 +8,5 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', [
 	'UI:Layout:ObjectDetails:KeyboardShortcut:DeleteObject' => 'Delete displayed object~~',
 	'UI:Layout:ObjectDetails:KeyboardShortcut:NewObject' => 'Create a new object (with same class as displayed object)~~',
 	'UI:Layout:ObjectDetails:KeyboardShortcut:SaveObject' => 'Save displayed object~~',
+	'UI:Layout:ObjectDetails:New:Modal:Title' => 'Creation of an object~~',
 ]);
diff --git a/dictionaries/ui/layouts/object-details/tr.dictionary.itop.object-details.php b/dictionaries/ui/layouts/object-details/tr.dictionary.itop.object-details.php
index 993f891c9e..c5aff0bfbe 100644
--- a/dictionaries/ui/layouts/object-details/tr.dictionary.itop.object-details.php
+++ b/dictionaries/ui/layouts/object-details/tr.dictionary.itop.object-details.php
@@ -8,4 +8,5 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', [
 	'UI:Layout:ObjectDetails:KeyboardShortcut:DeleteObject' => 'Delete displayed object~~',
 	'UI:Layout:ObjectDetails:KeyboardShortcut:NewObject' => 'Create a new object (with same class as displayed object)~~',
 	'UI:Layout:ObjectDetails:KeyboardShortcut:SaveObject' => 'Save displayed object~~',
+	'UI:Layout:ObjectDetails:New:Modal:Title' => 'Creation of an object~~',
 ]);
diff --git a/dictionaries/ui/layouts/object-details/zh_cn.dictionary.itop.object-details.php b/dictionaries/ui/layouts/object-details/zh_cn.dictionary.itop.object-details.php
index c100f98993..f183aaf420 100644
--- a/dictionaries/ui/layouts/object-details/zh_cn.dictionary.itop.object-details.php
+++ b/dictionaries/ui/layouts/object-details/zh_cn.dictionary.itop.object-details.php
@@ -8,4 +8,5 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'UI:Layout:ObjectDetails:KeyboardShortcut:DeleteObject' => '删除当前对象',
 	'UI:Layout:ObjectDetails:KeyboardShortcut:NewObject' => '创建新对象 (与当前对象相同)',
 	'UI:Layout:ObjectDetails:KeyboardShortcut:SaveObject' => '保存当前对象',
+	'UI:Layout:ObjectDetails:New:Modal:Title' => 'Creation of an object~~',
 ]);
diff --git a/dictionaries/ui/layouts/page-content/es_cr.dictionary.itop.page-content.php b/dictionaries/ui/layouts/page-content/es_cr.dictionary.itop.page-content.php
index 3acdfe502b..d41edd0796 100644
--- a/dictionaries/ui/layouts/page-content/es_cr.dictionary.itop.page-content.php
+++ b/dictionaries/ui/layouts/page-content/es_cr.dictionary.itop.page-content.php
@@ -5,4 +5,4 @@
  */
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'UIBlock:Error:CannotGetBlocks' => 'No se pudieron recuperar bloques del área de contenido "%1$s", ya que parece existir para el contenido de la página "%2$s"',
-]);
\ No newline at end of file
+]);
diff --git a/dictionaries/ui/layouts/tab-container/es_cr.dictionary.itop.tab-container.php b/dictionaries/ui/layouts/tab-container/es_cr.dictionary.itop.tab-container.php
index d98c5ff327..b5146851a1 100644
--- a/dictionaries/ui/layouts/tab-container/es_cr.dictionary.itop.tab-container.php
+++ b/dictionaries/ui/layouts/tab-container/es_cr.dictionary.itop.tab-container.php
@@ -7,4 +7,4 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'UI:Layout:TabContainer:ExtraTabsListToggler:Label' => 'Otras pestañas',
 	'UIBlock:Error:AddBlockNotTabForbidden' => 'No se puede agregar el bloque %1$s a %2$s (solo se permiten bloques de pestañas)',
 	'UIBlock:TabContainer:RemoteTabLoad' => 'Dar click para cargar esta pestaña',
-]);
\ No newline at end of file
+]);
diff --git a/dictionaries/ui/layouts/ui-content-block/es_cr.dictionary.itop.ui-content-block.php b/dictionaries/ui/layouts/ui-content-block/es_cr.dictionary.itop.ui-content-block.php
index 31d831bcdd..085e2aa107 100644
--- a/dictionaries/ui/layouts/ui-content-block/es_cr.dictionary.itop.ui-content-block.php
+++ b/dictionaries/ui/layouts/ui-content-block/es_cr.dictionary.itop.ui-content-block.php
@@ -5,4 +5,4 @@
  */
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'UIBlock:Error:AddBlockForbidden' => 'No se puede agregar bloque a %1$s',
-]);
\ No newline at end of file
+]);
diff --git a/dictionaries/ui/pages/errorpage/hu.dictionary.itop.errorpage.php b/dictionaries/ui/pages/errorpage/hu.dictionary.itop.errorpage.php
index d8536135c9..d61ae8c760 100644
--- a/dictionaries/ui/pages/errorpage/hu.dictionary.itop.errorpage.php
+++ b/dictionaries/ui/pages/errorpage/hu.dictionary.itop.errorpage.php
@@ -22,4 +22,4 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'UI:ErrorPage:KittyDisclaimer' => 'Egyetlen cica sem sérült meg ennek a GIF-nek a készítése és kiadása során.
 
 - The R&amp;D Team~~',
-));
+));
\ No newline at end of file
diff --git a/dictionaries/ui/pages/oauth.landing/en.dictionary.itop.oauth.landing.php b/dictionaries/ui/pages/oauth.landing/en.dictionary.itop.oauth.landing.php
new file mode 100644
index 0000000000..5e5e45f446
--- /dev/null
+++ b/dictionaries/ui/pages/oauth.landing/en.dictionary.itop.oauth.landing.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+
+// Navigation menu
+Dict::Add('EN US', 'English', 'English', array(
+	'core/Operation:Landing/Title' => 'OAuth token creation',
+));
\ No newline at end of file
diff --git a/dictionaries/ui/pages/oauth.landing/fr.dictionary.itop.oauth.landing.php b/dictionaries/ui/pages/oauth.landing/fr.dictionary.itop.oauth.landing.php
new file mode 100644
index 0000000000..7df5ca509d
--- /dev/null
+++ b/dictionaries/ui/pages/oauth.landing/fr.dictionary.itop.oauth.landing.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * 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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+
+// Navigation menu
+Dict::Add('FR FR', 'French', 'Français', array(
+	'core/Operation:Landing/Title' => 'Création d\'un jeton OAuth',
+));
\ No newline at end of file
diff --git a/dictionaries/ui/pages/preferences/cs.dictionary.itop.preferences.php b/dictionaries/ui/pages/preferences/cs.dictionary.itop.preferences.php
index 40d74327cf..20e8d8637d 100644
--- a/dictionaries/ui/pages/preferences/cs.dictionary.itop.preferences.php
+++ b/dictionaries/ui/pages/preferences/cs.dictionary.itop.preferences.php
@@ -18,31 +18,33 @@
  */
 // Navigation menu
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
-	'UI:Preferences:Title'                                             => 'Preferences~~',
-	'UI:Preferences:UserInterface:Title'                               => 'User interface~~',
-	'UI:Preferences:General:Title'                                     => 'General~~',
-	'UI:Preferences:General:Theme'                                     => 'Theme~~',
-	'UI:Preferences:General:Theme:DefaultThemeLabel'                   => '%1$s (default)~~',
-	'UI:Preferences:Lists:Title'                                       => 'Lists~~',
-	'UI:Preferences:RichText:Title'                                    => 'Rich text editor~~',
-	'UI:Preferences:RichText:ToolbarState'                             => 'Toolbar default state~~',
-	'UI:Preferences:RichText:ToolbarState:Expanded'                    => 'Expanded~~',
-	'UI:Preferences:RichText:ToolbarState:Collapsed'                   => 'Collapsed~~',
-	'UI:Preferences:ActivityPanel:Title'                               => 'Activity panel~~',
-	'UI:Preferences:ActivityPanel:EntryFormOpened'                     => 'Entry form opened by default~~',
-	'UI:Preferences:ActivityPanel:EntryFormOpened+'                    => 'Whether the entry form will be opened when displaying an object. If unchecked, you will still be able to open it by clicking the compose button~~',
-	'UI:Preferences:PersonalizeKeyboardShortcuts:Title'                => 'Application keyboard shortcuts~~',
-	'UI:Preferences:PersonalizeKeyboardShortcuts:Input:Hint'           => 'Type a keyboard shortcut~~',
-	'UI:Preferences:PersonalizeKeyboardShortcuts:Button:Tooltip'       => 'Record a keyboard shortcut~~',
-	'UI:Preferences:PersonalizeKeyboardShortcuts:Button:Reset'         => 'Reset~~',
+	'UI:Preferences:Title' => 'Preferences~~',
+	'UI:Preferences:UserInterface:Title' => 'User interface~~',
+	'UI:Preferences:General:Title' => 'General~~',
+	'UI:Preferences:General:Theme' => 'Theme~~',
+	'UI:Preferences:General:Theme:DefaultThemeLabel' => '%1$s (default)~~',
+	'UI:Favorites:General:ShowSummaryCards' => 'Show summary cards~~',
+	'UI:Favorites:General:ShowSummaryCards+' => 'When hovering an hyperlink targeting an object, display a short summary of the object, if available for that class~~',
+	'UI:Preferences:Lists:Title' => 'Lists~~',
+	'UI:Preferences:RichText:Title' => 'Rich text editor~~',
+	'UI:Preferences:RichText:ToolbarState' => 'Toolbar default state~~',
+	'UI:Preferences:RichText:ToolbarState:Expanded' => 'Expanded~~',
+	'UI:Preferences:RichText:ToolbarState:Collapsed' => 'Collapsed~~',
+	'UI:Preferences:ActivityPanel:Title' => 'Activity panel~~',
+	'UI:Preferences:ActivityPanel:EntryFormOpened' => 'Entry form opened by default~~',
+	'UI:Preferences:ActivityPanel:EntryFormOpened+' => 'Whether the entry form will be opened when displaying an object. If unchecked, you will still be able to open it by clicking the compose button~~',
+	'UI:Preferences:PersonalizeKeyboardShortcuts:Title' => 'Application keyboard shortcuts~~',
+	'UI:Preferences:PersonalizeKeyboardShortcuts:Input:Hint' => 'Type a keyboard shortcut~~',
+	'UI:Preferences:PersonalizeKeyboardShortcuts:Button:Tooltip' => 'Record a keyboard shortcut~~',
+	'UI:Preferences:PersonalizeKeyboardShortcuts:Button:Reset' => 'Reset~~',
 	'UI:Preferences:PersonalizeKeyboardShortcuts:Button:Reset:Tooltip' => 'Back to default keyboard shortcut~~',
-	'UI:Preferences:Tabs:Title'                                        => 'Tabs~~',
-	'UI:Preferences:Tabs:Layout:Label'                                 => 'Layout~~',
-	'UI:Preferences:Tabs:Layout:Horizontal'                            => 'Horizontal~~',
-	'UI:Preferences:Tabs:Layout:Vertical'                              => 'Vertical~~',
-	'UI:Preferences:Tabs:Scrollable:Label'                             => 'Navigation~~',
-	'UI:Preferences:Tabs:Scrollable:Classic'                           => 'Classic~~',
-	'UI:Preferences:Tabs:Scrollable:Scrollable'                        => 'Scrollable~~',
-	'UI:Preferences:ChooseAPlaceholder'                                => 'User placeholder image~~',
-	'UI:Preferences:ChooseAPlaceholder+'                               => 'Choose a placeholder image that will be displayed if the contact linked to your user doesn\'t have one~~',
+	'UI:Preferences:Tabs:Title' => 'Tabs~~',
+	'UI:Preferences:Tabs:Layout:Label' => 'Layout~~',
+	'UI:Preferences:Tabs:Layout:Horizontal' => 'Horizontal~~',
+	'UI:Preferences:Tabs:Layout:Vertical' => 'Vertical~~',
+	'UI:Preferences:Tabs:Scrollable:Label' => 'Navigation~~',
+	'UI:Preferences:Tabs:Scrollable:Classic' => 'Classic~~',
+	'UI:Preferences:Tabs:Scrollable:Scrollable' => 'Scrollable~~',
+	'UI:Preferences:ChooseAPlaceholder' => 'User placeholder image~~',
+	'UI:Preferences:ChooseAPlaceholder+' => 'Choose a placeholder image that will be displayed if the contact linked to your user doesn\'t have one~~',
 ));
diff --git a/dictionaries/ui/pages/preferences/da.dictionary.itop.preferences.php b/dictionaries/ui/pages/preferences/da.dictionary.itop.preferences.php
index 91bb832672..6cd28d02a4 100644
--- a/dictionaries/ui/pages/preferences/da.dictionary.itop.preferences.php
+++ b/dictionaries/ui/pages/preferences/da.dictionary.itop.preferences.php
@@ -18,31 +18,33 @@
  */
 // Navigation menu
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
-	'UI:Preferences:Title'                                             => 'Preferences~~',
-	'UI:Preferences:UserInterface:Title'                               => 'User interface~~',
-	'UI:Preferences:General:Title'                                     => 'General~~',
-	'UI:Preferences:General:Theme'                                     => 'Theme~~',
-	'UI:Preferences:General:Theme:DefaultThemeLabel'                   => '%1$s (default)~~',
-	'UI:Preferences:Lists:Title'                                       => 'Lists~~',
-	'UI:Preferences:RichText:Title'                                    => 'Rich text editor~~',
-	'UI:Preferences:RichText:ToolbarState'                             => 'Toolbar default state~~',
-	'UI:Preferences:RichText:ToolbarState:Expanded'                    => 'Expanded~~',
-	'UI:Preferences:RichText:ToolbarState:Collapsed'                   => 'Collapsed~~',
-	'UI:Preferences:ActivityPanel:Title'                               => 'Activity panel~~',
-	'UI:Preferences:ActivityPanel:EntryFormOpened'                     => 'Entry form opened by default~~',
-	'UI:Preferences:ActivityPanel:EntryFormOpened+'                    => 'Whether the entry form will be opened when displaying an object. If unchecked, you will still be able to open it by clicking the compose button~~',
-	'UI:Preferences:PersonalizeKeyboardShortcuts:Title'                => 'Application keyboard shortcuts~~',
-	'UI:Preferences:PersonalizeKeyboardShortcuts:Input:Hint'           => 'Type a keyboard shortcut~~',
-	'UI:Preferences:PersonalizeKeyboardShortcuts:Button:Tooltip'       => 'Record a keyboard shortcut~~',
-	'UI:Preferences:PersonalizeKeyboardShortcuts:Button:Reset'         => 'Reset~~',
+	'UI:Preferences:Title' => 'Preferences~~',
+	'UI:Preferences:UserInterface:Title' => 'User interface~~',
+	'UI:Preferences:General:Title' => 'General~~',
+	'UI:Preferences:General:Theme' => 'Theme~~',
+	'UI:Preferences:General:Theme:DefaultThemeLabel' => '%1$s (default)~~',
+	'UI:Favorites:General:ShowSummaryCards' => 'Show summary cards~~',
+	'UI:Favorites:General:ShowSummaryCards+' => 'When hovering an hyperlink targeting an object, display a short summary of the object, if available for that class~~',
+	'UI:Preferences:Lists:Title' => 'Lists~~',
+	'UI:Preferences:RichText:Title' => 'Rich text editor~~',
+	'UI:Preferences:RichText:ToolbarState' => 'Toolbar default state~~',
+	'UI:Preferences:RichText:ToolbarState:Expanded' => 'Expanded~~',
+	'UI:Preferences:RichText:ToolbarState:Collapsed' => 'Collapsed~~',
+	'UI:Preferences:ActivityPanel:Title' => 'Activity panel~~',
+	'UI:Preferences:ActivityPanel:EntryFormOpened' => 'Entry form opened by default~~',
+	'UI:Preferences:ActivityPanel:EntryFormOpened+' => 'Whether the entry form will be opened when displaying an object. If unchecked, you will still be able to open it by clicking the compose button~~',
+	'UI:Preferences:PersonalizeKeyboardShortcuts:Title' => 'Application keyboard shortcuts~~',
+	'UI:Preferences:PersonalizeKeyboardShortcuts:Input:Hint' => 'Type a keyboard shortcut~~',
+	'UI:Preferences:PersonalizeKeyboardShortcuts:Button:Tooltip' => 'Record a keyboard shortcut~~',
+	'UI:Preferences:PersonalizeKeyboardShortcuts:Button:Reset' => 'Reset~~',
 	'UI:Preferences:PersonalizeKeyboardShortcuts:Button:Reset:Tooltip' => 'Back to default keyboard shortcut~~',
-	'UI:Preferences:Tabs:Title'                                        => 'Tabs~~',
-	'UI:Preferences:Tabs:Layout:Label'                                 => 'Layout~~',
-	'UI:Preferences:Tabs:Layout:Horizontal'                            => 'Horizontal~~',
-	'UI:Preferences:Tabs:Layout:Vertical'                              => 'Vertical~~',
-	'UI:Preferences:Tabs:Scrollable:Label'                             => 'Navigation~~',
-	'UI:Preferences:Tabs:Scrollable:Classic'                           => 'Classic~~',
-	'UI:Preferences:Tabs:Scrollable:Scrollable'                        => 'Scrollable~~',
-	'UI:Preferences:ChooseAPlaceholder'                                => 'User placeholder image~~',
-	'UI:Preferences:ChooseAPlaceholder+'                               => 'Choose a placeholder image that will be displayed if the contact linked to your user doesn\'t have one~~',
+	'UI:Preferences:Tabs:Title' => 'Tabs~~',
+	'UI:Preferences:Tabs:Layout:Label' => 'Layout~~',
+	'UI:Preferences:Tabs:Layout:Horizontal' => 'Horizontal~~',
+	'UI:Preferences:Tabs:Layout:Vertical' => 'Vertical~~',
+	'UI:Preferences:Tabs:Scrollable:Label' => 'Navigation~~',
+	'UI:Preferences:Tabs:Scrollable:Classic' => 'Classic~~',
+	'UI:Preferences:Tabs:Scrollable:Scrollable' => 'Scrollable~~',
+	'UI:Preferences:ChooseAPlaceholder' => 'User placeholder image~~',
+	'UI:Preferences:ChooseAPlaceholder+' => 'Choose a placeholder image that will be displayed if the contact linked to your user doesn\'t have one~~',
 ));
diff --git a/dictionaries/ui/pages/preferences/de.dictionary.itop.preferences.php b/dictionaries/ui/pages/preferences/de.dictionary.itop.preferences.php
index 216db56ad3..f6a66270bf 100644
--- a/dictionaries/ui/pages/preferences/de.dictionary.itop.preferences.php
+++ b/dictionaries/ui/pages/preferences/de.dictionary.itop.preferences.php
@@ -18,31 +18,33 @@
  */
 // Navigation menu
 Dict::Add('DE DE', 'German', 'Deutsch', array(
-	'UI:Preferences:Title'                                             => 'Einstellungen',
-	'UI:Preferences:UserInterface:Title'                               => 'Benutzerinterface',
-	'UI:Preferences:General:Title'                                     => 'Generell',
-	'UI:Preferences:General:Theme'                                     => 'Theme',
-	'UI:Preferences:General:Theme:DefaultThemeLabel'                   => '%1$s (default)',
-	'UI:Preferences:Lists:Title'                                       => 'Listen',
-	'UI:Preferences:RichText:Title'                                    => 'Rich Text Editor',
-	'UI:Preferences:RichText:ToolbarState'                             => 'Default Status der Toolbar',
-	'UI:Preferences:RichText:ToolbarState:Expanded'                    => 'Ausgeklappt',
-	'UI:Preferences:RichText:ToolbarState:Collapsed'                   => 'Eingeklappt',
-	'UI:Preferences:ActivityPanel:Title'                               => 'Aktives Panel',
-	'UI:Preferences:ActivityPanel:EntryFormOpened'                     => 'Formular standardmäßig geöffnet',
-	'UI:Preferences:ActivityPanel:EntryFormOpened+'                    => 'Ob ein Formular, wenn ein Objekt angezeigt wird, standardmäßig geöffnet ist. Wenn dieser Haken nicht gesetzt ist, können Sie das Formular mit einem Klick auf den Compose-Button trotzdem jederzeit öffnen.',
-	'UI:Preferences:PersonalizeKeyboardShortcuts:Title'                => 'Keyboard-Shortcuts dieser Applikation',
-	'UI:Preferences:PersonalizeKeyboardShortcuts:Input:Hint'           => 'Geben Sie einen Keyboard-Shortcut ein',
-	'UI:Preferences:PersonalizeKeyboardShortcuts:Button:Tooltip'       => 'Nehmen Sie einen Keyboard-Shortcut auf',
-	'UI:Preferences:PersonalizeKeyboardShortcuts:Button:Reset'         => 'Zurücksetzen',
+	'UI:Preferences:Title' => 'Einstellungen',
+	'UI:Preferences:UserInterface:Title' => 'Benutzerinterface',
+	'UI:Preferences:General:Title' => 'Generell',
+	'UI:Preferences:General:Theme' => 'Theme',
+	'UI:Preferences:General:Theme:DefaultThemeLabel' => '%1$s (default)',
+	'UI:Favorites:General:ShowSummaryCards' => 'Eine Vorschau auf Links anzeigen',
+	'UI:Favorites:General:ShowSummaryCards+' => 'Wenn Sie mit der Maus über einen Link zu einem Objekt fahren, wird eine Übersicht angezeigt, sofern eine solche für diese Objektklasse existiert.',
+	'UI:Preferences:Lists:Title' => 'Listen',
+	'UI:Preferences:RichText:Title' => 'Rich Text Editor',
+	'UI:Preferences:RichText:ToolbarState' => 'Default Status der Toolbar',
+	'UI:Preferences:RichText:ToolbarState:Expanded' => 'Ausgeklappt',
+	'UI:Preferences:RichText:ToolbarState:Collapsed' => 'Eingeklappt',
+	'UI:Preferences:ActivityPanel:Title' => 'Aktives Panel',
+	'UI:Preferences:ActivityPanel:EntryFormOpened' => 'Formular standardmäßig geöffnet',
+	'UI:Preferences:ActivityPanel:EntryFormOpened+' => 'Ob ein Formular, wenn ein Objekt angezeigt wird, standardmäßig geöffnet ist. Wenn dieser Haken nicht gesetzt ist, können Sie das Formular mit einem Klick auf den Compose-Button trotzdem jederzeit öffnen.',
+	'UI:Preferences:PersonalizeKeyboardShortcuts:Title' => 'Keyboard-Shortcuts dieser Applikation',
+	'UI:Preferences:PersonalizeKeyboardShortcuts:Input:Hint' => 'Geben Sie einen Keyboard-Shortcut ein',
+	'UI:Preferences:PersonalizeKeyboardShortcuts:Button:Tooltip' => 'Nehmen Sie einen Keyboard-Shortcut auf',
+	'UI:Preferences:PersonalizeKeyboardShortcuts:Button:Reset' => 'Zurücksetzen',
 	'UI:Preferences:PersonalizeKeyboardShortcuts:Button:Reset:Tooltip' => 'Auf den Standard-Keyboard-Shortcut zurücksetzen',
-	'UI:Preferences:Tabs:Title'                                        => 'Tabs',
-	'UI:Preferences:Tabs:Layout:Label'                                 => 'Layout',
-	'UI:Preferences:Tabs:Layout:Horizontal'                            => 'Horizontal',
-	'UI:Preferences:Tabs:Layout:Vertical'                              => 'Vertikal',
-	'UI:Preferences:Tabs:Scrollable:Label'                             => 'Navigation',
-	'UI:Preferences:Tabs:Scrollable:Classic'                           => 'klassisch',
-	'UI:Preferences:Tabs:Scrollable:Scrollable'                        => 'scrollbar',
-	'UI:Preferences:ChooseAPlaceholder'                                => 'Platzhalterbild für Profilbild',
-	'UI:Preferences:ChooseAPlaceholder+'                               => 'Nutzen Sie ein Platzhalterbild, das angezeigt wird, wenn der Kontakt, der mit dem User verlinkt ist, kein Profilbild gesetzt hat.',
+	'UI:Preferences:Tabs:Title' => 'Tabs',
+	'UI:Preferences:Tabs:Layout:Label' => 'Layout',
+	'UI:Preferences:Tabs:Layout:Horizontal' => 'Horizontal',
+	'UI:Preferences:Tabs:Layout:Vertical' => 'Vertikal',
+	'UI:Preferences:Tabs:Scrollable:Label' => 'Navigation',
+	'UI:Preferences:Tabs:Scrollable:Classic' => 'klassisch',
+	'UI:Preferences:Tabs:Scrollable:Scrollable' => 'scrollbar',
+	'UI:Preferences:ChooseAPlaceholder' => 'Platzhalterbild für Profilbild',
+	'UI:Preferences:ChooseAPlaceholder+' => 'Nutzen Sie ein Platzhalterbild, das angezeigt wird, wenn der Kontakt, der mit dem User verlinkt ist, kein Profilbild gesetzt hat.',
 ));
diff --git a/dictionaries/ui/pages/preferences/es_cr.dictionary.itop.preferences.php b/dictionaries/ui/pages/preferences/es_cr.dictionary.itop.preferences.php
index 13242eda74..7b3ba5ec57 100644
--- a/dictionaries/ui/pages/preferences/es_cr.dictionary.itop.preferences.php
+++ b/dictionaries/ui/pages/preferences/es_cr.dictionary.itop.preferences.php
@@ -18,31 +18,33 @@
  */
 // Navigation menu
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
-	'UI:Preferences:Title'                                             => 'Preferencias',
-	'UI:Preferences:UserInterface:Title'                               => 'Interfaz de Usuario',
-	'UI:Preferences:General:Title'                                     => 'General',
-	'UI:Preferences:General:Theme'                                     => 'Tema',
-	'UI:Preferences:General:Theme:DefaultThemeLabel'                   => '%1$s (predeterminado)',
-	'UI:Preferences:Lists:Title'                                       => 'Listas',
-	'UI:Preferences:RichText:Title'                                    => 'Editor de texto enriquecido',
-	'UI:Preferences:RichText:ToolbarState'                             => 'Estado predeterminado de la barra de herramientas',
-	'UI:Preferences:RichText:ToolbarState:Expanded'                    => 'Expandido',
-	'UI:Preferences:RichText:ToolbarState:Collapsed'                   => 'Contraído',
-	'UI:Preferences:ActivityPanel:Title'                               => 'Panel de Actividad',
-	'UI:Preferences:ActivityPanel:EntryFormOpened'                     => 'Formulario de entrada abierto de forma predeterminada',
-	'UI:Preferences:ActivityPanel:EntryFormOpened+'                    => 'Si el formulario de entrada se abrirá cuando se muestre un objeto. Si no está marcado, aún podrá abrirlo haciendo click en el botón de redacción',
-	'UI:Preferences:PersonalizeKeyboardShortcuts:Title'                => 'Métodos abreviados de teclado de la aplicación',
-	'UI:Preferences:PersonalizeKeyboardShortcuts:Input:Hint'           => 'Escriba un atajo de teclado',
-	'UI:Preferences:PersonalizeKeyboardShortcuts:Button:Tooltip'       => 'Grabar un atajo de teclado',
-	'UI:Preferences:PersonalizeKeyboardShortcuts:Button:Reset'         => 'Restablecer',
+	'UI:Preferences:Title' => 'Preferencias',
+	'UI:Preferences:UserInterface:Title' => 'Interfaz de Usuario',
+	'UI:Preferences:General:Title' => 'General',
+	'UI:Preferences:General:Theme' => 'Tema',
+	'UI:Preferences:General:Theme:DefaultThemeLabel' => '%1$s (predeterminado)',
+	'UI:Favorites:General:ShowSummaryCards' => 'Show summary cards~~',
+	'UI:Favorites:General:ShowSummaryCards+' => 'When hovering an hyperlink targeting an object, display a short summary of the object, if available for that class~~',
+	'UI:Preferences:Lists:Title' => 'Listas',
+	'UI:Preferences:RichText:Title' => 'Editor de texto enriquecido',
+	'UI:Preferences:RichText:ToolbarState' => 'Estado predeterminado de la barra de herramientas',
+	'UI:Preferences:RichText:ToolbarState:Expanded' => 'Expandido',
+	'UI:Preferences:RichText:ToolbarState:Collapsed' => 'Contraído',
+	'UI:Preferences:ActivityPanel:Title' => 'Panel de Actividad',
+	'UI:Preferences:ActivityPanel:EntryFormOpened' => 'Formulario de entrada abierto de forma predeterminada',
+	'UI:Preferences:ActivityPanel:EntryFormOpened+' => 'Si el formulario de entrada se abrirá cuando se muestre un objeto. Si no está marcado, aún podrá abrirlo haciendo click en el botón de redacción',
+	'UI:Preferences:PersonalizeKeyboardShortcuts:Title' => 'Métodos abreviados de teclado de la aplicación',
+	'UI:Preferences:PersonalizeKeyboardShortcuts:Input:Hint' => 'Escriba un atajo de teclado',
+	'UI:Preferences:PersonalizeKeyboardShortcuts:Button:Tooltip' => 'Grabar un atajo de teclado',
+	'UI:Preferences:PersonalizeKeyboardShortcuts:Button:Reset' => 'Restablecer',
 	'UI:Preferences:PersonalizeKeyboardShortcuts:Button:Reset:Tooltip' => 'Volver al método abreviado de teclado predeterminado',
-	'UI:Preferences:Tabs:Title'                                        => 'Pestañas',
-	'UI:Preferences:Tabs:Layout:Label'                                 => 'Formato',
-	'UI:Preferences:Tabs:Layout:Horizontal'                            => 'Horizontal',
-	'UI:Preferences:Tabs:Layout:Vertical'                              => 'Vertical',
-	'UI:Preferences:Tabs:Scrollable:Label'                             => 'Navigación',
-	'UI:Preferences:Tabs:Scrollable:Classic'                           => 'Clásico',
-	'UI:Preferences:Tabs:Scrollable:Scrollable'                        => 'Desplazable',
-	'UI:Preferences:ChooseAPlaceholder'                                => 'Imagen de marcador de posición de usuario',
-	'UI:Preferences:ChooseAPlaceholder+'                               => 'Elija una imagen de marcador de posición que se mostrará si el contacto vinculado a su usuario no tiene uno',
-));
\ No newline at end of file
+	'UI:Preferences:Tabs:Title' => 'Pestañas',
+	'UI:Preferences:Tabs:Layout:Label' => 'Formato',
+	'UI:Preferences:Tabs:Layout:Horizontal' => 'Horizontal',
+	'UI:Preferences:Tabs:Layout:Vertical' => 'Vertical',
+	'UI:Preferences:Tabs:Scrollable:Label' => 'Navigación',
+	'UI:Preferences:Tabs:Scrollable:Classic' => 'Clásico',
+	'UI:Preferences:Tabs:Scrollable:Scrollable' => 'Desplazable',
+	'UI:Preferences:ChooseAPlaceholder' => 'Imagen de marcador de posición de usuario',
+	'UI:Preferences:ChooseAPlaceholder+' => 'Elija una imagen de marcador de posición que se mostrará si el contacto vinculado a su usuario no tiene uno',
+));
diff --git a/dictionaries/ui/pages/preferences/fr.dictionary.itop.preferences.php b/dictionaries/ui/pages/preferences/fr.dictionary.itop.preferences.php
index babd1f860a..b060a660bd 100644
--- a/dictionaries/ui/pages/preferences/fr.dictionary.itop.preferences.php
+++ b/dictionaries/ui/pages/preferences/fr.dictionary.itop.preferences.php
@@ -18,33 +18,33 @@
  */
 // Navigation menu
 Dict::Add('FR FR', 'French', 'Français', array(
-	'UI:Preferences:Title'                                             => 'Préférences',
-	'UI:Preferences:UserInterface:Title'                               => 'Interface utilisateur',
-	'UI:Preferences:General:Title'                                     => 'Général',
-	'UI:Preferences:General:Theme'                                     => 'Thème',
-	'UI:Preferences:General:Theme:DefaultThemeLabel'                   => '%1$s (défaut)',
-	'UI:Favorites:General:ShowSummaryCards'                            => 'Afficher un aperçu sur les liens',
-	'UI:Favorites:General:ShowSummaryCards+'                           => 'Quand la souris passe sur un lien vers un objet, une vue synthètique est affichée si elle existe pour cette classe d\'objets',
-	'UI:Preferences:Lists:Title'                                       => 'Listes',
-	'UI:Preferences:RichText:Title'                                    => 'Éditeur texte riche',
-	'UI:Preferences:RichText:ToolbarState'                             => 'Affichage par défaut de la barre d\'outil',
-	'UI:Preferences:RichText:ToolbarState:Expanded'                    => 'Déplié',
-	'UI:Preferences:RichText:ToolbarState:Collapsed'                   => 'Replié',
-	'UI:Preferences:ActivityPanel:Title'                               => 'Panneau d\'activité',
-	'UI:Preferences:ActivityPanel:EntryFormOpened'                     => 'Formulaire de saisie ouvert par défaut',
-	'UI:Preferences:ActivityPanel:EntryFormOpened+'                    => 'État du formulaire de saisie lors de l\'affichage d\'un objet. Si la case est décochée, le formulaire pourra être ouvert en utilisant l\'icone "Nouvelle entrée".',
-	'UI:Preferences:PersonalizeKeyboardShortcuts:Title'                => 'Raccourcis clavier de l\'application',
-	'UI:Preferences:PersonalizeKeyboardShortcuts:Input:Hint'           => 'Saisissez un raccourci clavier',
-	'UI:Preferences:PersonalizeKeyboardShortcuts:Button:Tooltip'       => 'Enregistrer un raccourci clavier',
-	'UI:Preferences:PersonalizeKeyboardShortcuts:Button:Reset'         => 'Réinitialiser',
+	'UI:Preferences:Title' => 'Préférences',
+	'UI:Preferences:UserInterface:Title' => 'Interface utilisateur',
+	'UI:Preferences:General:Title' => 'Général',
+	'UI:Preferences:General:Theme' => 'Thème',
+	'UI:Preferences:General:Theme:DefaultThemeLabel' => '%1$s (défaut)',
+	'UI:Favorites:General:ShowSummaryCards' => 'Afficher un aperçu sur les liens',
+	'UI:Favorites:General:ShowSummaryCards+' => 'Quand la souris passe sur un lien vers un objet, une vue synthètique est affichée si elle existe pour cette classe d\'objets',
+	'UI:Preferences:Lists:Title' => 'Listes',
+	'UI:Preferences:RichText:Title' => 'Éditeur texte riche',
+	'UI:Preferences:RichText:ToolbarState' => 'Affichage par défaut de la barre d\'outil',
+	'UI:Preferences:RichText:ToolbarState:Expanded' => 'Déplié',
+	'UI:Preferences:RichText:ToolbarState:Collapsed' => 'Replié',
+	'UI:Preferences:ActivityPanel:Title' => 'Panneau d\'activité',
+	'UI:Preferences:ActivityPanel:EntryFormOpened' => 'Formulaire de saisie ouvert par défaut',
+	'UI:Preferences:ActivityPanel:EntryFormOpened+' => 'État du formulaire de saisie lors de l\'affichage d\'un objet. Si la case est décochée, le formulaire pourra être ouvert en utilisant l\'icone "Nouvelle entrée".',
+	'UI:Preferences:PersonalizeKeyboardShortcuts:Title' => 'Raccourcis clavier de l\'application',
+	'UI:Preferences:PersonalizeKeyboardShortcuts:Input:Hint' => 'Saisissez un raccourci clavier',
+	'UI:Preferences:PersonalizeKeyboardShortcuts:Button:Tooltip' => 'Enregistrer un raccourci clavier',
+	'UI:Preferences:PersonalizeKeyboardShortcuts:Button:Reset' => 'Réinitialiser',
 	'UI:Preferences:PersonalizeKeyboardShortcuts:Button:Reset:Tooltip' => 'Remettre les raccourcis claviers par défaut',
-	'UI:Preferences:Tabs:Title'                                        => 'Onglets',
-	'UI:Preferences:Tabs:Layout:Label'                                 => 'Affichage',
-	'UI:Preferences:Tabs:Layout:Horizontal'                            => 'Horizontal',
-	'UI:Preferences:Tabs:Layout:Vertical'                              => 'Vertical',
-	'UI:Preferences:Tabs:Scrollable:Label'                             => 'Navigation',
-	'UI:Preferences:Tabs:Scrollable:Classic'                           => 'Classique',
-	'UI:Preferences:Tabs:Scrollable:Scrollable'                        => 'Défilement',
-	'UI:Preferences:ChooseAPlaceholder'                                => 'Avatar de l\'utilisateur',
-	'UI:Preferences:ChooseAPlaceholder+'                               => 'Choisissez un avatar qui sera affiché si le contact associé à votre compte utilisateur n\'en possède pas',
+	'UI:Preferences:Tabs:Title' => 'Onglets',
+	'UI:Preferences:Tabs:Layout:Label' => 'Affichage',
+	'UI:Preferences:Tabs:Layout:Horizontal' => 'Horizontal',
+	'UI:Preferences:Tabs:Layout:Vertical' => 'Vertical',
+	'UI:Preferences:Tabs:Scrollable:Label' => 'Navigation',
+	'UI:Preferences:Tabs:Scrollable:Classic' => 'Classique',
+	'UI:Preferences:Tabs:Scrollable:Scrollable' => 'Défilement',
+	'UI:Preferences:ChooseAPlaceholder' => 'Avatar de l\'utilisateur',
+	'UI:Preferences:ChooseAPlaceholder+' => 'Choisissez un avatar qui sera affiché si le contact associé à votre compte utilisateur n\'en possède pas',
 ));
diff --git a/dictionaries/ui/pages/preferences/hu.dictionary.itop.preferences.php b/dictionaries/ui/pages/preferences/hu.dictionary.itop.preferences.php
index 9c610dcb0e..7eb7663749 100644
--- a/dictionaries/ui/pages/preferences/hu.dictionary.itop.preferences.php
+++ b/dictionaries/ui/pages/preferences/hu.dictionary.itop.preferences.php
@@ -18,31 +18,33 @@
  */
 // Navigation menu
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-	'UI:Preferences:Title'                                             => 'Beállítások',
-	'UI:Preferences:UserInterface:Title'                               => 'Felhasználói felület',
-	'UI:Preferences:General:Title'                                     => 'Általános beállítások',
-	'UI:Preferences:General:Theme'                                     => 'Téma',
-	'UI:Preferences:General:Theme:DefaultThemeLabel'                   => '%1$s (alapértelmezett)',
-	'UI:Preferences:Lists:Title'                                       => 'Listák',
-	'UI:Preferences:RichText:Title'                                    => 'Rich text szerkesztő',
-	'UI:Preferences:RichText:ToolbarState'                             => 'Eszköztár alapállapota',
-	'UI:Preferences:RichText:ToolbarState:Expanded'                    => 'Kinyitott',
-	'UI:Preferences:RichText:ToolbarState:Collapsed'                   => 'Összecsukott',
-	'UI:Preferences:ActivityPanel:Title'                               => 'Tevékenység panel',
-	'UI:Preferences:ActivityPanel:EntryFormOpened'                     => 'Alapból ide érkezzen',
-    'UI:Preferences:ActivityPanel:EntryFormOpened+'                    => 'Megnyíljon-e a beviteli űrlap egy objektum megjelenítésekor. Ha nincs bejelölve, akkor továbbra is meg tudja nyitni az űrlapot az összeállítás gombra kattintva.',
-	'UI:Preferences:PersonalizeKeyboardShortcuts:Title'                => 'Billentyűparancsok',
-	'UI:Preferences:PersonalizeKeyboardShortcuts:Input:Hint'           => 'Írjon be egy billentyűparancsot',
-    'UI:Preferences:PersonalizeKeyboardShortcuts:Button:Tooltip'       => 'Rögzítsen egy billentyűparancsot',
-	'UI:Preferences:PersonalizeKeyboardShortcuts:Button:Reset'         => 'Visszaállítás',
+	'UI:Preferences:Title' => 'Beállítások',
+	'UI:Preferences:UserInterface:Title' => 'Felhasználói felület',
+	'UI:Preferences:General:Title' => 'Általános beállítások',
+	'UI:Preferences:General:Theme' => 'Téma',
+	'UI:Preferences:General:Theme:DefaultThemeLabel' => '%1$s (alapértelmezett)',
+	'UI:Favorites:General:ShowSummaryCards' => 'Show summary cards~~',
+	'UI:Favorites:General:ShowSummaryCards+' => 'When hovering an hyperlink targeting an object, display a short summary of the object, if available for that class~~',
+	'UI:Preferences:Lists:Title' => 'Listák',
+	'UI:Preferences:RichText:Title' => 'Rich text szerkesztő',
+	'UI:Preferences:RichText:ToolbarState' => 'Eszköztár alapállapota',
+	'UI:Preferences:RichText:ToolbarState:Expanded' => 'Kinyitott',
+	'UI:Preferences:RichText:ToolbarState:Collapsed' => 'Összecsukott',
+	'UI:Preferences:ActivityPanel:Title' => 'Tevékenység panel',
+	'UI:Preferences:ActivityPanel:EntryFormOpened' => 'Alapból ide érkezzen',
+	'UI:Preferences:ActivityPanel:EntryFormOpened+' => 'Megnyíljon-e a beviteli űrlap egy objektum megjelenítésekor. Ha nincs bejelölve, akkor továbbra is meg tudja nyitni az űrlapot az összeállítás gombra kattintva.',
+	'UI:Preferences:PersonalizeKeyboardShortcuts:Title' => 'Billentyűparancsok',
+	'UI:Preferences:PersonalizeKeyboardShortcuts:Input:Hint' => 'Írjon be egy billentyűparancsot',
+	'UI:Preferences:PersonalizeKeyboardShortcuts:Button:Tooltip' => 'Rögzítsen egy billentyűparancsot',
+	'UI:Preferences:PersonalizeKeyboardShortcuts:Button:Reset' => 'Visszaállítás',
 	'UI:Preferences:PersonalizeKeyboardShortcuts:Button:Reset:Tooltip' => 'Visszaállítja az alap billentyűket',
-	'UI:Preferences:Tabs:Title'                                        => 'Táblák',
-	'UI:Preferences:Tabs:Layout:Label'                                 => 'Elrendezés',
-	'UI:Preferences:Tabs:Layout:Horizontal'                            => 'Vízszintesen',
-	'UI:Preferences:Tabs:Layout:Vertical'                              => 'Függölegesen',
-	'UI:Preferences:Tabs:Scrollable:Label'                             => 'Navigáció',
-	'UI:Preferences:Tabs:Scrollable:Classic'                           => 'Klasszikus',
-	'UI:Preferences:Tabs:Scrollable:Scrollable'                        => 'Görgethető',
-	'UI:Preferences:ChooseAPlaceholder'                                => 'Felhasználói helyettesítő kép',
-	'UI:Preferences:ChooseAPlaceholder+'                               => 'Válasszon ki egy helyettesítő képet, amely akkor jelenik meg, ha a kapcsolattartói beállításaiban még nem adott meg fényképet.',
+	'UI:Preferences:Tabs:Title' => 'Táblák',
+	'UI:Preferences:Tabs:Layout:Label' => 'Elrendezés',
+	'UI:Preferences:Tabs:Layout:Horizontal' => 'Vízszintesen',
+	'UI:Preferences:Tabs:Layout:Vertical' => 'Függölegesen',
+	'UI:Preferences:Tabs:Scrollable:Label' => 'Navigáció',
+	'UI:Preferences:Tabs:Scrollable:Classic' => 'Klasszikus',
+	'UI:Preferences:Tabs:Scrollable:Scrollable' => 'Görgethető',
+	'UI:Preferences:ChooseAPlaceholder' => 'Felhasználói helyettesítő kép',
+	'UI:Preferences:ChooseAPlaceholder+' => 'Válasszon ki egy helyettesítő képet, amely akkor jelenik meg, ha a kapcsolattartói beállításaiban még nem adott meg fényképet.',
 ));
diff --git a/dictionaries/ui/pages/preferences/it.dictionary.itop.preferences.php b/dictionaries/ui/pages/preferences/it.dictionary.itop.preferences.php
index 913cd4b966..0ba958f836 100644
--- a/dictionaries/ui/pages/preferences/it.dictionary.itop.preferences.php
+++ b/dictionaries/ui/pages/preferences/it.dictionary.itop.preferences.php
@@ -18,31 +18,33 @@
  */
 // Navigation menu
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'UI:Preferences:Title'                                             => 'Preferences~~',
-	'UI:Preferences:UserInterface:Title'                               => 'User interface~~',
-	'UI:Preferences:General:Title'                                     => 'General~~',
-	'UI:Preferences:General:Theme'                                     => 'Theme~~',
-	'UI:Preferences:General:Theme:DefaultThemeLabel'                   => '%1$s (default)~~',
-	'UI:Preferences:Lists:Title'                                       => 'Lists~~',
-	'UI:Preferences:RichText:Title'                                    => 'Rich text editor~~',
-	'UI:Preferences:RichText:ToolbarState'                             => 'Toolbar default state~~',
-	'UI:Preferences:RichText:ToolbarState:Expanded'                    => 'Expanded~~',
-	'UI:Preferences:RichText:ToolbarState:Collapsed'                   => 'Collapsed~~',
-	'UI:Preferences:ActivityPanel:Title'                               => 'Activity panel~~',
-	'UI:Preferences:ActivityPanel:EntryFormOpened'                     => 'Entry form opened by default~~',
-	'UI:Preferences:ActivityPanel:EntryFormOpened+'                    => 'Whether the entry form will be opened when displaying an object. If unchecked, you will still be able to open it by clicking the compose button~~',
-	'UI:Preferences:PersonalizeKeyboardShortcuts:Title'                => 'Application keyboard shortcuts~~',
-	'UI:Preferences:PersonalizeKeyboardShortcuts:Input:Hint'           => 'Type a keyboard shortcut~~',
-	'UI:Preferences:PersonalizeKeyboardShortcuts:Button:Tooltip'       => 'Record a keyboard shortcut~~',
-	'UI:Preferences:PersonalizeKeyboardShortcuts:Button:Reset'         => 'Reset~~',
+	'UI:Preferences:Title' => 'Preferences~~',
+	'UI:Preferences:UserInterface:Title' => 'User interface~~',
+	'UI:Preferences:General:Title' => 'General~~',
+	'UI:Preferences:General:Theme' => 'Theme~~',
+	'UI:Preferences:General:Theme:DefaultThemeLabel' => '%1$s (default)~~',
+	'UI:Favorites:General:ShowSummaryCards' => 'Show summary cards~~',
+	'UI:Favorites:General:ShowSummaryCards+' => 'When hovering an hyperlink targeting an object, display a short summary of the object, if available for that class~~',
+	'UI:Preferences:Lists:Title' => 'Lists~~',
+	'UI:Preferences:RichText:Title' => 'Rich text editor~~',
+	'UI:Preferences:RichText:ToolbarState' => 'Toolbar default state~~',
+	'UI:Preferences:RichText:ToolbarState:Expanded' => 'Expanded~~',
+	'UI:Preferences:RichText:ToolbarState:Collapsed' => 'Collapsed~~',
+	'UI:Preferences:ActivityPanel:Title' => 'Activity panel~~',
+	'UI:Preferences:ActivityPanel:EntryFormOpened' => 'Entry form opened by default~~',
+	'UI:Preferences:ActivityPanel:EntryFormOpened+' => 'Whether the entry form will be opened when displaying an object. If unchecked, you will still be able to open it by clicking the compose button~~',
+	'UI:Preferences:PersonalizeKeyboardShortcuts:Title' => 'Application keyboard shortcuts~~',
+	'UI:Preferences:PersonalizeKeyboardShortcuts:Input:Hint' => 'Type a keyboard shortcut~~',
+	'UI:Preferences:PersonalizeKeyboardShortcuts:Button:Tooltip' => 'Record a keyboard shortcut~~',
+	'UI:Preferences:PersonalizeKeyboardShortcuts:Button:Reset' => 'Reset~~',
 	'UI:Preferences:PersonalizeKeyboardShortcuts:Button:Reset:Tooltip' => 'Back to default keyboard shortcut~~',
-	'UI:Preferences:Tabs:Title'                                        => 'Tabs~~',
-	'UI:Preferences:Tabs:Layout:Label'                                 => 'Layout~~',
-	'UI:Preferences:Tabs:Layout:Horizontal'                            => 'Horizontal~~',
-	'UI:Preferences:Tabs:Layout:Vertical'                              => 'Vertical~~',
-	'UI:Preferences:Tabs:Scrollable:Label'                             => 'Navigation~~',
-	'UI:Preferences:Tabs:Scrollable:Classic'                           => 'Classic~~',
-	'UI:Preferences:Tabs:Scrollable:Scrollable'                        => 'Scrollable~~',
-	'UI:Preferences:ChooseAPlaceholder'                                => 'User placeholder image~~',
-	'UI:Preferences:ChooseAPlaceholder+'                               => 'Choose a placeholder image that will be displayed if the contact linked to your user doesn\'t have one~~',
+	'UI:Preferences:Tabs:Title' => 'Tabs~~',
+	'UI:Preferences:Tabs:Layout:Label' => 'Layout~~',
+	'UI:Preferences:Tabs:Layout:Horizontal' => 'Horizontal~~',
+	'UI:Preferences:Tabs:Layout:Vertical' => 'Vertical~~',
+	'UI:Preferences:Tabs:Scrollable:Label' => 'Navigation~~',
+	'UI:Preferences:Tabs:Scrollable:Classic' => 'Classic~~',
+	'UI:Preferences:Tabs:Scrollable:Scrollable' => 'Scrollable~~',
+	'UI:Preferences:ChooseAPlaceholder' => 'User placeholder image~~',
+	'UI:Preferences:ChooseAPlaceholder+' => 'Choose a placeholder image that will be displayed if the contact linked to your user doesn\'t have one~~',
 ));
diff --git a/dictionaries/ui/pages/preferences/ja.dictionary.itop.preferences.php b/dictionaries/ui/pages/preferences/ja.dictionary.itop.preferences.php
index 0a07cfc123..7743ed209b 100644
--- a/dictionaries/ui/pages/preferences/ja.dictionary.itop.preferences.php
+++ b/dictionaries/ui/pages/preferences/ja.dictionary.itop.preferences.php
@@ -18,31 +18,33 @@
  */
 // Navigation menu
 Dict::Add('JA JP', 'Japanese', '日本語', array(
-	'UI:Preferences:Title'                                             => 'Preferences~~',
-	'UI:Preferences:UserInterface:Title'                               => 'User interface~~',
-	'UI:Preferences:General:Title'                                     => 'General~~',
-	'UI:Preferences:General:Theme'                                     => 'Theme~~',
-	'UI:Preferences:General:Theme:DefaultThemeLabel'                   => '%1$s (default)~~',
-	'UI:Preferences:Lists:Title'                                       => 'Lists~~',
-	'UI:Preferences:RichText:Title'                                    => 'Rich text editor~~',
-	'UI:Preferences:RichText:ToolbarState'                             => 'Toolbar default state~~',
-	'UI:Preferences:RichText:ToolbarState:Expanded'                    => 'Expanded~~',
-	'UI:Preferences:RichText:ToolbarState:Collapsed'                   => 'Collapsed~~',
-	'UI:Preferences:ActivityPanel:Title'                               => 'Activity panel~~',
-	'UI:Preferences:ActivityPanel:EntryFormOpened'                     => 'Entry form opened by default~~',
-	'UI:Preferences:ActivityPanel:EntryFormOpened+'                    => 'Whether the entry form will be opened when displaying an object. If unchecked, you will still be able to open it by clicking the compose button~~',
-	'UI:Preferences:PersonalizeKeyboardShortcuts:Title'                => 'Application keyboard shortcuts~~',
-	'UI:Preferences:PersonalizeKeyboardShortcuts:Input:Hint'           => 'Type a keyboard shortcut~~',
-	'UI:Preferences:PersonalizeKeyboardShortcuts:Button:Tooltip'       => 'Record a keyboard shortcut~~',
-	'UI:Preferences:PersonalizeKeyboardShortcuts:Button:Reset'         => 'Reset~~',
+	'UI:Preferences:Title' => 'Preferences~~',
+	'UI:Preferences:UserInterface:Title' => 'User interface~~',
+	'UI:Preferences:General:Title' => 'General~~',
+	'UI:Preferences:General:Theme' => 'Theme~~',
+	'UI:Preferences:General:Theme:DefaultThemeLabel' => '%1$s (default)~~',
+	'UI:Favorites:General:ShowSummaryCards' => 'Show summary cards~~',
+	'UI:Favorites:General:ShowSummaryCards+' => 'When hovering an hyperlink targeting an object, display a short summary of the object, if available for that class~~',
+	'UI:Preferences:Lists:Title' => 'Lists~~',
+	'UI:Preferences:RichText:Title' => 'Rich text editor~~',
+	'UI:Preferences:RichText:ToolbarState' => 'Toolbar default state~~',
+	'UI:Preferences:RichText:ToolbarState:Expanded' => 'Expanded~~',
+	'UI:Preferences:RichText:ToolbarState:Collapsed' => 'Collapsed~~',
+	'UI:Preferences:ActivityPanel:Title' => 'Activity panel~~',
+	'UI:Preferences:ActivityPanel:EntryFormOpened' => 'Entry form opened by default~~',
+	'UI:Preferences:ActivityPanel:EntryFormOpened+' => 'Whether the entry form will be opened when displaying an object. If unchecked, you will still be able to open it by clicking the compose button~~',
+	'UI:Preferences:PersonalizeKeyboardShortcuts:Title' => 'Application keyboard shortcuts~~',
+	'UI:Preferences:PersonalizeKeyboardShortcuts:Input:Hint' => 'Type a keyboard shortcut~~',
+	'UI:Preferences:PersonalizeKeyboardShortcuts:Button:Tooltip' => 'Record a keyboard shortcut~~',
+	'UI:Preferences:PersonalizeKeyboardShortcuts:Button:Reset' => 'Reset~~',
 	'UI:Preferences:PersonalizeKeyboardShortcuts:Button:Reset:Tooltip' => 'Back to default keyboard shortcut~~',
-	'UI:Preferences:Tabs:Title'                                        => 'Tabs~~',
-	'UI:Preferences:Tabs:Layout:Label'                                 => 'Layout~~',
-	'UI:Preferences:Tabs:Layout:Horizontal'                            => 'Horizontal~~',
-	'UI:Preferences:Tabs:Layout:Vertical'                              => 'Vertical~~',
-	'UI:Preferences:Tabs:Scrollable:Label'                             => 'Navigation~~',
-	'UI:Preferences:Tabs:Scrollable:Classic'                           => 'Classic~~',
-	'UI:Preferences:Tabs:Scrollable:Scrollable'                        => 'Scrollable~~',
-	'UI:Preferences:ChooseAPlaceholder'                                => 'User placeholder image~~',
-	'UI:Preferences:ChooseAPlaceholder+'                               => 'Choose a placeholder image that will be displayed if the contact linked to your user doesn\'t have one~~',
+	'UI:Preferences:Tabs:Title' => 'Tabs~~',
+	'UI:Preferences:Tabs:Layout:Label' => 'Layout~~',
+	'UI:Preferences:Tabs:Layout:Horizontal' => 'Horizontal~~',
+	'UI:Preferences:Tabs:Layout:Vertical' => 'Vertical~~',
+	'UI:Preferences:Tabs:Scrollable:Label' => 'Navigation~~',
+	'UI:Preferences:Tabs:Scrollable:Classic' => 'Classic~~',
+	'UI:Preferences:Tabs:Scrollable:Scrollable' => 'Scrollable~~',
+	'UI:Preferences:ChooseAPlaceholder' => 'User placeholder image~~',
+	'UI:Preferences:ChooseAPlaceholder+' => 'Choose a placeholder image that will be displayed if the contact linked to your user doesn\'t have one~~',
 ));
diff --git a/dictionaries/ui/pages/preferences/nl.dictionary.itop.preferences.php b/dictionaries/ui/pages/preferences/nl.dictionary.itop.preferences.php
index 9b410be365..a3fa52550b 100644
--- a/dictionaries/ui/pages/preferences/nl.dictionary.itop.preferences.php
+++ b/dictionaries/ui/pages/preferences/nl.dictionary.itop.preferences.php
@@ -18,31 +18,33 @@
  */
 // Navigation menu
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'UI:Preferences:Title'                                             => 'Voorkeuren',
-	'UI:Preferences:UserInterface:Title'                               => 'Gebruikersinterface',
-	'UI:Preferences:General:Title'                                     => 'Algemeen',
-	'UI:Preferences:General:Theme'                                     => 'Thema',
-	'UI:Preferences:General:Theme:DefaultThemeLabel'                   => '%1$s (standaard)',
-	'UI:Preferences:Lists:Title'                                       => 'Lijsten',
-	'UI:Preferences:RichText:Title'                                    => 'Rich text editor',
-	'UI:Preferences:RichText:ToolbarState'                             => 'Standaard status werkbalk',
-	'UI:Preferences:RichText:ToolbarState:Expanded'                    => 'Uitgeklapt',
-	'UI:Preferences:RichText:ToolbarState:Collapsed'                   => 'Ingeklapt',
-	'UI:Preferences:ActivityPanel:Title'                               => 'Activiteitenpaneel',
-	'UI:Preferences:ActivityPanel:EntryFormOpened'                     => 'Invoerformulier standaard opengeklapt',
-	'UI:Preferences:ActivityPanel:EntryFormOpened+'                    => 'Of het invulformulier standaard opengeklapt is terwijl een object getoond wordt. Als dit uitgevinkt is, kan je het nog altijd openen door op de "Log toevoegen"-knop te klikken.',
-	'UI:Preferences:PersonalizeKeyboardShortcuts:Title'                => 'Sneltoetsen',
-	'UI:Preferences:PersonalizeKeyboardShortcuts:Input:Hint'           => 'Typ een sneltoets',
-	'UI:Preferences:PersonalizeKeyboardShortcuts:Button:Tooltip'       => 'Neem een sneltoets op',
-	'UI:Preferences:PersonalizeKeyboardShortcuts:Button:Reset'         => 'Reset',
+	'UI:Preferences:Title' => 'Voorkeuren',
+	'UI:Preferences:UserInterface:Title' => 'Gebruikersinterface',
+	'UI:Preferences:General:Title' => 'Algemeen',
+	'UI:Preferences:General:Theme' => 'Thema',
+	'UI:Preferences:General:Theme:DefaultThemeLabel' => '%1$s (standaard)',
+	'UI:Favorites:General:ShowSummaryCards' => 'Show summary cards~~',
+	'UI:Favorites:General:ShowSummaryCards+' => 'When hovering an hyperlink targeting an object, display a short summary of the object, if available for that class~~',
+	'UI:Preferences:Lists:Title' => 'Lijsten',
+	'UI:Preferences:RichText:Title' => 'Rich text editor',
+	'UI:Preferences:RichText:ToolbarState' => 'Standaard status werkbalk',
+	'UI:Preferences:RichText:ToolbarState:Expanded' => 'Uitgeklapt',
+	'UI:Preferences:RichText:ToolbarState:Collapsed' => 'Ingeklapt',
+	'UI:Preferences:ActivityPanel:Title' => 'Activiteitenpaneel',
+	'UI:Preferences:ActivityPanel:EntryFormOpened' => 'Invoerformulier standaard opengeklapt',
+	'UI:Preferences:ActivityPanel:EntryFormOpened+' => 'Of het invulformulier standaard opengeklapt is terwijl een object getoond wordt. Als dit uitgevinkt is, kan je het nog altijd openen door op de "Log toevoegen"-knop te klikken.',
+	'UI:Preferences:PersonalizeKeyboardShortcuts:Title' => 'Sneltoetsen',
+	'UI:Preferences:PersonalizeKeyboardShortcuts:Input:Hint' => 'Typ een sneltoets',
+	'UI:Preferences:PersonalizeKeyboardShortcuts:Button:Tooltip' => 'Neem een sneltoets op',
+	'UI:Preferences:PersonalizeKeyboardShortcuts:Button:Reset' => 'Reset',
 	'UI:Preferences:PersonalizeKeyboardShortcuts:Button:Reset:Tooltip' => 'Terugzetten naar de standaard sneltoetsen',
-	'UI:Preferences:Tabs:Title'                                        => 'Tabs',
-	'UI:Preferences:Tabs:Layout:Label'                                 => 'Layout',
-	'UI:Preferences:Tabs:Layout:Horizontal'                            => 'Horizontaal',
-	'UI:Preferences:Tabs:Layout:Vertical'                              => 'Verticaal',
-	'UI:Preferences:Tabs:Scrollable:Label'                             => 'Navigatie',
-	'UI:Preferences:Tabs:Scrollable:Classic'                           => 'Klassiek',
-	'UI:Preferences:Tabs:Scrollable:Scrollable'                        => 'Scrollbaar',
-	'UI:Preferences:ChooseAPlaceholder'                                => 'Gebruikersafbeelding placeholder',
-	'UI:Preferences:ChooseAPlaceholder+'                               => 'Kies een standaard afbeelding die getoond wordt als het contact gelinkt aan jouw gebruiker geen eigen afbeelding heeft.',
+	'UI:Preferences:Tabs:Title' => 'Tabs',
+	'UI:Preferences:Tabs:Layout:Label' => 'Layout',
+	'UI:Preferences:Tabs:Layout:Horizontal' => 'Horizontaal',
+	'UI:Preferences:Tabs:Layout:Vertical' => 'Verticaal',
+	'UI:Preferences:Tabs:Scrollable:Label' => 'Navigatie',
+	'UI:Preferences:Tabs:Scrollable:Classic' => 'Klassiek',
+	'UI:Preferences:Tabs:Scrollable:Scrollable' => 'Scrollbaar',
+	'UI:Preferences:ChooseAPlaceholder' => 'Gebruikersafbeelding placeholder',
+	'UI:Preferences:ChooseAPlaceholder+' => 'Kies een standaard afbeelding die getoond wordt als het contact gelinkt aan jouw gebruiker geen eigen afbeelding heeft.',
 ));
diff --git a/dictionaries/ui/pages/preferences/pl.dictionary.itop.preferences.php b/dictionaries/ui/pages/preferences/pl.dictionary.itop.preferences.php
index 81cedebd84..22bfe6d144 100644
--- a/dictionaries/ui/pages/preferences/pl.dictionary.itop.preferences.php
+++ b/dictionaries/ui/pages/preferences/pl.dictionary.itop.preferences.php
@@ -18,31 +18,33 @@
  */
 // Navigation menu
 Dict::Add('PL PL', 'Polish', 'Polski', array(
-	'UI:Preferences:Title'                                             => 'Preferencje',
-	'UI:Preferences:UserInterface:Title'                               => 'Interfejs użytkownika',
-	'UI:Preferences:General:Title'                                     => 'Ogólne',
-	'UI:Preferences:General:Theme'                                     => 'Motyw',
-	'UI:Preferences:General:Theme:DefaultThemeLabel'                   => '%1$s (domyślny)',
-	'UI:Preferences:Lists:Title'                                       => 'Listy',
-	'UI:Preferences:RichText:Title'                                    => 'Bogaty edytor tekstu',
-	'UI:Preferences:RichText:ToolbarState'                             => 'Domyślny stan paska narzędzi',
-	'UI:Preferences:RichText:ToolbarState:Expanded'                    => 'Rozwinięty',
-	'UI:Preferences:RichText:ToolbarState:Collapsed'                   => 'Zwinięty',
-	'UI:Preferences:ActivityPanel:Title'                               => 'Panel aktywności',
-	'UI:Preferences:ActivityPanel:EntryFormOpened'                     => 'Formularz zgłoszeniowy otwierany domyślnie',
-	'UI:Preferences:ActivityPanel:EntryFormOpened+'                    => 'Czy formularz wpisu zostanie otwarty podczas wyświetlania obiektu. Jeśli odznaczone, nadal będziesz mógł go otworzyć, klikając przycisk tworzenia',
-	'UI:Preferences:PersonalizeKeyboardShortcuts:Title'                => 'Skróty klawiaturowe aplikacji',
-	'UI:Preferences:PersonalizeKeyboardShortcuts:Input:Hint'           => 'Wpisz skrót klawiaturowy',
-	'UI:Preferences:PersonalizeKeyboardShortcuts:Button:Tooltip'       => 'Nagraj skrót klawiaturowy',
-	'UI:Preferences:PersonalizeKeyboardShortcuts:Button:Reset'         => 'Reset',
+	'UI:Preferences:Title' => 'Preferencje',
+	'UI:Preferences:UserInterface:Title' => 'Interfejs użytkownika',
+	'UI:Preferences:General:Title' => 'Ogólne',
+	'UI:Preferences:General:Theme' => 'Motyw',
+	'UI:Preferences:General:Theme:DefaultThemeLabel' => '%1$s (domyślny)',
+	'UI:Favorites:General:ShowSummaryCards' => 'Show summary cards~~',
+	'UI:Favorites:General:ShowSummaryCards+' => 'When hovering an hyperlink targeting an object, display a short summary of the object, if available for that class~~',
+	'UI:Preferences:Lists:Title' => 'Listy',
+	'UI:Preferences:RichText:Title' => 'Bogaty edytor tekstu',
+	'UI:Preferences:RichText:ToolbarState' => 'Domyślny stan paska narzędzi',
+	'UI:Preferences:RichText:ToolbarState:Expanded' => 'Rozwinięty',
+	'UI:Preferences:RichText:ToolbarState:Collapsed' => 'Zwinięty',
+	'UI:Preferences:ActivityPanel:Title' => 'Panel aktywności',
+	'UI:Preferences:ActivityPanel:EntryFormOpened' => 'Formularz zgłoszeniowy otwierany domyślnie',
+	'UI:Preferences:ActivityPanel:EntryFormOpened+' => 'Czy formularz wpisu zostanie otwarty podczas wyświetlania obiektu. Jeśli odznaczone, nadal będziesz mógł go otworzyć, klikając przycisk tworzenia',
+	'UI:Preferences:PersonalizeKeyboardShortcuts:Title' => 'Skróty klawiaturowe aplikacji',
+	'UI:Preferences:PersonalizeKeyboardShortcuts:Input:Hint' => 'Wpisz skrót klawiaturowy',
+	'UI:Preferences:PersonalizeKeyboardShortcuts:Button:Tooltip' => 'Nagraj skrót klawiaturowy',
+	'UI:Preferences:PersonalizeKeyboardShortcuts:Button:Reset' => 'Reset',
 	'UI:Preferences:PersonalizeKeyboardShortcuts:Button:Reset:Tooltip' => 'Przywróć domyślny skrót klawiaturowy',
-	'UI:Preferences:Tabs:Title'                                        => 'Zakładki',
-	'UI:Preferences:Tabs:Layout:Label'                                 => 'Układ',
-	'UI:Preferences:Tabs:Layout:Horizontal'                            => 'Poziomy',
-	'UI:Preferences:Tabs:Layout:Vertical'                              => 'Pionowy',
-	'UI:Preferences:Tabs:Scrollable:Label'                             => 'Nawigacja',
-	'UI:Preferences:Tabs:Scrollable:Classic'                           => 'Klasyczna',
-	'UI:Preferences:Tabs:Scrollable:Scrollable'                        => 'Przewijana',
-	'UI:Preferences:ChooseAPlaceholder'                                => 'Obraz zastępczy użytkownika',
-	'UI:Preferences:ChooseAPlaceholder+'                               => 'Wybierz obraz zastępczy, który będzie wyświetlany, jeśli kontakt powiązany z Twoim użytkownikiem go nie ma',
+	'UI:Preferences:Tabs:Title' => 'Zakładki',
+	'UI:Preferences:Tabs:Layout:Label' => 'Układ',
+	'UI:Preferences:Tabs:Layout:Horizontal' => 'Poziomy',
+	'UI:Preferences:Tabs:Layout:Vertical' => 'Pionowy',
+	'UI:Preferences:Tabs:Scrollable:Label' => 'Nawigacja',
+	'UI:Preferences:Tabs:Scrollable:Classic' => 'Klasyczna',
+	'UI:Preferences:Tabs:Scrollable:Scrollable' => 'Przewijana',
+	'UI:Preferences:ChooseAPlaceholder' => 'Obraz zastępczy użytkownika',
+	'UI:Preferences:ChooseAPlaceholder+' => 'Wybierz obraz zastępczy, który będzie wyświetlany, jeśli kontakt powiązany z Twoim użytkownikiem go nie ma',
 ));
diff --git a/dictionaries/ui/pages/preferences/pt_br.dictionary.itop.preferences.php b/dictionaries/ui/pages/preferences/pt_br.dictionary.itop.preferences.php
index 113c3ca68f..6c9c476b4a 100644
--- a/dictionaries/ui/pages/preferences/pt_br.dictionary.itop.preferences.php
+++ b/dictionaries/ui/pages/preferences/pt_br.dictionary.itop.preferences.php
@@ -18,31 +18,33 @@
  */
 // Navigation menu
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'UI:Preferences:Title'                                             => 'Preferências',
-	'UI:Preferences:UserInterface:Title'                               => 'Interface de usuário',
-	'UI:Preferences:General:Title'                                     => 'Geral',
-	'UI:Preferences:General:Theme'                                     => 'Tema',
-	'UI:Preferences:General:Theme:DefaultThemeLabel'                   => '%1$s (padrão)',
-	'UI:Preferences:Lists:Title'                                       => 'Listas',
-	'UI:Preferences:RichText:Title'                                    => 'Editor de Rich Text',
-	'UI:Preferences:RichText:ToolbarState'                             => 'Estado padrão da barra de ferramentas',
-	'UI:Preferences:RichText:ToolbarState:Expanded'                    => 'Expandida',
-	'UI:Preferences:RichText:ToolbarState:Collapsed'                   => 'Recolhida',
-	'UI:Preferences:ActivityPanel:Title'                               => 'Painel de atividades',
-	'UI:Preferences:ActivityPanel:EntryFormOpened'                     => 'Formulário de adicionar nova entrada aberto por padrão',
-	'UI:Preferences:ActivityPanel:EntryFormOpened+'                    => 'Se o formulário de adicionar nova entrada será aberto automaticamente ao abrir o Painel de Atividades. Se desmarcado, você ainda poderá abri-lo clicando no botão de "adicionar"',
-	'UI:Preferences:PersonalizeKeyboardShortcuts:Title'                => 'Atalhos de teclado de aplicativo',
-	'UI:Preferences:PersonalizeKeyboardShortcuts:Input:Hint'           => 'Pressione um atalho de teclado',
-	'UI:Preferences:PersonalizeKeyboardShortcuts:Button:Tooltip'       => 'Grave um atalho de teclado',
-	'UI:Preferences:PersonalizeKeyboardShortcuts:Button:Reset'         => 'Redefinir',
+	'UI:Preferences:Title' => 'Preferências',
+	'UI:Preferences:UserInterface:Title' => 'Interface de usuário',
+	'UI:Preferences:General:Title' => 'Geral',
+	'UI:Preferences:General:Theme' => 'Tema',
+	'UI:Preferences:General:Theme:DefaultThemeLabel' => '%1$s (padrão)',
+	'UI:Favorites:General:ShowSummaryCards' => 'Show summary cards~~',
+	'UI:Favorites:General:ShowSummaryCards+' => 'When hovering an hyperlink targeting an object, display a short summary of the object, if available for that class~~',
+	'UI:Preferences:Lists:Title' => 'Listas',
+	'UI:Preferences:RichText:Title' => 'Editor de Rich Text',
+	'UI:Preferences:RichText:ToolbarState' => 'Estado padrão da barra de ferramentas',
+	'UI:Preferences:RichText:ToolbarState:Expanded' => 'Expandida',
+	'UI:Preferences:RichText:ToolbarState:Collapsed' => 'Recolhida',
+	'UI:Preferences:ActivityPanel:Title' => 'Painel de atividades',
+	'UI:Preferences:ActivityPanel:EntryFormOpened' => 'Formulário de adicionar nova entrada aberto por padrão',
+	'UI:Preferences:ActivityPanel:EntryFormOpened+' => 'Se o formulário de adicionar nova entrada será aberto automaticamente ao abrir o Painel de Atividades. Se desmarcado, você ainda poderá abri-lo clicando no botão de "adicionar"',
+	'UI:Preferences:PersonalizeKeyboardShortcuts:Title' => 'Atalhos de teclado de aplicativo',
+	'UI:Preferences:PersonalizeKeyboardShortcuts:Input:Hint' => 'Pressione um atalho de teclado',
+	'UI:Preferences:PersonalizeKeyboardShortcuts:Button:Tooltip' => 'Grave um atalho de teclado',
+	'UI:Preferences:PersonalizeKeyboardShortcuts:Button:Reset' => 'Redefinir',
 	'UI:Preferences:PersonalizeKeyboardShortcuts:Button:Reset:Tooltip' => 'Voltar ao atalho padrão do teclado',
-	'UI:Preferences:Tabs:Title'                                        => 'Guias',
-	'UI:Preferences:Tabs:Layout:Label'                                 => 'Layout',
-	'UI:Preferences:Tabs:Layout:Horizontal'                            => 'Horizontal',
-	'UI:Preferences:Tabs:Layout:Vertical'                              => 'Vertical',
-	'UI:Preferences:Tabs:Scrollable:Label'                             => 'Navegação',
-	'UI:Preferences:Tabs:Scrollable:Classic'                           => 'Clássica',
-	'UI:Preferences:Tabs:Scrollable:Scrollable'                        => 'Rolável',
-	'UI:Preferences:ChooseAPlaceholder'                                => 'Avatar padrão do usuário',
-	'UI:Preferences:ChooseAPlaceholder+'                               => 'Escolha uma imagem padrão que será exibida caso o contato associado ao usuário não possuir nenhuma',
+	'UI:Preferences:Tabs:Title' => 'Guias',
+	'UI:Preferences:Tabs:Layout:Label' => 'Layout',
+	'UI:Preferences:Tabs:Layout:Horizontal' => 'Horizontal',
+	'UI:Preferences:Tabs:Layout:Vertical' => 'Vertical',
+	'UI:Preferences:Tabs:Scrollable:Label' => 'Navegação',
+	'UI:Preferences:Tabs:Scrollable:Classic' => 'Clássica',
+	'UI:Preferences:Tabs:Scrollable:Scrollable' => 'Rolável',
+	'UI:Preferences:ChooseAPlaceholder' => 'Avatar padrão do usuário',
+	'UI:Preferences:ChooseAPlaceholder+' => 'Escolha uma imagem padrão que será exibida caso o contato associado ao usuário não possuir nenhuma',
 ));
diff --git a/dictionaries/ui/pages/preferences/ru.dictionary.itop.preferences.php b/dictionaries/ui/pages/preferences/ru.dictionary.itop.preferences.php
index cf5f74233e..050b547a32 100755
--- a/dictionaries/ui/pages/preferences/ru.dictionary.itop.preferences.php
+++ b/dictionaries/ui/pages/preferences/ru.dictionary.itop.preferences.php
@@ -18,31 +18,33 @@
  */
 // Navigation menu
 Dict::Add('RU RU', 'Russian', 'Русский', array(
-	'UI:Preferences:Title'                                             => 'Предпочтения',
-	'UI:Preferences:UserInterface:Title'                               => 'Пользовательский интерфейс',
-	'UI:Preferences:General:Title'                                     => 'Основные',
-	'UI:Preferences:General:Theme'                                     => 'Тема',
-	'UI:Preferences:General:Theme:DefaultThemeLabel'                   => '%1$s (по умолчанию)',
-	'UI:Preferences:Lists:Title'                                       => 'Списки',
-	'UI:Preferences:RichText:Title'                                    => 'Текстовый редактор',
-	'UI:Preferences:RichText:ToolbarState'                             => 'Панель инструментов по умолчанию',
-	'UI:Preferences:RichText:ToolbarState:Expanded'                    => 'Развёрнута',
-	'UI:Preferences:RichText:ToolbarState:Collapsed'                   => 'Свёрнута',
-	'UI:Preferences:ActivityPanel:Title'                               => 'Панель активности',
-	'UI:Preferences:ActivityPanel:EntryFormOpened'                     => 'Форма записи журнала открыта по умолчанию',
-	'UI:Preferences:ActivityPanel:EntryFormOpened+'                    => 'Состояние формы добавления записи журнала при отображении объекта. Если флажок снят, форму можно будет открыть с помощью соответствующей кнопки.',
-	'UI:Preferences:PersonalizeKeyboardShortcuts:Title'                => 'Сочетания клавиш',
-	'UI:Preferences:PersonalizeKeyboardShortcuts:Input:Hint'           => 'Введите сочетание клавиш',
-	'UI:Preferences:PersonalizeKeyboardShortcuts:Button:Tooltip'       => 'Записать сочетание клавиш',
-	'UI:Preferences:PersonalizeKeyboardShortcuts:Button:Reset'         => 'Reset~~',
+	'UI:Preferences:Title' => 'Предпочтения',
+	'UI:Preferences:UserInterface:Title' => 'Пользовательский интерфейс',
+	'UI:Preferences:General:Title' => 'Основные',
+	'UI:Preferences:General:Theme' => 'Тема',
+	'UI:Preferences:General:Theme:DefaultThemeLabel' => '%1$s (по умолчанию)',
+	'UI:Favorites:General:ShowSummaryCards' => 'Show summary cards~~',
+	'UI:Favorites:General:ShowSummaryCards+' => 'When hovering an hyperlink targeting an object, display a short summary of the object, if available for that class~~',
+	'UI:Preferences:Lists:Title' => 'Списки',
+	'UI:Preferences:RichText:Title' => 'Текстовый редактор',
+	'UI:Preferences:RichText:ToolbarState' => 'Панель инструментов по умолчанию',
+	'UI:Preferences:RichText:ToolbarState:Expanded' => 'Развёрнута',
+	'UI:Preferences:RichText:ToolbarState:Collapsed' => 'Свёрнута',
+	'UI:Preferences:ActivityPanel:Title' => 'Панель активности',
+	'UI:Preferences:ActivityPanel:EntryFormOpened' => 'Форма записи журнала открыта по умолчанию',
+	'UI:Preferences:ActivityPanel:EntryFormOpened+' => 'Состояние формы добавления записи журнала при отображении объекта. Если флажок снят, форму можно будет открыть с помощью соответствующей кнопки.',
+	'UI:Preferences:PersonalizeKeyboardShortcuts:Title' => 'Сочетания клавиш',
+	'UI:Preferences:PersonalizeKeyboardShortcuts:Input:Hint' => 'Введите сочетание клавиш',
+	'UI:Preferences:PersonalizeKeyboardShortcuts:Button:Tooltip' => 'Записать сочетание клавиш',
+	'UI:Preferences:PersonalizeKeyboardShortcuts:Button:Reset' => 'Reset~~',
 	'UI:Preferences:PersonalizeKeyboardShortcuts:Button:Reset:Tooltip' => 'Back to default keyboard shortcut~~',
-	'UI:Preferences:Tabs:Title'                                        => 'Вкладки',
-	'UI:Preferences:Tabs:Layout:Label'                                 => 'Расположение',
-	'UI:Preferences:Tabs:Layout:Horizontal'                            => 'Горизонтальное',
-	'UI:Preferences:Tabs:Layout:Vertical'                              => 'Вертикальное',
-	'UI:Preferences:Tabs:Scrollable:Label'                             => 'Навигация',
-	'UI:Preferences:Tabs:Scrollable:Classic'                           => 'Классическая',
-	'UI:Preferences:Tabs:Scrollable:Scrollable'                        => 'Прокручиваемая',
-	'UI:Preferences:ChooseAPlaceholder'                                => 'Аватар пользователя',
-	'UI:Preferences:ChooseAPlaceholder+'                               => 'Выберите аватар, который будет отображаться, если у связанного с вашей учетной записью контакта нет фотографии',
+	'UI:Preferences:Tabs:Title' => 'Вкладки',
+	'UI:Preferences:Tabs:Layout:Label' => 'Расположение',
+	'UI:Preferences:Tabs:Layout:Horizontal' => 'Горизонтальное',
+	'UI:Preferences:Tabs:Layout:Vertical' => 'Вертикальное',
+	'UI:Preferences:Tabs:Scrollable:Label' => 'Навигация',
+	'UI:Preferences:Tabs:Scrollable:Classic' => 'Классическая',
+	'UI:Preferences:Tabs:Scrollable:Scrollable' => 'Прокручиваемая',
+	'UI:Preferences:ChooseAPlaceholder' => 'Аватар пользователя',
+	'UI:Preferences:ChooseAPlaceholder+' => 'Выберите аватар, который будет отображаться, если у связанного с вашей учетной записью контакта нет фотографии',
 ));
diff --git a/dictionaries/ui/pages/preferences/sk.dictionary.itop.preferences.php b/dictionaries/ui/pages/preferences/sk.dictionary.itop.preferences.php
index a7f31e976d..186ce79167 100644
--- a/dictionaries/ui/pages/preferences/sk.dictionary.itop.preferences.php
+++ b/dictionaries/ui/pages/preferences/sk.dictionary.itop.preferences.php
@@ -18,31 +18,33 @@
  */
 // Navigation menu
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
-	'UI:Preferences:Title'                                             => 'Preferences~~',
-	'UI:Preferences:UserInterface:Title'                               => 'User interface~~',
-	'UI:Preferences:General:Title'                                     => 'General~~',
-	'UI:Preferences:General:Theme'                                     => 'Theme~~',
-	'UI:Preferences:General:Theme:DefaultThemeLabel'                   => '%1$s (default)~~',
-	'UI:Preferences:Lists:Title'                                       => 'Lists~~',
-	'UI:Preferences:RichText:Title'                                    => 'Rich text editor~~',
-	'UI:Preferences:RichText:ToolbarState'                             => 'Toolbar default state~~',
-	'UI:Preferences:RichText:ToolbarState:Expanded'                    => 'Expanded~~',
-	'UI:Preferences:RichText:ToolbarState:Collapsed'                   => 'Collapsed~~',
-	'UI:Preferences:ActivityPanel:Title'                               => 'Activity panel~~',
-	'UI:Preferences:ActivityPanel:EntryFormOpened'                     => 'Entry form opened by default~~',
-	'UI:Preferences:ActivityPanel:EntryFormOpened+'                    => 'Whether the entry form will be opened when displaying an object. If unchecked, you will still be able to open it by clicking the compose button~~',
-	'UI:Preferences:PersonalizeKeyboardShortcuts:Title'                => 'Application keyboard shortcuts~~',
-	'UI:Preferences:PersonalizeKeyboardShortcuts:Input:Hint'           => 'Type a keyboard shortcut~~',
-	'UI:Preferences:PersonalizeKeyboardShortcuts:Button:Tooltip'       => 'Record a keyboard shortcut~~',
-	'UI:Preferences:PersonalizeKeyboardShortcuts:Button:Reset'         => 'Reset~~',
+	'UI:Preferences:Title' => 'Preferences~~',
+	'UI:Preferences:UserInterface:Title' => 'User interface~~',
+	'UI:Preferences:General:Title' => 'General~~',
+	'UI:Preferences:General:Theme' => 'Theme~~',
+	'UI:Preferences:General:Theme:DefaultThemeLabel' => '%1$s (default)~~',
+	'UI:Favorites:General:ShowSummaryCards' => 'Show summary cards~~',
+	'UI:Favorites:General:ShowSummaryCards+' => 'When hovering an hyperlink targeting an object, display a short summary of the object, if available for that class~~',
+	'UI:Preferences:Lists:Title' => 'Lists~~',
+	'UI:Preferences:RichText:Title' => 'Rich text editor~~',
+	'UI:Preferences:RichText:ToolbarState' => 'Toolbar default state~~',
+	'UI:Preferences:RichText:ToolbarState:Expanded' => 'Expanded~~',
+	'UI:Preferences:RichText:ToolbarState:Collapsed' => 'Collapsed~~',
+	'UI:Preferences:ActivityPanel:Title' => 'Activity panel~~',
+	'UI:Preferences:ActivityPanel:EntryFormOpened' => 'Entry form opened by default~~',
+	'UI:Preferences:ActivityPanel:EntryFormOpened+' => 'Whether the entry form will be opened when displaying an object. If unchecked, you will still be able to open it by clicking the compose button~~',
+	'UI:Preferences:PersonalizeKeyboardShortcuts:Title' => 'Application keyboard shortcuts~~',
+	'UI:Preferences:PersonalizeKeyboardShortcuts:Input:Hint' => 'Type a keyboard shortcut~~',
+	'UI:Preferences:PersonalizeKeyboardShortcuts:Button:Tooltip' => 'Record a keyboard shortcut~~',
+	'UI:Preferences:PersonalizeKeyboardShortcuts:Button:Reset' => 'Reset~~',
 	'UI:Preferences:PersonalizeKeyboardShortcuts:Button:Reset:Tooltip' => 'Back to default keyboard shortcut~~',
-	'UI:Preferences:Tabs:Title'                                        => 'Tabs~~',
-	'UI:Preferences:Tabs:Layout:Label'                                 => 'Layout~~',
-	'UI:Preferences:Tabs:Layout:Horizontal'                            => 'Horizontal~~',
-	'UI:Preferences:Tabs:Layout:Vertical'                              => 'Vertical~~',
-	'UI:Preferences:Tabs:Scrollable:Label'                             => 'Navigation~~',
-	'UI:Preferences:Tabs:Scrollable:Classic'                           => 'Classic~~',
-	'UI:Preferences:Tabs:Scrollable:Scrollable'                        => 'Scrollable~~',
-	'UI:Preferences:ChooseAPlaceholder'                                => 'User placeholder image~~',
-	'UI:Preferences:ChooseAPlaceholder+'                               => 'Choose a placeholder image that will be displayed if the contact linked to your user doesn\'t have one~~',
+	'UI:Preferences:Tabs:Title' => 'Tabs~~',
+	'UI:Preferences:Tabs:Layout:Label' => 'Layout~~',
+	'UI:Preferences:Tabs:Layout:Horizontal' => 'Horizontal~~',
+	'UI:Preferences:Tabs:Layout:Vertical' => 'Vertical~~',
+	'UI:Preferences:Tabs:Scrollable:Label' => 'Navigation~~',
+	'UI:Preferences:Tabs:Scrollable:Classic' => 'Classic~~',
+	'UI:Preferences:Tabs:Scrollable:Scrollable' => 'Scrollable~~',
+	'UI:Preferences:ChooseAPlaceholder' => 'User placeholder image~~',
+	'UI:Preferences:ChooseAPlaceholder+' => 'Choose a placeholder image that will be displayed if the contact linked to your user doesn\'t have one~~',
 ));
diff --git a/dictionaries/ui/pages/preferences/tr.dictionary.itop.preferences.php b/dictionaries/ui/pages/preferences/tr.dictionary.itop.preferences.php
index 1599c2cbc9..948638d97d 100644
--- a/dictionaries/ui/pages/preferences/tr.dictionary.itop.preferences.php
+++ b/dictionaries/ui/pages/preferences/tr.dictionary.itop.preferences.php
@@ -18,31 +18,33 @@
  */
 // Navigation menu
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'UI:Preferences:Title'                                             => 'Preferences~~',
-	'UI:Preferences:UserInterface:Title'                               => 'User interface~~',
-	'UI:Preferences:General:Title'                                     => 'General~~',
-	'UI:Preferences:General:Theme'                                     => 'Theme~~',
-	'UI:Preferences:General:Theme:DefaultThemeLabel'                   => '%1$s (default)~~',
-	'UI:Preferences:Lists:Title'                                       => 'Lists~~',
-	'UI:Preferences:RichText:Title'                                    => 'Rich text editor~~',
-	'UI:Preferences:RichText:ToolbarState'                             => 'Toolbar default state~~',
-	'UI:Preferences:RichText:ToolbarState:Expanded'                    => 'Expanded~~',
-	'UI:Preferences:RichText:ToolbarState:Collapsed'                   => 'Collapsed~~',
-	'UI:Preferences:ActivityPanel:Title'                               => 'Activity panel~~',
-	'UI:Preferences:ActivityPanel:EntryFormOpened'                     => 'Entry form opened by default~~',
-	'UI:Preferences:ActivityPanel:EntryFormOpened+'                    => 'Whether the entry form will be opened when displaying an object. If unchecked, you will still be able to open it by clicking the compose button~~',
-	'UI:Preferences:PersonalizeKeyboardShortcuts:Title'                => 'Application keyboard shortcuts~~',
-	'UI:Preferences:PersonalizeKeyboardShortcuts:Input:Hint'           => 'Type a keyboard shortcut~~',
-	'UI:Preferences:PersonalizeKeyboardShortcuts:Button:Tooltip'       => 'Record a keyboard shortcut~~',
-	'UI:Preferences:PersonalizeKeyboardShortcuts:Button:Reset'         => 'Reset~~',
+	'UI:Preferences:Title' => 'Preferences~~',
+	'UI:Preferences:UserInterface:Title' => 'User interface~~',
+	'UI:Preferences:General:Title' => 'General~~',
+	'UI:Preferences:General:Theme' => 'Theme~~',
+	'UI:Preferences:General:Theme:DefaultThemeLabel' => '%1$s (default)~~',
+	'UI:Favorites:General:ShowSummaryCards' => 'Show summary cards~~',
+	'UI:Favorites:General:ShowSummaryCards+' => 'When hovering an hyperlink targeting an object, display a short summary of the object, if available for that class~~',
+	'UI:Preferences:Lists:Title' => 'Lists~~',
+	'UI:Preferences:RichText:Title' => 'Rich text editor~~',
+	'UI:Preferences:RichText:ToolbarState' => 'Toolbar default state~~',
+	'UI:Preferences:RichText:ToolbarState:Expanded' => 'Expanded~~',
+	'UI:Preferences:RichText:ToolbarState:Collapsed' => 'Collapsed~~',
+	'UI:Preferences:ActivityPanel:Title' => 'Activity panel~~',
+	'UI:Preferences:ActivityPanel:EntryFormOpened' => 'Entry form opened by default~~',
+	'UI:Preferences:ActivityPanel:EntryFormOpened+' => 'Whether the entry form will be opened when displaying an object. If unchecked, you will still be able to open it by clicking the compose button~~',
+	'UI:Preferences:PersonalizeKeyboardShortcuts:Title' => 'Application keyboard shortcuts~~',
+	'UI:Preferences:PersonalizeKeyboardShortcuts:Input:Hint' => 'Type a keyboard shortcut~~',
+	'UI:Preferences:PersonalizeKeyboardShortcuts:Button:Tooltip' => 'Record a keyboard shortcut~~',
+	'UI:Preferences:PersonalizeKeyboardShortcuts:Button:Reset' => 'Reset~~',
 	'UI:Preferences:PersonalizeKeyboardShortcuts:Button:Reset:Tooltip' => 'Back to default keyboard shortcut~~',
-	'UI:Preferences:Tabs:Title'                                        => 'Tabs~~',
-	'UI:Preferences:Tabs:Layout:Label'                                 => 'Layout~~',
-	'UI:Preferences:Tabs:Layout:Horizontal'                            => 'Horizontal~~',
-	'UI:Preferences:Tabs:Layout:Vertical'                              => 'Vertical~~',
-	'UI:Preferences:Tabs:Scrollable:Label'                             => 'Navigation~~',
-	'UI:Preferences:Tabs:Scrollable:Classic'                           => 'Classic~~',
-	'UI:Preferences:Tabs:Scrollable:Scrollable'                        => 'Scrollable~~',
-	'UI:Preferences:ChooseAPlaceholder'                                => 'User placeholder image~~',
-	'UI:Preferences:ChooseAPlaceholder+'                               => 'Choose a placeholder image that will be displayed if the contact linked to your user doesn\'t have one~~',
+	'UI:Preferences:Tabs:Title' => 'Tabs~~',
+	'UI:Preferences:Tabs:Layout:Label' => 'Layout~~',
+	'UI:Preferences:Tabs:Layout:Horizontal' => 'Horizontal~~',
+	'UI:Preferences:Tabs:Layout:Vertical' => 'Vertical~~',
+	'UI:Preferences:Tabs:Scrollable:Label' => 'Navigation~~',
+	'UI:Preferences:Tabs:Scrollable:Classic' => 'Classic~~',
+	'UI:Preferences:Tabs:Scrollable:Scrollable' => 'Scrollable~~',
+	'UI:Preferences:ChooseAPlaceholder' => 'User placeholder image~~',
+	'UI:Preferences:ChooseAPlaceholder+' => 'Choose a placeholder image that will be displayed if the contact linked to your user doesn\'t have one~~',
 ));
diff --git a/dictionaries/ui/pages/preferences/zh_cn.dictionary.itop.preferences.php b/dictionaries/ui/pages/preferences/zh_cn.dictionary.itop.preferences.php
index 0bdffc0f0c..4aef20074c 100644
--- a/dictionaries/ui/pages/preferences/zh_cn.dictionary.itop.preferences.php
+++ b/dictionaries/ui/pages/preferences/zh_cn.dictionary.itop.preferences.php
@@ -18,31 +18,33 @@
  */
 // Navigation menu
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'UI:Preferences:Title'                                             => '首选项',
-	'UI:Preferences:UserInterface:Title'                               => '用户界面',
-	'UI:Preferences:General:Title'                                     => '概况',
-	'UI:Preferences:General:Theme'                                     => '主题',
-	'UI:Preferences:General:Theme:DefaultThemeLabel'                   => '%1$s (默认)',
-	'UI:Preferences:Lists:Title'                                       => '列表',
-	'UI:Preferences:RichText:Title'                                    => '富文本编辑器',
-	'UI:Preferences:RichText:ToolbarState'                             => '工具栏默认状态',
-	'UI:Preferences:RichText:ToolbarState:Expanded'                    => '展开',
-	'UI:Preferences:RichText:ToolbarState:Collapsed'                   => '折叠',
-	'UI:Preferences:ActivityPanel:Title'                               => '活动面板',
-	'UI:Preferences:ActivityPanel:EntryFormOpened'                     => 'Entry form opened by default~~',
-	'UI:Preferences:ActivityPanel:EntryFormOpened+'                    => 'Whether the entry form will be opened when displaying an object. If unchecked, you will still be able to open it by clicking the compose button~~',
-	'UI:Preferences:PersonalizeKeyboardShortcuts:Title'                => '键盘快捷键',
-	'UI:Preferences:PersonalizeKeyboardShortcuts:Input:Hint'           => '请输入键盘快捷键',
-	'UI:Preferences:PersonalizeKeyboardShortcuts:Button:Tooltip'       => '录制键盘快捷键',
-	'UI:Preferences:PersonalizeKeyboardShortcuts:Button:Reset'         => '重置',
+	'UI:Preferences:Title' => '首选项',
+	'UI:Preferences:UserInterface:Title' => '用户界面',
+	'UI:Preferences:General:Title' => '概况',
+	'UI:Preferences:General:Theme' => '主题',
+	'UI:Preferences:General:Theme:DefaultThemeLabel' => '%1$s (默认)',
+	'UI:Favorites:General:ShowSummaryCards' => 'Show summary cards~~',
+	'UI:Favorites:General:ShowSummaryCards+' => 'When hovering an hyperlink targeting an object, display a short summary of the object, if available for that class~~',
+	'UI:Preferences:Lists:Title' => '列表',
+	'UI:Preferences:RichText:Title' => '富文本编辑器',
+	'UI:Preferences:RichText:ToolbarState' => '工具栏默认状态',
+	'UI:Preferences:RichText:ToolbarState:Expanded' => '展开',
+	'UI:Preferences:RichText:ToolbarState:Collapsed' => '折叠',
+	'UI:Preferences:ActivityPanel:Title' => '活动面板',
+	'UI:Preferences:ActivityPanel:EntryFormOpened' => 'Entry form opened by default~~',
+	'UI:Preferences:ActivityPanel:EntryFormOpened+' => 'Whether the entry form will be opened when displaying an object. If unchecked, you will still be able to open it by clicking the compose button~~',
+	'UI:Preferences:PersonalizeKeyboardShortcuts:Title' => '键盘快捷键',
+	'UI:Preferences:PersonalizeKeyboardShortcuts:Input:Hint' => '请输入键盘快捷键',
+	'UI:Preferences:PersonalizeKeyboardShortcuts:Button:Tooltip' => '录制键盘快捷键',
+	'UI:Preferences:PersonalizeKeyboardShortcuts:Button:Reset' => '重置',
 	'UI:Preferences:PersonalizeKeyboardShortcuts:Button:Reset:Tooltip' => '还原到默认的键盘快捷键',
-	'UI:Preferences:Tabs:Title'                                        => '标签栏',
-	'UI:Preferences:Tabs:Layout:Label'                                 => '布局',
-	'UI:Preferences:Tabs:Layout:Horizontal'                            => '水平',
-	'UI:Preferences:Tabs:Layout:Vertical'                              => '垂直',
-	'UI:Preferences:Tabs:Scrollable:Label'                             => '导航',
-	'UI:Preferences:Tabs:Scrollable:Classic'                           => '经典',
-	'UI:Preferences:Tabs:Scrollable:Scrollable'                        => '可滚动',
-	'UI:Preferences:ChooseAPlaceholder'                                => '用户的默认头像',
-	'UI:Preferences:ChooseAPlaceholder+'                               => '选择一个占位图片,将在用户联系人没有设定头像图片时显示',
+	'UI:Preferences:Tabs:Title' => '标签栏',
+	'UI:Preferences:Tabs:Layout:Label' => '布局',
+	'UI:Preferences:Tabs:Layout:Horizontal' => '水平',
+	'UI:Preferences:Tabs:Layout:Vertical' => '垂直',
+	'UI:Preferences:Tabs:Scrollable:Label' => '导航',
+	'UI:Preferences:Tabs:Scrollable:Classic' => '经典',
+	'UI:Preferences:Tabs:Scrollable:Scrollable' => '可滚动',
+	'UI:Preferences:ChooseAPlaceholder' => '用户的默认头像',
+	'UI:Preferences:ChooseAPlaceholder+' => '选择一个占位图片,将在用户联系人没有设定头像图片时显示',
 ));
diff --git a/dictionaries/zh_cn.dictionary.itop.core.php b/dictionaries/zh_cn.dictionary.itop.core.php
index 04040f8ef6..b8ac6bfa65 100644
--- a/dictionaries/zh_cn.dictionary.itop.core.php
+++ b/dictionaries/zh_cn.dictionary.itop.core.php
@@ -22,57 +22,42 @@
  */
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Core:DeletedObjectLabel' => '%1s (已删除)',
-	'Core:DeletedObjectTip'   => '对象已被删除于 %1$s (%2$s)',
-
+	'Core:DeletedObjectTip' => '对象已被删除于 %1$s (%2$s)',
 	'Core:UnknownObjectLabel' => '对象找不到 (class: %1$s, id: %2$d)',
-	'Core:UnknownObjectTip'   => 'The object could not be found. It may have been deleted some time ago and the log has been purged since.',
-
+	'Core:UnknownObjectTip' => 'The object could not be found. It may have been deleted some time ago and the log has been purged since.~~',
 	'Core:UniquenessDefaultError' => 'Uniqueness rule \'%1$s\' in error~~',
-	'Core:CheckConsistencyError'  => 'Consistency rules not followed: %1$s~~',
-	'Core:CheckValueError'        => 'Unexpected value for attribute \'%1$s\' (%2$s) : %3$s~~',
-
-	'Core:AttributeLinkedSet'  => '对象数组',
-	'Core:AttributeLinkedSet+' => 'Any kind of objects of the same class or subclass',
-
+	'Core:CheckConsistencyError' => 'Consistency rules not followed: %1$s~~',
+	'Core:CheckValueError' => 'Unexpected value for attribute \'%1$s\' (%2$s) : %3$s~~',
+	'Core:AttributeLinkedSet' => '对象数组',
+	'Core:AttributeLinkedSet+' => 'Any kind of objects of the same class or subclass~~',
 	'Core:AttributeLinkedSetDuplicatesFound' => 'Duplicates in the \'%1$s\' field : %2$s~~',
-
-	'Core:AttributeDashboard'  => '仪表盘',
+	'Core:AttributeDashboard' => '仪表盘',
 	'Core:AttributeDashboard+' => '',
-
-	'Core:AttributePhoneNumber'  => '电话号码',
+	'Core:AttributePhoneNumber' => '电话号码',
 	'Core:AttributePhoneNumber+' => '',
-
 	'Core:AttributeObsolescenceDate' => '报废日期',
 	'Core:AttributeObsolescenceDate+' => '',
-
 	'Core:AttributeTagSet' => '清单',
 	'Core:AttributeTagSet+' => '',
 	'Core:AttributeSet:placeholder' => '请点击这里添加',
 	'Core:AttributeClassAttCodeSet:ItemLabel:AttributeFromClass' => '%1$s (%2$s)~~',
 	'Core:AttributeClassAttCodeSet:ItemLabel:AttributeFromOneChildClass' => '%1$s (%2$s from %3$s)~~',
 	'Core:AttributeClassAttCodeSet:ItemLabel:AttributeFromSeveralChildClasses' => '%1$s (%2$s from child classes)~~',
-
 	'Core:AttributeCaseLog' => '日志',
 	'Core:AttributeCaseLog+' => '',
-
 	'Core:AttributeMetaEnum' => 'Computed enum~~',
 	'Core:AttributeMetaEnum+' => '~~',
-
 	'Core:AttributeLinkedSetIndirect' => '对象数组(N-N)',
-	'Core:AttributeLinkedSetIndirect+' => 'Any kind of objects [subclass] of the same class',
-
+	'Core:AttributeLinkedSetIndirect+' => 'Any kind of objects [subclass] of the same class~~',
 	'Core:AttributeInteger' => '整数',
 	'Core:AttributeInteger+' => '整数值(可以为负)',
-
 	'Core:AttributeDecimal' => '小数',
 	'Core:AttributeDecimal+' => '小数(可以为负)',
-
 	'Core:AttributeBoolean' => '布尔',
 	'Core:AttributeBoolean+' => '布尔',
 	'Core:AttributeBoolean/Value:null' => '',
 	'Core:AttributeBoolean/Value:yes' => '是',
 	'Core:AttributeBoolean/Value:no' => '否',
-
 	'Core:AttributeArchiveFlag' => '是否归档',
 	'Core:AttributeArchiveFlag/Value:yes' => '是',
 	'Core:AttributeArchiveFlag/Value:yes+' => '此对象仅在归档模式可见',
@@ -81,63 +66,46 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Core:AttributeArchiveFlag/Label+' => '',
 	'Core:AttributeArchiveDate/Label' => '归档日期',
 	'Core:AttributeArchiveDate/Label+' => '',
-
 	'Core:AttributeObsolescenceFlag' => '是否废弃',
 	'Core:AttributeObsolescenceFlag/Value:yes' => '是',
-	'Core:AttributeObsolescenceFlag/Value:yes+' => 'This object is excluded from the impact analysis, and hidden from search results',
+	'Core:AttributeObsolescenceFlag/Value:yes+' => 'This object is excluded from the impact analysis, and hidden from search results~~',
 	'Core:AttributeObsolescenceFlag/Value:no' => '否',
 	'Core:AttributeObsolescenceFlag/Label' => '是否废弃',
-	'Core:AttributeObsolescenceFlag/Label+' => 'Computed dynamically on other attributes',
+	'Core:AttributeObsolescenceFlag/Label+' => 'Computed dynamically on other attributes~~',
 	'Core:AttributeObsolescenceDate/Label' => '废弃时间',
-	'Core:AttributeObsolescenceDate/Label+' => 'Approximative date at which the object has been considered obsolete',
-
+	'Core:AttributeObsolescenceDate/Label+' => 'Approximative date at which the object has been considered obsolete~~',
 	'Core:AttributeString' => '字符串',
 	'Core:AttributeString+' => '字符串',
-
 	'Core:AttributeClass' => '类',
 	'Core:AttributeClass+' => '类别',
-
 	'Core:AttributeApplicationLanguage' => '用户语言',
 	'Core:AttributeApplicationLanguage+' => '语言和国家地区(EN US)',
-
 	'Core:AttributeFinalClass' => '类 (auto)',
 	'Core:AttributeFinalClass+' => 'Real class of the object (automatically created by the core)',
-
 	'Core:AttributePassword' => '密码',
-	'Core:AttributePassword+' => 'Password of an external device',
-
+	'Core:AttributePassword+' => '外部设备的密码',
 	'Core:AttributeEncryptedString' => '加密字符串',
-	'Core:AttributeEncryptedString+' => 'String encrypted with a local key',
+	'Core:AttributeEncryptedString+' => 'String encrypted with a local key~~',
 	'Core:AttributeEncryptUnknownLibrary' => '未知的加密库 (%1$s)',
 	'Core:AttributeEncryptFailedToDecrypt' => '** 解密错误 **',
-
 	'Core:AttributeText' => '文本',
 	'Core:AttributeText+' => '多行字符串',
-
 	'Core:AttributeHTML' => 'HTML',
 	'Core:AttributeHTML+' => 'HTML字符串',
-
 	'Core:AttributeEmailAddress' => '邮箱地址',
 	'Core:AttributeEmailAddress+' => '邮箱地址',
-
 	'Core:AttributeIPAddress' => 'IP地址',
 	'Core:AttributeIPAddress+' => 'IP地址',
-
 	'Core:AttributeOQL' => 'OQL',
-	'Core:AttributeOQL+' => 'Object Query Langage expression',
-
-	'Core:AttributeEnum' => '列举',
-	'Core:AttributeEnum+' => 'List of predefined alphanumeric strings',
-
+	'Core:AttributeOQL+' => 'Object Query Langage expression~~',
+	'Core:AttributeEnum' => 'Enum~~',
+	'Core:AttributeEnum+' => 'List of predefined alphanumeric strings~~',
 	'Core:AttributeTemplateString' => '字符模板',
 	'Core:AttributeTemplateString+' => '包含占位符的字符串',
-
 	'Core:AttributeTemplateText' => '文字模板',
 	'Core:AttributeTemplateText+' => '包含占位符的文本',
-
 	'Core:AttributeTemplateHTML' => 'HTML模板',
-	'Core:AttributeTemplateHTML+' => 'HTML containing placeholders',
-
+	'Core:AttributeTemplateHTML+' => 'HTML containing placeholders~~',
 	'Core:AttributeDateTime' => '日期/时间',
 	'Core:AttributeDateTime+' => 'Date and time (年-月-日 时:分:秒)',
 	'Core:AttributeDateTime?SmartSearch' => '
@@ -155,7 +123,6 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 <p>
 如果不写具体时间,则默认00:00:00
 </p>',
-
 	'Core:AttributeDate' => '日期',
 	'Core:AttributeDate+' => '日期 (年-月-日)',
 	'Core:AttributeDate?SmartSearch' => '
@@ -170,43 +137,30 @@ Operators:<br/>
 	<b>&lt;</b><em>日期</em><br/>
 	<b>[</b><em>日期</em>,<em>日期</em><b>]</b>
 </p>',
-
 	'Core:AttributeDeadline' => '截止日期',
 	'Core:AttributeDeadline+' => '日期, 显示与当前的相对时间',
-
 	'Core:AttributeExternalKey' => '外键',
-	'Core:AttributeExternalKey+' => 'External (or foreign) key',
-
-	'Core:AttributeHierarchicalKey' => 'Hierarchical Key',
-	'Core:AttributeHierarchicalKey+' => 'External (or foreign) key to the parent',
-
+	'Core:AttributeExternalKey+' => 'External (or foreign) key~~',
+	'Core:AttributeHierarchicalKey' => 'Hierarchical Key~~',
+	'Core:AttributeHierarchicalKey+' => 'External (or foreign) key to the parent~~',
 	'Core:AttributeExternalField' => '外部字段',
-	'Core:AttributeExternalField+' => 'Field mapped to an external key',
-
+	'Core:AttributeExternalField+' => 'Field mapped to an external key~~',
 	'Core:AttributeURL' => 'URL',
-	'Core:AttributeURL+' => 'Absolute or relative URL as a text string',
-
+	'Core:AttributeURL+' => 'Absolute or relative URL as a text string~~',
 	'Core:AttributeBlob' => 'Blob',
 	'Core:AttributeBlob+' => '任何二进制内容(文档)',
-
 	'Core:AttributeOneWayPassword' => '单向密码',
 	'Core:AttributeOneWayPassword+' => '单向加密(或哈希) 的密码',
-
 	'Core:AttributeTable' => '表',
 	'Core:AttributeTable+' => '带索引的二维数组',
-
 	'Core:AttributePropertySet' => '属性',
-	'Core:AttributePropertySet+' => 'List of untyped properties (name and value)',
-
+	'Core:AttributePropertySet+' => 'List of untyped properties (name and value)~~',
 	'Core:AttributeFriendlyName' => '通用名称',
-	'Core:AttributeFriendlyName+' => 'Attribute created automatically ; the friendly name is computed after several attributes',
-
+	'Core:AttributeFriendlyName+' => 'Attribute created automatically ; the friendly name is computed after several attributes~~',
 	'Core:FriendlyName-Label' => '全称',
 	'Core:FriendlyName-Description' => '全称',
-
 	'Core:AttributeTag' => '标签',
 	'Core:AttributeTag+' => '标签',
-	
 	'Core:Context=REST/JSON' => 'REST',
 	'Core:Context=Synchro' => '同步',
 	'Core:Context=Setup' => '安装向导',
@@ -231,7 +185,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:CMDBChange/Attribute:date' => '日期',
 	'Class:CMDBChange/Attribute:date+' => '变更被记录的日期和时间',
 	'Class:CMDBChange/Attribute:userinfo' => '杂项信息',
-	'Class:CMDBChange/Attribute:userinfo+' => '呼叫者已定义的信息',
+	'Class:CMDBChange/Attribute:userinfo+' => '发起人定义的信息',
 	'Class:CMDBChange/Attribute:origin/Value:interactive' => '图形界面交互',
 	'Class:CMDBChange/Attribute:origin/Value:csv-import.php' => '使用脚本导入CSV',
 	'Class:CMDBChange/Attribute:origin/Value:csv-interactive' => '使用图形界面导入CSV',
@@ -259,8 +213,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:CMDBChangeOp/Attribute:objclass+' => 'object class',
 	'Class:CMDBChangeOp/Attribute:objkey' => '对象id',
 	'Class:CMDBChangeOp/Attribute:objkey+' => '对象id',
-	'Class:CMDBChangeOp/Attribute:finalclass' => 'CMDBChangeOp sub-class',
-	'Class:CMDBChangeOp/Attribute:finalclass+' => 'Name of the final class',
+	'Class:CMDBChangeOp/Attribute:finalclass' => 'CMDB操作类型',
+	'Class:CMDBChangeOp/Attribute:finalclass+' => '根本属性的名称',
 ));
 
 //
@@ -289,7 +243,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:CMDBChangeOpSetAttribute' => '对象变化',
 	'Class:CMDBChangeOpSetAttribute+' => '对象属性变化跟踪',
 	'Class:CMDBChangeOpSetAttribute/Attribute:attcode' => '属性',
-	'Class:CMDBChangeOpSetAttribute/Attribute:attcode+' => 'code of the modified property',
+	'Class:CMDBChangeOpSetAttribute/Attribute:attcode+' => 'code of the modified property~~',
 ));
 
 //
@@ -354,13 +308,13 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:Event' => '日志事件',
 	'Class:Event+' => '应用程序的内部事件',
 	'Class:Event/Attribute:message' => '消息',
-	'Class:Event/Attribute:message+' => 'short description of the event',
+	'Class:Event/Attribute:message+' => 'short description of the event~~',
 	'Class:Event/Attribute:date' => '日期',
 	'Class:Event/Attribute:date+' => '记录的日期和时间',
 	'Class:Event/Attribute:userinfo' => '用户信息',
 	'Class:Event/Attribute:userinfo+' => 'identification of the user that was doing the action that triggered this event',
-	'Class:Event/Attribute:finalclass' => '事件子类别',
-	'Class:Event/Attribute:finalclass+' => 'Name of the final class',
+	'Class:Event/Attribute:finalclass' => '事件类型',
+	'Class:Event/Attribute:finalclass+' => '根本属性的名称',
 ));
 
 //
@@ -369,13 +323,13 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:EventNotification' => '通知事件',
-	'Class:EventNotification+' => 'Trace of a notification that has been sent',
+	'Class:EventNotification+' => 'Trace of a notification that has been sent~~',
 	'Class:EventNotification/Attribute:trigger_id' => '触发器',
-	'Class:EventNotification/Attribute:trigger_id+' => '用户帐户',
+	'Class:EventNotification/Attribute:trigger_id+' => '用户账户',
 	'Class:EventNotification/Attribute:action_id' => '用户',
-	'Class:EventNotification/Attribute:action_id+' => '用户帐户',
+	'Class:EventNotification/Attribute:action_id+' => '用户账户',
 	'Class:EventNotification/Attribute:object_id' => '对象id',
-	'Class:EventNotification/Attribute:object_id+' => 'object id (class defined by the trigger ?)',
+	'Class:EventNotification/Attribute:object_id+' => 'object id (class defined by the trigger ?)~~',
 ));
 
 //
@@ -406,20 +360,20 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 //
 
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:EventIssue' => 'Issue event',
-	'Class:EventIssue+' => 'Trace of an issue (warning, error, etc.)',
+	'Class:EventIssue' => 'Issue event~~',
+	'Class:EventIssue+' => 'Trace of an issue (warning, error, etc.)~~',
 	'Class:EventIssue/Attribute:issue' => '事件',
 	'Class:EventIssue/Attribute:issue+' => '发生了什么',
 	'Class:EventIssue/Attribute:impact' => '影响',
 	'Class:EventIssue/Attribute:impact+' => '重要性如何',
 	'Class:EventIssue/Attribute:page' => 'Page',
-	'Class:EventIssue/Attribute:page+' => 'HTTP entry point',
+	'Class:EventIssue/Attribute:page+' => 'HTTP entry point~~',
 	'Class:EventIssue/Attribute:arguments_post' => 'POST参数',
 	'Class:EventIssue/Attribute:arguments_post+' => 'HTTP POST参数',
 	'Class:EventIssue/Attribute:arguments_get' => 'URL参数',
 	'Class:EventIssue/Attribute:arguments_get+' => 'HTTP GET参数',
 	'Class:EventIssue/Attribute:callstack' => '调用栈',
-	'Class:EventIssue/Attribute:callstack+' => 'Call stack',
+	'Class:EventIssue/Attribute:callstack+' => 'Call stack~~',
 	'Class:EventIssue/Attribute:data' => '数据',
 	'Class:EventIssue/Attribute:data+' => '更多信息',
 ));
@@ -429,35 +383,35 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 //
 
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:EventWebService' => 'Web service event',
-	'Class:EventWebService+' => 'Trace of an web service call',
-	'Class:EventWebService/Attribute:verb' => 'Verb',
-	'Class:EventWebService/Attribute:verb+' => 'Name of the operation',
+	'Class:EventWebService' => 'Web service event~~',
+	'Class:EventWebService+' => 'Trace of an web service call~~',
+	'Class:EventWebService/Attribute:verb' => 'Verb~~',
+	'Class:EventWebService/Attribute:verb+' => 'Name of the operation~~',
 	'Class:EventWebService/Attribute:result' => '结果',
-	'Class:EventWebService/Attribute:result+' => 'Overall success/failure',
-	'Class:EventWebService/Attribute:log_info' => 'Info log',
-	'Class:EventWebService/Attribute:log_info+' => 'Result info log',
-	'Class:EventWebService/Attribute:log_warning' => 'Warning log',
-	'Class:EventWebService/Attribute:log_warning+' => 'Result warning log',
-	'Class:EventWebService/Attribute:log_error' => 'Error log',
-	'Class:EventWebService/Attribute:log_error+' => 'Result error log',
+	'Class:EventWebService/Attribute:result+' => 'Overall success/failure~~',
+	'Class:EventWebService/Attribute:log_info' => 'Info log~~',
+	'Class:EventWebService/Attribute:log_info+' => 'Result info log~~',
+	'Class:EventWebService/Attribute:log_warning' => 'Warning log~~',
+	'Class:EventWebService/Attribute:log_warning+' => 'Result warning log~~',
+	'Class:EventWebService/Attribute:log_error' => 'Error log~~',
+	'Class:EventWebService/Attribute:log_error+' => 'Result error log~~',
 	'Class:EventWebService/Attribute:data' => '数据',
-	'Class:EventWebService/Attribute:data+' => 'Result data',
+	'Class:EventWebService/Attribute:data+' => 'Result data~~',
 ));
 
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:EventRestService' => 'REST/JSON 调用',
-	'Class:EventRestService+' => 'Trace of a REST/JSON service call',
+	'Class:EventRestService+' => 'Trace of a REST/JSON service call~~',
 	'Class:EventRestService/Attribute:operation' => '操作',
 	'Class:EventRestService/Attribute:operation+' => '参数 \'操作\'',
 	'Class:EventRestService/Attribute:version' => '版本',
 	'Class:EventRestService/Attribute:version+' => '参数 \'版本\'',
 	'Class:EventRestService/Attribute:json_input' => '输入',
-	'Class:EventRestService/Attribute:json_input+' => 'Argument \'json_data\'',
+	'Class:EventRestService/Attribute:json_input+' => 'Argument \'json_data\'~~',
 	'Class:EventRestService/Attribute:code' => '代码',
 	'Class:EventRestService/Attribute:code+' => '返回代码',
 	'Class:EventRestService/Attribute:json_output' => '响应',
-	'Class:EventRestService/Attribute:json_output+' => 'HTTP响应 (json)',
+	'Class:EventRestService/Attribute:json_output+' => 'HTTP 响应 (json)',
 	'Class:EventRestService/Attribute:provider' => '提供者',
 	'Class:EventRestService/Attribute:provider+' => '实现此功能的PHP类',
 ));
@@ -468,7 +422,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:EventLoginUsage' => '登录频率',
-	'Class:EventLoginUsage+' => 'Connection to the application',
+	'Class:EventLoginUsage+' => 'Connection to the application~~',
 	'Class:EventLoginUsage/Attribute:user_id' => '登录',
 	'Class:EventLoginUsage/Attribute:user_id+' => '登录',
 	'Class:EventLoginUsage/Attribute:contact_name' => '用户名',
@@ -484,6 +438,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:Action' => '自定义操作',
 	'Class:Action+' => '用户定义的操作',
+	'Class:Action/ComplementaryName' => '%1$s: %2$s',
 	'Class:Action/Attribute:name' => '名称',
 	'Class:Action/Attribute:name+' => '',
 	'Class:Action/Attribute:description' => '描述',
@@ -498,8 +453,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:Action/Attribute:status/Value:disabled+' => '停用',
 	'Class:Action/Attribute:trigger_list' => '相关的触发器',
 	'Class:Action/Attribute:trigger_list+' => '此操作关联的触发器',
-	'Class:Action/Attribute:finalclass' => 'Action sub-class',
-	'Class:Action/Attribute:finalclass+' => 'Name of the final class',
+	'Class:Action/Attribute:finalclass' => '操作类型',
+	'Class:Action/Attribute:finalclass+' => '根本属性的名称',
 	'Action:WarningNoTriggerLinked' => 'Warning, no trigger is linked to the action. It will not be active until it has at least 1.~~',
 ));
 
@@ -519,38 +474,70 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:ActionEmail' => '邮件通知',
 	'Class:ActionEmail+' => '',
-	'Class:ActionEmail/Attribute:status+' => 'This status drives who will be notified: just the Test recipient, all (To, cc and Bcc) or no-one~~',
-	'Class:ActionEmail/Attribute:status/Value:test+' => 'Only the Test recipient is notified~~',
-	'Class:ActionEmail/Attribute:status/Value:enabled+' => 'All To, Cc and Bcc emails are notified~~',
+	'Class:ActionEmail/Attribute:status+' => 'This status drives who will be notified: 
+- Being tested: just the Test recipient, 
+- In production: all (To, cc and Bcc) 
+- Inactive: no-one~~',
+	'Class:ActionEmail/Attribute:status/Value:test+' => '仅测试收件人会被通知',
+	'Class:ActionEmail/Attribute:status/Value:enabled+' => '通知所有人, 包含抄送和秘抄',
 	'Class:ActionEmail/Attribute:status/Value:disabled+' => 'The email notification will not be sent~~',
 	'Class:ActionEmail/Attribute:test_recipient' => '测试收件人',
-	'Class:ActionEmail/Attribute:test_recipient+' => 'Detination in case status is set to "Test"',
-	'Class:ActionEmail/Attribute:from' => '发件人~~',
-	'Class:ActionEmail/Attribute:from+' => 'Will be sent into the email header~~',
+	'Class:ActionEmail/Attribute:test_recipient+' => 'Destination email address used instead of To, Cc and Bcc when notification is being tested~~',
+	'Class:ActionEmail/Attribute:from' => 'From (email)~~',
+	'Class:ActionEmail/Attribute:from+' => 'Either a static email address or a placeholder like $this->agent_id->email$.
+The latest may not be accepted by some email servers.~~',
 	'Class:ActionEmail/Attribute:from_label' => 'From (label)~~',
-	'Class:ActionEmail/Attribute:from_label+' => 'Sender display name will be sent into the email header~~',
-	'Class:ActionEmail/Attribute:reply_to' => '回复到~~',
-	'Class:ActionEmail/Attribute:reply_to+' => 'Will be sent into the email header~~',
+	'Class:ActionEmail/Attribute:from_label+' => 'Either a static label or a placeholder like $this->agent_id->friendlyname$',
+	'Class:ActionEmail/Attribute:reply_to' => 'Reply to (email)~~',
+	'Class:ActionEmail/Attribute:reply_to+' => 'Either a static email address or a placeholder like $this->team_id->email$.
+If omitted the From (email) is used.~~',
 	'Class:ActionEmail/Attribute:reply_to_label' => 'Reply to (label)~~',
-	'Class:ActionEmail/Attribute:reply_to_label+' => 'Reply to display name will be sent into the email header~~',
+	'Class:ActionEmail/Attribute:reply_to_label+' => 'Either a static label or a placeholder like $this->team_id->friendlyname$.
+If omitted the From (label) is used.~~',
 	'Class:ActionEmail/Attribute:to' => '收件人',
-	'Class:ActionEmail/Attribute:to+' => 'Destination of the email',
+	'Class:ActionEmail/Attribute:to+' => 'To: an OQL query returning objects having an email field.
+While editing, click on the magnifier to get pertinent examples~~',
 	'Class:ActionEmail/Attribute:cc' => '抄送',
-	'Class:ActionEmail/Attribute:cc+' => '明文抄送',
-	'Class:ActionEmail/Attribute:bcc' => '密抄',
-	'Class:ActionEmail/Attribute:bcc+' => '加密抄送',
+	'Class:ActionEmail/Attribute:cc+' => 'Carbon Copy: an OQL query returning objects having an email field.
+While editing, click on the magnifier to get pertinent examples~~',
+	'Class:ActionEmail/Attribute:bcc' => '秘抄',
+	'Class:ActionEmail/Attribute:bcc+' => 'Blind Carbon Copy: an OQL query returning objects having an email field. 
+While editing, click on the magnifier to get pertinent examples~~',
 	'Class:ActionEmail/Attribute:subject' => '主题',
-	'Class:ActionEmail/Attribute:subject+' => '邮件主题',
+	'Class:ActionEmail/Attribute:subject+' => 'Title of the email. Can contain placeholders like $this->attribute_code$',
 	'Class:ActionEmail/Attribute:body' => '正文',
-	'Class:ActionEmail/Attribute:body+' => '邮件内容',
+	'Class:ActionEmail/Attribute:body+' => 'Contents of the email. Can contain placeholders like:
+- $this->attribute_code$ any attribute of the object triggering the notification,
+- $this->html(attribute_code)$ same as above but displayed in html format,
+- $this->hyperlink()$ hyperlink in the console to the object triggering the notification,
+- $this->hyperlink(portal)$ hyperlink in the portal to the object triggering the notification,
+- $this->head_html(case_log_attribute)$ last reply in html format of a caselog attribute,
+- $this->attribute_external_key->attribute$ recursive syntax for any remote attribute,
+- $current_contact->attribute$ attribute of the Person who triggered the notification~~',
 	'Class:ActionEmail/Attribute:importance' => '重要性',
-	'Class:ActionEmail/Attribute:importance+' => '重要性标记',
+	'Class:ActionEmail/Attribute:importance+' => 'Importance flag set on the generated email~~',
 	'Class:ActionEmail/Attribute:importance/Value:low' => '低',
-	'Class:ActionEmail/Attribute:importance/Value:low+' => '低',
+	'Class:ActionEmail/Attribute:importance/Value:low+' => '',
 	'Class:ActionEmail/Attribute:importance/Value:normal' => '普通',
-	'Class:ActionEmail/Attribute:importance/Value:normal+' => '普通',
+	'Class:ActionEmail/Attribute:importance/Value:normal+' => '',
 	'Class:ActionEmail/Attribute:importance/Value:high' => '高',
-	'Class:ActionEmail/Attribute:importance/Value:high+' => '高',
+	'Class:ActionEmail/Attribute:importance/Value:high+' => '',
+	'Class:ActionEmail/Attribute:language' => 'Language~~',
+	'Class:ActionEmail/Attribute:language+' => 'Language to use for placeholders ($xxx$) inside the message (state, importance, priority, etc)~~',
+	'Class:ActionEmail/Attribute:html_template' => 'HTML template~~',
+	'Class:ActionEmail/Attribute:html_template+' => 'Optional HTML template wrapping around the content of the \'Body\' attribute below, useful for tailored email layouts (in the template, content of the \'Body\' attribute will replace the $content$ placeholder)~~',
+	'Class:ActionEmail/Attribute:ignore_notify' => 'Ignore the Notify flag~~',
+	'Class:ActionEmail/Attribute:ignore_notify+' => 'If set to \'Yes\' the \'Notify\' flag on Contacts has no effect.~~',
+	'Class:ActionEmail/Attribute:ignore_notify/Value:no' => 'No~~',
+	'Class:ActionEmail/Attribute:ignore_notify/Value:yes' => 'Yes~~',
+	'ActionEmail:main' => '消息',
+	'ActionEmail:trigger' => '触发器',
+	'ActionEmail:recipients' => '联系人',
+	'ActionEmail:preview_tab' => 'Preview~~',
+	'ActionEmail:preview_tab+' => 'Preview of the eMail template~~',
+	'ActionEmail:preview_warning' => 'The actual eMail may look different in the eMail client than this preview in your browser.~~',
+	'ActionEmail:preview_more_info' => 'For more information about the CSS features supported by the different eMail clients, refer to %1$s~~',
+	'ActionEmail:content_placeholder_missing' => 'The placeholder "%1$s" was not found in the HTML template. The content of the field "%2$s" will not be included in the generated emails.~~',
 ));
 
 //
@@ -559,15 +546,18 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:Trigger' => '触发器',
-	'Class:Trigger+' => 'Custom event handler',
+	'Class:Trigger+' => 'Custom event handler~~',
+	'Class:Trigger/ComplementaryName' => '%1$s, %2$s',
 	'Class:Trigger/Attribute:description' => '描述',
 	'Class:Trigger/Attribute:description+' => '简短描述',
-	'Class:Trigger/Attribute:action_list' => '触发的行为',
-	'Class:Trigger/Attribute:action_list+' => 'Actions performed when the trigger is activated',
-	'Class:Trigger/Attribute:finalclass' => '触发器子类别',
-	'Class:Trigger/Attribute:finalclass+' => 'Name of the final class',
+	'Class:Trigger/Attribute:action_list' => '触发的操作',
+	'Class:Trigger/Attribute:action_list+' => 'Actions performed when the trigger is activated~~',
+	'Class:Trigger/Attribute:finalclass' => '触发器类型',
+	'Class:Trigger/Attribute:finalclass+' => '根本属性的名称',
 	'Class:Trigger/Attribute:context' => '上下文',
-	'Class:Trigger/Attribute:context+' => '触发场景',
+	'Class:Trigger/Attribute:context+' => 'Context to allow the trigger to start~~',
+	'Class:Trigger/Attribute:complement' => '其它信息',
+	'Class:Trigger/Attribute:complement+' => 'Further information as provided in english, by this trigger~~',
 ));
 
 //
@@ -576,13 +566,13 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:TriggerOnObject' => '触发器 (class dependent)',
-	'Class:TriggerOnObject+' => 'Trigger on a given class of objects',
+	'Class:TriggerOnObject+' => 'Trigger on a given class of objects~~',
 	'Class:TriggerOnObject/Attribute:target_class' => '目标类',
 	'Class:TriggerOnObject/Attribute:target_class+' => '',
-	'Class:TriggerOnObject/Attribute:filter' => '过滤器',
+	'Class:TriggerOnObject/Attribute:filter' => '筛选器',
 	'Class:TriggerOnObject/Attribute:filter+' => 'Limit the object list (of the target class) which will activate the trigger~~',
-	'TriggerOnObject:WrongFilterQuery' => 'Wrong filter query: %1$s',
-	'TriggerOnObject:WrongFilterClass' => 'The filter query must return objects of class "%1$s"',
+	'TriggerOnObject:WrongFilterQuery' => 'Wrong filter query: %1$s~~',
+	'TriggerOnObject:WrongFilterClass' => 'The filter query must return objects of class "%1$s"~~',
 ));
 
 //
@@ -663,6 +653,17 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:TriggerOnObjectMention/Attribute:mentioned_filter+' => 'Limit the list of mentioned objects which will activate the trigger. If empty, any mentioned object (of any class) will activate it.~~',
 ));
 
+//
+// Class: TriggerOnAttributeBlobDownload
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:TriggerOnAttributeBlobDownload' => 'Trigger (on object\'s document download)~~',
+	'Class:TriggerOnAttributeBlobDownload+' => 'Trigger on object\'s document field download of [a child class of] the given class~~',
+	'Class:TriggerOnAttributeBlobDownload/Attribute:target_attcodes' => 'Target fields~~',
+	'Class:TriggerOnAttributeBlobDownload/Attribute:target_attcodes+' => '',
+));
+
 //
 // Class: TriggerOnThresholdReached
 //
@@ -682,9 +683,9 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:lnkTriggerAction' => '操作/触发器',
-	'Class:lnkTriggerAction+' => 'Link between a trigger and an action',
+	'Class:lnkTriggerAction+' => 'Link between a trigger and an action~~',
 	'Class:lnkTriggerAction/Attribute:action_id' => '操作',
-	'Class:lnkTriggerAction/Attribute:action_id+' => 'The action to be executed',
+	'Class:lnkTriggerAction/Attribute:action_id+' => 'The action to be executed~~',
 	'Class:lnkTriggerAction/Attribute:action_name' => '操作',
 	'Class:lnkTriggerAction/Attribute:action_name+' => '',
 	'Class:lnkTriggerAction/Attribute:trigger_id' => '触发器',
@@ -699,173 +700,184 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 // Synchro Data Source
 //
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:SynchroDataSource' => '数据源同步',
 	'Class:SynchroDataSource/Attribute:name' => '名称',
-	'Class:SynchroDataSource/Attribute:name+' => '名称',
+	'Class:SynchroDataSource/Attribute:name+' => '',
 	'Class:SynchroDataSource/Attribute:description' => '描述',
 	'Class:SynchroDataSource/Attribute:status' => '状态',
-	'Class:SynchroDataSource/Attribute:scope_class' => '目标类',
+	'Class:SynchroDataSource/Attribute:scope_class' => 'Target class~~',
+	'Class:SynchroDataSource/Attribute:scope_class+' => 'A Synchro Data Source can only populate a single '.ITOP_APPLICATION_SHORT.' class',
 	'Class:SynchroDataSource/Attribute:user_id' => '用户',
-	'Class:SynchroDataSource/Attribute:notify_contact_id' => '要通知的人',
-	'Class:SynchroDataSource/Attribute:notify_contact_id+' => 'Contact to notify in case of error',
+	'Class:SynchroDataSource/Attribute:notify_contact_id' => '联系人',
+	'Class:SynchroDataSource/Attribute:notify_contact_id+' => 'Contact to notify in case of error~~',
 	'Class:SynchroDataSource/Attribute:url_icon' => '图标的超链接',
-	'Class:SynchroDataSource/Attribute:url_icon+' => 'Hyperlink a (small) image representing the application with which '.ITOP_APPLICATION_SHORT.' is synchronized',
+	'Class:SynchroDataSource/Attribute:url_icon+' => 'Hyperlink a (small) image representing the application with which '.ITOP_APPLICATION_SHORT.' is synchronized.
+This icon is shown in the tooltip of the “Lock” symbol on '.ITOP_APPLICATION_SHORT.' synchronized object~~',
 	'Class:SynchroDataSource/Attribute:url_application' => '应用的超链接',
-	'Class:SynchroDataSource/Attribute:url_application+' => 'Hyperlink to the '.ITOP_APPLICATION_SHORT.' object in the external application with which '.ITOP_APPLICATION_SHORT.' is synchronized (if applicable). Possible placeholders: $this->attribute$ and $replica->primary_key$',
-	'Class:SynchroDataSource/Attribute:reconciliation_policy' => 'Reconciliation policy',
-	'Class:SynchroDataSource/Attribute:full_load_periodicity' => 'Full load interval',
-	'Class:SynchroDataSource/Attribute:full_load_periodicity+' => 'A complete reload of all data must occur at least as often as specified here',
-	'Class:SynchroDataSource/Attribute:action_on_zero' => '执行结果成功时',
-	'Class:SynchroDataSource/Attribute:action_on_zero+' => 'Action taken when the search returns no object',
-	'Class:SynchroDataSource/Attribute:action_on_one' => '执行结果失败时',
-	'Class:SynchroDataSource/Attribute:action_on_one+' => 'Action taken when the search returns exactly one object',
-	'Class:SynchroDataSource/Attribute:action_on_multiple' => '执行结果未知时',
-	'Class:SynchroDataSource/Attribute:action_on_multiple+' => 'Action taken when the search returns more than one object',
-	'Class:SynchroDataSource/Attribute:user_delete_policy' => '授权用户',
-	'Class:SynchroDataSource/Attribute:user_delete_policy+' => 'Who is allowed to delete synchronized objects',
+	'Class:SynchroDataSource/Attribute:url_application+' => 'Hyperlink to the object in the external application corresponding to a synchronized '.ITOP_APPLICATION_SHORT.' object. 
+Possible placeholders: $this->attribute$ and $replica->primary_key$.
+The hyperlink is displayed in the tooltip appearing on the “Lock” symbol of any synchronized '.ITOP_APPLICATION_SHORT.' object~~',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy' => 'Reconciliation policy~~',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy+' => '"Use the attributes": '.ITOP_APPLICATION_SHORT.' object matches replica values for each Synchro attributes flagged for Reconciliation.
+"Use primary_key": the column primary_key of the replica is expected to contain the identifier of the '.ITOP_APPLICATION_SHORT.' object~~',
+	'Class:SynchroDataSource/Attribute:full_load_periodicity' => 'Full load interval~~',
+	'Class:SynchroDataSource/Attribute:full_load_periodicity+' => 'A complete reload of all data must occur at least as often as specified here~~',
+	'Class:SynchroDataSource/Attribute:action_on_zero' => 'Action on zero~~',
+	'Class:SynchroDataSource/Attribute:action_on_zero+' => 'Action taken when the search returns no object~~',
+	'Class:SynchroDataSource/Attribute:action_on_one' => 'Action on one~~',
+	'Class:SynchroDataSource/Attribute:action_on_one+' => 'Action taken when the search returns exactly one object~~',
+	'Class:SynchroDataSource/Attribute:action_on_multiple' => 'Action on many~~',
+	'Class:SynchroDataSource/Attribute:action_on_multiple+' => 'Action taken when the search returns more than one object~~',
+	'Class:SynchroDataSource/Attribute:user_delete_policy' => 'Users allowed~~',
+	'Class:SynchroDataSource/Attribute:user_delete_policy+' => 'Who is allowed to delete synchronized objects~~',
 	'Class:SynchroDataSource/Attribute:delete_policy/Value:never' => 'Nobody',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:depends' => '仅限管理员',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:always' => '所有授权用户',
-	'Class:SynchroDataSource/Attribute:delete_policy_update' => '更新规则',
-	'Class:SynchroDataSource/Attribute:delete_policy_update+' => '语法: field_name:value; ...',
-	'Class:SynchroDataSource/Attribute:delete_policy_retention' => '保留期限',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:depends' => 'Administrators only',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:always' => 'All allowed users',
+	'Class:SynchroDataSource/Attribute:delete_policy_update' => 'Update rules',
+	'Class:SynchroDataSource/Attribute:delete_policy_update+' => 'A list of "field_name:value;":
+"field_name" must be a valid field of the Target class.
+"value" must be an authorised value for that field.~~',
+	'Class:SynchroDataSource/Attribute:delete_policy_retention' => 'Retention Duration~~',
 	'Class:SynchroDataSource/Attribute:delete_policy_retention+' => 'How much time an obsolete object is kept before being deleted',
 	'Class:SynchroDataSource/Attribute:database_table_name' => 'Data table',
 	'Class:SynchroDataSource/Attribute:database_table_name+' => 'Name of the table to store the synchronization data. If left empty, a default name will be computed.',
-	'SynchroDataSource:Description' => '描述',
-	'SynchroDataSource:Reconciliation' => 'Search &amp; reconciliation',
-	'SynchroDataSource:Deletion' => '删除规则',
-	'SynchroDataSource:Status' => '状态',
-	'SynchroDataSource:Information' => '信息',
-	'SynchroDataSource:Definition' => '定义',
-	'Core:SynchroAttributes' => '属性',
-	'Core:SynchroStatus' => '状态',
-	'Core:Synchro:ErrorsLabel' => '错误',
-	'Core:Synchro:CreatedLabel' => '已创建',
-	'Core:Synchro:ModifiedLabel' => '已修改',
-	'Core:Synchro:UnchangedLabel' => '保持不变',
-	'Core:Synchro:ReconciledErrorsLabel' => '错误',
-	'Core:Synchro:ReconciledLabel' => '已核对',
-	'Core:Synchro:ReconciledNewLabel' => '已创建',
-	'Core:SynchroReconcile:Yes' => '是',
-	'Core:SynchroReconcile:No' => '否',
-	'Core:SynchroUpdate:Yes' => '是',
-	'Core:SynchroUpdate:No' => '否',
-	'Core:Synchro:LastestStatus' => '最新状态',
-	'Core:Synchro:History' => '同步历史',
-	'Core:Synchro:NeverRun' => 'This synchro was never run. No log yet.',
-	'Core:Synchro:SynchroEndedOn_Date' => '最近的同步发生在 %1$s.',
-	'Core:Synchro:SynchroRunningStartedOn_Date' => ' %1$s 开始的同步还在进行中...',
-	'Menu:DataSources' => '同步数据源', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:DataSources+' => '所有同步数据源', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Core:Synchro:label_repl_ignored' => '已忽略 (%1$s)',
-	'Core:Synchro:label_repl_disappeared' => '已消失 (%1$s)',
-	'Core:Synchro:label_repl_existing' => '已存在 (%1$s)',
-	'Core:Synchro:label_repl_new' => '新增 (%1$s)',
-	'Core:Synchro:label_obj_deleted' => '已删除 (%1$s)',
-	'Core:Synchro:label_obj_obsoleted' => '已废弃 (%1$s)',
-	'Core:Synchro:label_obj_disappeared_errors' => '错误 (%1$s)',
-	'Core:Synchro:label_obj_disappeared_no_action' => 'No Action (%1$s)',
-	'Core:Synchro:label_obj_unchanged' => '保持不变 (%1$s)',
-	'Core:Synchro:label_obj_updated' => '已更新 (%1$s)',
-	'Core:Synchro:label_obj_updated_errors' => 'Errors (%1$s)',
-	'Core:Synchro:label_obj_new_unchanged' => '保持不变 (%1$s)',
-	'Core:Synchro:label_obj_new_updated' => '已更新 (%1$s)',
-	'Core:Synchro:label_obj_created' => '已创建 (%1$s)',
-	'Core:Synchro:label_obj_new_errors' => '错误 (%1$s)',
-	'Core:SynchroLogTitle' => '%1$s - %2$s',
-	'Core:Synchro:Nb_Replica' => 'Replica processed: %1$s',
-	'Core:Synchro:Nb_Class:Objects' => '%1$s: %2$s',
-	'Class:SynchroDataSource/Error:AtLeastOneReconciliationKeyMustBeSpecified' => 'At Least one reconciliation key must be specified, or the reconciliation policy must be to use the primary key.',
-	'Class:SynchroDataSource/Error:DeleteRetentionDurationMustBeSpecified' => 'A delete retention period must be specified, since objects are to be deleted after being marked as obsolete',
-	'Class:SynchroDataSource/Error:DeletePolicyUpdateMustBeSpecified' => 'Obsolete objects are to be updated, but no update is specified.',
-	'Class:SynchroDataSource/Error:DataTableAlreadyExists' => 'The table %1$s already exists in the database. Please use another name for the synchro data table.',
-	'Core:SynchroReplica:PublicData' => '公共数据',
-	'Core:SynchroReplica:PrivateDetails' => '专属详情',
-	'Core:SynchroReplica:BackToDataSource' => '返回同步数据源: %1$s',
-	'Core:SynchroReplica:ListOfReplicas' => 'List of Replica',
-	'Core:SynchroAttExtKey:ReconciliationById' => 'id (Primary Key)',
-	'Core:SynchroAtt:attcode' => '属性',
-	'Core:SynchroAtt:attcode+' => 'Field of the object',
-	'Core:SynchroAtt:reconciliation' => 'Reconciliation ?',
-	'Core:SynchroAtt:reconciliation+' => 'Used for searching',
-	'Core:SynchroAtt:update' => '更新 ?',
-	'Core:SynchroAtt:update+' => 'Used to update the object',
-	'Core:SynchroAtt:update_policy' => '更新策略',
-	'Core:SynchroAtt:update_policy+' => 'Behavior of the updated field',
-	'Core:SynchroAtt:reconciliation_attcode' => 'Reconciliation Key',
-	'Core:SynchroAtt:reconciliation_attcode+' => 'Attribute Code for the External Key Reconciliation',
-	'Core:SyncDataExchangeComment' => '(Data Synchro)',
-	'Core:Synchro:ListOfDataSources' => '数据源列表:',
-	'Core:Synchro:LastSynchro' => '上次同步:',
-	'Core:Synchro:ThisObjectIsSynchronized' => 'This object is synchronized with an external data source',
-	'Core:Synchro:TheObjectWasCreatedBy_Source' => 'The object was <b>created</b> by the external data source %1$s',
-	'Core:Synchro:TheObjectCanBeDeletedBy_Source' => 'The object <b>can be deleted</b> by the external data source %1$s',
-	'Core:Synchro:TheObjectCannotBeDeletedByUser_Source' => 'You <b>cannot delete the object</b> because it is owned by the external data source %1$s',
-	'TitleSynchroExecution' => 'Execution of the synchronization',
-	'Class:SynchroDataSource:DataTable' => 'Database table: %1$s',
-	'Core:SyncDataSourceObsolete' => '数据源已被废弃. 操作已取消.',
-	'Core:SyncDataSourceAccessRestriction' => '仅数据源中指定的用户才能执行此操作. 操作已取消.',
-	'Core:SyncTooManyMissingReplicas' => 'All records have been untouched for some time (all of the objects could be deleted). Please check that the process that writes into the synchronization table is still running. Operation cancelled.',
-	'Core:SyncSplitModeCLIOnly' => 'The synchronization can be executed in chunks only if run in mode CLI',
-	'Core:Synchro:ListReplicas_AllReplicas_Errors_Warnings' => '%1$s replicas, %2$s error(s), %3$s warning(s).',
-	'Core:SynchroReplica:TargetObject' => '已同步的对象: %1$s',
-	'Class:AsyncSendEmail' => 'Email (异步)',
-	'Class:AsyncSendEmail/Attribute:to' => '收件人',
-	'Class:AsyncSendEmail/Attribute:subject' => '主题',
-	'Class:AsyncSendEmail/Attribute:body' => '正文',
-	'Class:AsyncSendEmail/Attribute:header' => '抬头',
-	'Class:CMDBChangeOpSetAttributeOneWayPassword' => '加密密码',
-	'Class:CMDBChangeOpSetAttributeOneWayPassword/Attribute:prev_pwd' => '之前的值',
-	'Class:CMDBChangeOpSetAttributeEncrypted' => '加密字段',
-	'Class:CMDBChangeOpSetAttributeEncrypted/Attribute:prevstring' => '之前的值',
-	'Class:CMDBChangeOpSetAttributeCaseLog' => 'Case Log',
-	'Class:CMDBChangeOpSetAttributeCaseLog/Attribute:lastentry' => 'Last Entry',
-	'Class:SynchroDataSource' => '同步数据源',
-	'Class:SynchroDataSource/Attribute:status/Value:implementation' => '上线',
+	'Class:SynchroDataSource/Attribute:status/Value:implementation' => '生效',
 	'Class:SynchroDataSource/Attribute:status/Value:obsolete' => '废弃',
 	'Class:SynchroDataSource/Attribute:status/Value:production' => '生产',
-	'Class:SynchroDataSource/Attribute:scope_restriction' => '范围限制',
+	'Class:SynchroDataSource/Attribute:scope_restriction' => 'Scope restriction',
 	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_attributes' => 'Use the attributes',
 	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_primary_key' => 'Use the primary_key field',
-	'Class:SynchroDataSource/Attribute:action_on_zero/Value:create' => '已创建',
-	'Class:SynchroDataSource/Attribute:action_on_zero/Value:error' => '错误',
-	'Class:SynchroDataSource/Attribute:action_on_one/Value:error' => '错误',
-	'Class:SynchroDataSource/Attribute:action_on_one/Value:update' => '更新',
-	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:create' => '创建',
-	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:error' => '错误',
-	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:take_first' => '选择第一项(随机?)',
+	'Class:SynchroDataSource/Attribute:action_on_zero/Value:create' => 'Create',
+	'Class:SynchroDataSource/Attribute:action_on_zero/Value:error' => 'Error',
+	'Class:SynchroDataSource/Attribute:action_on_one/Value:error' => 'Error',
+	'Class:SynchroDataSource/Attribute:action_on_one/Value:update' => 'Update',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:create' => 'Create',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:error' => 'Error',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:take_first' => 'Take the first one (random?)',
 	'Class:SynchroDataSource/Attribute:delete_policy' => '删除策略',
+	'Class:SynchroDataSource/Attribute:delete_policy+' => 'What to do when a replica becomes obsolete:
+"Ignore": do nothing, the associated object remains as is in iTop.
+"Delete": Delete the associated object in iTop (and the replica in the data table).
+"Update": Update the associated object as specified by the Update rules (see below).
+"Update then Delete": apply the "Update rules". When Retention Duration expires, execute a "Delete" ~~',
 	'Class:SynchroDataSource/Attribute:delete_policy/Value:delete' => '删除',
 	'Class:SynchroDataSource/Attribute:delete_policy/Value:ignore' => '忽略',
 	'Class:SynchroDataSource/Attribute:delete_policy/Value:update' => '更新',
 	'Class:SynchroDataSource/Attribute:delete_policy/Value:update_then_delete' => '先更新再删除',
-	'Class:SynchroDataSource/Attribute:attribute_list' => '属性列表',
-	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:administrators' => '仅限管理员',
-	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:everybody' => '允许所有人删除此对象',
+	'Class:SynchroDataSource/Attribute:attribute_list' => 'Attributes List~~',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:administrators' => 'Administrators only',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:everybody' => 'Everybody allowed to delete such objects',
 	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:nobody' => 'Nobody',
-	'Class:SynchroAttribute' => '同步属性',
-	'Class:SynchroAttribute/Attribute:sync_source_id' => '同步数据源',
-	'Class:SynchroAttribute/Attribute:attcode' => '属性代码',
-	'Class:SynchroAttribute/Attribute:update' => '更新',
-	'Class:SynchroAttribute/Attribute:reconcile' => '核对',
-	'Class:SynchroAttribute/Attribute:update_policy' => '更新策略',
-	'Class:SynchroAttribute/Attribute:update_policy/Value:master_locked' => '加锁',
-	'Class:SynchroAttribute/Attribute:update_policy/Value:master_unlocked' => '解锁',
-	'Class:SynchroAttribute/Attribute:update_policy/Value:write_if_empty' => '如果为空则初始化',
+	'SynchroDataSource:Description' => '描述',
+	'SynchroDataSource:Reconciliation' => 'Search &amp; reconciliation~~',
+	'SynchroDataSource:Deletion' => 'Deletion rules~~',
+	'SynchroDataSource:Status' => '状态',
+	'SynchroDataSource:Information' => '基本信息',
+	'SynchroDataSource:Definition' => 'Definition',
+	'Core:SynchroAttributes' => '属性',
+	'Core:SynchroStatus' => '状态',
+	'Core:Synchro:ErrorsLabel' => 'Errors~~',
+	'Core:Synchro:CreatedLabel' => 'Created~~',
+	'Core:Synchro:ModifiedLabel' => 'Modified~~',
+	'Core:Synchro:UnchangedLabel' => 'Unchanged~~',
+	'Core:Synchro:ReconciledErrorsLabel' => 'Errors~~',
+	'Core:Synchro:ReconciledLabel' => 'Reconciled~~',
+	'Core:Synchro:ReconciledNewLabel' => 'Created~~',
+	'Core:SynchroReconcile:Yes' => 'Yes',
+	'Core:SynchroReconcile:No' => 'No',
+	'Core:SynchroUpdate:Yes' => 'Yes',
+	'Core:SynchroUpdate:No' => 'No',
+	'Core:Synchro:LastestStatus' => '最新状态',
+	'Core:Synchro:History' => 'Synchronization History~~',
+	'Core:Synchro:NeverRun' => 'This synchro was never run. No log yet.~~',
+	'Core:Synchro:SynchroEndedOn_Date' => 'The latest synchronization ended on %1$s.~~',
+	'Core:Synchro:SynchroRunningStartedOn_Date' => 'The synchronization started on %1$s is still running...~~',
+	'Core:Synchro:label_repl_ignored' => 'Ignored (%1$s)',
+	'Core:Synchro:label_repl_disappeared' => 'Disappeared (%1$s)',
+	'Core:Synchro:label_repl_existing' => 'Existing (%1$s)',
+	'Core:Synchro:label_repl_new' => '新建 (%1$s)',
+	'Core:Synchro:label_obj_deleted' => '已删除 (%1$s)',
+	'Core:Synchro:label_obj_obsoleted' => '已废弃 (%1$s)',
+	'Core:Synchro:label_obj_disappeared_errors' => 'Errors (%1$s)',
+	'Core:Synchro:label_obj_disappeared_no_action' => 'No Action (%1$s)',
+	'Core:Synchro:label_obj_unchanged' => 'Unchanged (%1$s)',
+	'Core:Synchro:label_obj_updated' => 'Updated (%1$s)',
+	'Core:Synchro:label_obj_updated_errors' => 'Errors (%1$s)',
+	'Core:Synchro:label_obj_new_unchanged' => 'Unchanged (%1$s)',
+	'Core:Synchro:label_obj_new_updated' => 'Updated (%1$s)',
+	'Core:Synchro:label_obj_created' => 'Created (%1$s)',
+	'Core:Synchro:label_obj_new_errors' => 'Errors (%1$s)',
+	'Core:SynchroLogTitle' => '%1$s - %2$s',
+	'Core:Synchro:Nb_Replica' => 'Replica processed: %1$s',
+	'Core:Synchro:Nb_Class:Objects' => '%1$s: %2$s',
+	'Class:SynchroDataSource/Error:AtLeastOneReconciliationKeyMustBeSpecified' => 'At Least one reconciliation key must be specified, or the reconciliation policy must be to use the primary key.~~',
+	'Class:SynchroDataSource/Error:DeleteRetentionDurationMustBeSpecified' => 'A delete retention period must be specified, since objects are to be deleted after being marked as obsolete~~',
+	'Class:SynchroDataSource/Error:DeletePolicyUpdateMustBeSpecified' => 'Obsolete objects are to be updated, but no update is specified.~~',
+	'Class:SynchroDataSource/Error:DataTableAlreadyExists' => 'The table %1$s already exists in the database. Please use another name for the synchro data table.~~',
+	'Core:SynchroReplica:PublicData' => 'Public Data~~',
+	'Core:SynchroReplica:PrivateDetails' => 'Private Details~~',
+	'Core:SynchroReplica:BackToDataSource' => 'Go Back to the Synchro Data Source: %1$s~~',
+	'Core:SynchroReplica:ListOfReplicas' => 'List of Replica~~',
+	'Core:SynchroAttExtKey:ReconciliationById' => 'id (Primary Key)~~',
+	'Core:SynchroAtt:attcode' => '属性',
+	'Core:SynchroAtt:attcode+' => 'Field of the object~~',
+	'Core:SynchroAtt:reconciliation' => 'Reconciliation ?~~',
+	'Core:SynchroAtt:reconciliation+' => 'Used for searching~~',
+	'Core:SynchroAtt:update' => 'Update ?~~',
+	'Core:SynchroAtt:update+' => 'Used to update the object~~',
+	'Core:SynchroAtt:update_policy' => 'Update Policy~~',
+	'Core:SynchroAtt:update_policy+' => 'Behavior of the updated field~~',
+	'Core:SynchroAtt:reconciliation_attcode' => 'Reconciliation Key~~',
+	'Core:SynchroAtt:reconciliation_attcode+' => 'Attribute Code for the External Key Reconciliation~~',
+	'Core:SyncDataExchangeComment' => '(Data Synchro)~~',
+	'Core:Synchro:ListOfDataSources' => 'List of data sources:~~',
+	'Core:Synchro:LastSynchro' => 'Last synchronization:~~',
+	'Core:Synchro:ThisObjectIsSynchronized' => 'This object is synchronized with an external data source~~',
+	'Core:Synchro:TheObjectWasCreatedBy_Source' => 'The object was <b>created</b> by the external data source %1$s~~',
+	'Core:Synchro:TheObjectCanBeDeletedBy_Source' => 'The object <b>can be deleted</b> by the external data source %1$s~~',
+	'Core:Synchro:TheObjectCannotBeDeletedByUser_Source' => 'You <b>cannot delete the object</b> because it is owned by the external data source %1$s~~',
+	'TitleSynchroExecution' => 'Execution of the synchronization~~',
+	'Class:SynchroDataSource:DataTable' => 'Database table: %1$s~~',
+	'Core:SyncDataSourceObsolete' => 'The data source is marked as obsolete. Operation cancelled.~~',
+	'Core:SyncDataSourceAccessRestriction' => 'Only adminstrators or the user specified in the data source can execute this operation. Operation cancelled.',
+	'Core:SyncTooManyMissingReplicas' => 'All records have been untouched for some time (all of the objects could be deleted). Please check that the process that writes into the synchronization table is still running. Operation cancelled.',
+	'Core:SyncSplitModeCLIOnly' => 'The synchronization can be executed in chunks only if run in mode CLI~~',
+	'Core:Synchro:ListReplicas_AllReplicas_Errors_Warnings' => '%1$s replicas, %2$s error(s), %3$s warning(s).~~',
+	'Core:SynchroReplica:TargetObject' => 'Synchronized Object: %1$s~~',
+	'Class:AsyncSendEmail' => 'Email (asynchronous)~~',
+	'Class:AsyncSendEmail/Attribute:to' => '收件人',
+	'Class:AsyncSendEmail/Attribute:subject' => '主题',
+	'Class:AsyncSendEmail/Attribute:body' => '正文',
+	'Class:AsyncSendEmail/Attribute:header' => 'Header~~',
+	'Class:CMDBChangeOpSetAttributeOneWayPassword' => 'Encrypted Password~~',
+	'Class:CMDBChangeOpSetAttributeOneWayPassword/Attribute:prev_pwd' => 'Previous Value~~',
+	'Class:CMDBChangeOpSetAttributeEncrypted' => 'Encrypted Field~~',
+	'Class:CMDBChangeOpSetAttributeEncrypted/Attribute:prevstring' => 'Previous Value~~',
+	'Class:CMDBChangeOpSetAttributeCaseLog' => 'Case Log~~',
+	'Class:CMDBChangeOpSetAttributeCaseLog/Attribute:lastentry' => 'Last Entry~~',
+	'Class:SynchroAttribute' => 'Synchro Attribute~~',
+	'Class:SynchroAttribute/Attribute:sync_source_id' => 'Synchro Data Source~~',
+	'Class:SynchroAttribute/Attribute:attcode' => 'Attribute Code~~',
+	'Class:SynchroAttribute/Attribute:update' => 'Update',
+	'Class:SynchroAttribute/Attribute:reconcile' => 'Reconcile',
+	'Class:SynchroAttribute/Attribute:update_policy' => 'Update Policy',
+	'Class:SynchroAttribute/Attribute:update_policy/Value:master_locked' => 'Locked',
+	'Class:SynchroAttribute/Attribute:update_policy/Value:master_unlocked' => 'Unlocked',
+	'Class:SynchroAttribute/Attribute:update_policy/Value:write_if_empty' => 'Initialize if empty',
 	'Class:SynchroAttribute/Attribute:finalclass' => 'Class',
 	'Class:SynchroAttExtKey' => 'Synchro Attribute (ExtKey)',
 	'Class:SynchroAttExtKey/Attribute:reconciliation_attcode' => 'Reconciliation Attribute',
 	'Class:SynchroAttLinkSet' => 'Synchro Attribute (Linkset)',
-	'Class:SynchroAttLinkSet/Attribute:row_separator' => '列的分隔符',
-	'Class:SynchroAttLinkSet/Attribute:attribute_separator' => '属性的分隔符',
-	'Class:SynchroLog' => '同步日志',
-	'Class:SynchroLog/Attribute:sync_source_id' => '同步数据源',
+	'Class:SynchroAttLinkSet/Attribute:row_separator' => 'Rows separator',
+	'Class:SynchroAttLinkSet/Attribute:attribute_separator' => 'Attributes separator',
+	'Class:SynchroLog' => 'Synchr Log',
+	'Class:SynchroLog/Attribute:sync_source_id' => 'Synchro Data Source',
 	'Class:SynchroLog/Attribute:start_date' => '开始日期',
 	'Class:SynchroLog/Attribute:end_date' => '结束日期',
 	'Class:SynchroLog/Attribute:status' => '状态',
 	'Class:SynchroLog/Attribute:status/Value:completed' => '已完成',
-	'Class:SynchroLog/Attribute:status/Value:error' => '错误',
-	'Class:SynchroLog/Attribute:status/Value:running' => '正在运行',
+	'Class:SynchroLog/Attribute:status/Value:error' => 'Error',
+	'Class:SynchroLog/Attribute:status/Value:running' => 'Still Running',
 	'Class:SynchroLog/Attribute:stats_nb_replica_seen' => 'Nb replica seen',
 	'Class:SynchroLog/Attribute:stats_nb_replica_total' => 'Nb replica total',
 	'Class:SynchroLog/Attribute:stats_nb_obj_deleted' => 'Nb objects deleted',
@@ -875,18 +887,18 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:SynchroLog/Attribute:stats_nb_obj_created' => 'Nb objects created',
 	'Class:SynchroLog/Attribute:stats_nb_obj_created_errors' => 'Nb or errors while creating',
 	'Class:SynchroLog/Attribute:stats_nb_obj_updated' => 'Nb objects updated',
-	'Class:SynchroLog/Attribute:stats_nb_obj_updated_errors' => 'Nb errors while updating',
-	'Class:SynchroLog/Attribute:stats_nb_replica_reconciled_errors' => 'Nb of errors during reconciliation',
-	'Class:SynchroLog/Attribute:stats_nb_replica_disappeared_no_action' => 'Nb replica disappeared',
-	'Class:SynchroLog/Attribute:stats_nb_obj_new_updated' => 'Nb objects updated',
-	'Class:SynchroLog/Attribute:stats_nb_obj_new_unchanged' => 'Nb objects unchanged',
-	'Class:SynchroLog/Attribute:last_error' => 'Last error',
-	'Class:SynchroLog/Attribute:traces' => 'Traces',
-	'Class:SynchroReplica' => 'Synchro Replica',
-	'Class:SynchroReplica/Attribute:sync_source_id' => 'Synchro Data Source',
+	'Class:SynchroLog/Attribute:stats_nb_obj_updated_errors' => 'Nb errors while updating~~',
+	'Class:SynchroLog/Attribute:stats_nb_replica_reconciled_errors' => 'Nb of errors during reconciliation~~',
+	'Class:SynchroLog/Attribute:stats_nb_replica_disappeared_no_action' => 'Nb replica disappeared~~',
+	'Class:SynchroLog/Attribute:stats_nb_obj_new_updated' => 'Nb objects updated~~',
+	'Class:SynchroLog/Attribute:stats_nb_obj_new_unchanged' => 'Nb objects unchanged~~',
+	'Class:SynchroLog/Attribute:last_error' => 'Last error~~',
+	'Class:SynchroLog/Attribute:traces' => 'Traces~~',
+	'Class:SynchroReplica' => 'Synchro Replica~~',
+	'Class:SynchroReplica/Attribute:sync_source_id' => 'Synchro Data Source~~',
 	'Class:SynchroReplica/Attribute:dest_id' => 'Destination object (ID)',
-	'Class:SynchroReplica/Attribute:dest_class' => 'Destination type',
-	'Class:SynchroReplica/Attribute:status_last_seen' => 'Last seen',
+	'Class:SynchroReplica/Attribute:dest_class' => 'Destination type~~',
+	'Class:SynchroReplica/Attribute:status_last_seen' => 'Last seen~~',
 	'Class:SynchroReplica/Attribute:status' => '状态',
 	'Class:SynchroReplica/Attribute:status/Value:modified' => '已修改',
 	'Class:SynchroReplica/Attribute:status/Value:new' => '新建',
@@ -895,14 +907,14 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:SynchroReplica/Attribute:status/Value:synchronized' => '已同步',
 	'Class:SynchroReplica/Attribute:status_dest_creator' => 'Object Created ?',
 	'Class:SynchroReplica/Attribute:status_last_error' => 'Last Error',
-	'Class:SynchroReplica/Attribute:status_last_warning' => '警告',
+	'Class:SynchroReplica/Attribute:status_last_warning' => 'Warnings',
 	'Class:SynchroReplica/Attribute:info_creation_date' => '创建日期',
 	'Class:SynchroReplica/Attribute:info_last_modified' => '最后修改日期',
-	'Class:appUserPreferences' => '用户资料',
+	'Class:appUserPreferences' => '用户偏好',
 	'Class:appUserPreferences/Attribute:userid' => '用户',
 	'Class:appUserPreferences/Attribute:preferences' => '首选项',
-	'Core:ExecProcess:Code1' => 'Wrong command or command finished with errors (e.g. wrong script name)',
-	'Core:ExecProcess:Code255' => 'PHP Error (parsing, or runtime)',
+	'Core:ExecProcess:Code1' => 'Wrong command or command finished with errors (e.g. wrong script name)~~',
+	'Core:ExecProcess:Code255' => 'PHP Error (parsing, or runtime)~~',
 
 	// Attribute Duration
 	'Core:Duration_Seconds' => '%1$ds',
@@ -911,9 +923,9 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Core:Duration_Days_Hours_Minutes_Seconds' => '%1$sd %2$dh %3$dmin %4$ds',
 
 	// Explain working time computing
-	'Core:ExplainWTC:ElapsedTime' => 'Time elapsed (stored as "%1$s")',
-	'Core:ExplainWTC:StopWatch-TimeSpent' => 'Time spent for "%1$s"',
-	'Core:ExplainWTC:StopWatch-Deadline' => 'Deadline for "%1$s" at %2$d%%',
+	'Core:ExplainWTC:ElapsedTime' => '耗时 (stored as "%1$s")',
+	'Core:ExplainWTC:StopWatch-TimeSpent' => 'Time spent for "%1$s"~~',
+	'Core:ExplainWTC:StopWatch-Deadline' => 'Deadline for "%1$s" at %2$d%%~~',
 
 	// Bulk export
 	'Core:BulkExport:MissingParameter_Param' => '缺少参数 "%1$s"',
@@ -955,13 +967,13 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Core:BulkExport:OptionFormattedText' => '保持文本格式',
 	'Core:BulkExport:ScopeDefinition' => '定义要导出的对象',
 	'Core:BulkExportLabelOQLExpression' => 'OQL查询:',
-	'Core:BulkExportLabelPhrasebookEntry' => 'Query Phrasebook Entry:',
+	'Core:BulkExportLabelPhrasebookEntry' => '来自查询手册:',
 	'Core:BulkExportMessageEmptyOQL' => '请输入有效的OQL查询.',
-	'Core:BulkExportMessageEmptyPhrasebookEntry' => 'Please select a valid phrasebook entry.',
+	'Core:BulkExportMessageEmptyPhrasebookEntry' => '请选择有效的查询手册.',
 	'Core:BulkExportQueryPlaceholder' => '请在这里输入OQL查询...',
 	'Core:BulkExportCanRunNonInteractive' => '点击这里运行非交互式导出.',
 	'Core:BulkExportLegacyExport' => '点击这里进入旧版导出.',
-	'Core:BulkExport:XLSXOptions' => 'Excel选项',
+	'Core:BulkExport:XLSXOptions' => 'Excel 选项',
 	'Core:BulkExport:TextFormat' => '文本中包含一些HTML 标记',
 	'Core:BulkExport:DateTimeFormat' => '日期和时间格式',
 	'Core:BulkExport:DateTimeFormatDefault_Example' => '默认格式 (%1$s), e.g. %2$s',
@@ -984,7 +996,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Core:Validator:Default' => '格式错误',
 	'Core:Validator:Mandatory' => '这里必填',
 	'Core:Validator:MustBeInteger' => '必须是整数',
-	'Core:Validator:MustSelectOne' => '请选择一个',
+	'Core:Validator:MustSelectOne' => '请选择',
 ));
 
 //
@@ -993,7 +1005,6 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:TagSetFieldData' => '%2$s for class %1$s~~',
 	'Class:TagSetFieldData+' => '~~',
-
 	'Class:TagSetFieldData/Attribute:code' => '代码',
 	'Class:TagSetFieldData/Attribute:code+' => '内部代码. 必须至少包含3个数字或字母',
 	'Class:TagSetFieldData/Attribute:label' => '标签',
@@ -1003,7 +1014,6 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:TagSetFieldData/Attribute:finalclass' => 'Tag class~~~~',
 	'Class:TagSetFieldData/Attribute:obj_class' => 'Object class~~~~',
 	'Class:TagSetFieldData/Attribute:obj_attcode' => 'Field code~~~~',
-
 	'Core:TagSetFieldData:ErrorDeleteUsedTag' => '已使用的标签无法删除',
 	'Core:TagSetFieldData:ErrorDuplicateTagCodeOrLabel' => 'Tags codes or labels must be unique~~',
 	'Core:TagSetFieldData:ErrorTagCodeSyntax' => 'Tags code must contain between 3 and %1$d alphanumeric characters, starting with a letter.~~',
@@ -1078,7 +1088,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:AsyncTask/Attribute:planned+' => '',
 	'Class:AsyncTask/Attribute:event_id' => '事件',
 	'Class:AsyncTask/Attribute:event_id+' => '',
-	'Class:AsyncTask/Attribute:finalclass' => 'Final class~~',
+	'Class:AsyncTask/Attribute:finalclass' => '类型',
 	'Class:AsyncTask/Attribute:finalclass+' => '~~',
 	'Class:AsyncTask/Attribute:status' => '状态',
 	'Class:AsyncTask/Attribute:status+' => '~~',
@@ -1090,8 +1100,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:AsyncTask/Attribute:last_error+' => '~~',
 	'Class:AsyncTask/Attribute:last_attempt' => 'Last attempt~~',
 	'Class:AsyncTask/Attribute:last_attempt+' => '~~',
-    'Class:AsyncTask:InvalidConfig_Class_Keys' => 'Invalid format for the configuration of "async_task_retries[%1$s]". Expecting an array with the following keys: %2$s~~',
-    'Class:AsyncTask:InvalidConfig_Class_InvalidKey_Keys' => 'Invalid format for the configuration of "async_task_retries[%1$s]": unexpected key "%2$s". Expecting only the following keys: %3$s~~',
+	'Class:AsyncTask:InvalidConfig_Class_Keys' => 'Invalid format for the configuration of "async_task_retries[%1$s]". Expecting an array with the following keys: %2$s~~',
+	'Class:AsyncTask:InvalidConfig_Class_InvalidKey_Keys' => 'Invalid format for the configuration of "async_task_retries[%1$s]": unexpected key "%2$s". Expecting only the following keys: %3$s~~',
 ));
 
 //
@@ -1129,11 +1139,10 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:ResourceSystemMenu' => 'Resource System Menu~~',
 	'Class:ResourceSystemMenu+' => '',
 ));
-
-
-
-
 // Additional language entries not present in English dict
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
- 'INTERNAL:JQuery-DatePicker:LangCode' => 'zh-CN',
+	'INTERNAL:JQuery-DatePicker:LangCode' => 'zh-CN'
 ));
+
+
+
diff --git a/dictionaries/zh_cn.dictionary.itop.ui.php b/dictionaries/zh_cn.dictionary.itop.ui.php
index 583eb3133e..d70f08dcda 100644
--- a/dictionaries/zh_cn.dictionary.itop.ui.php
+++ b/dictionaries/zh_cn.dictionary.itop.ui.php
@@ -3,22 +3,17 @@
  * @copyright   Copyright (C) 2010-2023 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
-
-
 //////////////////////////////////////////////////////////////////////
 // Classes in 'gui'
 //////////////////////////////////////////////////////////////////////
 //
-
 //////////////////////////////////////////////////////////////////////
 // Classes in 'application'
 //////////////////////////////////////////////////////////////////////
 //
-
 //
 // Class: AuditCategory
 //
-
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:AuditCategory' => '审计类别',
 	'Class:AuditCategory+' => '全部审计中的一个区段',
@@ -30,6 +25,12 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:AuditCategory/Attribute:definition_set+' => '定义用于审计的对象的OQL表达式',
 	'Class:AuditCategory/Attribute:rules_list' => '审计规则',
 	'Class:AuditCategory/Attribute:rules_list+' => '此类别的审计规则',
+	'Class:AuditCategory/Attribute:ok_error_tolerance' => 'Error tolerance (OK)~~',
+	'Class:AuditCategory/Attribute:ok_error_tolerance+' => 'Allowed percentage of invalid objects at which the result is still displayed as OK (green)~~',
+	'Class:AuditCategory/Attribute:warning_error_tolerance' => 'Error tolerance (warning)~~',
+	'Class:AuditCategory/Attribute:warning_error_tolerance+' => 'Allowed percentage of invalid objects at which the result is still displayed as a warning (orange)~~',
+	'Class:AuditCategory/Attribute:domains_list' => 'Domains',
+	'Class:AuditCategory/Attribute:domains_list+' => 'List of domains linked to this category~~',
 ));
 
 //
@@ -57,7 +58,41 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:AuditRule/Attribute:category_id' => '类别',
 	'Class:AuditRule/Attribute:category_id+' => '从规则对应的类别',
 	'Class:AuditRule/Attribute:category_name' => '类别',
-	'Class:AuditRule/Attribute:category_name+' => '此规则对应类别的名称',
+	'Class:AuditRule/Attribute:category_name+' => '此规则对应类别的名称'
+));
+
+//
+// Class: AuditDomain
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:AuditDomain' => 'Audit Domain~~',
+	'Class:AuditDomain+' => '',
+	'Class:AuditDomain/Attribute:name' => 'Name',
+	'Class:AuditDomain/Attribute:name+' => 'Its a segmentation of the Audit by who is in charge of fixing it or just interested~~',
+	'Class:AuditDomain/Attribute:description' => '描述',
+	'Class:AuditDomain/Attribute:description+' => '',
+	'Class:AuditDomain/Attribute:icon' => '图标',
+	'Class:AuditDomain/Attribute:icon+' => '',
+	'Class:AuditDomain/Attribute:categories_list' => '类别',
+	'Class:AuditDomain/Attribute:categories_list+' => 'Linked audit categories~~',
+));
+
+//
+// Class: lnkAuditCategoryToAuditDomain
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:lnkAuditCategoryToAuditDomain' => 'Link AuditCategory / AuditDomain~~',
+	'Class:lnkAuditCategoryToAuditDomain+' => '',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:category_id' => '类别',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:category_id+' => 'Audit Category~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:category_name' => '名称',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:category_name+' => 'Audit category name~~',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:domain_id' => 'Domain',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:domain_id+' => 'Audit domain',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:domain_name' => 'Domain name',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:domain_name+' => 'Audit domain name',
 ));
 
 //
@@ -75,12 +110,22 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:Query/Attribute:is_template+' => 'Usable as source for recipient OQL in Notifications~~',
 	'Class:Query/Attribute:is_template/Value:yes' => '是',
 	'Class:Query/Attribute:is_template/Value:no' => '否',
+	'Class:Query/Attribute:export_count' => 'Export counter~~',
+	'Class:Query/Attribute:export_count+' => 'Counter reflecting the number of time this query has been executed~~',
+	'Class:Query/Attribute:export_last_date' => 'Last export~~',
+	'Class:Query/Attribute:export_last_date+' => 'Date and time of the last export execution~~',
+	'Class:Query/Attribute:export_last_user_id' => '用户',
+	'Class:Query/Attribute:export_last_user_id+' => 'The user who executed the last export~~',
+	'Class:Query/Attribute:export_last_user_contact' => '联系人',
+	'Class:Query/Attribute:export_last_user_contact+' => 'The contact who executed the last export~~',
+	'Query:baseinfo' => '基本信息',
+	'Query:exportInfo' => '导出信息',
 	'Class:QueryOQL/Attribute:fields' => '区域',
 	'Class:QueryOQL/Attribute:fields+' => '属性之间使用逗号分隔 (or alias.attribute) to export~~',
 	'Class:QueryOQL' => 'OQL查询',
 	'Class:QueryOQL+' => '一种基于对象查询的语言',
 	'Class:QueryOQL/Attribute:oql' => '表达式',
-	'Class:QueryOQL/Attribute:oql+' => 'OQL表达式',
+	'Class:QueryOQL/Attribute:oql+' => 'OQL 表达式',
 ));
 
 //////////////////////////////////////////////////////////////////////
@@ -95,7 +140,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:User' => '用户',
 	'Class:User+' => '用户登录名',
-	'Class:User/Attribute:finalclass' => '帐户类别',
+	'Class:User/Attribute:finalclass' => '账户类型',
 	'Class:User/Attribute:finalclass+' => '',
 	'Class:User/Attribute:contactid' => '联系人 (个人)',
 	'Class:User/Attribute:contactid+' => '来自业务数据的个人明细信息',
@@ -123,7 +168,6 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:User/Attribute:status+' => '账户是否启用.',
 	'Class:User/Attribute:status/Value:enabled' => '启用',
 	'Class:User/Attribute:status/Value:disabled' => '停用',
-
 	'Class:User/Error:LoginMustBeUnique' => '登录名必须唯一 - "%1s" 已经被使用.',
 	'Class:User/Error:AtLeastOneProfileIsNeeded' => '必须指定至少一个角色给此用户.',
 	'Class:User/Error:ProfileNotAllowed' => 'Profile "%1$s" cannot be added it will deny the access to backoffice~~',
@@ -177,7 +221,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:URP_UserProfile+' => '用户的角色',
 	'Class:URP_UserProfile/Name' => '关联 %1$s 和 %2$s',
 	'Class:URP_UserProfile/Attribute:userid' => '用户',
-	'Class:URP_UserProfile/Attribute:userid+' => '用户帐户',
+	'Class:URP_UserProfile/Attribute:userid+' => '用户账户',
 	'Class:URP_UserProfile/Attribute:userlogin' => '登录名',
 	'Class:URP_UserProfile/Attribute:userlogin+' => '用户的登录名',
 	'Class:URP_UserProfile/Attribute:profileid' => '角色',
@@ -198,7 +242,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:URP_UserOrg+' => '可以访问的组织',
 	'Class:URP_UserOrg/Name' => '关联 %1$s 和 %2$s',
 	'Class:URP_UserOrg/Attribute:userid' => '用户',
-	'Class:URP_UserOrg/Attribute:userid+' => '用户帐户',
+	'Class:URP_UserOrg/Attribute:userid+' => '用户账户',
 	'Class:URP_UserOrg/Attribute:userlogin' => '登录名',
 	'Class:URP_UserOrg/Attribute:userlogin+' => '用户的登录名',
 	'Class:URP_UserOrg/Attribute:allowed_org_id' => '组织',
@@ -332,6 +376,29 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Expression:Unit:Short:YEAR' => '年',
 ));
 
+//
+// Duplicated into itop-welcome-itil ( will be removed from here...)
+//
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Menu:WelcomeMenu' => '欢迎',
+	'Menu:WelcomeMenu+' => '欢迎使用 '.ITOP_APPLICATION_SHORT,
+	'Menu:WelcomeMenuPage' => '欢迎',
+	'Menu:WelcomeMenuPage+' => '欢迎使用 '.ITOP_APPLICATION_SHORT,
+	'Menu:AdminTools' => '管理',
+	'Menu:AdminTools+' => '管理工具',
+	'Menu:AdminTools?' => '具有管理员角色的用户才能使用的工具',
+	'Menu:CSVImportMenu' => 'CSV导入',
+	'Menu:CSVImportMenu+' => '批量创建或修改',
+	'Menu:DataModelMenu' => '数据模型',
+	'Menu:DataModelMenu+' => '数据模型概况',
+	'Menu:ExportMenu' => '导出',
+	'Menu:ExportMenu+' => '以HTML, CSV 或XML 格式导出任何查询的结果',
+	'Menu:NotificationsMenu' => '通知',
+	'Menu:NotificationsMenu+' => '配置通知',
+	'Menu:MyShortcuts' => '我的快捷方式',
+	'Menu:DataAdministration' => '数据管理',
+	'Menu:DataAdministration+' => '数据管理',
+));
 
 //
 // String from the User Interface: menu, messages, buttons, etc...
@@ -341,13 +408,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'BooleanLabel:yes' => '是',
 	'BooleanLabel:no' => '否',
 	'UI:Login:Title' => ITOP_APPLICATION_SHORT.' 登录',
-	'Menu:WelcomeMenu' => '欢迎',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:WelcomeMenu+' => '欢迎使用 '.ITOP_APPLICATION_SHORT, // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:WelcomeMenuPage' => '欢迎',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:WelcomeMenuPage+' => '欢迎使用 '.ITOP_APPLICATION_SHORT, // Duplicated into itop-welcome-itil (will be removed from here...)
 	'UI:WelcomeMenu:Title' => '欢迎使用 '.ITOP_APPLICATION_SHORT,
-
-	'UI:WelcomeMenu:LeftBlock' => '<p>'.ITOP_APPLICATION_SHORT.' 是完全开源的IT操作门户.</p>
+	'UI:WelcomeMenu:LeftBlock' => '<p>'.ITOP_APPLICATION_SHORT.' 是完全开源的IT运维门户.</p>
 <ul>它包括:
 <li>完整的CMDB(配置管理数据库),用于登记和管理您的IT资产.</li>
 <li>事件管理模块用于跟踪和传递所有发生在IT系统中的事件.</li>
@@ -357,7 +419,6 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 <li>通过仪表盘快速获得您的IT概况.</li>
 </ul>
 <p>所有模块互相独立,可以单独部署.</p>',
-
 	'UI:WelcomeMenu:RightBlock' => '<p>'.ITOP_APPLICATION_SHORT.' 是面向服务供应商的, 它使得IT 工程师能够更方便地管理多客户和多组织.
 <ul>'.ITOP_APPLICATION_SHORT.' 提供功能丰富的业务处理流程:
 <li>提高IT管理效率</li> 
@@ -373,7 +434,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 <li>管理IT 中最重要的资产: 文档.</li>
 </ul>
 </p>',
-	'UI:WelcomeMenu:Text'=> '<div>恭喜, 您运行的是 '.ITOP_APPLICATION.' '.ITOP_VERSION_NAME.'!</div>
+	'UI:WelcomeMenu:Text' => '<div>恭喜, 您运行的是 '.ITOP_APPLICATION.' '.ITOP_VERSION_NAME.'!</div>
 
 <div>此版本全新设计了一个现代且易用的后台界面.</div>
 
@@ -392,8 +453,9 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'UI:LoggedAsMessage+Admin' => '以 %1$s 身份登录(%2$s, Administrator)',
 	'UI:Button:Logoff' => '注销',
 	'UI:Button:GlobalSearch' => '搜索',
-	'UI:Button:Search' => '搜索',
-	'UI:Button:Clear' => ' 清空',
+	'UI:Button:Search' => ' 搜索 ',
+	'UI:Button:Clear' => ' 清空 ',
+	'UI:Button:Confirm' => ' 确认 ',
 	'UI:Button:SearchInHierarchy' => ' 递归搜索',
 	'UI:Button:Query' => '查询',
 	'UI:Button:Ok' => 'OK',
@@ -410,16 +472,16 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'UI:Button:Finish' => '结束',
 	'UI:Button:DoImport' => ' 执行导入 ! ',
 	'UI:Button:Done' => '完成',
-	'UI:Button:SimulateImport' => '开始导入',
+	'UI:Button:SimulateImport' => '模拟导入',
 	'UI:Button:Test' => '测试!',
-	'UI:Button:Evaluate' => '测试',
+	'UI:Button:Evaluate' => '评估',
 	'UI:Button:Evaluate:Title' => '评估 (Ctrl+Enter)',
 	'UI:Button:AddObject' => '添加... ',
 	'UI:Button:BrowseObjects' => '浏览...',
 	'UI:Button:Add' => '添加',
 	'UI:Button:AddToList' => '<< 添加',
 	'UI:Button:RemoveFromList' => '移除 >>',
-	'UI:Button:FilterList' => '过滤...',
+	'UI:Button:FilterList' => '筛选...',
 	'UI:Button:Create' => '创建',
 	'UI:Button:Delete' => '删除',
 	'UI:Button:Rename' => '重命名...',
@@ -434,7 +496,6 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'UI:UserPref:DoNotShowAgain' => '不再显示',
 	'UI:InputFile:NoFileSelected' => '未选择文件',
 	'UI:InputFile:SelectFile' => '选择文件',
-
 	'UI:SearchToggle' => '搜索',
 	'UI:ClickToCreateNew' => '新建 %1$s',
 	'UI:SearchFor_Class' => '搜索 %1$s ',
@@ -443,18 +504,17 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'UI:Error:MandatoryTemplateParameter_object_id' => '当link_attr 被指定时,参数 object_id 是必须的. 检查显示模板的定义.',
 	'UI:Error:MandatoryTemplateParameter_target_attr' => '当link_attr 被指定时, 参数 target_attr 是必须的. 检查显示模板的定义.',
 	'UI:Error:MandatoryTemplateParameter_group_by' => '参数 group_by 是必须的. 检查显示模板的定义.',
-	'UI:Error:InvalidGroupByFields' => '分组栏目列表是无效的: "%1$s".',
+	'UI:Error:InvalidGroupByFields' => '分组字段列表是无效的: "%1$s".',
 	'UI:Error:UnsupportedStyleOfBlock' => '错误: 不被支持的 block 格式: "%1$s".',
 	'UI:Error:IncorrectLinkDefinition_LinkedClass_Class' => '关联错误: 关联的对象: %1$s 不是 %2$s 的外键',
 	'UI:Error:Object_Class_Id_NotFound' => '对象: %1$s:%2$d 找不到.',
-	'UI:Error:WizardCircularReferenceInDependencies' => '错误: 栏目之间的依赖性出现循环引用, 请检查数据模型.',
+	'UI:Error:WizardCircularReferenceInDependencies' => '错误: 字段之间的依赖性出现循环引用, 请检查数据模型.',
 	'UI:Error:UploadedFileTooBig' => '上传文件太大. (允许的最大限制是 %1$s). 请检查 PHP 配置文件中的 upload_max_filesize 和 post_max_size.',
 	'UI:Error:UploadedFileTruncated.' => '上传的文件被截断 !',
 	'UI:Error:NoTmpDir' => '未定义临时目录.',
 	'UI:Error:CannotWriteToTmp_Dir' => '无法向硬盘写入临时文件. upload_tmp_dir = "%1$s".',
 	'UI:Error:UploadStoppedByExtension_FileName' => '上传因为扩展名被停止. (Original file name = "%1$s").',
 	'UI:Error:UploadFailedUnknownCause_Code' => '文件上传失败, 原因未知. (Error code = "%1$s").',
-
 	'UI:Error:1ParametersMissing' => '错误: 必须为此操作指定以下参数: %1$s.',
 	'UI:Error:2ParametersMissing' => '错误: 必须为此操作指定以下参数: %1$s and %2$s.',
 	'UI:Error:3ParametersMissing' => '错误: 必须为此操作指定以下参数: %1$s, %2$s and %3$s.',
@@ -476,9 +536,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'UI:Error:MaintenanceMode' => '应用正处于维护中',
 	'UI:Error:MaintenanceTitle' => '维护',
 	'UI:Error:InvalidToken' => 'Error: 所请求的操作已执行 (未发现 CSRF token )',
-
 	'UI:Error:SMTP:UnknownVendor' => 'OAuth SMTP provider %1$s does not exist  (email_transport_smtp.oauth.provider)~~',
-
 	'UI:GroupBy:Count' => '个数',
 	'UI:GroupBy:Count+' => '项目数',
 	'UI:CountOfObjects' => '%1$d 个对象符合指定的条件.',
@@ -488,14 +546,14 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'UI:HistoryTab' => '历史',
 	'UI:NotificationsTab' => '通知',
 	'UI:History:BulkImports' => '历史',
-	'UI:History:BulkImports+' => 'List of CSV imports (latest import first)',
-	'UI:History:BulkImportDetails' => 'Changes resulting from the CSV import performed on %1$s (by %2$s)',
+	'UI:History:BulkImports+' => 'List of CSV imports (latest import first)~~',
+	'UI:History:BulkImportDetails' => 'Changes resulting from the CSV import performed on %1$s (by %2$s)~~',
 	'UI:History:Date' => '日期',
 	'UI:History:Date+' => '变更日期',
 	'UI:History:User' => '用户',
-	'UI:History:User+' => '造成变更的用户',
-	'UI:History:Changes' => '变更',
-	'UI:History:Changes+' => '对此对象所做的变更',
+	'UI:History:User+' => '执行修改的用户',
+	'UI:History:Changes' => '修改',
+	'UI:History:Changes+' => '对此对象所做的修改',
 	'UI:History:StatsCreations' => '已创建',
 	'UI:History:StatsCreations+' => '已创建的对象个数',
 	'UI:History:StatsModifs' => '已修改',
@@ -504,9 +562,10 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'UI:History:StatsDeletes+' => '已删除的对象个数',
 	'UI:Loading' => '载入...',
 	'UI:Menu:Actions' => '操作',
-	'UI:Menu:OtherActions' => '其他操作',
-	'UI:Menu:Transitions' => '变化',
+	'UI:Menu:OtherActions' => '其它操作',
+	'UI:Menu:Transitions' => '状态变化',
 	'UI:Menu:OtherTransitions' => '其它变化',
+	'UI:Menu:View' => '查看对象',
 	'UI:Menu:New' => '新建...',
 	'UI:Menu:Add' => '添加...',
 	'UI:Menu:Manage' => '管理...',
@@ -515,6 +574,9 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'UI:Menu:Modify' => '修改...',
 	'UI:Menu:Delete' => '删除...',
 	'UI:Menu:BulkDelete' => '删除...',
+	'UI:Menu:BulkDelete_Class' => '删除 %1$s 个对象...',
+	'UI:Menu:BulkDelete_Link' => '删除 %1$s...',
+	'UI:Menu:BulkDelete_Remote' => '删除 %1$s...',
 	'UI:UndefinedObject' => '未定义',
 	'UI:Document:OpenInNewWindow:Download' => '在新窗口打开: %1$s, 下载: %2$s',
 	'UI:SplitDateTime-Date' => '日期',
@@ -547,7 +609,6 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'UI:Login:ResetPassword' => '立即发送!',
 	'UI:Login:ResetPwdFailed' => '邮件发送失败: %1$s',
 	'UI:Login:SeparatorOr' => '或',
-
 	'UI:ResetPwd-Error-WrongLogin' => '\'%1$s\' 用户名无效',
 	'UI:ResetPwd-Error-NotPossible' => '外部账户不允许重置密码.',
 	'UI:ResetPwd-Error-FixedPwd' => '此账户不允许重置密码.',
@@ -558,50 +619,49 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'UI:ResetPwd-EmailSent' => '请检查您的收件箱并根据指引进行操作. 如果您没有收到邮件, 请检查您登录时的输入是否存在错误.',
 	'UI:ResetPwd-EmailSubject' => '重置 '.ITOP_APPLICATION_SHORT.' 密码',
 	'UI:ResetPwd-EmailBody' => '<body><p>您已请求重置iTop 密码.</p><p>请点击这个链接 (一次性) <a href="%1$s">来输入新的密码</a></p>.',
-
 	'UI:ResetPwd-Title' => '重置密码',
 	'UI:ResetPwd-Error-InvalidToken' => '对不起, 密码已经被重置, 请检查是否收到了多封密码重置邮件. 请点击最新邮件里的链接.',
 	'UI:ResetPwd-Error-EnterPassword' => '请输入 \'%1$s\' 的新密码.',
 	'UI:ResetPwd-Ready' => '密码已修改成功.',
 	'UI:ResetPwd-Login' => '点击这里登录...',
-
-	'UI:Login:About'                               => ITOP_APPLICATION.' Powered by Combodo',
-	'UI:Login:ChangeYourPassword'                  => '修改您的密码',
-	'UI:Login:OldPasswordPrompt'                   => '旧密码',
-	'UI:Login:NewPasswordPrompt'                   => '新密码',
-	'UI:Login:RetypeNewPasswordPrompt'             => '重复新密码',
-	'UI:Login:IncorrectOldPassword'                => '错误: 旧密码错误',
-	'UI:LogOffMenu'                                => '注销',
-	'UI:LogOff:ThankYou'                           => '感谢使用 '.ITOP_APPLICATION_SHORT,
-	'UI:LogOff:ClickHereToLoginAgain'              => '点击这里再次登录...',
-	'UI:ChangePwdMenu'                             => '修改密码...',
-	'UI:Login:PasswordChanged'                     => '密码已成功设置!',
-	'UI:AccessRO-All'                              => ITOP_APPLICATION_SHORT.' 是只读的',
-	'UI:AccessRO-Users'                            => ITOP_APPLICATION_SHORT.' 对于终端用户是只读的',
-	'UI:ApplicationEnvironment'                    => '应用环境: %1$s',
-	'UI:Login:RetypePwdDoesNotMatch'               => '新密码输入不一致!',
-	'UI:Button:Login'                              => '登录'.ITOP_APPLICATION_SHORT,
-	'UI:Login:Error:AccessRestricted'              => ITOP_APPLICATION_SHORT.' 访问被限制. 请联系管理员.',
-	'UI:Login:Error:AccessAdmin'                   => '只有具有管理员权限的人才能访问. 请联系管理员.',
-	'UI:Login:Error:WrongOrganizationName'         => '未知组织',
+	'UI:Login:About' => ITOP_APPLICATION.' Powered by Combodo',
+	'UI:Login:ChangeYourPassword' => '修改您的密码',
+	'UI:Login:OldPasswordPrompt' => '旧密码',
+	'UI:Login:NewPasswordPrompt' => '新密码',
+	'UI:Login:RetypeNewPasswordPrompt' => '重复新密码',
+	'UI:Login:IncorrectOldPassword' => '错误: 旧密码错误',
+	'UI:LogOffMenu' => '注销',
+	'UI:LogOff:ThankYou' => '感谢使用 '.ITOP_APPLICATION_SHORT,
+	'UI:LogOff:ClickHereToLoginAgain' => '点击这里再次登录...',
+	'UI:ChangePwdMenu' => '修改密码...',
+	'UI:Login:PasswordChanged' => '密码已成功设置!',
+	'UI:Login:PasswordNotChanged' => 'Error Password is the same!',
+	'UI:AccessRO-All' => ITOP_APPLICATION_SHORT.' 是只读的',
+	'UI:AccessRO-Users' => ITOP_APPLICATION_SHORT.' 对于终端用户是只读的',
+	'UI:ApplicationEnvironment' => '应用环境: %1$s',
+	'UI:Login:RetypePwdDoesNotMatch' => '新密码输入不一致!',
+	'UI:Button:Login' => '登录'.ITOP_APPLICATION_SHORT,
+	'UI:Login:Error:AccessRestricted' => ITOP_APPLICATION_SHORT.' 访问被限制. 请联系管理员.',
+	'UI:Login:Error:AccessAdmin' => '只有具有管理员权限的人才能访问. 请联系管理员.',
+	'UI:Login:Error:WrongOrganizationName' => '未知组织',
 	'UI:Login:Error:MultipleContactsHaveSameEmail' => '多个联系人存在相同的邮箱',
-	'UI:Login:Error:NoValidProfiles'               => '无效的资料',
-	'UI:CSVImport:MappingSelectOne'                => '-- 请选择 --',
-	'UI:CSVImport:MappingNotApplicable'            => '-- 忽略此栏 --',
-	'UI:CSVImport:NoData'                          => '数据为空..., 请提供数据!',
-	'UI:Title:DataPreview'                         => '数据预览',
-	'UI:CSVImport:ErrorOnlyOneColumn'              => '错误: 数据仅包含一列. 您选择了合适的分隔符了吗?',
-	'UI:CSVImport:FieldName'                       => '栏 %1$d',
-	'UI:CSVImport:DataLine1'                       => '数据行 1',
-	'UI:CSVImport:DataLine2'                       => '数据行 2',
-	'UI:CSVImport:idField'                         => 'id (主键)',
-	'UI:Title:BulkImport'                          => ITOP_APPLICATION_SHORT.' - 批量导入',
-	'UI:Title:BulkImport+'                         => 'CSV导入向导',
-	'UI:Title:BulkSynchro_nbItem_ofClass_class'    => '同步 %2$s 个对象中的 %1$d',
-	'UI:CSVImport:ClassesSelectOne'                => '-- 请选择 --',
-	'UI:CSVImport:ErrorExtendedAttCode'            => '内部错误: "%1$s" 是错误的编码, 因为 "%2$s" 不是类 "%3$s" 的外键',
-	'UI:CSVImport:ObjectsWillStayUnchanged'        => '%1$d 个对象保持不变.',
-	'UI:CSVImport:ObjectsWillBeModified'           => '%1$d 个对象将被修改.',
+	'UI:Login:Error:NoValidProfiles' => '无效的资料',
+	'UI:CSVImport:MappingSelectOne' => '-- 请选择 --',
+	'UI:CSVImport:MappingNotApplicable' => '-- 忽略此栏 --',
+	'UI:CSVImport:NoData' => '数据为空..., 请提供数据!',
+	'UI:Title:DataPreview' => '数据预览',
+	'UI:CSVImport:ErrorOnlyOneColumn' => '错误: 数据仅包含一列. 您选择了合适的分隔符了吗?',
+	'UI:CSVImport:FieldName' => '栏 %1$d',
+	'UI:CSVImport:DataLine1' => '数据行 1',
+	'UI:CSVImport:DataLine2' => '数据行 2',
+	'UI:CSVImport:idField' => 'id (主键)',
+	'UI:Title:BulkImport' => ITOP_APPLICATION_SHORT.' - 批量导入',
+	'UI:Title:BulkImport+' => 'CSV导入向导',
+	'UI:Title:BulkSynchro_nbItem_ofClass_class' => '同步 %2$s 个对象中的 %1$d',
+	'UI:CSVImport:ClassesSelectOne' => '-- 请选择 --',
+	'UI:CSVImport:ErrorExtendedAttCode' => '内部错误: "%1$s" 是错误的编码, 因为 "%2$s" 不是类 "%3$s" 的外键',
+	'UI:CSVImport:ObjectsWillStayUnchanged' => '%1$d 个对象保持不变.',
+	'UI:CSVImport:ObjectsWillBeModified' => '%1$d 个对象将被修改.',
 	'UI:CSVImport:ObjectsWillBeAdded' => '%1$d 个对象将被添加.',
 	'UI:CSVImport:ObjectsWillHaveErrors' => '%1$d 个对象将发生错误.',
 	'UI:CSVImport:ObjectsRemainedUnchanged' => '%1$d 个对象保持不变.',
@@ -617,10 +677,10 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'UI:CSVImport:SeparatorComma+' => ', (逗号)',
 	'UI:CSVImport:SeparatorSemicolon+' => '; (分号)',
 	'UI:CSVImport:SeparatorTab+' => 'tab',
-	'UI:CSVImport:SeparatorOther' => '其他:',
+	'UI:CSVImport:SeparatorOther' => '其它:',
 	'UI:CSVImport:QualifierDoubleQuote+' => '" (双引号)',
 	'UI:CSVImport:QualifierSimpleQuote+' => '\' (单引号)',
-	'UI:CSVImport:QualifierOther' => '其他:',
+	'UI:CSVImport:QualifierOther' => '其它:',
 	'UI:CSVImport:TreatFirstLineAsHeader' => '将第一行视做标题头(列名称)',
 	'UI:CSVImport:Skip_N_LinesAtTheBeginning' => '跳过文件开始的 %1$s 行',
 	'UI:CSVImport:CSVDataPreview' => 'CSV 数据预览',
@@ -637,7 +697,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'UI:CSVImport:AdvancedMode' => '高级模式',
 	'UI:CSVImport:AdvancedMode+' => '在高级模式中,对象的"id" (主键) 可以被用来修改和重命名对象. 不管怎样,列 "id" (如果存在) 只能被用做一个搜索条件,不能与其它搜索条件混用.',
 	'UI:CSVImport:SelectAClassFirst' => '要配置映射,请先选择一个类.',
-	'UI:CSVImport:HeaderFields' => '栏目',
+	'UI:CSVImport:HeaderFields' => '字段',
 	'UI:CSVImport:HeaderMappings' => '映射',
 	'UI:CSVImport:HeaderSearch' => '搜索?',
 	'UI:CSVImport:AlertIncompleteMapping' => '请为每个栏选择一个映射.',
@@ -647,11 +707,14 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'UI:UniversalSearchTitle' => ITOP_APPLICATION_SHORT.' - 全局搜索',
 	'UI:UniversalSearch:Error' => '错误: %1$s',
 	'UI:UniversalSearch:LabelSelectTheClass' => '选择要搜索的类别: ',
-
 	'UI:CSVReport-Value-Modified' => '已修改',
 	'UI:CSVReport-Value-SetIssue' => 'invalid value for attribute~~',
 	'UI:CSVReport-Value-ChangeIssue' => '\'%1$s\' is an invalid value~~',
 	'UI:CSVReport-Value-NoMatch' => 'No match for value \'%1$s\'~~',
+	'UI:CSVReport-Value-NoMatch-PossibleValues' => 'Some possible \'%1$s\' value(s): %2$s~~',
+	'UI:CSVReport-Value-NoMatch-NoObject' => 'There are no \'%1$s\' objects~~',
+	'UI:CSVReport-Value-NoMatch-NoObject-ForCurrentUser' => 'There are no \'%1$s\' objects found with your current profile~~',
+	'UI:CSVReport-Value-NoMatch-SomeObjectNotVisibleForCurrentUser' => 'There are some \'%1$s\' objects not visible with your current profile~~',
 	'UI:CSVReport-Value-Missing' => '缺少必填项',
 	'UI:CSVReport-Value-Ambiguous' => '模糊匹配: 找到 %1$s 个对象',
 	'UI:CSVReport-Row-Unchanged' => '保持不变',
@@ -665,20 +728,21 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'UI:CSVReport-Value-Issue-Readonly' => '\'%1$s\' 的属性是只读的,不能修改 (当前值: %2$s, 建议值: %3$s)',
 	'UI:CSVReport-Value-Issue-Format' => '输入处理失败: %1$s',
 	'UI:CSVReport-Value-Issue-NoMatch' => 'Unexpected value for attribute \'%1$s\': 无法匹配, 请检查拼写',
+	'UI:CSVReport-Value-Issue-AllowedValues' => 'Allowed \'%1$s\' value(s): %2$s',
 	'UI:CSVReport-Value-Issue-Unknown' => 'Unexpected value for attribute \'%1$s\': %2$s',
 	'UI:CSVReport-Row-Issue-Inconsistent' => '属性不一致: %1$s',
 	'UI:CSVReport-Row-Issue-Attribute' => '错误的属性',
 	'UI:CSVReport-Row-Issue-MissingExtKey' => '创建失败, 因为缺少外键: %1$s',
 	'UI:CSVReport-Row-Issue-DateFormat' => '日期格式错误',
+	'UI:CSVReport-Row-Issue-ExpectedDateFormat' => 'Expected format: %1$s',
 	'UI:CSVReport-Row-Issue-Reconciliation' => '无法调和',
-	'UI:CSVReport-Row-Issue-Ambiguous' => 'ambiguous reconciliation',
+	'UI:CSVReport-Row-Issue-Ambiguous' => 'ambiguous reconciliation~~',
 	'UI:CSVReport-Row-Issue-Internal' => '内部错误: %1$s, %2$s',
-
 	'UI:CSVReport-Icon-Unchanged' => '保持不变',
 	'UI:CSVReport-Icon-Modified' => '修改',
 	'UI:CSVReport-Icon-Missing' => '丢失',
-	'UI:CSVReport-Object-MissingToUpdate' => 'Missing object: will be updated',
-	'UI:CSVReport-Object-MissingUpdated' => 'Missing object: updated',
+	'UI:CSVReport-Object-MissingToUpdate' => 'Missing object: will be updated~~',
+	'UI:CSVReport-Object-MissingUpdated' => 'Missing object: updated~~',
 	'UI:CSVReport-Icon-Created' => '创建',
 	'UI:CSVReport-Object-ToCreate' => '对象将被创建',
 	'UI:CSVReport-Object-Created' => '对象已创建',
@@ -688,14 +752,38 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'UI:CSVReport-Stats-Errors' => '%1$.0f %% 已加载的对象包含错误,它们将会被忽略.',
 	'UI:CSVReport-Stats-Created' => '%1$.0f %% 已加载的对象将会被创建.',
 	'UI:CSVReport-Stats-Modified' => '%1$.0f %% 已加载的对象将会被修改.',
-
 	'UI:CSVExport:AdvancedMode' => '高级模式',
-	'UI:CSVExport:AdvancedMode+' => 'In advanced mode, several columns are added to the export: the id of the object, the id of external keys and their reconciliation attributes.',
+	'UI:CSVExport:AdvancedMode+' => 'In advanced mode, several columns are added to the export: the id of the object, the id of external keys and their reconciliation attributes.~~',
 	'UI:CSVExport:LostChars' => '编码问题',
-	'UI:CSVExport:LostChars+' => 'The downloaded file will be encoded into %1$s. iTop has detected some characters that are not compatible with this format. Those characters will either be replaced by a substitute (e.g. accentuated chars losing the accent), or they will be discarded. You can copy/paste the data from your web browser. Alternatively, you can contact your administrator to change the encoding (See parameter \'csv_file_default_charset\').',
-
+	'UI:CSVExport:LostChars+' => 'The downloaded file will be encoded into %1$s. iTop has detected some characters that are not compatible with this format. Those characters will either be replaced by a substitute (e.g. accentuated chars losing the accent), or they will be discarded. You can copy/paste the data from your web browser. Alternatively, you can contact your administrator to change the encoding (See parameter \'csv_file_default_charset\').~~',
 	'UI:Audit:Title' => ITOP_APPLICATION_SHORT.' - CMDB 审计',
-	'UI:Audit:InteractiveAudit' => '交互审计',
+	'UI:Audit:InteractiveAudit' => '交互式审计',
+	'UI:Audit:InteractiveAudit:Selection' => 'Audit - Domain Selection~~',
+	'UI:Audit:InteractiveAudit:Selection+' => 'Select a domain to get the result for selected domain~~',
+	'UI:Audit:InteractiveAudit:Selection:All' => 'All categories~~',
+	'UI:Audit:InteractiveAudit:AllCategories' => 'Audit result for all categories~~',
+	'UI:Audit:InteractiveAudit:SelectedCategories' => 'Audit result for %1$s categories / category~~',
+	'UI:Audit:InteractiveAudit:SelectedDomain' => 'Audit result for domain: %1$s~~',
+	'UI:Audit:Interactive:All:Title' => 'Audit results~~',
+	'UI:Audit:Interactive:All:SubTitle' => 'Full audit: includes all rules, all categories, all domains~~',
+	'UI:Audit:Interactive:All:BreadCrumb' => 'Full audit~~',
+	'UI:Audit:Interactive:All:BreadCrumb+' => 'Audit results for all rules~~',
+	'UI:Audit:Interactive:Categories:Title' => 'Audit results for categories: %1$s~~',
+	'UI:Audit:Interactive:Categories:SubTitle' => 'Audit results for all the rules belonging to one of those %1$s categories~~',
+	'UI:Audit:Interactive:Categories:BreadCrumb' => 'Categories~~',
+	'UI:Audit:Interactive:Categories:BreadCrumb+' => 'Audit categories: %1$s~~',
+	'UI:Audit:Interactive:Domain:Title' => 'Audit results for Domain: %1$s~~',
+	'UI:Audit:Interactive:Domain:SubTitle' => 'Audit results for all the rules belonging to a category related to the domain: %1$s~~',
+	'UI:Audit:Interactive:Domain:BreadCrumb' => '%1$s~~',
+	'UI:Audit:Interactive:Domain:BreadCrumb+' => 'Audit for Domain: %1$s~~',
+	'UI:Audit:Interactive:Selection:Title' => 'Selection of an audit~~',
+	'UI:Audit:Interactive:Selection:SubTitle' => 'Select a domain to get the results limited to this domain or select "All categories" to get a full audit (can take time or even fail if too much data to audit)~~',
+	'UI:Audit:Interactive:Selection:BreadCrumb' => 'Selection~~',
+	'UI:Audit:Interactive:Selection:BreadCrumb+' => 'Selection of an Audit to run~~',
+	'UI:Audit:Interactive:Selection:BadgeAll' => 'All categories~~',
+	'UI:Audit:Interactive:Button:Back' => 'Back to the audit~~',
+	'UI:Audit:Interactive:Button:Configuration' => 'Audit configuration~~',
+	'UI:Audit:ViewRules' => 'Check the rules~~',
 	'UI:Audit:HeaderAuditRule' => '审计规则',
 	'UI:Audit:HeaderNbObjects' => '# 对象',
 	'UI:Audit:HeaderNbErrors' => '# 错误',
@@ -703,16 +791,14 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'UI:Audit:OqlError' => 'OQL Error~~',
 	'UI:Audit:Error:ValueNA' => 'n/a',
 	'UI:Audit:ErrorIn_Rule' => '规则中有错误',
-	'UI:Audit:ErrorIn_Rule_Reason' => 'OQL Error in the Rule %1$s: %2$s.',
+	'UI:Audit:ErrorIn_Rule_Reason' => 'OQL Error in the Rule %1$s: %2$s.~~',
 	'UI:Audit:ErrorIn_Category' => 'Error in Category~~',
-	'UI:Audit:ErrorIn_Category_Reason' => 'OQL Error in the Category %1$s: %2$s.',
+	'UI:Audit:ErrorIn_Category_Reason' => 'OQL Error in the Category %1$s: %2$s.~~',
 	'UI:Audit:AuditErrors' => '审计出错',
 	'UI:Audit:Dashboard:ObjectsAudited' => '对象已审计',
 	'UI:Audit:Dashboard:ObjectsInError' => '对象出错',
 	'UI:Audit:Dashboard:ObjectsValidated' => '对象已验证',
 	'UI:Audit:AuditCategory:Subtitle' => '%2$s 个中有 %1$s 个错误 - %3$s%%',
-
-
 	'UI:RunQuery:Title' => ITOP_APPLICATION_SHORT.' - OQL查询评估',
 	'UI:RunQuery:QueryExamples' => '示例查询',
 	'UI:RunQuery:QueryResults' => '查询结果',
@@ -723,7 +809,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'UI:RunQuery:ExpressionToEvaluate' => '请输入表达式: ',
 	'UI:RunQuery:QueryArguments' => '查询参数',
 	'UI:RunQuery:MoreInfo' => '此查询的更多信息: ',
-	'UI:RunQuery:DevelopedQuery' => '重新开发的查询表达式: ',
+	'UI:RunQuery:DevelopedQuery' => '快捷查询表达式: ',
 	'UI:RunQuery:SerializedFilter' => '序列化的过滤器: ',
 	'UI:RunQuery:DevelopedOQL' => '优化的 OQL',
 	'UI:RunQuery:DevelopedOQLCount' => 'Developed OQL for count~~',
@@ -751,7 +837,6 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'UI:Schema:Label' => '标签',
 	'UI:Schema:Label+' => '属性标签',
 	'UI:Schema:Type' => '类别',
-
 	'UI:Schema:Type+' => '属性的数据类型',
 	'UI:Schema:Origin' => '来自',
 	'UI:Schema:Origin+' => '此属性被定义的基类',
@@ -760,7 +845,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'UI:Schema:AllowedValues' => '允许值',
 	'UI:Schema:AllowedValues+' => '此属性取值的限制',
 	'UI:Schema:MoreInfo' => '更多信息',
-	'UI:Schema:MoreInfo+' => '此栏目在数据库中被定义的更多信息',
+	'UI:Schema:MoreInfo+' => '此字段在数据库中被定义的更多信息',
 	'UI:Schema:SearchCriteria' => '搜索条件',
 	'UI:Schema:FilterCode' => '过滤器编码',
 	'UI:Schema:FilterCode+' => '此搜索条件的编码',
@@ -776,9 +861,9 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'UI:Schema:Relation_Code_Description' => '关联 <em>%1$s</em> (%2$s)',
 	'UI:Schema:RelationDown_Description' => '向下: %1$s',
 	'UI:Schema:RelationUp_Description' => '向上: %1$s',
-	'UI:Schema:RelationPropagates' => '%1$s: 繁殖到 %2$d 个层级, 查询: %3$s',
-	'UI:Schema:RelationDoesNotPropagate' => '%1$s: 没有繁殖 (%2$d 层级), 查询: %3$s',
-	'UI:Schema:Class_ReferencingClasses_From_By' => '%1$s 被类 %2$s 参照, 通过栏目 %3$s',
+	'UI:Schema:RelationPropagates' => '%1$s: 延申到 %2$d 个层级, 查询: %3$s',
+	'UI:Schema:RelationDoesNotPropagate' => '%1$s: 没有延申 (%2$d 层级), 查询: %3$s',
+	'UI:Schema:Class_ReferencingClasses_From_By' => '%1$s 被类 %2$s 参照, 通过字段 %3$s',
 	'UI:Schema:Class_IsLinkedTo_Class_Via_ClassAndAttribute' => '%1$s 被链接到 %2$s 通过 %3$s::<em>%4$s</em>',
 	'UI:Schema:Links:1-n' => '类指向 %1$s (1:n 链接):',
 	'UI:Schema:Links:n-n' => '类关联到 %1$s (n:n 链接):',
@@ -789,7 +874,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'UI:Schema:LifeCycleHiddenAttribute' => '隐藏',
 	'UI:Schema:LifeCycleReadOnlyAttribute' => '只读',
 	'UI:Schema:LifeCycleMandatoryAttribute' => '必须',
-	'UI:Schema:LifeCycleAttributeMustChange' => '必须变更',
+	'UI:Schema:LifeCycleAttributeMustChange' => '必须修改',
 	'UI:Schema:LifeCycleAttributeMustPrompt' => '用户将被提示改变值',
 	'UI:Schema:LifeCycleEmptyList' => '空列表',
 	'UI:Schema:ClassFilter' => '类别:',
@@ -797,8 +882,18 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'UI:Schema:DisplaySelector/LabelAndCode' => '标记和代码',
 	'UI:Schema:DisplaySelector/Label' => '标记',
 	'UI:Schema:DisplaySelector/Code' => '代码',
-	'UI:Schema:Attribute/Filter' => '过滤器',
-	'UI:Schema:DefaultNullValue' => 'Default null : "%1$s"',
+	'UI:Schema:Attribute/Filter' => '筛选器',
+	'UI:Schema:DefaultNullValue' => '默认为空 : "%1$s"',
+	'UI:Schema:Events' => 'Events~~',
+	'UI:Schema:Events:Defined' => 'Defined events~~',
+	'UI:Schema:Events:NoEvent' => 'No event defined~~',
+	'UI:Schema:Events:Listeners' => 'Event listeners~~',
+	'UI:Schema:Events:NoListener' => 'No event listener~~',
+	'UI:Schema:Events:Event' => 'Event',
+	'UI:Schema:Events:Description' => '描述',
+	'UI:Schema:Events:Listener' => 'Listener~~',
+	'UI:Schema:Events:Rank' => 'Rank~~',
+	'UI:Schema:Events:Module' => 'Module',
 	'UI:LinksWidget:Autocomplete+' => '输入前3个字符...',
 	'UI:Edit:SearchQuery' => '请选择预定义的查询',
 	'UI:Edit:TestQuery' => '测试查询',
@@ -818,7 +913,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'UI:Title:DeletionOf_Object' => '删除 %1$s',
 	'UI:Title:BulkDeletionOf_Count_ObjectsOf_Class' => '批量删除 %1$d 个 %2$s 类的对象',
 	'UI:Delete:NotAllowedToDelete' => '您无权删除此对象',
-	'UI:Delete:NotAllowedToUpdate_Fields' => '您无权更新以下栏目: %1$s',
+	'UI:Delete:NotAllowedToUpdate_Fields' => '您无权更新以下字段: %1$s',
 	'UI:Error:ActionNotAllowed' => '您无权进行操作',
 	'UI:Error:NotEnoughRightsToDelete' => '无法删除此对象, 因为当前用户没有足够的权限',
 	'UI:Error:CannotDeleteBecause' => '无法删除此对象,因为: %1$s',
@@ -827,7 +922,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'UI:Archive_User_OnBehalfOf_User' => '%1$s on behalf of %2$s',
 	'UI:Delete:Deleted' => '已删除',
 	'UI:Delete:AutomaticallyDeleted' => '已自动删除',
-	'UI:Delete:AutomaticResetOf_Fields' => '自动重置栏目: %1$s',
+	'UI:Delete:AutomaticResetOf_Fields' => '自动重置字段: %1$s',
 	'UI:Delete:CleaningUpRefencesTo_Object' => '删除所有对 %1$s 的引用...',
 	'UI:Delete:CleaningUpRefencesTo_Several_ObjectsOf_Class' => '删除所有对 %2$s 类的 %1$d 个对象的引用...',
 	'UI:Delete:Done+' => '做了什么...',
@@ -869,7 +964,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'UI:Search:Ongoing' => '正在搜索 "%1$s"',
 	'UI:Search:Enlarge' => 'Broaden the search',
 	'UI:FullTextSearchTitle_Text' => '"%1$s" 的结果:',
-	'UI:Search:Count_ObjectsOf_Class_Found' => '发现 %2$s 类的 %1$d 个对象.',
+	'UI:Search:Count_ObjectsOf_Class_Found' => '找到 %1$d 个 %2$s .',
 	'UI:Search:NoObjectFound' => '未发现对象.',
 	'UI:ModificationPageTitle_Object_Class' => ITOP_APPLICATION_SHORT.' - %1$s - %2$s 修改',
 	'UI:ModificationTitle_Class_Object' => '修改 %1$s: <span class=\\"hilite\\">%2$s</span>',
@@ -879,18 +974,17 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'UI:CreationTitle_Class' => '新建 %1$s',
 	'UI:SelectTheTypeOf_Class_ToCreate' => '选择 %1$s 的类别:',
 	'UI:Class_Object_NotUpdated' => '未发现变化, %1$s (%2$s) <strong>没有</strong> 被更新.',
-	'UI:Class_Object_Updated' => '%1$s (%2$s) 更新了.',
+	'UI:Class_Object_Updated' => '%1$s (%2$s) 已更新.',
 	'UI:BulkDeletePageTitle' => ITOP_APPLICATION_SHORT.' - 批量删除',
 	'UI:BulkDeleteTitle' => '选择您要删除的对象:',
-	'UI:PageTitle:ObjectCreated' => ITOP_APPLICATION_SHORT.' 对象创建了.',
-	'UI:Title:Object_Of_Class_Created' => '%1$s - %2$s 创建了.',
+	'UI:PageTitle:ObjectCreated' => ITOP_APPLICATION_SHORT.' 对象已创建.',
+	'UI:Title:Object_Of_Class_Created' => '%1$s - %2$s 已创建.',
 	'UI:Apply_Stimulus_On_Object_In_State_ToTarget_State' => '应用 %1$s 在对象: %2$s 上, 从 %3$s 状态到目标状态: %4$s.',
 	'UI:ObjectCouldNotBeWritten' => '对象不能写入: %1$s',
 	'UI:PageTitle:FatalError' => ITOP_APPLICATION_SHORT.' - 致命错误',
 	'UI:SystemIntrusion' => '访问被禁止. 您正尝试未被许可的操作.',
 	'UI:FatalErrorMessage' => '致命错误, iTop 无法继续.',
 	'UI:Error_Details' => '错误: %1$s.',
-
 	'UI:PageTitle:ProfileProjections' => ITOP_APPLICATION_SHORT.' 用户管理 - 角色映射',
 	'UI:UserManagement:Class' => '类',
 	'UI:UserManagement:Class+' => '对象的类',
@@ -925,66 +1019,42 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'UI:UserManagement:NoLifeCycleApplicable' => 'N/A',
 	'UI:UserManagement:NoLifeCycleApplicable+' => '此类未定义生命周期',
 	'UI:UserManagement:GrantMatrix' => '授权矩阵',
-
-	'Menu:AdminTools' => '管理工具',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:AdminTools+' => '管理工具',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:AdminTools?' => '具有管理员角色的用户才能使用的工具',// Duplicated into itop-welcome-itil (will be removed from here...)
 	'Menu:SystemTools' => '系统',
-
 	'UI:ChangeManagementMenu' => '变更管理',
 	'UI:ChangeManagementMenu+' => '变更管理',
 	'UI:ChangeManagementMenu:Title' => '变更概况',
 	'UI-ChangeManagementMenu-ChangesByType' => '按类别划分的变更',
 	'UI-ChangeManagementMenu-ChangesByStatus' => '按状态划分的变更',
 	'UI-ChangeManagementMenu-ChangesNotYetAssigned' => '尚未分配的变更',
-
 	'UI:ConfigurationManagementMenu' => '配置管理',
 	'UI:ConfigurationManagementMenu+' => '配置管理',
 	'UI:ConfigurationManagementMenu:Title' => '基础架构概况',
 	'UI-ConfigurationManagementMenu-InfraByType' => '按类别划分基础架构对象',
 	'UI-ConfigurationManagementMenu-InfraByStatus' => '按状态划分基础架构对象',
-
 	'UI:ConfigMgmtMenuOverview:Title' => '配置管理仪表盘',
 	'UI-ConfigMgmtMenuOverview-FunctionalCIbyStatus' => '按状态配置项目',
 	'UI-ConfigMgmtMenuOverview-FunctionalCIByType' => '按类别配置项目',
-
 	'UI:RequestMgmtMenuOverview:Title' => '需求管理仪表盘',
 	'UI-RequestManagementOverview-RequestByService' => '按服务划分用户需求',
 	'UI-RequestManagementOverview-RequestByPriority' => '按优先级划分用户需求',
 	'UI-RequestManagementOverview-RequestUnassigned' => '尚未分配给办理人的用户需求',
-
 	'UI:IncidentMgmtMenuOverview:Title' => '事件管理仪表盘',
 	'UI-IncidentManagementOverview-IncidentByService' => '按服务级划分事件',
 	'UI-IncidentManagementOverview-IncidentByPriority' => '按优先级划分事件',
 	'UI-IncidentManagementOverview-IncidentUnassigned' => '尚未分配给办理人的事件',
-
 	'UI:ChangeMgmtMenuOverview:Title' => '变更管理仪表盘',
 	'UI-ChangeManagementOverview-ChangeByType' => '按类别划分变更',
 	'UI-ChangeManagementOverview-ChangeUnassigned' => '尚未分配给办理人的变更',
 	'UI-ChangeManagementOverview-ChangeWithOutage' => '变更引起的停机',
-
 	'UI:ServiceMgmtMenuOverview:Title' => '服务管理仪表盘',
 	'UI-ServiceManagementOverview-CustomerContractToRenew' => '客户合同需在30日内更新',
 	'UI-ServiceManagementOverview-ProviderContractToRenew' => '供应商合同需在30日内更新',
-
 	'UI:ContactsMenu' => '联系人',
 	'UI:ContactsMenu+' => '联系人',
 	'UI:ContactsMenu:Title' => '联系人概况',
-	'UI-ContactsMenu-ContactsByLocation' => '按地理位置划分联系人',
+	'UI-ContactsMenu-ContactsByLocation' => '按地点划分联系人',
 	'UI-ContactsMenu-ContactsByType' => '按类别划分联系人',
 	'UI-ContactsMenu-ContactsByStatus' => '按状态划分联系人',
-
-	'Menu:CSVImportMenu' => 'CSV导入',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:CSVImportMenu+' => '批量创建或修改',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:DataModelMenu' => '数据模型',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:DataModelMenu+' => '数据模型概况',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:ExportMenu' => '导出',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:ExportMenu+' => '以HTML, CSV 或XML 格式导出任何查询的结果',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:NotificationsMenu' => '通知',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:NotificationsMenu+' => '配置通知',// Duplicated into itop-welcome-itil (will be removed from here...)
 	'UI:NotificationsMenu:Title' => '配置 通知',
 	'UI:NotificationsMenu:Help' => '帮助',
 	'UI:NotificationsMenu:HelpContent' => '<p>在'.ITOP_APPLICATION_SHORT.' 中, 通知可以被自定义. 它们是基于两个对象集: <i>触发器和操作</i>.</p>
@@ -1015,71 +1085,36 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'UI:NotificationsMenu:Actions:ActionWebhook' => 'Webhook actions (outgoing integrations)~~',
 	'UI:NotificationsMenu:Actions:Action' => '其它操作',
 	'UI:NotificationsMenu:AvailableActions' => '有效的操作',
-
 	'Menu:TagAdminMenu' => '标签配置',
 	'Menu:TagAdminMenu+' => '标签值管理',
 	'UI:TagAdminMenu:Title' => '标签配置',
 	'UI:TagAdminMenu:NoTags' => '未配置标签',
 	'UI:TagSetFieldData:Error' => '错误: %1$s',
-
-	'Menu:AuditCategories' => '审计类别',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:AuditCategories+' => '审计类别',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:Notifications:Title' => '审计类别',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:RunQueriesMenu' => '运行查询',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:RunQueriesMenu+' => '运行任何查询',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:QueryMenu' => '查询手册',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:QueryMenu+' => '查询手册',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:DataAdministration' => '数据管理',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:DataAdministration+' => '数据管理',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:UniversalSearchMenu' => '全局搜索',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UniversalSearchMenu+' => '搜索所有...',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:UserManagementMenu' => '用户管理',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UserManagementMenu+' => '用户管理',// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:ProfilesMenu' => '角色',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:ProfilesMenu+' => '角色',// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:ProfilesMenu:Title' => '角色',
-	// Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:UserAccountsMenu' => '用户帐户',
-	// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UserAccountsMenu+' => '用户帐户',
-	// Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UserAccountsMenu:Title' => '用户帐户',
-	// Duplicated into itop-welcome-itil (will be removed from here...)
-
 	'UI:iTopVersion:Short' => '%1$s version %2$s',
 	'UI:iTopVersion:Long' => '%1$s version %2$s-%3$s built on %4$s',
 	'UI:PropertiesTab' => '属性',
-
 	'UI:OpenDocumentInNewWindow_' => '打开',
 	'UI:DownloadDocument_' => '下载',
 	'UI:Document:NoPreview' => '此类文档无法预览',
 	'UI:Download-CSV' => '下载 %1$s',
-
 	'UI:DeadlineMissedBy_duration' => '超过 %1$s',
 	'UI:Deadline_LessThan1Min' => '< 1 分钟',
-	'UI:Deadline_Minutes' => '%1$d min',
+	'UI:Deadline_Minutes' => '%1$d 分钟',
 	'UI:Deadline_Hours_Minutes' => '%1$dh %2$dmin',
 	'UI:Deadline_Days_Hours_Minutes' => '%1$dd %2$dh %3$dmin',
 	'UI:Help' => '帮助',
 	'UI:PasswordConfirm' => '确认',
 	'UI:BeforeAdding_Class_ObjectsSaveThisObject' => '在添加更多 %1$s 之前, 保存此对象.',
 	'UI:DisplayThisMessageAtStartup' => '在启动时显示此消息',
-	'UI:RelationshipGraph' => '图览',
-	'UI:RelationshipList' => '列表',
+	'UI:RelationshipGraph' => '图形视图',
+	'UI:RelationshipList' => '列表视图',
 	'UI:RelationGroups' => '组',
 	'UI:OperationCancelled' => '操作已取消',
-	'UI:ElementsDisplayed' => '过滤',
+	'UI:ElementsDisplayed' => '筛选',
 	'UI:RelationGroupNumber_N' => '分组 #%1$d',
 	'UI:Relation:ExportAsPDF' => '导出PDF...',
 	'UI:RelationOption:GroupingThreshold' => '分组阈值',
-	'UI:Relation:AdditionalContextInfo' => '其他信息',
+	'UI:Relation:AdditionalContextInfo' => '其它信息',
 	'UI:Relation:NoneSelected' => '无',
 	'UI:Relation:Zoom' => '放大',
 	'UI:Relation:ExportAsAttachment' => '导出为附件...',
@@ -1087,7 +1122,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'UI:Relation:PDFExportOptions' => 'PDF导出选项',
 	'UI:Relation:AttachmentExportOptions_Name' => 'Options for Attachment to %1$s',
 	'UI:RelationOption:Untitled' => '无标题',
-	'UI:Relation:Key' => 'Key',
+	'UI:Relation:Key' => '键',
 	'UI:Relation:Comments' => '备注',
 	'UI:RelationOption:Title' => '标题',
 	'UI:RelationOption:IncludeList' => '包含的对象列表',
@@ -1127,8 +1162,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Portal:TitleRequestDetailsFor_Request' => '需求详情 %1$s:',
 	'Portal:NoOpenRequest' => '此类别中没有打开的需求.',
 	'Portal:NoClosedRequest' => '此分类中没有需求',
-	'Portal:Button:ReopenTicket' => '重新打开这个工单',
-	'Portal:Button:CloseTicket' => '关闭这个工单',
+	'Portal:Button:ReopenTicket' => '重新打开工单',
+	'Portal:Button:CloseTicket' => '关闭工单',
 	'Portal:Button:UpdateRequest' => '更新需求',
 	'Portal:EnterYourCommentsOnTicket' => '请点评此工单的解决方案:',
 	'Portal:ErrorNoContactForThisUser' => '错误: 当前用户没有与任何联系人关联. 请联系管理员.',
@@ -1140,9 +1175,13 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Enum:Undefined' => '未定义',
 	'UI:DurationForm_Days_Hours_Minutes_Seconds' => '%1$s 天 %2$s 小时 %3$s 分 %4$s 秒',
 	'UI:ModifyAllPageTitle' => '修改所有',
+	'UI:Modify_ObjectsOf_Class' => 'Modifying objects of class %1$s',
 	'UI:Modify_N_ObjectsOf_Class' => '正在修改 %1$d 个 %2$s',
 	'UI:Modify_M_ObjectsOf_Class_OutOf_N' => '正在修改 %1$d 个 %2$s ,一共 %3$d 个',
 	'UI:Menu:ModifyAll' => '修改...',
+	'UI:Menu:ModifyAll_Class' => 'Modify %1$s objects...',
+	'UI:Menu:ModifyAll_Link' => 'Modify %1$s...',
+	'UI:Menu:ModifyAll_Remote' => 'Modify %1$s...',
 	'UI:Button:ModifyAll' => '全部修改',
 	'UI:Button:PreviewModifications' => '修改预览 >>',
 	'UI:ModifiedObject' => '对象已修改',
@@ -1179,11 +1218,11 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'UI:ArchiveMode:Banner' => '归档模式',
 	'UI:ArchiveMode:Banner+' => '已归档的对象可见但不允许修改',
 	'UI:FavoriteOrganizations' => '快速访问',
-	'UI:FavoriteOrganizations+' => '进入组织下的列表,可实现通过下拉菜单快速访问. 请注意,这并不是一个安全设置, 其他组织的对象依然可以通过选择 "所有组织" 下拉列表看到.',
+	'UI:FavoriteOrganizations+' => '进入组织下的列表,可实现通过下拉菜单快速访问. 请注意,这并不是一个安全设置, 其它组织的对象依然可以通过选择 "所有组织" 下拉列表看到.',
 	'UI:FavoriteLanguage' => '语言',
 	'UI:Favorites:SelectYourLanguage' => '选择语言',
-	'UI:FavoriteOtherSettings' => '其他设置',
-	'UI:Favorites:Default_X_ItemsPerPage' => '默认列表: 每页 %1$s 个项目~~',
+	'UI:FavoriteOtherSettings' => '其它设置',
+	'UI:Favorites:Default_X_ItemsPerPage' => '默认行数: 每页 %1$s 个项目',
 	'UI:Favorites:ShowObsoleteData' => '显示废弃的数据',
 	'UI:Favorites:ShowObsoleteData+' => '在搜索结果中显示已废弃的数据',
 	'UI:NavigateAwayConfirmationMessage' => '所有修改都将丢失.',
@@ -1194,7 +1233,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'UI:Menu:AddToDashboard' => '添加到仪表盘...',
 	'UI:Button:Refresh' => '刷新',
 	'UI:Button:GoPrint' => '打印...',
-	'UI:ExplainPrintable' => '点击 %1$s 图标可隐藏打印内容.<br/>在打印之前可使用浏览器的 "打印预览" 功能.<br/>注: 这个页首和其他控制面板不会被打印.',
+	'UI:ExplainPrintable' => '点击 %1$s 图标可隐藏打印内容.<br/>在打印之前可使用浏览器的 "打印预览" 功能.<br/>注: 这个页首和其它控制面板不会被打印.',
 	'UI:PrintResolution:FullSize' => '全尺寸',
 	'UI:PrintResolution:A4Portrait' => 'A4 纵向',
 	'UI:PrintResolution:A4Landscape' => 'A4 横向',
@@ -1202,8 +1241,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'UI:PrintResolution:LetterLandscape' => '横向信纸',
 	'UI:Toggle:SwitchToStandardDashboard' => '切换到标准仪表盘',
 	'UI:Toggle:SwitchToCustomDashboard' => '切换到自定义仪表盘',
-
-	'UI:ConfigureThisList' => '配置这个列表...',
+	'UI:ConfigureThisList' => '配置列表...',
 	'UI:ListConfigurationTitle' => '列表配置',
 	'UI:ColumnsAndSortOrder' => '列和排序顺序:',
 	'UI:UseDefaultSettings' => '使用默认配置',
@@ -1218,10 +1256,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'UI:ExtField_AsRemoteField' => '%1$s (%2$s)',
 	'UI:Button:MoveUp' => '上移',
 	'UI:Button:MoveDown' => '下移',
-
 	'UI:OQL:UnknownClassAndFix' => '未知类别 "%1$s". 您可以试试 "%2$s" .',
 	'UI:OQL:UnknownClassNoFix' => '未知类别 "%1$s"',
-
 	'UI:Dashboard:EditCustom' => '编辑自定义版本...',
 	'UI:Dashboard:CreateCustom' => '新建自定义版本...',
 	'UI:Dashboard:DeleteCustom' => '删除自定义版本...',
@@ -1232,13 +1268,10 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'UI:ImportDashboardText' => '选择要导入的仪表盘文件:',
 	'UI:Dashboard:Actions' => '仪表盘操作',
 	'UI:Dashboard:NotUpToDateUntilContainerSaved' => 'This dashboard displays information that does not include the on-going changes.~~',
-
-
 	'UI:DashletCreation:Title' => '创建新组件',
 	'UI:DashletCreation:Dashboard' => '仪表盘',
 	'UI:DashletCreation:DashletType' => '组件类型',
 	'UI:DashletCreation:EditNow' => '编辑仪表盘',
-
 	'UI:DashboardEdit:Title' => '仪表盘编辑器',
 	'UI:DashboardEdit:DashboardTitle' => '标题',
 	'UI:DashboardEdit:AutoReload' => '自动刷新',
@@ -1246,38 +1279,31 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'UI:DashboardEdit:AutoReloadSec+' => '最小值是 %1$d 秒',
 	'UI:DashboardEdit:Revert' => '撤回',
 	'UI:DashboardEdit:Apply' => '应用',
-
 	'UI:DashboardEdit:Layout' => '布局',
 	'UI:DashboardEdit:Properties' => '仪表盘属性',
 	'UI:DashboardEdit:Dashlets' => '可用的组件',
 	'UI:DashboardEdit:DashletProperties' => '组件属性',
-
 	'UI:Form:Property' => '属性',
 	'UI:Form:Value' => '值',
-
 	'UI:DashletUnknown:Label' => '未知',
-	'UI:DashletUnknown:Description' => 'Unknown dashlet (might have been uninstalled)',
-	'UI:DashletUnknown:RenderText:View' => 'Unable to render this dashlet.',
-	'UI:DashletUnknown:RenderText:Edit' => 'Unable to render this dashlet (class "%1$s"). Check with your administrator if it is still available.',
-	'UI:DashletUnknown:RenderNoDataText:Edit' => 'No preview available for this dashlet (class "%1$s").',
+	'UI:DashletUnknown:Description' => 'Unknown dashlet (might have been uninstalled)~~',
+	'UI:DashletUnknown:RenderText:View' => 'Unable to render this dashlet.~~',
+	'UI:DashletUnknown:RenderText:Edit' => 'Unable to render this dashlet (class "%1$s"). Check with your administrator if it is still available.~~',
+	'UI:DashletUnknown:RenderNoDataText:Edit' => 'No preview available for this dashlet (class "%1$s").~~',
 	'UI:DashletUnknown:Prop-XMLConfiguration' => '配置 (显示为纯 XML)',
-
 	'UI:DashletProxy:Label' => '代理',
-	'UI:DashletProxy:Description' => 'Proxy dashlet',
+	'UI:DashletProxy:Description' => 'Proxy dashlet~~',
 	'UI:DashletProxy:RenderNoDataText:Edit' => '第三方组件无法预览(class "%1$s").',
 	'UI:DashletProxy:Prop-XMLConfiguration' => '配置 (显示为纯 XML)',
-
 	'UI:DashletPlainText:Label' => '文本',
 	'UI:DashletPlainText:Description' => '纯文本(无格式)',
 	'UI:DashletPlainText:Prop-Text' => '内容',
 	'UI:DashletPlainText:Prop-Text:Default' => '请在这里输入内容...',
-
 	'UI:DashletObjectList:Label' => '对象列表',
-	'UI:DashletObjectList:Description' => 'Object list dashlet',
+	'UI:DashletObjectList:Description' => 'Object list dashlet~~',
 	'UI:DashletObjectList:Prop-Title' => '标题',
 	'UI:DashletObjectList:Prop-Query' => '查询',
 	'UI:DashletObjectList:Prop-Menu' => '菜单',
-
 	'UI:DashletGroupBy:Prop-Title' => '标题',
 	'UI:DashletGroupBy:Prop-Query' => '查询',
 	'UI:DashletGroupBy:Prop-Style' => '样式',
@@ -1291,42 +1317,36 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfWeek' => '%1$s (day of week)',
 	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfMonth' => '%1$s (day of month)',
 	'UI:DashletGroupBy:MissingGroupBy' => 'Please select the field on which the objects will be grouped together',
-
 	'UI:DashletGroupByPie:Label' => '饼图',
 	'UI:DashletGroupByPie:Description' => '饼图',
 	'UI:DashletGroupByBars:Label' => '柱状图',
 	'UI:DashletGroupByBars:Description' => '柱状图',
 	'UI:DashletGroupByTable:Label' => '分组 (表)',
 	'UI:DashletGroupByTable:Description' => '列表 (Grouped by a field)',
-
-	// New in 2.5
+    // New in 2.5
 	'UI:DashletGroupBy:Prop-Function' => '聚合函数',
 	'UI:DashletGroupBy:Prop-FunctionAttribute' => '函数属性',
 	'UI:DashletGroupBy:Prop-OrderDirection' => '方向',
 	'UI:DashletGroupBy:Prop-OrderField' => '排序',
 	'UI:DashletGroupBy:Prop-Limit' => 'Limit',
-
 	'UI:DashletGroupBy:Order:asc' => '升序',
 	'UI:DashletGroupBy:Order:desc' => '降序',
-
 	'UI:GroupBy:count' => '个数',
-	'UI:GroupBy:count+' => '元件的个数',
+	'UI:GroupBy:count+' => '组件的个数',
 	'UI:GroupBy:sum' => '总数',
-	'UI:GroupBy:sum+' => 'Sum of %1$s',
+	'UI:GroupBy:sum+' => 'Sum of %1$s~~',
 	'UI:GroupBy:avg' => '平均',
-	'UI:GroupBy:avg+' => 'Average of %1$s',
+	'UI:GroupBy:avg+' => 'Average of %1$s~~',
 	'UI:GroupBy:min' => '最小',
-	'UI:GroupBy:min+' => 'Minimum of %1$s',
+	'UI:GroupBy:min+' => 'Minimum of %1$s~~',
 	'UI:GroupBy:max' => '最大',
-	'UI:GroupBy:max+' => 'Maximum of %1$s',
-	// ---
-
+	'UI:GroupBy:max+' => 'Maximum of %1$s~~',
+    // ---
 	'UI:DashletHeaderStatic:Label' => 'Header',
 	'UI:DashletHeaderStatic:Description' => '显示水平分隔符',
 	'UI:DashletHeaderStatic:Prop-Title' => '标题',
 	'UI:DashletHeaderStatic:Prop-Title:Default' => '联系人',
 	'UI:DashletHeaderStatic:Prop-Icon' => '图标',
-
 	'UI:DashletHeaderDynamic:Label' => 'Header with statistics',
 	'UI:DashletHeaderDynamic:Description' => 'Header with stats (grouped by...)',
 	'UI:DashletHeaderDynamic:Prop-Title' => '标题',
@@ -1337,11 +1357,9 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'UI:DashletHeaderDynamic:Prop-Query' => '查询',
 	'UI:DashletHeaderDynamic:Prop-GroupBy' => '分组依据',
 	'UI:DashletHeaderDynamic:Prop-Values' => '值',
-
-	'UI:DashletBadge:Label' => 'Badge',
-	'UI:DashletBadge:Description' => 'Object Icon with new/search',
+	'UI:DashletBadge:Label' => 'Badge~~',
+	'UI:DashletBadge:Description' => 'Object Icon with new/search~~',
 	'UI:DashletBadge:Prop-Class' => 'Class',
-
 	'DayOfWeek-Sunday' => '周日',
 	'DayOfWeek-Monday' => '周一',
 	'DayOfWeek-Tuesday' => '周二',
@@ -1361,8 +1379,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Month-10' => '十月',
 	'Month-11' => '十一月',
 	'Month-12' => '十二月',
-
-	// Short version for the DatePicker
+    // Short version for the DatePicker
 	'DayOfWeek-Sunday-Min' => '日',
 	'DayOfWeek-Monday-Min' => '一',
 	'DayOfWeek-Tuesday-Min' => '二',
@@ -1382,13 +1399,13 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Month-10-Short' => '10月',
 	'Month-11-Short' => '11月',
 	'Month-12-Short' => '12月',
-	'Calendar-FirstDayOfWeek' => '0',// 0 = Sunday, 1 = Monday, etc...
-
+	'Calendar-FirstDayOfWeek' => '0',
+    // 0 = Sunday, 1 = Monday, etc...
 	'UI:Menu:ShortcutList' => '创建快捷方式...',
+	'UI:Menu:FilterList' => 'Display list with search criteria~~',
 	'UI:ShortcutRenameDlg:Title' => '重命名快捷方式',
 	'UI:ShortcutListDlg:Title' => '为此列表创建快捷方式',
 	'UI:ShortcutDelete:Confirm' => '请确认是否删除这个(些)快捷方式.',
-	'Menu:MyShortcuts' => '我的快捷方式',// Duplicated into itop-welcome-itil (will be removed from here...)
 	'Class:Shortcut' => '快捷方式',
 	'Class:Shortcut+' => '',
 	'Class:Shortcut/Attribute:name' => '名称',
@@ -1396,18 +1413,16 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:ShortcutOQL' => '搜索结果的快捷方式',
 	'Class:ShortcutOQL+' => '',
 	'Class:ShortcutOQL/Attribute:oql' => '查询',
-	'Class:ShortcutOQL/Attribute:oql+' => 'OQL defining the list of objects to search for',
+	'Class:ShortcutOQL/Attribute:oql+' => 'OQL defining the list of objects to search for~~',
 	'Class:ShortcutOQL/Attribute:auto_reload' => '自动刷新',
 	'Class:ShortcutOQL/Attribute:auto_reload/Value:none' => '禁用',
 	'Class:ShortcutOQL/Attribute:auto_reload/Value:custom' => '自定义频率',
 	'Class:ShortcutOQL/Attribute:auto_reload_sec' => '自动刷新间隔(秒)',
 	'Class:ShortcutOQL/Attribute:auto_reload_sec/tip' => '最小值是 %1$d 秒',
-
 	'UI:FillAllMandatoryFields' => '请填写所有的必填项.',
 	'UI:ValueMustBeSet' => '必填',
 	'UI:ValueMustBeChanged' => '必须修改这个值',
 	'UI:ValueInvalidFormat' => '格式无效',
-
 	'UI:CSVImportConfirmTitle' => '请确认本次操作',
 	'UI:CSVImportConfirmMessage' => '请确认是否继续 ?',
 	'UI:CSVImportError_items' => '错误: %1$d',
@@ -1433,11 +1448,9 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 <tr><td>i</td><td>分 (2位数, 比如 00..59)</td></tr>
 <tr><td>s</td><td>秒 (2位数, 比如 00..59)</td></tr>
 </table>',
-
 	'UI:Button:Remove' => '移除',
 	'UI:AddAnExisting_Class' => '添加 %1$s...',
 	'UI:SelectionOf_Class' => '选择 %1$s',
-
 	'UI:AboutBox' => '关于 '.ITOP_APPLICATION_SHORT.'...',
 	'UI:About:Title' => '关于 '.ITOP_APPLICATION_SHORT,
 	'UI:About:DataModel' => '数据模型',
@@ -1447,12 +1460,10 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'UI:About:ManualExtensionSource' => '扩展',
 	'UI:About:Extension_Version' => '版本: %1$s',
 	'UI:About:RemoteExtensionSource' => '数据',
-
 	'UI:DisconnectedDlgMessage' => '您已断开. 要继续使用,需要重新验证您的用户名和密码.',
 	'UI:DisconnectedDlgTitle' => '警告!',
 	'UI:LoginAgain' => '再次登录',
 	'UI:StayOnThePage' => '保持在当前页面',
-
 	'ExcelExporter:ExportMenu' => 'Excel导出...',
 	'ExcelExporter:ExportDialogTitle' => 'Excel导出',
 	'ExcelExporter:ExportButton' => '导出',
@@ -1462,54 +1473,46 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'ExcelExporter:Done' => '完成.',
 	'ExcelExport:AutoDownload' => '导出准备好之后自动开始下载',
 	'ExcelExport:PreparingExport' => '正在准备导出...',
-	'ExcelExport:Statistics' => '统计',
+	'ExcelExport:Statistics' => '状态',
 	'portal:legacy_portal' => '终端用户门户',
 	'portal:backoffice' => ITOP_APPLICATION_SHORT.' 后台用户界面',
-
 	'UI:CurrentObjectIsLockedBy_User' => '对象被锁住,因为正在修改 %1$s.',
 	'UI:CurrentObjectIsLockedBy_User_Explanation' => '此对象正在被 %1$s 修改. 您的修改无法提交因为它们会冲突.',
 	'UI:CurrentObjectIsSoftLockedBy_User' => 'The object is currently being modified by %1$s. You\'ll be able to submit your modifications once they have finished.~~',
 	'UI:CurrentObjectLockExpired' => '并发修改的锁定期已过.',
-	'UI:CurrentObjectLockExpired_Explanation' => 'The lock to prevent concurrent modifications of the object has expired. You can no longer submit your modification since other users are now allowed to modify this object.',
+	'UI:CurrentObjectLockExpired_Explanation' => 'The lock to prevent concurrent modifications of the object has expired. You can no longer submit your modification since other users are now allowed to modify this object.~~',
 	'UI:ConcurrentLockKilled' => '阻止并发修改当前对象的锁已被删除.',
 	'UI:Menu:KillConcurrentLock' => '消除并发修改锁定!',
-
 	'UI:Menu:ExportPDF' => '导出PDF...',
 	'UI:Menu:PrintableVersion' => '打印',
-
 	'UI:BrowseInlineImages' => '浏览图片...',
 	'UI:UploadInlineImageLegend' => '上传新图片',
 	'UI:SelectInlineImageToUpload' => '选择要上传的图片',
 	'UI:AvailableInlineImagesLegend' => '可用的图片',
 	'UI:NoInlineImage' => '服务器上没有图片. 使用上面的 "浏览" 按钮,从您的电脑上选择并上传到服务器.',
-
 	'UI:ToggleFullScreen' => '切换 最大化/最小化',
 	'UI:Button:ResetImage' => '恢复之前的图片',
 	'UI:Button:RemoveImage' => '移除图片',
 	'UI:Button:UploadImage' => '从硬盘上传图像',
 	'UI:UploadNotSupportedInThisMode' => '本模式下不支持修改文件或图片.',
-
 	'UI:Button:RemoveDocument' => '移除文档',
-
-	// Search form
+    // Search form
 	'UI:Search:Toggle' => '折叠/展开',
 	'UI:Search:AutoSubmit:DisabledHint' => '此类别已禁用自动提交',
 	'UI:Search:Obsolescence:DisabledHint' => '根据您的设置, 废弃的数据会被隐藏',
 	'UI:Search:NoAutoSubmit:ExplainText' => '在搜索框中添加规则,或者单击对象按钮查看对象.',
 	'UI:Search:Criterion:MoreMenu:AddCriteria' => '添加条件',
-	// - Add new criteria button
+    // - Add new criteria button
 	'UI:Search:AddCriteria:List:RecentlyUsed:Title' => '最近使用',
 	'UI:Search:AddCriteria:List:MostPopular:Title' => '最常用',
 	'UI:Search:AddCriteria:List:Others:Title' => '其它',
 	'UI:Search:AddCriteria:List:RecentlyUsed:Placeholder' => '还没有.',
-
-	// - Criteria header actions
+    // - Criteria header actions
 	'UI:Search:Criteria:Toggle' => '折叠/展开',
 	'UI:Search:Criteria:Remove' => '移除',
 	'UI:Search:Criteria:Locked' => '已锁定',
-
-	// - Criteria titles
-	//   - Default widget
+    // - Criteria titles
+    //   - Default widget
 	'UI:Search:Criteria:Title:Default:Any' => '%1$s: 任何',
 	'UI:Search:Criteria:Title:Default:Empty' => '%1$s 为空',
 	'UI:Search:Criteria:Title:Default:NotEmpty' => '%1$s 不为空',
@@ -1531,62 +1534,65 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'UI:Search:Criteria:Title:Default:Between:All' => '%1$s: 任何',
 	'UI:Search:Criteria:Title:Default:Between:From' => '%1$s 从 %2$s',
 	'UI:Search:Criteria:Title:Default:Between:Until' => '%1$s 到 %2$s',
-	//   - Numeric widget
-	//   None yet
-	//   - DateTime widget
+    //   - Numeric widget
+    //   None yet
+    //   - DateTime widget
 	'UI:Search:Criteria:Title:DateTime:Between' => '%2$s <= 1$s <= %3$s',
-	//   - Enum widget
+    //   - Enum widget
 	'UI:Search:Criteria:Title:Enum:In' => '%1$s: %2$s',
 	'UI:Search:Criteria:Title:Enum:In:Many' => '%1$s: %2$s 和 %3$s others',
 	'UI:Search:Criteria:Title:Enum:In:All' => '%1$s: 任何',
-	//   - TagSet widget
+    //   - TagSet widget
 	'UI:Search:Criteria:Title:TagSet:Matches' => '%1$s: %2$s',
-	//   - External key widget
+    //   - External key widget
 	'UI:Search:Criteria:Title:ExternalKey:Empty' => '%1$s 已定义',
 	'UI:Search:Criteria:Title:ExternalKey:NotEmpty' => '%1$s 未被定义',
 	'UI:Search:Criteria:Title:ExternalKey:Equals' => '%1$s %2$s',
 	'UI:Search:Criteria:Title:ExternalKey:In' => '%1$s: %2$s',
 	'UI:Search:Criteria:Title:ExternalKey:In:Many' => '%1$s: %2$s 和 %3$s others',
 	'UI:Search:Criteria:Title:ExternalKey:In:All' => '%1$s: 任何',
-	//   - Hierarchical key widget
+    //   - Hierarchical key widget
 	'UI:Search:Criteria:Title:HierarchicalKey:Empty' => '%1$s 已定义',
 	'UI:Search:Criteria:Title:HierarchicalKey:NotEmpty' => '%1$s 未被定义',
 	'UI:Search:Criteria:Title:HierarchicalKey:Equals' => '%1$s %2$s',
 	'UI:Search:Criteria:Title:HierarchicalKey:In' => '%1$s: %2$s',
 	'UI:Search:Criteria:Title:HierarchicalKey:In:Many' => '%1$s: %2$s 和 %3$s others',
 	'UI:Search:Criteria:Title:HierarchicalKey:In:All' => '%1$s: 任何',
-
-	// - Criteria operators
-	//   - Default widget
+    // - Criteria operators
+    //   - Default widget
 	'UI:Search:Criteria:Operator:Default:Empty' => '为空',
 	'UI:Search:Criteria:Operator:Default:NotEmpty' => '非空',
 	'UI:Search:Criteria:Operator:Default:Equals' => '等于',
 	'UI:Search:Criteria:Operator:Default:Between' => '之间',
-	//   - String widget
+    //   - String widget
 	'UI:Search:Criteria:Operator:String:Contains' => '包含',
 	'UI:Search:Criteria:Operator:String:StartsWith' => '起始为',
 	'UI:Search:Criteria:Operator:String:EndsWith' => '结尾是',
 	'UI:Search:Criteria:Operator:String:RegExp' => '正则表达式.',
-	//   - Numeric widget
-	'UI:Search:Criteria:Operator:Numeric:Equals' => '等于',// => '=',
-	'UI:Search:Criteria:Operator:Numeric:GreaterThan' => '大于',// => '>',
-	'UI:Search:Criteria:Operator:Numeric:GreaterThanOrEquals' => '大于/等于',// > '>=',
-	'UI:Search:Criteria:Operator:Numeric:LessThan' => '小于',// => '<',
-	'UI:Search:Criteria:Operator:Numeric:LessThanOrEquals' => '小于/等于',// > '<=',
-	'UI:Search:Criteria:Operator:Numeric:Different' => '不同',// => '≠',
-	//   - Tag Set Widget
+    //   - Numeric widget
+	'UI:Search:Criteria:Operator:Numeric:Equals' => '等于',
+    // => '=',
+	'UI:Search:Criteria:Operator:Numeric:GreaterThan' => '大于',
+    // => '>',
+	'UI:Search:Criteria:Operator:Numeric:GreaterThanOrEquals' => '大于/等于',
+    // > '>=',
+	'UI:Search:Criteria:Operator:Numeric:LessThan' => '小于',
+    // => '<',
+	'UI:Search:Criteria:Operator:Numeric:LessThanOrEquals' => '小于/等于',
+    // > '<=',
+	'UI:Search:Criteria:Operator:Numeric:Different' => '不同',
+    // => '≠',
+    //   - Tag Set Widget
 	'UI:Search:Criteria:Operator:TagSet:Matches' => '匹配',
-
-	// - Other translations
-	'UI:Search:Value:Filter:Placeholder' => '过滤器...',
+    // - Other translations
+	'UI:Search:Value:Filter:Placeholder' => '筛选器...',
 	'UI:Search:Value:Search:Placeholder' => '搜索...',
 	'UI:Search:Value:Autocomplete:StartTyping' => '开始输入值.',
 	'UI:Search:Value:Autocomplete:Wait' => '请稍后...',
 	'UI:Search:Value:Autocomplete:NoResult' => '没有找到结果.',
 	'UI:Search:Value:Toggler:CheckAllNone' => '全选/不选',
 	'UI:Search:Value:Toggler:CheckAllNoneFiltered' => '全选/不选',
-
-	// - Widget other translations
+    // - Widget other translations
 	'UI:Search:Criteria:Numeric:From' => '从',
 	'UI:Search:Criteria:Numeric:Until' => '到',
 	'UI:Search:Criteria:Numeric:PlaceholderFrom' => '任何',
@@ -1600,10 +1606,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'UI:Search:Criteria:DateTime:PlaceholderUntil' => '任何日期',
 	'UI:Search:Criteria:DateTime:PlaceholderUntilTime' => '任何日期',
 	'UI:Search:Criteria:HierarchicalKey:ChildrenIncluded:Hint' => '将会包含选中对象的子集.',
-
-	'UI:Search:Criteria:Raw:Filtered' => '已过滤',
-	'UI:Search:Criteria:Raw:FilteredOn' => '基于 %1$s 过滤',
-
+	'UI:Search:Criteria:Raw:Filtered' => '已筛选',
+	'UI:Search:Criteria:Raw:FilteredOn' => '基于 %1$s 筛选',
 	'UI:StateChanged' => '状态已改变',
 ));
 
@@ -1614,16 +1618,13 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Expression:Operator:AND' => ' 与 ',
 	'Expression:Operator:OR' => ' 或 ',
 	'Expression:Operator:=' => ': ~~',
-
 	'Expression:Unit:Short:DAY' => '日',
 	'Expression:Unit:Short:WEEK' => '周',
 	'Expression:Unit:Short:MONTH' => '月',
 	'Expression:Unit:Short:YEAR' => '年',
-
 	'Expression:Unit:Long:DAY' => '日',
 	'Expression:Unit:Long:HOUR' => '小时',
 	'Expression:Unit:Long:MINUTE' => '分钟',
-
 	'Expression:Verb:NOW' => '现在',
 	'Expression:Verb:ISNULL' => ': 未定义',
 ));
@@ -1647,46 +1648,32 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Menu:DataSources' => '同步数据源',
 	'Menu:DataSources+' => '所有同步数据源',
-	'Menu:WelcomeMenu' => '欢迎',
-	'Menu:WelcomeMenu+' => '欢迎使用 '.ITOP_APPLICATION_SHORT,
-	'Menu:WelcomeMenuPage' => '欢迎',
-	'Menu:WelcomeMenuPage+' => '欢迎使用 '.ITOP_APPLICATION_SHORT,
-	'Menu:AdminTools' => '管理工具',
-	'Menu:AdminTools+' => '管理工具',
-	'Menu:AdminTools?' => '具有管理员角色的用户才能使用的工具',
-	'Menu:DataModelMenu' => '数据模型',
-	'Menu:DataModelMenu+' => '数据模型概况',
-	'Menu:ExportMenu' => '导出',
-	'Menu:ExportMenu+' => '以HTML, CSV 或XML 格式导出任何查询的结果',
-	'Menu:NotificationsMenu' => '通知',
-	'Menu:NotificationsMenu+' => '配置通知',
 	'Menu:AuditCategories' => '审计类别',
 	'Menu:AuditCategories+' => '审计类别',
 	'Menu:Notifications:Title' => '审计类别',
-	'Menu:RunQueriesMenu'         => '运行查询',
-	'Menu:RunQueriesMenu+'        => '运行任何查询',
-	'Menu:QueryMenu'              => '查询手册',
-	'Menu:QueryMenu+'             => '查询手册',
-	'Menu:UniversalSearchMenu'    => '全局搜索',
-	'Menu:UniversalSearchMenu+'   => '搜索所有...',
-	'Menu:UserManagementMenu'     => '用户管理',
-	'Menu:UserManagementMenu+'    => '用户管理',
-	'Menu:ProfilesMenu'           => '角色~~',
-	'Menu:ProfilesMenu+'          => '角色~~',
-	'Menu:ProfilesMenu:Title'     => '角色~~',
-	'Menu:UserAccountsMenu'       => '用户帐户',
-	'Menu:UserAccountsMenu+'      => '用户帐户',
-	'Menu:UserAccountsMenu:Title' => '用户帐户',
-	'Menu:MyShortcuts'            => '我的快捷方式',
-	'Menu:UserManagement'         => '用户管理',
-	'Menu:Queries'                => '查询',
-	'Menu:ConfigurationTools'     => '配置',
+	'Menu:AuditCategories:Title' => 'Audit configuration~~',
+	'Menu:RunQueriesMenu' => '运行查询',
+	'Menu:RunQueriesMenu+' => '运行任何查询',
+	'Menu:QueryMenu' => '查询手册',
+	'Menu:QueryMenu+' => '查询手册',
+	'Menu:UniversalSearchMenu' => '全局搜索',
+	'Menu:UniversalSearchMenu+' => '搜索所有...',
+	'Menu:UserManagementMenu' => '用户管理',
+	'Menu:UserManagementMenu+' => 'Who can connect to '.ITOP_APPLICATION_SHORT.' and what can they do?~~',
+	'Menu:ProfilesMenu' => '首选项',
+	'Menu:ProfilesMenu+' => 'View existing Profiles~~',
+	'Menu:ProfilesMenu:Title' => '首选项',
+	'Menu:UserAccountsMenu' => '用户账户',
+	'Menu:UserAccountsMenu+' => 'Handling '.ITOP_APPLICATION_SHORT.' users and their access rights~~',
+	'Menu:UserAccountsMenu:Title' => '用户账户',
+	'Menu:UserManagement' => '用户管理',
+	'Menu:Queries' => '查询',
+	'Menu:ConfigurationTools' => '配置'
 ));
-
 // Additional language entries not present in English dict
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'UI:Toggle:StandardDashboard' => '标准',
-	'UI:Toggle:CustomDashboard'   => '自定义',
-	'UI:Dashboard:Edit'           => '编辑这个页面...',
-	'UI:Dashboard:Revert'         => '还原到初始版本...',
+	'UI:Toggle:CustomDashboard' => '自定义',
+	'UI:Dashboard:Edit' => '编辑这个页面...',
+	'UI:Dashboard:Revert' => '还原到初始版本...'
 ));
diff --git a/js/dataTables.settings.js b/js/dataTables.settings.js
index dac74d29f3..77e9cc57ed 100644
--- a/js/dataTables.settings.js
+++ b/js/dataTables.settings.js
@@ -35,8 +35,8 @@ $(function () {
 				var me = this;
 				var bViewLink = (this.options.sViewLink == 'true');
 				$('#sfl_'+me.options.sListId).fieldsorter({hasKeyColumn: bViewLink, labels: this.options.oLabels, fields: this.options.oColumns, onChange: function() { me._onSpecificSettings(); } });
-				$('#datatable_dlg_'+me.options.sListId).find('input[name=page_size]').on('click', function() { me._onSpecificSettings(); });
-				$('#datatable_dlg_'+me.options.sListId).find('input[name=save_settings]').on('click', function() { me._updateSaveScope(); });
+				$('#datatable_dlg_'+me.options.sListId).find('input[name="page_size"]').on('click', function() { me._onSpecificSettings(); });
+				$('#datatable_dlg_'+me.options.sListId).find('input[name="save_settings"]').on('click', function() { me._updateSaveScope(); });
 				this._updateSaveScope();
 				this._saveDlgState();
 			},
@@ -92,8 +92,12 @@ $(function () {
 							if ($.inArray(item, aLoadedJsFilesRegister) === -1)
 							{
 								sFileUrl = CombodoGlobalToolbox.AddParameterToUrl(item, aOptions.js_files_param, aOptions.js_files_value);
-								$.ajax({url:sFileUrl, dataType: 'script', cache: true });
-								aLoadedJsFilesRegister.push(item);
+								$.ajax({url: sFileUrl, dataType: 'script', cache: true});
+								aLoadedJsFilesRegister.set(item, new Promise(function (fJsFileResolve) {
+									aLoadedJsFilesResolveCallbacks.set(item, fJsFileResolve);
+									// Resolve promise right away as these files are loaded immediately
+									aLoadedJsFilesResolveCallbacks.get(item, fJsFileResolve)();
+								}));
 							}
 						});
 					}
@@ -170,7 +174,7 @@ $(function () {
 			},
 			onDlgOk: function() {
 				var oOptions = {};
-				oSettings = $('#datatable_dlg_'+this.options.sListId).find('input[name=settings]:checked');
+				oSettings = $('#datatable_dlg_'+this.options.sListId).find('input[name="settings"]:checked');
 				if (oSettings.val() == 'defaults') {
 					oOptions = { iPageSize: this.options.oDefaultSettings.iDefaultPageSize,
 						oColumns: this.options.oDefaultSettings.oColumns
@@ -181,7 +185,7 @@ $(function () {
 					var iSortIdx = 0;
 					var sSortDirection = 'asc';
 					var oColumns = $('#datatable_dlg_'+this.options.sListId).find(':itop-fieldsorter').fieldsorter('get_params');
-					var iPageSize = parseInt($('#datatable_dlg_'+this.options.sListId+' input[name=page_size]').val(), 10);
+					var iPageSize = parseInt($('#datatable_dlg_'+this.options.sListId+' input[name="page_size"]').val(), 10);
 
 					oOptions = {oColumns: oColumns, iPageSize: iPageSize, iDefaultPageSize: iPageSize };
 				}
@@ -189,8 +193,8 @@ $(function () {
 				this._refresh();
 
 				// Check if we need to save the settings or not...
-				var oSaveCheck = $('#datatable_dlg_'+this.options.sListId).find('input[name=save_settings]');
-				var oSaveScope = $('#datatable_dlg_'+this.options.sListId).find('input[name=scope]:checked');
+				var oSaveCheck = $('#datatable_dlg_'+this.options.sListId).find('input[name="save_settings"]');
+				var oSaveScope = $('#datatable_dlg_'+this.options.sListId).find('input[name="scope"]:checked');
 				if (oSaveCheck.prop('checked')) {
 					if (oSettings.val() == 'defaults') {
 						this._useDefaultSettings((oSaveScope.val() == 'defaults'));
@@ -200,7 +204,7 @@ $(function () {
 				}
 				this._saveDlgState();
 
-				$('#datatable_dlg_'+this.options.sListId).find('[name=action]').val("save");
+				$('#datatable_dlg_'+this.options.sListId).find('[name="action"]').val("save");
 				$('#datatable_dlg_'+this.options.sListId).dialog('close');
 			},
 			onDlgCancel: function() {
@@ -210,15 +214,15 @@ $(function () {
 				$('#datatable_dlg_'+this.options.sListId).find('input.specific_settings').prop('checked', true);
 			},
 			_updateSaveScope: function() {
-				var oSaveCheck = $('#datatable_dlg_'+this.options.sListId).find('input[name=save_settings]');
+				var oSaveCheck = $('#datatable_dlg_'+this.options.sListId).find('input[name="save_settings"]');
 				if (oSaveCheck.prop('checked')) {
-					$('#datatable_dlg_'+this.options.sListId).find('input[name=scope]').each(function() {
+					$('#datatable_dlg_'+this.options.sListId).find('input[name="scope"]').each(function() {
 						if ($(this).attr('stay-disabled') != 'true') {
 							$(this).prop('disabled', false);
 						}
 					});
 				} else {
-					$('#datatable_dlg_'+this.options.sListId).find('input[name=scope]').prop('disabled', true);
+					$('#datatable_dlg_'+this.options.sListId).find('input[name="scope"]').prop('disabled', true);
 				}
 			},
 			// events bound via _bind are removed automatically
@@ -259,7 +263,7 @@ $(function () {
 				}
 
 				var dlgElement = $('#datatable_dlg_'+this.options.sListId);
-				dlgElement.find('input[name=page_size]').val(iPageSize);
+				dlgElement.find('input[name="page_size"]').val(iPageSize);
 				dlgElement.find(':itop-fieldsorter').fieldsorter('option', { fields: this.options.oColumns });
 			},
 			_saveDlgState: function () {
@@ -267,7 +271,8 @@ $(function () {
 				for (k in this.aDlgStateParams) {
 					this.originalState[this.aDlgStateParams[k]] = this.options[this.aDlgStateParams[k]];
 				}
-				this.originalState.oFields = $('#datatable_dlg_' + this.options.sListId).find(':itop-fieldsorter').fieldsorter('get_params');
+				this.originalState.iDefaultPageSize = $('#datatable_dlg_'+this.options.sListId).find('input[name="page_size"]').val();
+				this.originalState.oFields = $('#datatable_dlg_'+this.options.sListId).find(':itop-fieldsorter').fieldsorter('get_params');
 			},
 			_restoreDlgState: function () {
 				var dlgElement = $('#datatable_dlg_' + this.options.sListId);
@@ -276,7 +281,7 @@ $(function () {
 					this._setOption(this.aDlgStateParams[k], this.originalState[this.aDlgStateParams[k]]);
 				}
 
-				dlgElement.find('input[name=page_size]').val(this.originalState.iDefaultPageSize);
+				dlgElement.find('input[name="page_size"]').val(this.originalState.iDefaultPageSize);
 
 				dlgElement.find(':itop-fieldsorter').fieldsorter('option', {fields: this.originalState.oFields});
 
diff --git a/js/extkeywidget.js b/js/extkeywidget.js
index 16609ae733..9c792820b8 100644
--- a/js/extkeywidget.js
+++ b/js/extkeywidget.js
@@ -651,6 +651,25 @@ function ExtKeyWidget(id, sTargetClass, sFilter, sTitle, bSelectMode, oWizHelper
 		$('#ac_create_'+me.id).dialog('close');
 	};
 
+	/**
+	 * Extract transaction id of the root object edited.
+	 * When create/update a new object via external key,
+	 * this transaction id reflects the root form transaction id an not the current form transaction id.
+	 *
+	 * @constructor
+	 */
+	this.GetRootTransactionId = function(){
+		// Retrieve the object form
+		const oForm = $(`#${me.id}`).closest('form');
+		// If root transaction id exist, then use it
+		let oFieldTransaction = $('input[name=root_transaction_id]', oForm);
+		if(oFieldTransaction.length === 0){
+			// otherwise, use the object form transaction id
+			oFieldTransaction = $('input[name=transaction_id]', oForm);
+		}
+		return oFieldTransaction.val();
+	}
+
 	this.CreateObject = function (bTargetClassSelected) {
 		if ($('#'+me.id).prop('disabled')) {
 			return;
@@ -679,6 +698,10 @@ function ExtKeyWidget(id, sTargetClass, sFilter, sTitle, bSelectMode, oWizHelper
 
 		// Run the query and get the result back directly in HTML
 		var sLocalTargetClass = me.sTargetClass; // Remember the target class since it will be reset when closing the dialog
+
+		// Handle transaction id
+		const sRootFormTransactionId = me.GetRootTransactionId();
+
 		me.ajax_request = $.post(AddAppContext(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php'), theMap,
 			function (data) {
 				$('#ajax_'+me.id).html(data);
@@ -696,6 +719,8 @@ function ExtKeyWidget(id, sTargetClass, sFilter, sTitle, bSelectMode, oWizHelper
 					if ($('#ac_create_'+me.id).height() > ($(window).height()-70)) {
 						$('#ac_create_'+me.id).height($(window).height()-70);
 					}
+					// Add root_transaction_id
+					$('#ac_create_'+me.id+' form').append(`<input type="hidden" name="root_transaction_id" value="${sRootFormTransactionId}"/>`)
 				});
 			},
 			'html'
diff --git a/js/jquery.ba-bbq.js b/js/jquery.ba-bbq.js
index 68da4e8858..b9fc8bb0d4 100644
--- a/js/jquery.ba-bbq.js
+++ b/js/jquery.ba-bbq.js
@@ -1,6 +1,9 @@
 /*!
  * Combodo: issued from https://github.com/cee-chen/jquery-bbq
  * fork from http://github.com/cowboy/jquery-bbq/
+ *
+ * IMPORTANT: Part for detecting MSIE has been removed as it was not present in the previous version and is making the app crash.
+ * It's far from perfect but as mentioned in the previous commit, we don't have much choices for now
  */
 
 /*!
@@ -1286,96 +1289,6 @@
       timeout_id = setTimeout( poll, $.fn[ str_hashchange ].delay );
     };
     
-    // vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
-    // vvvvvvvvvvvvvvvvvvv REMOVE IF NOT SUPPORTING IE6/7/8 vvvvvvvvvvvvvvvvvvv
-    // vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
-    $.browser.msie && !supports_onhashchange && (function(){
-      // Not only do IE6/7 need the "magical" Iframe treatment, but so does IE8
-      // when running in "IE7 compatibility" mode.
-      
-      var iframe,
-        iframe_src;
-      
-      // When the event is bound and polling starts in IE 6/7, create a hidden
-      // Iframe for history handling.
-      self.start = function(){
-        if ( !iframe ) {
-          iframe_src = $.fn[ str_hashchange ].src;
-          iframe_src = iframe_src && iframe_src + get_fragment();
-          
-          // Create hidden Iframe. Attempt to make Iframe as hidden as possible
-          // by using techniques from http://www.paciellogroup.com/blog/?p=604.
-          iframe = $('<iframe tabindex="-1" title="empty"/>').hide()
-            
-            // When Iframe has completely loaded, initialize the history and
-            // start polling.
-            .one( 'load', function(){
-              iframe_src || history_set( get_fragment() );
-              poll();
-            })
-            
-            // Load Iframe src if specified, otherwise nothing.
-            .attr( 'src', iframe_src || 'javascript:0' )
-            
-            // Append Iframe after the end of the body to prevent unnecessary
-            // initial page scrolling (yes, this works).
-            .insertAfter( 'body' )[0].contentWindow;
-          
-          // Whenever `document.title` changes, update the Iframe's title to
-          // prettify the back/next history menu entries. Since IE sometimes
-          // errors with "Unspecified error" the very first time this is set
-          // (yes, very useful) wrap this with a try/catch block.
-          doc.onpropertychange = function(){
-            try {
-              if ( event.propertyName === 'title' ) {
-                iframe.document.title = doc.title;
-              }
-            } catch(e) {}
-          };
-          
-        }
-      };
-      
-      // Override the "stop" method since an IE6/7 Iframe was created. Even
-      // if there are no longer any bound event handlers, the polling loop
-      // is still necessary for back/next to work at all!
-      self.stop = fn_retval;
-      
-      // Get history by looking at the hidden Iframe's location.hash.
-      history_get = function() {
-        return get_fragment( iframe.location.href );
-      };
-      
-      // Set a new history item by opening and then closing the Iframe
-      // document, *then* setting its location.hash. If document.domain has
-      // been set, update that as well.
-      history_set = function( hash, history_hash ) {
-        var iframe_doc = iframe.document,
-          domain = $.fn[ str_hashchange ].domain;
-        
-        if ( hash !== history_hash ) {
-          // Update Iframe with any initial `document.title` that might be set.
-          iframe_doc.title = doc.title;
-          
-          // Opening the Iframe's document after it has been closed is what
-          // actually adds a history entry.
-          iframe_doc.open();
-          
-          // Set document.domain for the Iframe document as well, if necessary.
-          domain && iframe_doc.write( '<script>document.domain="' + domain + '"</script>' );
-          
-          iframe_doc.close();
-          
-          // Update the Iframe's hash, for great justice.
-          iframe.location.hash = hash;
-        }
-      };
-      
-    })();
-    // ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-    // ^^^^^^^^^^^^^^^^^^^ REMOVE IF NOT SUPPORTING IE6/7/8 ^^^^^^^^^^^^^^^^^^^
-    // ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-    
     return self;
   })();
   
diff --git a/js/jquery.ba-bbq.min.js b/js/jquery.ba-bbq.min.js
index c1a3397232..1bf1b614f3 100644
--- a/js/jquery.ba-bbq.min.js
+++ b/js/jquery.ba-bbq.min.js
@@ -1,3 +1,10 @@
+/*!
+ * Combodo: issued from https://github.com/cee-chen/jquery-bbq
+ * fork from http://github.com/cowboy/jquery-bbq/
+ *
+ * IMPORTANT: Part for detecting MSIE has been removed as it was not present in the previous version and is making the app crash.
+ * It's far from perfect but as mentioned in the previous commit, we don't have much choices for now
+ */
 /*
  * jQuery BBQ: Back Button & Query Library - v1.3pre - 8/26/2010
  * http://benalman.com/projects/jquery-bbq-plugin/
@@ -15,4 +22,4 @@
  * Dual licensed under the MIT and GPL licenses.
  * http://benalman.com/about/license/
  */
-(function($,e,b){var c="hashchange",h=document,f,g=$.event.special,i=h.documentMode,d="on"+c in e&&(i===b||i>7);function a(j){j=j||location.href;return"#"+j.replace(/^[^#]*#?(.*)$/,"$1")}$.fn[c]=function(j){return j?this.bind(c,j):this.trigger(c)};$.fn[c].delay=50;g[c]=$.extend(g[c],{setup:function(){if(d){return false}$(f.start)},teardown:function(){if(d){return false}$(f.stop)}});f=(function(){var j={},p,m=a(),k=function(q){return q},l=k,o=k;j.start=function(){p||n()};j.stop=function(){p&&clearTimeout(p);p=b};function n(){var r=a(),q=o(m);if(r!==m){l(m=r,q);$(e).trigger(c)}else{if(q!==m){location.href=location.href.replace(/#.*/,"")+q}}p=setTimeout(n,$.fn[c].delay)}$.browser.msie&&!d&&(function(){var q,r;j.start=function(){if(!q){r=$.fn[c].src;r=r&&r+a();q=$('<iframe tabindex="-1" title="empty"/>').hide().one("load",function(){r||l(a());n()}).attr("src",r||"javascript:0").insertAfter("body")[0].contentWindow;h.onpropertychange=function(){try{if(event.propertyName==="title"){q.document.title=h.title}}catch(s){}}}};j.stop=k;o=function(){return a(q.location.href)};l=function(v,s){var u=q.document,t=$.fn[c].domain;if(v!==s){u.title=h.title;u.open();t&&u.write('<script>document.domain="'+t+'"<\/script>');u.close();q.location.hash=v}}})();return j})()})(jQuery,this);
\ No newline at end of file
+(function($,e,b){var c="hashchange",h=document,f,g=$.event.special,i=h.documentMode,d="on"+c in e&&(i===b||i>7);function a(j){j=j||location.href;return"#"+j.replace(/^[^#]*#?(.*)$/,"$1")}$.fn[c]=function(j){return j?this.bind(c,j):this.trigger(c)};$.fn[c].delay=50;g[c]=$.extend(g[c],{setup:function(){if(d){return false}$(f.start)},teardown:function(){if(d){return false}$(f.stop)}});f=(function(){var j={},p,m=a(),k=function(q){return q},l=k,o=k;j.start=function(){p||n()};j.stop=function(){p&&clearTimeout(p);p=b};function n(){var r=a(),q=o(m);if(r!==m){l(m=r,q);$(e).trigger(c)}else{if(q!==m){location.href=location.href.replace(/#.*/,"")+q}}p=setTimeout(n,$.fn[c].delay)}return j})()})(jQuery,this);
\ No newline at end of file
diff --git a/js/search/search_form_criteria_enum.js b/js/search/search_form_criteria_enum.js
index 3fb73d42e4..c30498a86b 100644
--- a/js/search/search_form_criteria_enum.js
+++ b/js/search/search_form_criteria_enum.js
@@ -872,13 +872,13 @@ $(function()
 		// - Make a jQuery element for a list item
 		_makeListItemElement: function(sLabel, sValue, bInitChecked, bInitHidden,bObsolete, sAdditionalField)
 		{
-			var sEscapedLabel = $('<div />').text(sLabel).html();
+			var sEscapedLabel = CombodoSanitizer.EscapeHtml(sLabel, false);
 			if (bObsolete == 1)	{
 				sEscapedLabel = '<span class="object-ref-icon text_decoration"><span class="fas fa-eye-slash object-obsolete fa-1x fa-fw"></span></span>'+sEscapedLabel;
 			}
 
 			if (sAdditionalField != undefined )	{
-				sEscapedLabel = sEscapedLabel+'<br><i>'+sAdditionalField+'</i>';
+				sEscapedLabel = sEscapedLabel+'<br><i>'+CombodoSanitizer.EscapeHtml(sAdditionalField, false)+'</i>';
 			}
 
 			var oItemElem = $('<div></div>')
diff --git a/js/utils.js b/js/utils.js
index 83096163e9..7747f173c9 100644
--- a/js/utils.js
+++ b/js/utils.js
@@ -390,6 +390,11 @@ function ExportListDlg(sOQL, sDataTableId, sFormat, sDlgTitle) {
 		for (var j in oColumns) {
 			if (oColumns[j]['data']) {
 				if (oColumns[j]['data']!='id') {
+					// Ignore columns that seem not to contain an attribute
+					if (typeof oColumns[j]['data'] !== 'string') {
+						continue;
+					}
+
 					var sCode = oColumns[j]['data'].split("/");
 					if (sCode[1] == '_key_') {
 						sCode[1] = 'id';
diff --git a/js/wizardhelper.js b/js/wizardhelper.js
index f34cf9e287..b445eb2c76 100644
--- a/js/wizardhelper.js
+++ b/js/wizardhelper.js
@@ -65,6 +65,8 @@ function WizardHelper(sClass, sFormPrefix, sState, sInitialState, sStimulus) {
 		'm_aAllowedValuesRequested': [],
 		'm_oDefaultValue': {},
 		'm_oAllowedValues': {},
+		/** {Object} m_aStaticValues Values of the object that are not meant to be changed by the user. Only there to be used in the workflow for dependencies or to be passed through. */
+		'm_aStaticValues' : {},
 		'm_iFieldsCount': 0,
 		'm_sFormPrefix': sFormPrefix,
 		'm_sState': sState,
@@ -113,6 +115,18 @@ function WizardHelper(sClass, sFormPrefix, sState, sInitialState, sStimulus) {
 		this.m_oData.m_oCurrentValues[sFieldName] = currentValue;
 	};
 
+	/**
+	 * Set form object values for fields without field widget.
+	 *
+	 * @since 3.1
+	 *
+	 * @param values
+	 * @constructor
+	 */
+	this.SetStaticValues = function(values){
+		this.m_oData.m_aStaticValues = values;
+	};
+
 	this.SetReturnNotEditableFields = function (bReturnNotEditableFields) {
 		this.m_oData.m_bReturnNotEditableFields = bReturnNotEditableFields;
 	};
@@ -223,9 +237,15 @@ function WizardHelper(sClass, sFormPrefix, sState, sInitialState, sStimulus) {
 				$('#wizStep'+G_iCurrentStep).unblock({fadeOut: 0});
 			});
 	};
-	
+
 	this.UpdateCurrentValue = function (sFieldCode) {
 		var $oField = $('#'+this.m_oData.m_oFieldsMap[sFieldCode]);
+		// Static values handling
+		if(this.m_oData.m_aStaticValues.hasOwnProperty(sFieldCode)){
+			const value = this.m_oData.m_aStaticValues[sFieldCode];
+			this.m_oData.m_oCurrentValues[sFieldCode] = value;
+			return value;
+		}
 		$oField.trigger('update_value'); // Give the widget a chance to update its value (if it is aware of this event)
 		var value = $oField.val();
 		if (value == '')
diff --git a/lib/composer/autoload_classmap.php b/lib/composer/autoload_classmap.php
index 79f445f92b..72e6754164 100644
--- a/lib/composer/autoload_classmap.php
+++ b/lib/composer/autoload_classmap.php
@@ -371,6 +371,7 @@ return array(
     'Combodo\\iTop\\Controller\\Links\\LinkSetController' => $baseDir . '/sources/Controller/Links/LinkSetController.php',
     'Combodo\\iTop\\Controller\\OAuth\\OAuthLandingController' => $baseDir . '/sources/Controller/OAuth/OAuthLandingController.php',
     'Combodo\\iTop\\Controller\\PreferencesController' => $baseDir . '/sources/Controller/PreferencesController.php',
+    'Combodo\\iTop\\Controller\\TemporaryObjects\\TemporaryObjectController' => $baseDir . '/sources/Controller/TemporaryObjects/TemporaryObjectController.php',
     'Combodo\\iTop\\Controller\\iController' => $baseDir . '/sources/Controller/iController.php',
     'Combodo\\iTop\\Core\\Authentication\\Client\\OAuth\\IOAuthClientProvider' => $baseDir . '/sources/Core/Authentication/Client/OAuth/IOAuthClientProvider.php',
     'Combodo\\iTop\\Core\\Authentication\\Client\\OAuth\\OAuthClientProviderAbstract' => $baseDir . '/sources/Core/Authentication/Client/OAuth/OAuthClientProviderAbstract.php',
@@ -386,6 +387,7 @@ return array(
     'Combodo\\iTop\\Core\\MetaModel\\HierarchicalKey' => $baseDir . '/sources/Core/MetaModel/HierarchicalKey.php',
     'Combodo\\iTop\\DesignDocument' => $baseDir . '/core/designdocument.class.inc.php',
     'Combodo\\iTop\\DesignElement' => $baseDir . '/core/designdocument.class.inc.php',
+    'Combodo\\iTop\\Form\\Field\\AbstractSimpleField' => $baseDir . '/sources/Form/Field/AbstractSimpleField.php',
     'Combodo\\iTop\\Form\\Field\\BlobField' => $baseDir . '/sources/Form/Field/BlobField.php',
     'Combodo\\iTop\\Form\\Field\\CaseLogField' => $baseDir . '/sources/Form/Field/CaseLogField.php',
     'Combodo\\iTop\\Form\\Field\\CheckboxField' => $baseDir . '/sources/Form/Field/CheckboxField.php',
@@ -415,10 +417,16 @@ return array(
     'Combodo\\iTop\\Form\\Field\\UrlField' => $baseDir . '/sources/Form/Field/UrlField.php',
     'Combodo\\iTop\\Form\\Form' => $baseDir . '/sources/Form/Form.php',
     'Combodo\\iTop\\Form\\FormManager' => $baseDir . '/sources/Form/FormManager.php',
+    'Combodo\\iTop\\Form\\Helper\\FieldHelper' => $baseDir . '/sources/Form/Helper/FieldHelper.php',
+    'Combodo\\iTop\\Form\\Validator\\AbstractRegexpValidator' => $baseDir . '/sources/Form/Validator/AbstractRegexpValidator.php',
+    'Combodo\\iTop\\Form\\Validator\\AbstractValidator' => $baseDir . '/sources/Form/Validator/AbstractValidator.php',
+    'Combodo\\iTop\\Form\\Validator\\CustomRegexpValidator' => $baseDir . '/sources/Form/Validator/CustomRegexpValidator.php',
     'Combodo\\iTop\\Form\\Validator\\IntegerValidator' => $baseDir . '/sources/Form/Validator/IntegerValidator.php',
     'Combodo\\iTop\\Form\\Validator\\LinkedSetValidator' => $baseDir . '/sources/Form/Validator/LinkedSetValidator.php',
     'Combodo\\iTop\\Form\\Validator\\MandatoryValidator' => $baseDir . '/sources/Form/Validator/MandatoryValidator.php',
+    'Combodo\\iTop\\Form\\Validator\\MultipleChoicesValidator' => $baseDir . '/sources/Form/Validator/MultipleChoicesValidator.php',
     'Combodo\\iTop\\Form\\Validator\\NotEmptyExtKeyValidator' => $baseDir . '/sources/Form/Validator/NotEmptyExtKeyValidator.php',
+    'Combodo\\iTop\\Form\\Validator\\SelectObjectValidator' => $baseDir . '/sources/Form/Validator/SelectObjectValidator.php',
     'Combodo\\iTop\\Form\\Validator\\Validator' => $baseDir . '/sources/Form/Validator/Validator.php',
     'Combodo\\iTop\\Renderer\\BlockRenderer' => $baseDir . '/sources/Renderer/BlockRenderer.php',
     'Combodo\\iTop\\Renderer\\Bootstrap\\BsFieldRendererMappings' => $baseDir . '/sources/Renderer/Bootstrap/BsFieldRendererMappings.php',
@@ -456,6 +464,12 @@ return array(
     'Combodo\\iTop\\Service\\Router\\Exception\\RouteNotFoundException' => $baseDir . '/sources/Service/Router/Exception/RouteNotFoundException.php',
     'Combodo\\iTop\\Service\\Router\\Exception\\RouterException' => $baseDir . '/sources/Service/Router/Exception/RouterException.php',
     'Combodo\\iTop\\Service\\Router\\Router' => $baseDir . '/sources/Service/Router/Router.php',
+    'Combodo\\iTop\\Service\\TemporaryObjects\\TemporaryObjectConfig' => $baseDir . '/sources/Service/TemporaryObjects/TemporaryObjectConfig.php',
+    'Combodo\\iTop\\Service\\TemporaryObjects\\TemporaryObjectGC' => $baseDir . '/sources/Service/TemporaryObjects/TemporaryObjectGC.php',
+    'Combodo\\iTop\\Service\\TemporaryObjects\\TemporaryObjectHelper' => $baseDir . '/sources/Service/TemporaryObjects/TemporaryObjectHelper.php',
+    'Combodo\\iTop\\Service\\TemporaryObjects\\TemporaryObjectManager' => $baseDir . '/sources/Service/TemporaryObjects/TemporaryObjectManager.php',
+    'Combodo\\iTop\\Service\\TemporaryObjects\\TemporaryObjectRepository' => $baseDir . '/sources/Service/TemporaryObjects/TemporaryObjectRepository.php',
+    'Combodo\\iTop\\Service\\TemporaryObjects\\TemporaryObjectsEvents' => $baseDir . '/sources/Service/TemporaryObjects/TemporaryObjectsEvents.php',
     'CompileCSSService' => $baseDir . '/application/compilecssservice.class.inc.php',
     'Composer\\InstalledVersions' => $vendorDir . '/composer/InstalledVersions.php',
     'Config' => $baseDir . '/core/config.class.inc.php',
@@ -530,6 +544,7 @@ return array(
     'DesignerSubFormField' => $baseDir . '/application/forms.class.inc.php',
     'DesignerTabularForm' => $baseDir . '/application/forms.class.inc.php',
     'DesignerTextField' => $baseDir . '/application/forms.class.inc.php',
+    'DesignerXMLField' => $baseDir . '/application/forms.class.inc.php',
     'Dict' => $baseDir . '/core/dict.class.inc.php',
     'DictException' => $baseDir . '/application/exceptions/dict/DictException.php',
     'DictExceptionMissingString' => $baseDir . '/application/exceptions/dict/DictExceptionMissingString.php',
@@ -2684,6 +2699,7 @@ return array(
     'TemplateMenuNode' => $baseDir . '/application/menunode.class.inc.php',
     'TemplateString' => $baseDir . '/core/templatestring.class.inc.php',
     'TemplateStringPlaceholder' => $baseDir . '/core/templatestring.class.inc.php',
+    'TemporaryObjectDescriptor' => $baseDir . '/core/TemporaryObjectDescriptor.php',
     'TheNetworg\\OAuth2\\Client\\Grant\\JwtBearer' => $vendorDir . '/thenetworg/oauth2-azure/src/Grant/JwtBearer.php',
     'TheNetworg\\OAuth2\\Client\\Provider\\Azure' => $vendorDir . '/thenetworg/oauth2-azure/src/Provider/Azure.php',
     'TheNetworg\\OAuth2\\Client\\Provider\\AzureResourceOwner' => $vendorDir . '/thenetworg/oauth2-azure/src/Provider/AzureResourceOwner.php',
diff --git a/lib/composer/autoload_static.php b/lib/composer/autoload_static.php
index f6c6e67285..ce4ca190b0 100644
--- a/lib/composer/autoload_static.php
+++ b/lib/composer/autoload_static.php
@@ -735,6 +735,7 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f
         'Combodo\\iTop\\Controller\\Links\\LinkSetController' => __DIR__ . '/../..' . '/sources/Controller/Links/LinkSetController.php',
         'Combodo\\iTop\\Controller\\OAuth\\OAuthLandingController' => __DIR__ . '/../..' . '/sources/Controller/OAuth/OAuthLandingController.php',
         'Combodo\\iTop\\Controller\\PreferencesController' => __DIR__ . '/../..' . '/sources/Controller/PreferencesController.php',
+        'Combodo\\iTop\\Controller\\TemporaryObjects\\TemporaryObjectController' => __DIR__ . '/../..' . '/sources/Controller/TemporaryObjects/TemporaryObjectController.php',
         'Combodo\\iTop\\Controller\\iController' => __DIR__ . '/../..' . '/sources/Controller/iController.php',
         'Combodo\\iTop\\Core\\Authentication\\Client\\OAuth\\IOAuthClientProvider' => __DIR__ . '/../..' . '/sources/Core/Authentication/Client/OAuth/IOAuthClientProvider.php',
         'Combodo\\iTop\\Core\\Authentication\\Client\\OAuth\\OAuthClientProviderAbstract' => __DIR__ . '/../..' . '/sources/Core/Authentication/Client/OAuth/OAuthClientProviderAbstract.php',
@@ -750,6 +751,7 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f
         'Combodo\\iTop\\Core\\MetaModel\\HierarchicalKey' => __DIR__ . '/../..' . '/sources/Core/MetaModel/HierarchicalKey.php',
         'Combodo\\iTop\\DesignDocument' => __DIR__ . '/../..' . '/core/designdocument.class.inc.php',
         'Combodo\\iTop\\DesignElement' => __DIR__ . '/../..' . '/core/designdocument.class.inc.php',
+        'Combodo\\iTop\\Form\\Field\\AbstractSimpleField' => __DIR__ . '/../..' . '/sources/Form/Field/AbstractSimpleField.php',
         'Combodo\\iTop\\Form\\Field\\BlobField' => __DIR__ . '/../..' . '/sources/Form/Field/BlobField.php',
         'Combodo\\iTop\\Form\\Field\\CaseLogField' => __DIR__ . '/../..' . '/sources/Form/Field/CaseLogField.php',
         'Combodo\\iTop\\Form\\Field\\CheckboxField' => __DIR__ . '/../..' . '/sources/Form/Field/CheckboxField.php',
@@ -779,10 +781,16 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f
         'Combodo\\iTop\\Form\\Field\\UrlField' => __DIR__ . '/../..' . '/sources/Form/Field/UrlField.php',
         'Combodo\\iTop\\Form\\Form' => __DIR__ . '/../..' . '/sources/Form/Form.php',
         'Combodo\\iTop\\Form\\FormManager' => __DIR__ . '/../..' . '/sources/Form/FormManager.php',
+        'Combodo\\iTop\\Form\\Helper\\FieldHelper' => __DIR__ . '/../..' . '/sources/Form/Helper/FieldHelper.php',
+        'Combodo\\iTop\\Form\\Validator\\AbstractRegexpValidator' => __DIR__ . '/../..' . '/sources/Form/Validator/AbstractRegexpValidator.php',
+        'Combodo\\iTop\\Form\\Validator\\AbstractValidator' => __DIR__ . '/../..' . '/sources/Form/Validator/AbstractValidator.php',
+        'Combodo\\iTop\\Form\\Validator\\CustomRegexpValidator' => __DIR__ . '/../..' . '/sources/Form/Validator/CustomRegexpValidator.php',
         'Combodo\\iTop\\Form\\Validator\\IntegerValidator' => __DIR__ . '/../..' . '/sources/Form/Validator/IntegerValidator.php',
         'Combodo\\iTop\\Form\\Validator\\LinkedSetValidator' => __DIR__ . '/../..' . '/sources/Form/Validator/LinkedSetValidator.php',
         'Combodo\\iTop\\Form\\Validator\\MandatoryValidator' => __DIR__ . '/../..' . '/sources/Form/Validator/MandatoryValidator.php',
+        'Combodo\\iTop\\Form\\Validator\\MultipleChoicesValidator' => __DIR__ . '/../..' . '/sources/Form/Validator/MultipleChoicesValidator.php',
         'Combodo\\iTop\\Form\\Validator\\NotEmptyExtKeyValidator' => __DIR__ . '/../..' . '/sources/Form/Validator/NotEmptyExtKeyValidator.php',
+        'Combodo\\iTop\\Form\\Validator\\SelectObjectValidator' => __DIR__ . '/../..' . '/sources/Form/Validator/SelectObjectValidator.php',
         'Combodo\\iTop\\Form\\Validator\\Validator' => __DIR__ . '/../..' . '/sources/Form/Validator/Validator.php',
         'Combodo\\iTop\\Renderer\\BlockRenderer' => __DIR__ . '/../..' . '/sources/Renderer/BlockRenderer.php',
         'Combodo\\iTop\\Renderer\\Bootstrap\\BsFieldRendererMappings' => __DIR__ . '/../..' . '/sources/Renderer/Bootstrap/BsFieldRendererMappings.php',
@@ -820,6 +828,12 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f
         'Combodo\\iTop\\Service\\Router\\Exception\\RouteNotFoundException' => __DIR__ . '/../..' . '/sources/Service/Router/Exception/RouteNotFoundException.php',
         'Combodo\\iTop\\Service\\Router\\Exception\\RouterException' => __DIR__ . '/../..' . '/sources/Service/Router/Exception/RouterException.php',
         'Combodo\\iTop\\Service\\Router\\Router' => __DIR__ . '/../..' . '/sources/Service/Router/Router.php',
+        'Combodo\\iTop\\Service\\TemporaryObjects\\TemporaryObjectConfig' => __DIR__ . '/../..' . '/sources/Service/TemporaryObjects/TemporaryObjectConfig.php',
+        'Combodo\\iTop\\Service\\TemporaryObjects\\TemporaryObjectGC' => __DIR__ . '/../..' . '/sources/Service/TemporaryObjects/TemporaryObjectGC.php',
+        'Combodo\\iTop\\Service\\TemporaryObjects\\TemporaryObjectHelper' => __DIR__ . '/../..' . '/sources/Service/TemporaryObjects/TemporaryObjectHelper.php',
+        'Combodo\\iTop\\Service\\TemporaryObjects\\TemporaryObjectManager' => __DIR__ . '/../..' . '/sources/Service/TemporaryObjects/TemporaryObjectManager.php',
+        'Combodo\\iTop\\Service\\TemporaryObjects\\TemporaryObjectRepository' => __DIR__ . '/../..' . '/sources/Service/TemporaryObjects/TemporaryObjectRepository.php',
+        'Combodo\\iTop\\Service\\TemporaryObjects\\TemporaryObjectsEvents' => __DIR__ . '/../..' . '/sources/Service/TemporaryObjects/TemporaryObjectsEvents.php',
         'CompileCSSService' => __DIR__ . '/../..' . '/application/compilecssservice.class.inc.php',
         'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
         'Config' => __DIR__ . '/../..' . '/core/config.class.inc.php',
@@ -894,6 +908,7 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f
         'DesignerSubFormField' => __DIR__ . '/../..' . '/application/forms.class.inc.php',
         'DesignerTabularForm' => __DIR__ . '/../..' . '/application/forms.class.inc.php',
         'DesignerTextField' => __DIR__ . '/../..' . '/application/forms.class.inc.php',
+        'DesignerXMLField' => __DIR__ . '/../..' . '/application/forms.class.inc.php',
         'Dict' => __DIR__ . '/../..' . '/core/dict.class.inc.php',
         'DictException' => __DIR__ . '/../..' . '/application/exceptions/dict/DictException.php',
         'DictExceptionMissingString' => __DIR__ . '/../..' . '/application/exceptions/dict/DictExceptionMissingString.php',
@@ -3048,6 +3063,7 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f
         'TemplateMenuNode' => __DIR__ . '/../..' . '/application/menunode.class.inc.php',
         'TemplateString' => __DIR__ . '/../..' . '/core/templatestring.class.inc.php',
         'TemplateStringPlaceholder' => __DIR__ . '/../..' . '/core/templatestring.class.inc.php',
+        'TemporaryObjectDescriptor' => __DIR__ . '/../..' . '/core/TemporaryObjectDescriptor.php',
         'TheNetworg\\OAuth2\\Client\\Grant\\JwtBearer' => __DIR__ . '/..' . '/thenetworg/oauth2-azure/src/Grant/JwtBearer.php',
         'TheNetworg\\OAuth2\\Client\\Provider\\Azure' => __DIR__ . '/..' . '/thenetworg/oauth2-azure/src/Provider/Azure.php',
         'TheNetworg\\OAuth2\\Client\\Provider\\AzureResourceOwner' => __DIR__ . '/..' . '/thenetworg/oauth2-azure/src/Provider/AzureResourceOwner.php',
diff --git a/lib/composer/installed.php b/lib/composer/installed.php
index a69f6ff0d0..5f032ca9e7 100644
--- a/lib/composer/installed.php
+++ b/lib/composer/installed.php
@@ -5,7 +5,7 @@
         'type' => 'project',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
-        'reference' => '1b7529fcb988f27abcc14834836b047e765323bd',
+        'reference' => 'dbf3393c9729a20f0bf389d343507238d61fef56',
         'name' => 'combodo/itop',
         'dev' => true,
     ),
@@ -25,7 +25,7 @@
             'type' => 'project',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
-            'reference' => '1b7529fcb988f27abcc14834836b047e765323bd',
+            'reference' => 'dbf3393c9729a20f0bf389d343507238d61fef56',
             'dev_requirement' => false,
         ),
         'combodo/tcpdf' => array(
diff --git a/pages/UI.php b/pages/UI.php
index 591469b702..8c2f316098 100644
--- a/pages/UI.php
+++ b/pages/UI.php
@@ -301,7 +301,7 @@ require_once(APPROOT.'/application/application.inc.php');
 require_once(APPROOT.'/application/wizardhelper.class.inc.php');
 
 require_once(APPROOT.'/application/startup.inc.php');
-
+IssueLog::Trace('----- Request: '.utils::GetRequestUri(), LogChannels::WEB_REQUEST);
 try
 {
 	$oKPI = new ExecutionKPI();
diff --git a/pages/UniversalSearch.php b/pages/UniversalSearch.php
index 11d20887ff..ac73a64c4e 100644
--- a/pages/UniversalSearch.php
+++ b/pages/UniversalSearch.php
@@ -24,6 +24,7 @@ require_once(APPROOT.'/application/applicationcontext.class.inc.php');
 require_once(APPROOT.'/application/startup.inc.php');
 
 require_once(APPROOT.'/application/loginwebpage.class.inc.php');
+IssueLog::Trace('----- Request: '.utils::GetRequestUri(), LogChannels::WEB_REQUEST);
 LoginWebPage::DoLogin(); // Check user rights and prompt if needed
 ApplicationMenu::CheckMenuIdEnabled('UniversalSearchMenu');
 
@@ -123,4 +124,3 @@ if ($oFilter != null)
 }
 $oP->add("</div>\n");
 $oP->output();
-?>
diff --git a/pages/ajax.csvimport.php b/pages/ajax.csvimport.php
index 97d065e469..1d287f43c7 100644
--- a/pages/ajax.csvimport.php
+++ b/pages/ajax.csvimport.php
@@ -194,6 +194,7 @@ try
 	require_once(APPROOT.'/application/startup.inc.php');
 
 	require_once(APPROOT.'/application/loginwebpage.class.inc.php');
+	IssueLog::Trace('----- Request: '.utils::GetRequestUri(), LogChannels::WEB_REQUEST);
 	LoginWebPage::DoLogin(); // Check user rights and prompt if needed
 
 
diff --git a/pages/ajax.document.php b/pages/ajax.document.php
index 377090dbe6..2f0a3a5b0f 100644
--- a/pages/ajax.document.php
+++ b/pages/ajax.document.php
@@ -34,6 +34,7 @@ try
 	require_once(APPROOT.'/application/startup.inc.php');
 
 	require_once(APPROOT.'/application/loginwebpage.class.inc.php');
+	IssueLog::Trace('----- Request: '.utils::GetRequestUri(), LogChannels::WEB_REQUEST);
 
 	$oPage = new DownloadPage("");
 
diff --git a/pages/ajax.render.php b/pages/ajax.render.php
index c2652a0a09..ffdb84bc64 100644
--- a/pages/ajax.render.php
+++ b/pages/ajax.render.php
@@ -16,6 +16,7 @@ use Combodo\iTop\Controller\PreferencesController;
 use Combodo\iTop\Renderer\Console\ConsoleBlockRenderer;
 use Combodo\iTop\Renderer\Console\ConsoleFormRenderer;
 use Combodo\iTop\Service\Router\Router;
+use Combodo\iTop\Service\TemporaryObjects\TemporaryObjectManager;
 
 require_once('../approot.inc.php');
 
@@ -30,6 +31,7 @@ try
 {
 	require_once(APPROOT.'/application/startup.inc.php');
 	require_once(APPROOT.'/application/user.preferences.class.inc.php');
+	IssueLog::Trace('----- Request: '.utils::GetRequestUri(), LogChannels::WEB_REQUEST);
 	$oKPI = new ExecutionKPI();
 	$oKPI->ComputeAndReport('Data model loaded');
 
@@ -815,6 +817,9 @@ try
 					$bReleaseLock = iTopOwnershipLock::ReleaseLock($sObjClass, $iObjKey, $sToken);
 				}
 
+				// Invalidate temporary objects
+				TemporaryObjectManager::GetInstance()->CancelAllTemporaryObjects($iTransactionId);
+
 				IssueLog::Trace('on_form_cancel', $sObjClass, array(
 					'$iObjKey'        => $iObjKey,
 					'$sTransactionId' => $iTransactionId,
@@ -2552,7 +2557,7 @@ EOF
 			/** @internal */
 			case 'object.modify':
 				$oController = new ObjectController();
-				$oPage = $oController->Modify();
+				$oPage = $oController->OperationModify();
 				break;
 
 			default:
diff --git a/pages/ajax.searchform.php b/pages/ajax.searchform.php
index 5ba9f5701c..34247d0343 100644
--- a/pages/ajax.searchform.php
+++ b/pages/ajax.searchform.php
@@ -11,6 +11,7 @@ use Combodo\iTop\Application\UI\Base\Component\Html\Html;
 
 require_once('../approot.inc.php');
 require_once(APPROOT.'/application/startup.inc.php');
+IssueLog::Trace('----- Request: '.utils::GetRequestUri(), LogChannels::WEB_REQUEST);
 
 try
 {
@@ -52,7 +53,7 @@ try
 
     if (array_key_exists('table_inner_id', $aListParams))
     {
-        $sListId = utils::HtmlEntities($aListParams['table_inner_id']);
+        $sListId = utils::Sanitize($aListParams['table_inner_id'], '', utils::ENUM_SANITIZATION_FILTER_ELEMENT_IDENTIFIER);
     }
 
 	if (array_key_exists('json', $aListParams))
diff --git a/pages/audit.php b/pages/audit.php
index ce14fce768..f146dce69c 100644
--- a/pages/audit.php
+++ b/pages/audit.php
@@ -144,8 +144,8 @@ try
 {
 	require_once('../approot.inc.php');
 	require_once(APPROOT.'/application/application.inc.php');
-
 	require_once(APPROOT.'/application/startup.inc.php');
+	IssueLog::Trace('----- Request: '.utils::GetRequestUri(), LogChannels::WEB_REQUEST);
 
 	$bSelectionAuditRulesByDefault = utils::GetConfig()->Get('audit.enable_selection_landing_page');
 	$operation = utils::ReadParam('operation', $bSelectionAuditRulesByDefault ? 'selection' : 'audit');
@@ -260,7 +260,7 @@ try
 		case 'selection':
 			$oP->SetBreadCrumbEntry('ui-tool-auditselection', Dict::S('UI:Audit:Interactive:Selection:BreadCrumb'), Dict::S('UI:Audit:Interactive:Selection:BreadCrumb+'), '', 'fas fa-stethoscope', iTopWebPage::ENUM_BREADCRUMB_ENTRY_ICON_TYPE_CSS_CLASSES);
 			if (UserRights::IsActionAllowed('AuditCategory', UR_ACTION_MODIFY)) {
-				$oButton = ButtonUIBlockFactory::MakeLinkNeutral("./UI.php?c[menu]=AuditCategories", Dict::S('UI:Audit:Interactive:Button:Configuration'), 'fas fa-wrench');
+				$oButton = ButtonUIBlockFactory::MakeLinkNeutral(utils::GetAbsoluteUrlAppRoot()."pages/UI.php?c[menu]=AuditCategories", Dict::S('UI:Audit:Interactive:Button:Configuration'), 'fas fa-wrench');
 				$oP->AddUiBlock($oButton);
 			}
 			$oP->AddUiBlock(TitleUIBlockFactory::MakeForPage(Dict::S('UI:Audit:Interactive:Selection:Title')));
diff --git a/pages/csvimport.php b/pages/csvimport.php
index c9a729c4fd..6d847f8c48 100644
--- a/pages/csvimport.php
+++ b/pages/csvimport.php
@@ -36,6 +36,7 @@ try {
 
 	require_once(APPROOT.'/application/startup.inc.php');
 	require_once(APPROOT.'/application/loginwebpage.class.inc.php');
+	IssueLog::Trace('----- Request: '.utils::GetRequestUri(), LogChannels::WEB_REQUEST);
 
 	if (utils::SetMinMemoryLimit('256M') === false) {
 		IssueLog::Warning('csvimport : cannot set minimum memory_limit !');
@@ -375,7 +376,7 @@ try {
 		);
 		$oBulk->SetReportHtml();
 
-		$oPage->AddSubBlock(InputUIBlockFactory::MakeForHidden("csvdata_truncated", utils::EscapeHtml($sCSVDataTruncated), "csvdata_truncated"));
+		$oPage->AddSubBlock(InputUIBlockFactory::MakeForHidden("csvdata_truncated", $sCSVDataTruncated, "csvdata_truncated"));
 		$aRes = $oBulk->Process($oMyChange);
 
 		$aColumns = [];
@@ -474,6 +475,7 @@ try {
 					if (isset($aExternalKeysByColumn[$iNumber - 1])) {
 						$sExtKeyName = $aExternalKeysByColumn[$iNumber - 1];
 						$oExtKeyCellStatus = $aResRow[$sExtKeyName];
+						$oExtKeyCellStatus->SetDisplayableValue($oCellStatus->GetDisplayableValue());
 						$oCellStatus = $oExtKeyCellStatus;
 					}
 					$sHtmlValue = $oCellStatus->GetDisplayableValue();
@@ -485,25 +487,33 @@ try {
 							break;
 
 						case 'CellStatus_SearchIssue':
-							$aTableRow[$sClassName.'/'.$sAttCode] = sprintf("%s%s%s%s%s%s",
-								'<a href="',
-								$oCellStatus->GetSearchLinkUrl(),
-								'"><div class="ibo-csv-import--cell-error">',
-								Dict::Format('UI:CSVReport-Object-Error', $sHtmlValue),
-								GetDivAlert($oCellStatus->GetDescription()),
-								'<i class="fas fa-search"></i></div><a/>'
-							);
+							$sMessage = Dict::Format('UI:CSVReport-Object-Error', $sHtmlValue);
+							$sDivAlert = GetDivAlert($oCellStatus->GetDescription());
+							$sAllowedValuesLinkUrl = $oCellStatus->GetAllowedValuesLinkUrl();
+							$sAllowedValuesLinkLabel = Dict::S('UI:CSVImport:ViewAllPossibleValues');
+							$aTableRow[$sClassName.'/'.$sAttCode] =
+								<<<HTML
+								<div class="ibo-csv-import--cell-error">
+									$sMessage
+									$sDivAlert
+									<a class="ibo-button ibo-is-regular ibo-is-neutral" target="_blank" href="$sAllowedValuesLinkUrl"><i class="fas fa-search"></i>&nbsp;$sAllowedValuesLinkLabel</a>
+								</div>
+HTML;
 							break;
 
 						case 'CellStatus_Ambiguous':
-							$aTableRow[$sClassName.'/'.$sAttCode] = sprintf("%s%s%s%s%s%s",
-								'<a href="',
-								$oCellStatus->GetSearchLinkUrl(),
-								'"><i class="fas fa-search"/><div class="ibo-csv-import--cell-error">',
-								Dict::Format('UI:CSVReport-Object-Ambiguous', $sHtmlValue),
-								GetDivAlert($oCellStatus->GetDescription()),
-								'<i class="fas fa-search"></i></div><a/>'
-							);
+							$sMessage = Dict::Format('UI:CSVReport-Object-Ambiguous', $sHtmlValue);
+							$sDivAlert = GetDivAlert($oCellStatus->GetDescription());
+							$sSearchLinkUrl = $oCellStatus->GetSearchLinkUrl();
+							$sSearchLinkLabel = Dict::S('UI:CSVImport:ViewAllAmbiguousValues');
+							$aTableRow[$sClassName.'/'.$sAttCode] =
+								<<<HTML
+								<div class="ibo-csv-import--cell-error">
+									$sMessage
+									$sDivAlert
+									<a class="ibo-button ibo-is-regular ibo-is-neutral" target="_blank" href="$sSearchLinkUrl"><i class="fas fa-search"></i>&nbsp;$sSearchLinkLabel</a>
+								</div>
+HTML;
 							break;
 
 						case 'CellStatus_Modify':
@@ -530,19 +540,19 @@ try {
 
 		$oForm->AddSubBlock(InputUIBlockFactory::MakeForHidden("transaction_id", utils::GetNewTransactionId()));
 		$oForm->AddSubBlock(InputUIBlockFactory::MakeForHidden("step", ($iCurrentStep + 1)));
-		$oForm->AddSubBlock(InputUIBlockFactory::MakeForHidden("separator", utils::EscapeHtml($sSeparator)));
-		$oForm->AddSubBlock(InputUIBlockFactory::MakeForHidden("text_qualifier", utils::EscapeHtml($sTextQualifier)));
+		$oForm->AddSubBlock(InputUIBlockFactory::MakeForHidden("separator", $sSeparator));
+		$oForm->AddSubBlock(InputUIBlockFactory::MakeForHidden("text_qualifier", $sTextQualifier));
 		$oForm->AddSubBlock(InputUIBlockFactory::MakeForHidden("header_line", $bHeaderLine));
 		$oForm->AddSubBlock(InputUIBlockFactory::MakeForHidden("nb_skipped_lines", utils::ReadParam('nb_skipped_lines', '0')));
 		$oForm->AddSubBlock(InputUIBlockFactory::MakeForHidden("box_skiplines", utils::ReadParam('box_skiplines', '0')));
-		$oForm->AddSubBlock(InputUIBlockFactory::MakeForHidden("csvdata_truncated", utils::EscapeHtml($sCSVDataTruncated), "csvdata_truncated"));
-		$oForm->AddSubBlock(InputUIBlockFactory::MakeForHidden("csvdata", utils::EscapeHtml($sCSVData)));
+		$oForm->AddSubBlock(InputUIBlockFactory::MakeForHidden("csvdata_truncated", $sCSVDataTruncated, "csvdata_truncated"));
+		$oForm->AddSubBlock(InputUIBlockFactory::MakeForHidden("csvdata", $sCSVData));
 		$oForm->AddSubBlock(InputUIBlockFactory::MakeForHidden("encoding", $sEncoding));
 		$oForm->AddSubBlock(InputUIBlockFactory::MakeForHidden("synchro_scope", $sSynchroScope));
 		$oForm->AddSubBlock(InputUIBlockFactory::MakeForHidden("class_name", $sClassName));
 		$oForm->AddSubBlock(InputUIBlockFactory::MakeForHidden("advanced", $bAdvanced));
-		$oForm->AddSubBlock(InputUIBlockFactory::MakeForHidden("date_time_format", utils::EscapeHtml($sDateTimeFormat)));
-		$oForm->AddSubBlock(InputUIBlockFactory::MakeForHidden("custom_date_time_format", utils::EscapeHtml($sCustomDateTimeFormat)));
+		$oForm->AddSubBlock(InputUIBlockFactory::MakeForHidden("date_time_format", $sDateTimeFormat));
+		$oForm->AddSubBlock(InputUIBlockFactory::MakeForHidden("custom_date_time_format", $sCustomDateTimeFormat));
 
 		if (!empty($sSynchroScope)) {
 			foreach ($aSynchroUpdate as $sKey => $value) {
@@ -592,7 +602,7 @@ try {
 		$oMulticolumn->AddColumn(ColumnUIBlockFactory::MakeForBlock($oCheckBoxUnchanged));
 		$oPage->add_ready_script("$('#show_created').on('click', function(){ToggleRows('ibo-csv-import--row-added')})");
 
-		$oCheckBoxUnchanged = InputUIBlockFactory::MakeForInputWithLabel('<i class="fas fa-exclamation-triangle" style="color:#A33; background-color: #FFF0F0;">&nbsp;'.sprintf($aDisplayFilters['errors'], $iErrors).'</i></i>', '', "1", "show_errors", "checkbox");
+		$oCheckBoxUnchanged = InputUIBlockFactory::MakeForInputWithLabel('<span style="color:#A33; background-color: #FFF0F0;"><i class="fas fa-exclamation-triangle"></i>&nbsp;'.sprintf($aDisplayFilters['errors'], $iErrors) . '</span>', '', "1", "show_errors", "checkbox");
 		$oCheckBoxUnchanged->GetInput()->SetIsChecked(true);
 		$oCheckBoxUnchanged->SetBeforeInput(false);
 		$oCheckBoxUnchanged->GetInput()->AddCSSClass('ibo-input-checkbox');
@@ -885,17 +895,17 @@ EOF
 		$oForm->AddSubBlock($oDivMapping);
 
 		$oForm->AddSubBlock(InputUIBlockFactory::MakeForHidden("step", "4"));
-		$oForm->AddSubBlock(InputUIBlockFactory::MakeForHidden("separator", utils::EscapeHtml($sSeparator)));
-		$oForm->AddSubBlock(InputUIBlockFactory::MakeForHidden("text_qualifier", utils::EscapeHtml($sTextQualifier)));
+		$oForm->AddSubBlock(InputUIBlockFactory::MakeForHidden("separator", $sSeparator));
+		$oForm->AddSubBlock(InputUIBlockFactory::MakeForHidden("text_qualifier", $sTextQualifier));
 		$oForm->AddSubBlock(InputUIBlockFactory::MakeForHidden("header_line", $bHeaderLine));
 		$oForm->AddSubBlock(InputUIBlockFactory::MakeForHidden("nb_skipped_lines", utils::ReadParam('nb_skipped_lines', '0')));
 		$oForm->AddSubBlock(InputUIBlockFactory::MakeForHidden("box_skiplines", utils::ReadParam('box_skiplines', '0')));
-		$oForm->AddSubBlock(InputUIBlockFactory::MakeForHidden("csvdata_truncated", utils::EscapeHtml($sCSVDataTruncated), "csvdata_truncated"));
-		$oForm->AddSubBlock(InputUIBlockFactory::MakeForHidden("csvdata", utils::EscapeHtml($sCSVData)));
+		$oForm->AddSubBlock(InputUIBlockFactory::MakeForHidden("csvdata_truncated", $sCSVDataTruncated, "csvdata_truncated"));
+		$oForm->AddSubBlock(InputUIBlockFactory::MakeForHidden("csvdata", $sCSVData));
 		$oForm->AddSubBlock(InputUIBlockFactory::MakeForHidden("encoding", $sEncoding));
 		$oForm->AddSubBlock(InputUIBlockFactory::MakeForHidden("synchro_scope", $sSynchroScope));
-		$oForm->AddSubBlock(InputUIBlockFactory::MakeForHidden("date_time_format", utils::EscapeHtml($sDateTimeFormat)));
-		$oForm->AddSubBlock(InputUIBlockFactory::MakeForHidden("custom_date_time_format", utils::EscapeHtml($sCustomDateTimeFormat)));
+		$oForm->AddSubBlock(InputUIBlockFactory::MakeForHidden("date_time_format", $sDateTimeFormat));
+		$oForm->AddSubBlock(InputUIBlockFactory::MakeForHidden("custom_date_time_format", $sCustomDateTimeFormat));
 
 		if (!empty($sSynchroScope)) {
 			foreach ($aSynchroUpdate as $sKey => $value) {
@@ -1265,7 +1275,7 @@ EOF
 		$aSep['other'] = Dict::S('UI:CSVImport:SeparatorOther').' <input type="text" size="3" maxlength="1" name="other_separator"  id="other_separator" value="'.utils::EscapeHtml($sOtherSeparator).'" onChange="DoPreview()"/>';
 
 		foreach ($aSep as $sVal => $sLabel) {
-			$oRadio = InputUIBlockFactory::MakeForInputWithLabel($sLabel, "separator", utils::EscapeHtml($sVal), $sLabel, "radio");
+			$oRadio = InputUIBlockFactory::MakeForInputWithLabel($sLabel, "separator", $sVal, $sLabel, "radio");
 			$oRadio->GetInput()->SetIsChecked(($sVal == $sSeparator));
 			$oRadio->SetBeforeInput(false);
 			$oRadio->GetInput()->AddCSSClass('ibo-input--label-right');
@@ -1285,7 +1295,7 @@ EOF
 		);
 		$aQualifiers['other'] = Dict::S('UI:CSVImport:QualifierOther').' <input type="text" size="3" maxlength="1" name="other_qualifier" value="'.utils::EscapeHtml($sOtherTextQualifier).'" onChange="DoPreview()/>';
 		foreach ($aQualifiers as $sVal => $sLabel) {
-			$oRadio = InputUIBlockFactory::MakeForInputWithLabel($sLabel, "text_qualifier", utils::EscapeHtml($sVal), $sLabel, "radio");
+			$oRadio = InputUIBlockFactory::MakeForInputWithLabel($sLabel, "text_qualifier", $sVal, $sLabel, "radio");
 			$oRadio->GetInput()->SetIsChecked(($sVal == $sTextQualifier));
 			$oRadio->SetBeforeInput(false);
 			$oRadio->GetInput()->AddCSSClass('ibo-input-checkbox');
@@ -1322,8 +1332,8 @@ EOF
 		$sDateTimeFormat = utils::ReadParam('date_time_format', 'default');
 		$sCustomDateTimeFormat = utils::ReadParam('custom_date_time_format', (string)AttributeDateTime::GetFormat(), false, 'raw_data');
 
-		$sDefaultFormat = utils::EscapeHtml((string)AttributeDateTime::GetFormat());
-		$sExample = utils::EscapeHtml(date((string)AttributeDateTime::GetFormat()));
+		$sDefaultFormat = (string)AttributeDateTime::GetFormat();
+		$sExample = date((string)AttributeDateTime::GetFormat());
 		$oRadioDefault = InputUIBlockFactory::MakeForInputWithLabel(Dict::Format('UI:CSVImport:DefaultDateTimeFormat_Format_Example', $sDefaultFormat, $sExample), "date_time_format", "default", "radio_date_time_std", "radio");
 		$oRadioDefault->GetInput()->SetIsChecked(($sDateTimeFormat == (string)AttributeDateTime::GetFormat()));
 		$oRadioDefault->SetBeforeInput(false);
@@ -1342,8 +1352,8 @@ EOF
 		$oPage->add_ready_script("$('#custom_date_time_format').on('click', function() { DoPreview(); });");
 		$oPage->add_ready_script("$('#radio_date_time_std').on('click', function() { DoPreview(); });");
 
-		$oForm->AddSubBlock(InputUIBlockFactory::MakeForHidden("csvdata_truncated", utils::EscapeHtml($sCSVDataTruncated), "csvdata_truncated"));
-		$oForm->AddSubBlock(InputUIBlockFactory::MakeForHidden("csvdata", utils::EscapeHtml($sUTF8Data), 'csvdata'));
+		$oForm->AddSubBlock(InputUIBlockFactory::MakeForHidden("csvdata_truncated", $sCSVDataTruncated, "csvdata_truncated"));
+		$oForm->AddSubBlock(InputUIBlockFactory::MakeForHidden("csvdata", $sUTF8Data, 'csvdata'));
 		// The encoding has changed, keep that information within the wizard
 		$oForm->AddSubBlock(InputUIBlockFactory::MakeForHidden("encoding", "UTF-8"));
 		$oForm->AddSubBlock(InputUIBlockFactory::MakeForHidden("class_name", $sClassName));
@@ -1532,10 +1542,10 @@ EOF
 
 		$oFormPaste->AddSubBlock(InputUIBlockFactory::MakeForHidden("encoding", 'UTF-8'));
 		$oFormPaste->AddSubBlock(InputUIBlockFactory::MakeForHidden("step", '2'));
-		$oFormPaste->AddSubBlock(InputUIBlockFactory::MakeForHidden("separator", utils::EscapeHtml($sSeparator)));
-		$oFormPaste->AddSubBlock(InputUIBlockFactory::MakeForHidden("text_qualifier", utils::EscapeHtml($sTextQualifier)));
-		$oFormPaste->AddSubBlock(InputUIBlockFactory::MakeForHidden("date_time_format", utils::EscapeHtml($sDateTimeFormat)));
-		$oFormPaste->AddSubBlock(InputUIBlockFactory::MakeForHidden("custom_date_time_format", utils::EscapeHtml($sCustomDateTimeFormat)));
+		$oFormPaste->AddSubBlock(InputUIBlockFactory::MakeForHidden("separator", $sSeparator));
+		$oFormPaste->AddSubBlock(InputUIBlockFactory::MakeForHidden("text_qualifier", $sTextQualifier));
+		$oFormPaste->AddSubBlock(InputUIBlockFactory::MakeForHidden("date_time_format", $sDateTimeFormat));
+		$oFormPaste->AddSubBlock(InputUIBlockFactory::MakeForHidden("custom_date_time_format", $sCustomDateTimeFormat));
 		$oFormPaste->AddSubBlock(InputUIBlockFactory::MakeForHidden("header_line", $bHeaderLine));
 		$oFormPaste->AddSubBlock(InputUIBlockFactory::MakeForHidden("nb_skipped_lines", utils::ReadParam('nb_skipped_lines', '0')));
 		$oFormPaste->AddSubBlock(InputUIBlockFactory::MakeForHidden("box_skiplines", utils::ReadParam('box_skiplines', '0')));
diff --git a/pages/exec.php b/pages/exec.php
index 5a4857c4e4..ebaca9c7b9 100644
--- a/pages/exec.php
+++ b/pages/exec.php
@@ -24,6 +24,7 @@ require_once('../approot.inc.php');
 // Needed to read the parameters (with sanitization)
 require_once(APPROOT.'application/utils.inc.php');
 require_once(APPROOT.'core/metamodel.class.php');
+IssueLog::Trace('----- Request: '.utils::GetRequestUri(), LogChannels::WEB_REQUEST);
 
 utils::InitTimeZone();
 
diff --git a/pages/graphviz.php b/pages/graphviz.php
index e00998e355..819cee71e9 100644
--- a/pages/graphviz.php
+++ b/pages/graphviz.php
@@ -24,6 +24,7 @@ require_once(APPROOT.'/application/startup.inc.php');
 require_once(APPROOT.'/application/utils.inc.php');
 
 require_once(APPROOT.'/application/loginwebpage.class.inc.php');
+IssueLog::Trace('----- Request: '.utils::GetRequestUri(), LogChannels::WEB_REQUEST);
 LoginWebPage::DoLogin(); // Check user rights and prompt if needed
 
 /**
@@ -154,5 +155,3 @@ else
 	header('Content-Disposition: inline; filename="'.$sClass.'.png"');
 	readfile($sImageFilePath);
 }
-
-?>
diff --git a/pages/logoff.php b/pages/logoff.php
index 3acd81da23..1553c1cfd3 100644
--- a/pages/logoff.php
+++ b/pages/logoff.php
@@ -24,6 +24,7 @@ require_once(APPROOT.'/application/application.inc.php');
 require_once(APPROOT.'/application/wizardhelper.class.inc.php');
 
 require_once(APPROOT.'/application/startup.inc.php');
+IssueLog::Trace('----- Request: '.utils::GetRequestUri(), LogChannels::WEB_REQUEST);
 $oAppContext = new ApplicationContext();
 $currentOrganization = utils::ReadParam('org_id', '');
 $operation = utils::ReadParam('operation', '');
diff --git a/pages/notifications.php b/pages/notifications.php
index 775741a9d3..f53bc42608 100644
--- a/pages/notifications.php
+++ b/pages/notifications.php
@@ -27,6 +27,7 @@ require_once(APPROOT.'/application/application.inc.php');
 
 require_once(APPROOT.'/application/startup.inc.php');
 require_once(APPROOT.'/application/loginwebpage.class.inc.php');
+IssueLog::Trace('----- Request: '.utils::GetRequestUri(), LogChannels::WEB_REQUEST);
 LoginWebPage::DoLogin(); // Check user rights and prompt if needed
 ApplicationMenu::CheckMenuIdEnabled("NotificationsMenu");
 
diff --git a/pages/oauth.landing.php b/pages/oauth.landing.php
index 27019f4302..e1bd0063e8 100644
--- a/pages/oauth.landing.php
+++ b/pages/oauth.landing.php
@@ -5,6 +5,7 @@ use Combodo\iTop\Controller\OAuth\OAuthLandingController;
 
 require_once('../approot.inc.php');
 require_once(APPROOT.'/application/startup.inc.php');
+IssueLog::Trace('----- Request: '.utils::GetRequestUri(), LogChannels::WEB_REQUEST);
 
 $sTemplates = APPROOT.'templates/pages/backoffice/oauth';
 
diff --git a/pages/opensearch.xml.php b/pages/opensearch.xml.php
index 486b6b31ef..083557b644 100644
--- a/pages/opensearch.xml.php
+++ b/pages/opensearch.xml.php
@@ -20,7 +20,7 @@
 require_once('../approot.inc.php');
 require_once(APPROOT.'/application/application.inc.php');
 require_once(APPROOT.'/application/startup.inc.php');
-
+IssueLog::Trace('----- Request: '.utils::GetRequestUri(), LogChannels::WEB_REQUEST);
 
 $sFullUrl = utils::GetAbsoluteUrlAppRoot().'pages/UI.php';
 $sICOFullUrl = utils::GetAbsoluteUrlAppRoot().'/images/favicon.ico';
diff --git a/pages/preferences.php b/pages/preferences.php
index d30f9a5f4e..d8417227ba 100644
--- a/pages/preferences.php
+++ b/pages/preferences.php
@@ -24,6 +24,7 @@ use Combodo\iTop\Application\UI\Preferences\BlockShortcuts\BlockShortcuts;
 require_once('../approot.inc.php');
 require_once(APPROOT.'/application/application.inc.php');
 require_once(APPROOT.'/application/startup.inc.php');
+IssueLog::Trace('----- Request: '.utils::GetRequestUri(), LogChannels::WEB_REQUEST);
 
 /**
  * Displays the user's changeable preferences
diff --git a/pages/run_query.php b/pages/run_query.php
index fd337a85a8..91f0c76a7f 100644
--- a/pages/run_query.php
+++ b/pages/run_query.php
@@ -26,6 +26,7 @@ require_once('../approot.inc.php');
 require_once(APPROOT.'/application/application.inc.php');
 require_once(APPROOT.'/application/startup.inc.php');
 require_once(APPROOT.'/application/loginwebpage.class.inc.php');
+IssueLog::Trace('----- Request: '.utils::GetRequestUri(), LogChannels::WEB_REQUEST);
 
 LoginWebPage::DoLogin(); // Check user rights and prompt if needed
 ApplicationMenu::CheckMenuIdEnabled('RunQueriesMenu');
diff --git a/pages/schema.php b/pages/schema.php
index bf4c1d87d4..1705531882 100644
--- a/pages/schema.php
+++ b/pages/schema.php
@@ -19,6 +19,7 @@ require_once(APPROOT.'/application/application.inc.php');
 
 require_once(APPROOT.'/application/startup.inc.php');
 require_once(APPROOT.'/application/loginwebpage.class.inc.php');
+IssueLog::Trace('----- Request: '.utils::GetRequestUri(), LogChannels::WEB_REQUEST);
 LoginWebPage::DoLogin(); // Check user rights and prompt if needed
 ApplicationMenu::CheckMenuIdEnabled('DataModelMenu');
 
diff --git a/pages/tagadmin.php b/pages/tagadmin.php
index ed2171a6b7..33da2ab8fd 100644
--- a/pages/tagadmin.php
+++ b/pages/tagadmin.php
@@ -21,6 +21,7 @@ require_once('../approot.inc.php');
 require_once(APPROOT.'application/application.inc.php');
 require_once(APPROOT.'application/startup.inc.php');
 require_once(APPROOT.'application/loginwebpage.class.inc.php');
+IssueLog::Trace('----- Request: '.utils::GetRequestUri(), LogChannels::WEB_REQUEST);
 
 try
 {
diff --git a/setup/backup.class.inc.php b/setup/backup.class.inc.php
index 3d58173982..9b38db6b88 100644
--- a/setup/backup.class.inc.php
+++ b/setup/backup.class.inc.php
@@ -146,13 +146,13 @@ class DBBackup
 	/**
 	 * Create a normalized backup name, depending on the current date/time and Database
 	 *
-	 * @param string sNameSpec Name and path, eventually containing itop placeholders + time formatting following the strftime() format {@link https://www.php.net/manual/fr/function.strftime.php}
+	 * @param string $sNameSpec Name and path, eventually containing itop placeholders + time formatting following the strftime() format {@link https://www.php.net/manual/fr/function.strftime.php}
 	 * @param \DateTime|null $oDateTime Date time to use for the name
 	 *
-	 * @return string
-	 * @since 3.1.0 N°5279 Add $oDtaeaTime parameter
+	 * @return string Name of the backup file WITHOUT the file extension (eg. `.tar.gz`)
+	 * @since 3.1.0 N°5279 Add $oDateTime parameter
 	 */
-	public function MakeName($sNameSpec = "__DB__-%Y-%m-%d", DateTime $oDateTime = null)
+	public function MakeName(string $sNameSpec = "__DB__-%Y-%m-%d", DateTime $oDateTime = null)
 	{
 		if ($oDateTime === null) {
 			$oDateTime = new DateTime();
diff --git a/setup/compiler.class.inc.php b/setup/compiler.class.inc.php
index 4df999dff2..e25d851b81 100644
--- a/setup/compiler.class.inc.php
+++ b/setup/compiler.class.inc.php
@@ -2058,9 +2058,10 @@ EOF
 			$this->CompileCommonProperty('count_max', $oField, $aParameters, $sModuleRelativeDir, 0);
 			$this->CompileCommonProperty('duplicates', $oField, $aParameters, $sModuleRelativeDir, false);
 			$this->CompileCommonProperty('display_style', $oField, $aParameters, $sModuleRelativeDir);
+			$this->CompileCommonProperty('edit_mode', $oField, $aParameters, $sModuleRelativeDir);
 			$this->CompileCommonProperty('filter', $oField, $aParameters, $sModuleRelativeDir);
 			$this->CompileCommonProperty('allowed_values', $oField, $aParameters, $sModuleRelativeDir);
-			$this->CompileCommonProperty('with_constraint', $oField, $aParameters, $sModuleRelativeDir, false);
+			$this->CompileCommonProperty('with_php_constraint', $oField, $aParameters, $sModuleRelativeDir, false);
 			$aParameters['depends_on'] = $sDependencies;
 		} elseif ($sAttType == 'AttributeLinkedSet') {
 			$this->CompileCommonProperty('linked_class', $oField, $aParameters, $sModuleRelativeDir);
@@ -2070,7 +2071,7 @@ EOF
 			$this->CompileCommonProperty('display_style', $oField, $aParameters, $sModuleRelativeDir);
 			$this->CompileCommonProperty('edit_mode', $oField, $aParameters, $sModuleRelativeDir);
 			$this->CompileCommonProperty('filter', $oField, $aParameters, $sModuleRelativeDir);
-			$this->CompileCommonProperty('with_constraint', $oField, $aParameters, $sModuleRelativeDir, false);
+			$this->CompileCommonProperty('with_php_constraint', $oField, $aParameters, $sModuleRelativeDir, false);
 			$aParameters['depends_on'] = $sDependencies;
 		} elseif ($sAttType == 'AttributeExternalKey') {
 			$this->CompileCommonProperty('target_class', $oField, $aParameters, $sModuleRelativeDir);
@@ -2082,6 +2083,7 @@ EOF
 			$this->CompileCommonProperty('min_autocomplete_chars', $oField, $aParameters, $sModuleRelativeDir);
 			$this->CompileCommonProperty('allow_target_creation', $oField, $aParameters, $sModuleRelativeDir);
 			$this->CompileCommonProperty('display_style', $oField, $aParameters, $sModuleRelativeDir, 'select');
+			$this->CompileCommonProperty('create_temporary_object', $oField, $aParameters, $sModuleRelativeDir, false);
 			$aParameters['depends_on'] = $sDependencies;
 		} elseif ($sAttType == 'AttributeObjectKey') {
 			$this->CompileCommonProperty('class_attcode', $oField, $aParameters, $sModuleRelativeDir);
diff --git a/setup/itopdesignformat.class.inc.php b/setup/itopdesignformat.class.inc.php
index ecf4be5464..4894385df4 100644
--- a/setup/itopdesignformat.class.inc.php
+++ b/setup/itopdesignformat.class.inc.php
@@ -1043,65 +1043,7 @@ class iTopDesignFormat
 	 */
 	protected function From30To31($oFactory)
 	{
-		$oXPath = new DOMXPath($this->oDocument);
 
-		// N°5563 AttributeLinkedSet
-		// - move edit_mode attribute to legacy_edit_mode attribute
-		// - fill relation_type & read_only if non-existing
-		$oLinkedSetNodes = $oXPath->query("/itop_design/classes//class/fields/field[@xsi:type='AttributeLinkedSet']");
-		/** @var \DOMElement $oNode */
-		foreach ($oLinkedSetNodes as $oNode) {
-			$sEditMode = 'actions';
-			if ($oNode->hasChildNodes()) {
-				$oLinkedSetEditModeNodes = $oNode->getElementsByTagName('edit_mode');
-				if (count($oLinkedSetEditModeNodes)) {
-					$oEditModeNode = $oLinkedSetEditModeNodes->item(0);
-					/** @noinspection NullPointerExceptionInspection already checked */
-					$sEditMode = $oEditModeNode->nodeValue;
-				}
-
-				switch ($sEditMode) {
-					case 'none':
-						$sRelationType = 'link';
-						$sReadOnly = 'true';
-						break;
-					case 'add_only':
-					case 'add_remove':
-					case 'actions':
-					default:
-						$sRelationType = 'link';
-						$sReadOnly = 'false';
-						break;
-					case 'in_place':
-						$sRelationType = 'property';
-						$sReadOnly = 'false';
-						break;
-				}
-
-				$bHasRelationType = ($oNode->getElementsByTagName('relation_type')->count() > 0);
-				if (false === $bHasRelationType) {
-					$oRelationTypeNode = $oNode->ownerDocument->createElement('relation_type', $sRelationType);
-					$oNode->appendChild($oRelationTypeNode);
-				}
-
-				$bHasReadOnly = ($oNode->getElementsByTagName('read_only')->count() > 0);
-				if (false === $bHasReadOnly) {
-					$oReadOnlyNode = $oNode->ownerDocument->createElement('read_only', $sReadOnly);
-					$oNode->appendChild($oReadOnlyNode);
-				}
-			}
-		}
-
-		// N°5563 AttributeLinkedSetIndirect
-		// - fill read_only attribute if non-existing
-		$oLinkedSetIndirectNodes = $oXPath->query("/itop_design/classes//class/fields/field[@xsi:type='AttributeLinkedSetIndirect']");
-		foreach ($oLinkedSetIndirectNodes as $oNode) {
-			$bHasReadOnly = ($oNode->getElementsByTagName('read_only')->count() > 0);
-			if (false === $bHasReadOnly) {
-				$oReadOnlyNode = $oNode->ownerDocument->createElement('read_only', 'false');
-				$oNode->appendChild($oReadOnlyNode);
-			}
-		}
 	}
 	/**
 	 * Downgrade the format from version 3.1 to 3.0
@@ -1112,16 +1054,6 @@ class iTopDesignFormat
 	{
 		$oXPath = new DOMXPath($this->oDocument);
 
-		// N°5563 AttributeLinkedSet
-		// - Remove relation_type & read_only (added in 3.1)
-		// - Restore edit_mode attribute from legacy_edit_mode attribute
-		$this->RemoveNodeFromXPath("/itop_design/classes//class/fields/field[@xsi:type='AttributeLinkedSet']/read_only");
-		$this->RemoveNodeFromXPath("/itop_design/classes//class/fields/field[@xsi:type='AttributeLinkedSet']/relation_type");
-
-		// N°5563 AttributeLinkedSetIndirect
-		// - Remove read_only attribute (added in 3.1)
-		$this->RemoveNodeFromXPath("/itop_design/classes//class/fields/field[@xsi:type='AttributeLinkedSetIndirect']/read_only");
-
 		// N°4756 - Ease extensibility for CRUD operations : Event Service
 		$this->RemoveNodeFromXPath('/itop_design/events');
 		$this->RemoveNodeFromXPath('/itop_design/event_listeners');
diff --git a/setup/licenses/community-licenses.xml b/setup/licenses/community-licenses.xml
index 04cf8e011d..c552f1d0c5 100644
--- a/setup/licenses/community-licenses.xml
+++ b/setup/licenses/community-licenses.xml
@@ -1672,214 +1672,6 @@ Awesome, nor vice versa. **Please do not use brand logos for any purpose except
 to represent the company, product, or service to which they refer.**
 ]]></text>
   </license>
-  <license>
-          <product scope="datamodels">apereo/phpcas</product>
-          <author>Joachim Fritschi - Adam Franco - Henry Pan</author>
-          <license_type>Apache-2.0</license_type>
-          <text><![CDATA[
-                                   Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-  ]]></text>
-      </license>
   <license>
     <product scope="js">C3 js</product>
     <author>Masayuki Tanaka</author>
@@ -2662,1772 +2454,213 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ]]></text>
   </license>
   <license>
-          <product scope="lib">combodo/tcpdf</product>
-          <author>Nicola Asuni - Combodo</author>
-          <license_type>LGPL-3.0-only</license_type>
+          <product scope="lib">apereo/phpcas</product>
+          <author>Joachim Fritschi - Adam Franco - Henry Pan</author>
+          <license_type>Apache-2.0</license_type>
           <text><![CDATA[
-  Fonts are (c) Bitstream (see below). DejaVu changes are in public domain.
-Glyphs imported from Arev fonts are (c) Tavmjong Bah (see below)
+                                   Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
 
-Bitstream Vera Fonts Copyright
-------------------------------
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
-Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is
-a trademark of Bitstream, Inc.
+   1. Definitions.
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of the fonts accompanying this license ("Fonts") and associated
-documentation files (the "Font Software"), to reproduce and distribute the
-Font Software, including without limitation the rights to use, copy, merge,
-publish, distribute, and/or sell copies of the Font Software, and to permit
-persons to whom the Font Software is furnished to do so, subject to the
-following conditions:
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
 
-The above copyright and trademark notices and this permission notice shall
-be included in all copies of one or more of the Font Software typefaces.
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
 
-The Font Software may be modified, altered, or added to, and in particular
-the designs of glyphs or characters in the Fonts may be modified and
-additional glyphs or characters may be added to the Fonts, only if the fonts
-are renamed to names not containing either the words "Bitstream" or the word
-"Vera".
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
 
-This License becomes null and void to the extent applicable to Fonts or Font
-Software that has been modified and is distributed under the "Bitstream
-Vera" names.
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
 
-The Font Software may be sold as part of a larger software package but no
-copy of one or more of the Font Software typefaces may be sold by itself.
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
 
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT,
-TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME
-FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING
-ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
-THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE
-FONT SOFTWARE.
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
 
-Except as contained in this notice, the names of Gnome, the Gnome
-Foundation, and Bitstream Inc., shall not be used in advertising or
-otherwise to promote the sale, use or other dealings in this Font Software
-without prior written authorization from the Gnome Foundation or Bitstream
-Inc., respectively. For further information, contact: fonts at gnome dot
-org. 
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
 
-Arev Fonts Copyright
-------------------------------
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
 
-Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved.
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the fonts accompanying this license ("Fonts") and
-associated documentation files (the "Font Software"), to reproduce
-and distribute the modifications to the Bitstream Vera Font Software,
-including without limitation the rights to use, copy, merge, publish,
-distribute, and/or sell copies of the Font Software, and to permit
-persons to whom the Font Software is furnished to do so, subject to
-the following conditions:
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
 
-The above copyright and trademark notices and this permission notice
-shall be included in all copies of one or more of the Font Software
-typefaces.
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
 
-The Font Software may be modified, altered, or added to, and in
-particular the designs of glyphs or characters in the Fonts may be
-modified and additional glyphs or characters may be added to the
-Fonts, only if the fonts are renamed to names not containing either
-the words "Tavmjong Bah" or the word "Arev".
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
 
-This License becomes null and void to the extent applicable to Fonts
-or Font Software that has been modified and is distributed under the 
-"Tavmjong Bah Arev" names.
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
 
-The Font Software may be sold as part of a larger software package but
-no copy of one or more of the Font Software typefaces may be sold by
-itself.
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
 
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL
-TAVMJONG BAH BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
 
-Except as contained in this notice, the name of Tavmjong Bah shall not
-be used in advertising or otherwise to promote the sale, use or other
-dealings in this Font Software without prior written authorization
-from Tavmjong Bah. For further information, contact: tavmjong @ free
-. fr.
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
 
-$Id: LICENSE 2133 2007-11-28 02:46:28Z lechimp $
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
   ]]></text>
       </license>
-  <license>
-          <product scope="lib">container-interop/container-interop</product>
-          <author/>
-          <license_type>MIT</license_type>
-          <text><![CDATA[
-  The MIT License (MIT)
-
-Copyright (c) 2013 container-interop
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-  ]]></text>
-      </license>
-  <license>
-          <product scope="lib">doctrine/lexer</product>
-          <author>Guilherme Blanco - Roman Borschel - Johannes Schmitt</author>
-          <license_type>MIT</license_type>
-          <text><![CDATA[
-  Copyright (c) 2006-2018 Doctrine Project
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-  ]]></text>
-      </license>
-  <license>
-          <product scope="lib">egulias/email-validator</product>
-          <author>Eduardo Gulias Davis</author>
-          <license_type>MIT</license_type>
-          <text><![CDATA[
-  Copyright (c) 2013-2016 Eduardo Gulias Davis
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-  ]]></text>
-      </license>
-  <license>
-          <product scope="lib">laminas/laminas-loader</product>
-          <author/>
-          <license_type>BSD-3-Clause</license_type>
-          <text><![CDATA[
-  Copyright (c) 2019, Laminas Foundation
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-- Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
-
-- Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-- Neither the name of Laminas Foundation nor the names of its contributors may
-  be used to endorse or promote products derived from this software without
-  specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  ]]></text>
-      </license>
-  <license>
-          <product scope="lib">laminas/laminas-mail</product>
-          <author/>
-          <license_type>BSD-3-Clause</license_type>
-          <text><![CDATA[
-  Copyright (c) 2020 Laminas Project a Series of LF Projects, LLC.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-- Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
-
-- Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-- Neither the name of Laminas Foundation nor the names of its contributors may
-  be used to endorse or promote products derived from this software without
-  specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  ]]></text>
-      </license>
-  <license>
-          <product scope="lib">laminas/laminas-mime</product>
-          <author/>
-          <license_type>BSD-3-Clause</license_type>
-          <text><![CDATA[
-  Copyright (c) 2019-2020, Laminas Foundation
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-- Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
-
-- Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-- Neither the name of Laminas Foundation nor the names of its contributors may
-  be used to endorse or promote products derived from this software without
-  specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  ]]></text>
-      </license>
-  <license>
-          <product scope="lib">laminas/laminas-servicemanager</product>
-          <author/>
-          <license_type>BSD-3-Clause</license_type>
-          <text><![CDATA[
-  Copyright (c) 2020 Laminas Project a Series of LF Projects, LLC.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-- Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
-
-- Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-- Neither the name of Laminas Foundation nor the names of its contributors may
-  be used to endorse or promote products derived from this software without
-  specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  ]]></text>
-      </license>
-  <license>
-          <product scope="lib">laminas/laminas-stdlib</product>
-          <author/>
-          <license_type>BSD-3-Clause</license_type>
-          <text><![CDATA[
-  Copyright (c) 2019, Laminas Foundation
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-- Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
-
-- Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-- Neither the name of Laminas Foundation nor the names of its contributors may
-  be used to endorse or promote products derived from this software without
-  specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  ]]></text>
-      </license>
-  <license>
-          <product scope="lib">laminas/laminas-validator</product>
-          <author/>
-          <license_type>BSD-3-Clause</license_type>
-          <text><![CDATA[
-  Copyright (c) 2020 Laminas Project a Series of LF Projects, LLC.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-- Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
-
-- Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-- Neither the name of Laminas Foundation nor the names of its contributors may
-  be used to endorse or promote products derived from this software without
-  specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  ]]></text>
-      </license>
-  <license>
-          <product scope="lib">laminas/laminas-zendframework-bridge</product>
-          <author/>
-          <license_type>BSD-3-Clause</license_type>
-          <text><![CDATA[
-  Copyright (c) 2020 Laminas Project a Series of LF Projects, LLC.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-- Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
-
-- Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-- Neither the name of Laminas Foundation nor the names of its contributors may
-  be used to endorse or promote products derived from this software without
-  specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  ]]></text>
-      </license>
-  <license>
-          <product scope="lib">nikic/php-parser</product>
-          <author>Nikita Popov</author>
-          <license_type>BSD-3-Clause</license_type>
-          <text><![CDATA[
-  BSD 3-Clause License
-
-Copyright (c) 2011, Nikita Popov
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its
-   contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  ]]></text>
-      </license>
-  <license>
-          <product scope="lib">paragonie/random_compat</product>
-          <author>Paragon Initiative Enterprises</author>
-          <license_type>MIT</license_type>
-          <text><![CDATA[
-  The MIT License (MIT)
-
-Copyright (c) 2015 Paragon Initiative Enterprises
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-  ]]></text>
-      </license>
-  <license>
-          <product scope="lib">pear/archive_tar</product>
-          <author>Vincent Blavet - Greg Beaver - Michiel Rook</author>
-          <license_type>BSD-3-Clause</license_type>
-          <text><![CDATA[
-  
-  ]]></text>
-      </license>
-  <license>
-          <product scope="lib">pear/console_getopt</product>
-          <author>Andrei Zmievski - Stig Bakken - Greg Beaver</author>
-          <license_type>BSD-2-Clause</license_type>
-          <text><![CDATA[
-  Copyright (c) 2001-2015, The PEAR developers
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-1. Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  ]]></text>
-      </license>
-  <license>
-          <product scope="lib">pear/pear-core-minimal</product>
-          <author>Christian Weiske</author>
-          <license_type>BSD-3-Clause</license_type>
-          <text><![CDATA[
-  
-  ]]></text>
-      </license>
-  <license>
-          <product scope="lib">pear/pear_exception</product>
-          <author>Helgi Thormar - Greg Beaver</author>
-          <license_type>BSD-2-Clause</license_type>
-          <text><![CDATA[
-  Copyright (c) 1997-2009,
- Stig Bakken <ssb@php.net>,
- Gregory Beaver <cellog@php.net>,
- Helgi Þormar Þorbjörnsson <helgi@php.net>,
- Tomas V.V.Cox <cox@idecnet.com>,
- Martin Jansen <mj@php.net>.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  ]]></text>
-      </license>
-  <license>
-          <product scope="lib">pelago/emogrifier</product>
-          <author>Oliver Klee - Zoli Szab&#xF3; - John Reeve - Jake Hotson - Cameron Brooks - Jaime Prado</author>
-          <license_type>MIT</license_type>
-          <text><![CDATA[
-  MIT License
-
-Copyright (c) 2008-2018 Pelago
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-  ]]></text>
-      </license>
-  <license>
-          <product scope="lib">psr/cache</product>
-          <author>PHP-FIG</author>
-          <license_type>MIT</license_type>
-          <text><![CDATA[
-  Copyright (c) 2015 PHP Framework Interoperability Group
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-  ]]></text>
-      </license>
-  <license>
-          <product scope="lib">psr/container</product>
-          <author>PHP-FIG</author>
-          <license_type>MIT</license_type>
-          <text><![CDATA[
-  The MIT License (MIT)
-
-Copyright (c) 2013-2016 container-interop
-Copyright (c) 2016 PHP Framework Interoperability Group
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-  ]]></text>
-      </license>
-  <license>
-          <product scope="lib">psr/log</product>
-          <author>PHP-FIG</author>
-          <license_type>MIT</license_type>
-          <text><![CDATA[
-  Copyright (c) 2012 PHP Framework Interoperability Group
-
-Permission is hereby granted, free of charge, to any person obtaining a copy 
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights 
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 
-copies of the Software, and to permit persons to whom the Software is 
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in 
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-  ]]></text>
-      </license>
-  <license>
-          <product scope="lib">psr/simple-cache</product>
-          <author>PHP-FIG</author>
-          <license_type>MIT</license_type>
-          <text><![CDATA[
-  # The MIT License (MIT)
-
-Copyright (c) 2016 PHP Framework Interoperability Group
-
-> Permission is hereby granted, free of charge, to any person obtaining a copy
-> of this software and associated documentation files (the "Software"), to deal
-> in the Software without restriction, including without limitation the rights
-> to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-> copies of the Software, and to permit persons to whom the Software is
-> furnished to do so, subject to the following conditions:
->
-> The above copyright notice and this permission notice shall be included in
-> all copies or substantial portions of the Software.
->
-> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-> IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-> FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-> AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-> LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-> OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-> THE SOFTWARE.
-  ]]></text>
-      </license>
-  <license>
-          <product scope="lib">scssphp/scssphp</product>
-          <author>Anthon Pang - C&#xE9;dric Morin</author>
-          <license_type>MIT</license_type>
-          <text><![CDATA[
-  Copyright (c) 2015 Leaf Corcoran, http://scssphp.github.io/scssphp
- 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
- 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
- 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-  ]]></text>
-      </license>
-  <license>
-          <product scope="lib">symfony/cache</product>
-          <author>Nicolas Grekas - Symfony Community</author>
-          <license_type>MIT</license_type>
-          <text><![CDATA[
-  Copyright (c) 2016-2020 Fabien Potencier
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-  ]]></text>
-      </license>
-  <license>
-          <product scope="lib">symfony/class-loader</product>
-          <author>Fabien Potencier - Symfony Community</author>
-          <license_type>MIT</license_type>
-          <text><![CDATA[
-  Copyright (c) 2004-2020 Fabien Potencier
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-  ]]></text>
-      </license>
-  <license>
-          <product scope="lib">symfony/config</product>
-          <author>Fabien Potencier - Symfony Community</author>
-          <license_type>MIT</license_type>
-          <text><![CDATA[
-  Copyright (c) 2004-2020 Fabien Potencier
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-  ]]></text>
-      </license>
-  <license>
-          <product scope="lib">symfony/console</product>
-          <author>Fabien Potencier - Symfony Community</author>
-          <license_type>MIT</license_type>
-          <text><![CDATA[
-  Copyright (c) 2004-2020 Fabien Potencier
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-  ]]></text>
-      </license>
-  <license>
-          <product scope="lib">symfony/css-selector</product>
-          <author>Fabien Potencier - Jean-Fran&#xE7;ois Simon - Symfony Community</author>
-          <license_type>MIT</license_type>
-          <text><![CDATA[
-  Copyright (c) 2004-2020 Fabien Potencier
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-  ]]></text>
-      </license>
-  <license>
-          <product scope="lib">symfony/debug</product>
-          <author>Fabien Potencier - Symfony Community</author>
-          <license_type>MIT</license_type>
-          <text><![CDATA[
-  Copyright (c) 2004-2020 Fabien Potencier
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-  ]]></text>
-      </license>
-  <license>
-          <product scope="lib">symfony/dependency-injection</product>
-          <author>Fabien Potencier - Symfony Community</author>
-          <license_type>MIT</license_type>
-          <text><![CDATA[
-  Copyright (c) 2004-2020 Fabien Potencier
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-  ]]></text>
-      </license>
-  <license>
-          <product scope="lib">symfony/dotenv</product>
-          <author>Fabien Potencier - Symfony Community</author>
-          <license_type>MIT</license_type>
-          <text><![CDATA[
-  Copyright (c) 2016-2020 Fabien Potencier
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-  ]]></text>
-      </license>
-  <license>
-          <product scope="lib">symfony/event-dispatcher</product>
-          <author>Fabien Potencier - Symfony Community</author>
-          <license_type>MIT</license_type>
-          <text><![CDATA[
-  Copyright (c) 2004-2020 Fabien Potencier
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-  ]]></text>
-      </license>
-  <license>
-          <product scope="lib">symfony/filesystem</product>
-          <author>Fabien Potencier - Symfony Community</author>
-          <license_type>MIT</license_type>
-          <text><![CDATA[
-  Copyright (c) 2004-2020 Fabien Potencier
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-  ]]></text>
-      </license>
-  <license>
-          <product scope="lib">symfony/finder</product>
-          <author>Fabien Potencier - Symfony Community</author>
-          <license_type>MIT</license_type>
-          <text><![CDATA[
-  Copyright (c) 2004-2020 Fabien Potencier
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-  ]]></text>
-      </license>
-  <license>
-          <product scope="lib">symfony/framework-bundle</product>
-          <author>Fabien Potencier - Symfony Community</author>
-          <license_type>MIT</license_type>
-          <text><![CDATA[
-  Copyright (c) 2004-2020 Fabien Potencier
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-  ]]></text>
-      </license>
-  <license>
-          <product scope="lib">symfony/http-foundation</product>
-          <author>Fabien Potencier - Symfony Community</author>
-          <license_type>MIT</license_type>
-          <text><![CDATA[
-  Copyright (c) 2004-2020 Fabien Potencier
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-  ]]></text>
-      </license>
-  <license>
-          <product scope="lib">symfony/http-kernel</product>
-          <author>Fabien Potencier - Symfony Community</author>
-          <license_type>MIT</license_type>
-          <text><![CDATA[
-  Copyright (c) 2004-2020 Fabien Potencier
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-  ]]></text>
-      </license>
-  <license>
-          <product scope="lib">symfony/polyfill-apcu</product>
-          <author>Nicolas Grekas - Symfony Community</author>
-          <license_type>MIT</license_type>
-          <text><![CDATA[
-  Copyright (c) 2015-2019 Fabien Potencier
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-  ]]></text>
-      </license>
-  <license>
-          <product scope="lib">symfony/polyfill-ctype</product>
-          <author>Gert de Pagter - Symfony Community</author>
-          <license_type>MIT</license_type>
-          <text><![CDATA[
-  Copyright (c) 2018-2019 Fabien Potencier
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-  ]]></text>
-      </license>
-  <license>
-          <product scope="lib">symfony/polyfill-iconv</product>
-          <author>Nicolas Grekas - Symfony Community</author>
-          <license_type>MIT</license_type>
-          <text><![CDATA[
-  Copyright (c) 2015-2019 Fabien Potencier
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-  ]]></text>
-      </license>
-  <license>
-          <product scope="lib">symfony/polyfill-intl-idn</product>
-          <author>Laurent Bassin - Trevor Rowbotham - Symfony Community</author>
-          <license_type>MIT</license_type>
-          <text><![CDATA[
-  Copyright (c) 2018-2019 Fabien Potencier and Trevor Rowbotham <trevor.rowbotham@pm.me>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-  ]]></text>
-      </license>
-  <license>
-          <product scope="lib">symfony/polyfill-intl-normalizer</product>
-          <author>Nicolas Grekas - Symfony Community</author>
-          <license_type>MIT</license_type>
-          <text><![CDATA[
-  Copyright (c) 2015-2019 Fabien Potencier
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-  ]]></text>
-      </license>
-  <license>
-          <product scope="lib">symfony/polyfill-mbstring</product>
-          <author>Nicolas Grekas - Symfony Community</author>
-          <license_type>MIT</license_type>
-          <text><![CDATA[
-  Copyright (c) 2015-2019 Fabien Potencier
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-  ]]></text>
-      </license>
-  <license>
-          <product scope="lib">symfony/polyfill-php56</product>
-          <author>Nicolas Grekas - Symfony Community</author>
-          <license_type>MIT</license_type>
-          <text><![CDATA[
-  Copyright (c) 2015-2019 Fabien Potencier
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-  ]]></text>
-      </license>
-  <license>
-          <product scope="lib">symfony/polyfill-php70</product>
-          <author>Nicolas Grekas - Symfony Community</author>
-          <license_type>MIT</license_type>
-          <text><![CDATA[
-  Copyright (c) 2015-2019 Fabien Potencier
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-  ]]></text>
-      </license>
-  <license>
-          <product scope="lib">symfony/polyfill-php72</product>
-          <author>Nicolas Grekas - Symfony Community</author>
-          <license_type>MIT</license_type>
-          <text><![CDATA[
-  Copyright (c) 2015-2019 Fabien Potencier
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-  ]]></text>
-      </license>
-  <license>
-          <product scope="lib">symfony/polyfill-util</product>
-          <author>Nicolas Grekas - Symfony Community</author>
-          <license_type>MIT</license_type>
-          <text><![CDATA[
-  Copyright (c) 2015-2019 Fabien Potencier
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-  ]]></text>
-      </license>
-  <license>
-          <product scope="lib">symfony/routing</product>
-          <author>Fabien Potencier - Symfony Community</author>
-          <license_type>MIT</license_type>
-          <text><![CDATA[
-  Copyright (c) 2004-2020 Fabien Potencier
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-  ]]></text>
-      </license>
-  <license>
-          <product scope="lib">symfony/stopwatch</product>
-          <author>Fabien Potencier - Symfony Community</author>
-          <license_type>MIT</license_type>
-          <text><![CDATA[
-  Copyright (c) 2004-2020 Fabien Potencier
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-  ]]></text>
-      </license>
-  <license>
-          <product scope="lib">symfony/twig-bridge</product>
-          <author>Fabien Potencier - Symfony Community</author>
-          <license_type>MIT</license_type>
-          <text><![CDATA[
-  Copyright (c) 2004-2020 Fabien Potencier
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-  ]]></text>
-      </license>
-  <license>
-          <product scope="lib">symfony/twig-bundle</product>
-          <author>Fabien Potencier - Symfony Community</author>
-          <license_type>MIT</license_type>
-          <text><![CDATA[
-  Copyright (c) 2004-2020 Fabien Potencier
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-  ]]></text>
-      </license>
-  <license>
-          <product scope="lib">symfony/var-dumper</product>
-          <author>Nicolas Grekas - Symfony Community</author>
-          <license_type>MIT</license_type>
-          <text><![CDATA[
-  Copyright (c) 2014-2020 Fabien Potencier
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-  ]]></text>
-      </license>
-  <license>
-          <product scope="lib">symfony/web-profiler-bundle</product>
-          <author>Fabien Potencier - Symfony Community</author>
-          <license_type>MIT</license_type>
-          <text><![CDATA[
-  Copyright (c) 2004-2020 Fabien Potencier
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-  ]]></text>
-      </license>
-  <license>
-          <product scope="lib">symfony/yaml</product>
-          <author>Fabien Potencier - Symfony Community</author>
-          <license_type>MIT</license_type>
-          <text><![CDATA[
-  Copyright (c) 2004-2020 Fabien Potencier
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-  ]]></text>
-      </license>
-  <license>
-          <product scope="lib">true/punycode</product>
-          <author>Renan Gon&#xE7;alves</author>
-          <license_type>MIT</license_type>
-          <text><![CDATA[
-  Copyright (c) 2014 TrueServer B.V.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-  ]]></text>
-      </license>
-  <license>
-          <product scope="lib">twig/twig</product>
-          <author>Fabien Potencier - Twig Team - Armin Ronacher</author>
-          <license_type>BSD-3-Clause</license_type>
-          <text><![CDATA[
-  Copyright (c) 2009-2020 by the Twig Team.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-
-    * The names of the contributors may not be used to endorse or
-      promote products derived from this software without specific
-      prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  ]]></text>
-      </license>
-  <license>
-    <product scope="media">Freepik images</product>
-    <author>Freepik</author>
-    <license_type>Proprietary licensed</license_type>
-    <text><![CDATA[
-  The Company authorizes the User to download and use the Flaticon Content under the terms of this Section (see Section 7 in relation to the Sponsored Content). The Company and its licensors reserve all rights over the Flaticon Content not expressly granted in this license to the User.
-
-The Company authorizes the User in a non-transferable, limited, non-exclusive, manner and on a worldwide basis for the duration of the relevant rights; to download, use and modify the Flaticon Content, in a device the User owns or controls and only for the purposes and uses allowed in these Terms.
-
-The User may use the content in the Flaticon Content provided that it:
-
-Does not involve collective use;
-The content in the Flaticon Content is not used in a manner that suggests an association or endorsement by the Company or the Website;
-The content in the Flaticon Content or any derivative work is not used or included (in whole or in part) in a database, archive or in any other media/stock product, collection, set of clips, or library, for distribution or resale or used in any other way that could prevent or limit future visits or downloads from the Website;
-Does not resell, assign, transfer or sublicense the content in the Flaticon Content or any derived work from a content in the Flaticon Content;
-Does not use the content in the Flaticon Content in printed or electronic items (e.g. t-shirts, cups, postcards, birthday or greeting cards, invitations, calendars, web models or electronic devices, apps, videogames, advertising spots, audiovisual animations) aimed to be resold, in which the content in the Flaticon Content is the main element (because of size, relevance or any other cause, in case of doubt about whether the content is main element, it shall be deemed that the content is main element);
-Does not use the content in the Flaticon Content (totally or partially) in any trademark, logo or part of the same, which may be used by any other means to guarantee or to imply a guaranty of any product and/or service, unless the content in the Flaticon Content used in such cases is modified in such a way as to be a new and different content not confusingly similar with the original content in the Flaticon Content or implies a use of the content in the Flaticon Content as a template or test, and not as a final item or material;
-Does not make any use of the content in the Flaticon Content which might be considered defamatory, libellous, obscene, immoral or illegal, including, without limitation, using it in a way that places any person appearing in the content in the Flaticon Content in a negative light or depicts them in a way that they may find offensive such as the use in pornography, advertisements for escort or similar services, political endorsements, birth control products; and
-Does not make any use of the content in the Flaticon Content to slander, libel or to vilify a person, race, sex, culture, religion, country, region, town, village or any other place.
-When any content of the Flaticon Content is marked or identified as for editorial use, or when within the same there are logos, recognizable products, public buildings, public events or images taken in places where recognizable persons appear on the background, the User shall only be entitled to use it for such editorial use. In such cases, the User undertakes not to use that content in any manner that entails advertising, marketing or commercialization of any product or service. The User shall be directly liable and the Company shall not assume any liability as a result of the use for commercial purposes by the User of any content belonging to the Flaticon Content, which according to this paragraph should be for editorial use only.
-
-The authorization to use the content in the Flaticon Content shall be free provided that any use of the content in the Flaticon Content by the User is credited to the Company/Website as stated by the Company from time to time. In order to benefit from the Service or to use the content in the Flaticon Content without acknowledging the Company/Website, the User must purchase a subscription (hereinafter, the "Subscription") in the Website and download the content in the Flaticon Content during the term of any such Subscription. Conditions in Section 9 shall apply to the purchase of the Subscription.
-
-It is forbidden for a User to authorize any third parties to use the Flaticon Content (or any modification of any content in the Flaticon Content). As an exception to the prohibition, the User may allow third parties to use the content in the Flaticon Content, when each and every of the following conditions are met:
-
-The third party has professionally instructed the User to produce goods or provide services to it/him/her and the User uses a limited number of items within the content in the Flaticon Content to produce such goods or provide such services to the instructing third party;
-The authorization granted by the User to the third party is in writing and complies with every restriction of the User’s authorization to use the relevant content in the Flaticon Content and includes, without limitation, a restriction for the third party to distribute, resell or license the relevant content in the Flaticon Content (i.e. the third party is the final user of the relevant content in the Flaticon Content);
-None of the contents in the Flaticon Content which are subject to the authorization are used as the main element (because of size, relevance or any other cause; in case of doubt about whether the content is the main element, it shall be deemed as the main element) in printed or electronic items (e.g. t-shirts, cups, postcards, birthday or greeting cards, invitations, calendars, web models or electronic devices, apps, videogames, advertising spots, audiovisual animations) aimed to be resold by the third party;
-The production of goods or provision of services by the User to the third party is not done by automatic means, it is tailor made for the third party (and therefore its use is not authorized by the User to any other third party) and requires a specific substantial human intervention from the User in relation to each third party, and;
-The User -and not the third party- chooses the specific items within the content of the Flaticon Content to be used in the production of goods or provision of services for the third party.
-When all of the above conditions are met, the User shall be entitled to authorize a third party to use the relevant content in the Flaticon Content. This exception refers only to the prohibition for the User to authorize third parties to use the content in the Flaticon Content without affecting or limiting in any way the remaining conditions of the User’s right to use the Flaticon Content. Whether the above conditions regarding the exception to the prohibition for Users to authorize third parties to use the content in the Flaticon Content are met shall be interpreted restrictively so that, in case of doubt, it shall be deemed that the conditions are not met.
-
-The User does not acquire any right as a result of the use of the content in the Flaticon Content. In particular, the User is not authorized to distribute, resell or rent any content in the Flaticon Content (or any modification of any content in the Flaticon Content).
-
-The User rights under this Section will end automatically without any notice if the User breaches any of the Terms. In case of termination of the rights hereunder, the User shall cease using content in the Flaticon Content and will destroy every copy, whether total or partial, thereof.
-  ]]></text>
-  </license>
-  <license>
-    <product scope="media">icons8 images</product>
-    <author>icons8</author>
-    <license_type>Proprietary licensed</license_type>
-    <text><![CDATA[
-  Complete license available at https://icons8.com/vue-static/landings/pricing/icons8-license.pdf
-
-  a. Icons8 and its' subsidiaries grant the User or Licensee a worldwide, non-exclusive,
-non-transferable right to use; modify; or reproduce images; icons; photographs; and
-illustrations subject to restrictions or limitations as provided within this Licensing
-Agreement.
-
-Free and paid account holders may provide the third parties with the final product
-containing the Licensed Materials, if the third party agrees to the same terms and
-conditions (this document) as the Licensee. It is the Licensee’s responsibility to
-include a copy of the terms and conditions (this document) when providing third
-parties with the final product. Licensees are obligated to make third parties aware of
-the rules for crediting and distributing Licensed Materials stated in previous
-paragraphs.
-
-There is no restriction on personal or commercial use of any kind providing:
-
-I. Free Account Holders
-
-• Free Account Holders must not make derivative copies of any icons or music
-accessed, used, or downloaded from our website; however, Free Account Holders
-may use Icons8 Desktop Tools (Photo Creator, Ouch Creator, Icon Effects, OMGIMG, Pichon, Lunacy) to modify or change illustrations or photographs;
-• Free Account Holders must provide two hyperlinks to Licensed Materials used or
-embedded in a website or social media site as generated by the Icons8 website (or
-subsidiary site). One link shall be to the Icons8 website, and a secondary link to the
-location of the downloaded work, icon, photograph, illustration, or music. To
-maintain Free Account Holder status usage must comply with terms of this
-Agreement.
-
-II.Paid Users/Licensees
-
-• All paid Users and Licensees may make changes to photographs using our Photo
-Creator: https://photos.icons8.com/creator, including but not limited to derivative
-copies;
-• All paid Users and Licensees may make changes to or derivative copies of all
-Licensed Material found on the Icons8 website or subsidiary website including but
-not limited to: icons; illustrations; photographs; and music.
-• A User or Licensee may not resell or distribute Licensed Materials as stand-alone
-files (Example: Separate icon files in SVG format) without the express written
-consent of Icons8;
-• A User or Licensee is prohibited from exporting, distributing, or otherwise sharing
-our Licensed Content and Materials as stand-alone files (separating, reverse
-engineering, or making derivative copies of our Licensed Materials);
-
-b. Images and Licensed Materials may be used in any manner without restriction as to
-the number of copies, or personal or commercial usage provided such usage complies
-with provisions within this Agreement.
-
-c. The Licensee acknowledges that Icons8 retains all rights, title, and interest in
-copyrighted illustrations, icons, photographs, music, or other media created by Icons8
-staff; employees; or agents. Independent artists that create icons; photographs;
-music; or other Licensed Material for sale or distribution on the Icons8 website retain
-full rights of ownership and interest in their original works as provided herein.
-  ]]></text>
-  </license>
-  <license>
-    <product scope="media">unDraw illustrations</product>
-    <author>Katerina Limpitsouni</author>
-    <license_type>Proprietary licensed</license_type>
-    <text><![CDATA[
-  Copyright 2021 Katerina Limpitsouni
-All images, assets and vectors published on unDraw can be used for free. You can use them for noncommercial and commercial purposes. You do not need to ask permission from or provide credit to the creator or unDraw.
-
-More precisely, unDraw grants you an nonexclusive, worldwide copyright license to download, copy, modify, distribute, perform, and use the assets provided from unDraw for free, including for commercial purposes, without permission from or attributing the creator or unDraw. This license does not include the right to compile assets, vectors or images from unDraw to replicate a similar or competing service, in any form or distribute the assets in packs or otherwise. This extends to automated and non-automated ways to link, embed, scrape, search or download the assets included on the website without our consent.
-
-Regarding brand logos that are included:
-Are registered trademarks of their respected owners. Are included on a promotional basis and do not represent an association with unDraw or its users. Do not indicate any kind of endorsement of the trademark holder towards unDraw, nor vice versa. Are provided with the sole purpose to represent the actual brand/service/company that has registered the trademark and must not be used otherwise.
-  ]]></text>
-  </license>
-  <license>
-    <product scope="npm">bulma-scss</product>
-    <author>Jim Campbell</author>
-    <license_type>MIT</license_type>
-    <text><![CDATA[/node_modules/bulma-scss/LICENSE]]></text>
-  </license>
-  <license>
-    <product scope="npm">datatables.net</product>
-    <author>SpryMedia Ltd</author>
-    <license_type>MIT</license_type>
-    <text><![CDATA[/node_modules/datatables.net/License.txt]]></text>
-  </license>
-  <license>
-    <product scope="npm">datatables.net-fixedheader</product>
-    <author>SpryMedia Ltd</author>
-    <license_type>MIT</license_type>
-    <text><![CDATA[/node_modules/datatables.net-fixedheader/License.txt]]></text>
-  </license>
-  <license>
-    <product scope="npm">datatables.net-responsive</product>
-    <author>SpryMedia Ltd</author>
-    <license_type>MIT</license_type>
-    <text><![CDATA[/node_modules/datatables.net-responsive/License.txt]]></text>
-  </license>
-  <license>
-    <product scope="npm">datatables.net-scroller</product>
-    <author>SpryMedia Ltd</author>
-    <license_type>MIT</license_type>
-    <text><![CDATA[/node_modules/datatables.net-scroller/License.txt]]></text>
-  </license>
-  <license>
-    <product scope="npm">datatables.net-select</product>
-    <author>SpryMedia Ltd</author>
-    <license_type>MIT</license_type>
-    <text><![CDATA[/node_modules/datatables.net-select/License.txt]]></text>
-  </license>
-  <license>
-    <product scope="npm">popperjs/core</product>
-    <author>Federico Zivolo</author>
-    <license_type>MIT</license_type>
-    <text><![CDATA[/node_modules/@popperjs/core/LICENSE.md]]></text>
-  </license>
-  <license>
-    <product scope="npm">raleway-webfont</product>
-    <author>Pablo Impallari</author>
-    <license_type>MIT AND OFL-1.1</license_type>
-    <text><![CDATA[/node_modules/raleway-webfont/LICENSE]]></text>
-  </license>
-  <license>
-    <product scope="npm">scrollmagic</product>
-    <author>Jan Paepke</author>
-    <license_type>MIT OR GPL-3.0+</license_type>
-    <text><![CDATA[/node_modules/scrollmagic/LICENSE.md]]></text>
-  </license>
-  <license>
-    <product scope="npm">tippy.js</product>
-    <author>atomiks</author>
-    <license_type>MIT</license_type>
-    <text><![CDATA[/node_modules/tippy.js/LICENSE]]></text>
-  </license>
   <license>
           <product scope="lib">combodo/tcpdf</product>
           <author>Nicola Asuni - Combodo</author>
@@ -5293,85 +3526,6 @@ Public License instead of this License.  But first, please read
 
 **********************************************************************
 **********************************************************************
-  ]]></text>
-      </license>
-  <license>
-          <product scope="lib">container-interop/container-interop</product>
-          <author/>
-          <license_type>MIT</license_type>
-          <text><![CDATA[
-  The MIT License (MIT)
-
-Copyright (c) 2013 container-interop
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-  ]]></text>
-      </license>
-  <license>
-          <product scope="lib">doctrine/lexer</product>
-          <author>Guilherme Blanco - Roman Borschel - Johannes Schmitt</author>
-          <license_type>MIT</license_type>
-          <text><![CDATA[
-  Copyright (c) 2006-2018 Doctrine Project
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-  ]]></text>
-      </license>
-  <license>
-          <product scope="lib">egulias/email-validator</product>
-          <author>Eduardo Gulias Davis</author>
-          <license_type>MIT</license_type>
-          <text><![CDATA[
-  Copyright (c) 2013-2016 Eduardo Gulias Davis
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
   ]]></text>
       </license>
   <license>
@@ -5474,11 +3628,35 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
+  ]]></text>
+      </license>
+  <license>
+          <product scope="lib">guzzlehttp/promises/vendor-bin/php-cs-fixer</product>
+          <author/>
+          <license_type/>
+          <text><![CDATA[
+  
+  ]]></text>
+      </license>
+  <license>
+          <product scope="lib">guzzlehttp/promises/vendor-bin/phpstan</product>
+          <author/>
+          <license_type/>
+          <text><![CDATA[
+  
+  ]]></text>
+      </license>
+  <license>
+          <product scope="lib">guzzlehttp/promises/vendor-bin/psalm</product>
+          <author/>
+          <license_type/>
+          <text><![CDATA[
+  
   ]]></text>
       </license>
   <license>
           <product scope="lib">guzzlehttp/psr7</product>
-          <author>Graham Campbell - Michael Dowling - George Mponos - Tobias Nyholm - M&#xE1;rk S&#xE1;gi-Kaz&#xE1;r - Tobias Schultze</author>
+          <author>Graham Campbell - Michael Dowling - George Mponos - Tobias Nyholm - M&#xE1;rk S&#xE1;gi-Kaz&#xE1;r - Tobias Schultze - M&#xE1;rk S&#xE1;gi-Kaz&#xE1;r</author>
           <license_type>MIT</license_type>
           <text><![CDATA[
   The MIT License (MIT)
@@ -5514,8 +3692,7 @@ THE SOFTWARE.
           <author/>
           <license_type>BSD-3-Clause</license_type>
           <text><![CDATA[
-  Copyright (c) 2019, Laminas Foundation
-All rights reserved.
+  Copyright (c) 2020 Laminas Project a Series of LF Projects, LLC.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
@@ -5581,8 +3758,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
           <author/>
           <license_type>BSD-3-Clause</license_type>
           <text><![CDATA[
-  Copyright (c) 2019-2020, Laminas Foundation
-All rights reserved.
+  Copyright (c) 2020 Laminas Project a Series of LF Projects, LLC.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
@@ -5648,8 +3824,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
           <author/>
           <license_type>BSD-3-Clause</license_type>
           <text><![CDATA[
-  Copyright (c) 2019, Laminas Foundation
-All rights reserved.
+  Copyright (c) 2020 Laminas Project a Series of LF Projects, LLC.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
@@ -5682,40 +3857,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
           <author/>
           <license_type>BSD-3-Clause</license_type>
           <text><![CDATA[
-  Copyright (c) 2019, Laminas Foundation
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-- Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
-
-- Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-- Neither the name of Laminas Foundation nor the names of its contributors may
-  be used to endorse or promote products derived from this software without
-  specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  ]]></text>
-      </license>
-  <license>
-          <product scope="lib">laminas/laminas-zendframework-bridge</product>
-          <author/>
-          <license_type>BSD-3-Clause</license_type>
-          <text><![CDATA[
   Copyright (c) 2020 Laminas Project a Series of LF Projects, LLC.
 
 Redistribution and use in source and binary forms, with or without
@@ -6026,6 +4167,88 @@ FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
 COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
 IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+  ]]></text>
+      </license>
+  <license>
+          <product scope="lib">psr/event-dispatcher</product>
+          <author>PHP-FIG</author>
+          <license_type>MIT</license_type>
+          <text><![CDATA[
+  MIT License
+
+Copyright (c) 2018 PHP-FIG
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+  ]]></text>
+      </license>
+  <license>
+          <product scope="lib">psr/http-client</product>
+          <author>PHP-FIG</author>
+          <license_type>MIT</license_type>
+          <text><![CDATA[
+  Copyright (c) 2017 PHP Framework Interoperability Group
+
+Permission is hereby granted, free of charge, to any person obtaining a copy 
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights 
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 
+copies of the Software, and to permit persons to whom the Software is 
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in 
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+  ]]></text>
+      </license>
+  <license>
+          <product scope="lib">psr/http-factory</product>
+          <author>PHP-FIG</author>
+          <license_type>MIT</license_type>
+          <text><![CDATA[
+  MIT License
+
+Copyright (c) 2018 PHP-FIG
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
   ]]></text>
       </license>
   <license>
@@ -6078,34 +4301,6 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
-  ]]></text>
-      </license>
-  <license>
-          <product scope="lib">psr/simple-cache</product>
-          <author>PHP-FIG</author>
-          <license_type>MIT</license_type>
-          <text><![CDATA[
-  # The MIT License (MIT)
-
-Copyright (c) 2016 PHP Framework Interoperability Group
-
-> Permission is hereby granted, free of charge, to any person obtaining a copy
-> of this software and associated documentation files (the "Software"), to deal
-> in the Software without restriction, including without limitation the rights
-> to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-> copies of the Software, and to permit persons to whom the Software is
-> furnished to do so, subject to the following conditions:
->
-> The above copyright notice and this permission notice shall be included in
-> all copies or substantial portions of the Software.
->
-> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-> IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-> FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-> AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-> LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-> OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-> THE SOFTWARE.
   ]]></text>
       </license>
   <license>
@@ -6127,6 +4322,34 @@ furnished to do so, subject to the following conditions:
 The above copyright notice and this permission notice shall be included in all
 copies or substantial portions of the Software.
 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+  ]]></text>
+      </license>
+  <license>
+          <product scope="lib">sabberworm/php-css-parser</product>
+          <author>Raphael Schweikert</author>
+          <license_type>MIT</license_type>
+          <text><![CDATA[
+  MIT License
+
+Copyright (c) 2011 Raphael Schweikert, https://www.sabberworm.com/
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -6161,32 +4384,6 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-  ]]></text>
-      </license>
-  <license>
-          <product scope="lib">swiftmailer/swiftmailer</product>
-          <author>Chris Corbyn - Fabien Potencier</author>
-          <license_type>MIT</license_type>
-          <text><![CDATA[
-  Copyright (c) 2013-2021 Fabien Potencier
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
   ]]></text>
       </license>
   <license>
@@ -6194,7 +4391,7 @@ THE SOFTWARE.
           <author>Nicolas Grekas - Symfony Community</author>
           <license_type>MIT</license_type>
           <text><![CDATA[
-  Copyright (c) 2016-2020 Fabien Potencier
+  Copyright (c) 2016-2022 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -6216,11 +4413,11 @@ THE SOFTWARE.
   ]]></text>
       </license>
   <license>
-          <product scope="lib">symfony/class-loader</product>
-          <author>Fabien Potencier - Symfony Community</author>
+          <product scope="lib">symfony/cache-contracts</product>
+          <author>Nicolas Grekas - Symfony Community</author>
           <license_type>MIT</license_type>
           <text><![CDATA[
-  Copyright (c) 2004-2020 Fabien Potencier
+  Copyright (c) 2018-2022 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -6246,7 +4443,7 @@ THE SOFTWARE.
           <author>Fabien Potencier - Symfony Community</author>
           <license_type>MIT</license_type>
           <text><![CDATA[
-  Copyright (c) 2004-2020 Fabien Potencier
+  Copyright (c) 2004-2022 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -6272,7 +4469,7 @@ THE SOFTWARE.
           <author>Fabien Potencier - Symfony Community</author>
           <license_type>MIT</license_type>
           <text><![CDATA[
-  Copyright (c) 2004-2020 Fabien Potencier
+  Copyright (c) 2004-2023 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -6298,33 +4495,7 @@ THE SOFTWARE.
           <author>Fabien Potencier - Jean-Fran&#xE7;ois Simon - Symfony Community</author>
           <license_type>MIT</license_type>
           <text><![CDATA[
-  Copyright (c) 2004-2020 Fabien Potencier
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-  ]]></text>
-      </license>
-  <license>
-          <product scope="lib">symfony/debug</product>
-          <author>Fabien Potencier - Symfony Community</author>
-          <license_type>MIT</license_type>
-          <text><![CDATA[
-  Copyright (c) 2004-2020 Fabien Potencier
+  Copyright (c) 2004-2022 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -6350,7 +4521,33 @@ THE SOFTWARE.
           <author>Fabien Potencier - Symfony Community</author>
           <license_type>MIT</license_type>
           <text><![CDATA[
-  Copyright (c) 2004-2020 Fabien Potencier
+  Copyright (c) 2004-2022 Fabien Potencier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+  ]]></text>
+      </license>
+  <license>
+          <product scope="lib">symfony/deprecation-contracts</product>
+          <author>Nicolas Grekas - Symfony Community</author>
+          <license_type>MIT</license_type>
+          <text><![CDATA[
+  Copyright (c) 2020-2022 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -6376,7 +4573,33 @@ THE SOFTWARE.
           <author>Fabien Potencier - Symfony Community</author>
           <license_type>MIT</license_type>
           <text><![CDATA[
-  Copyright (c) 2016-2020 Fabien Potencier
+  Copyright (c) 2016-2023 Fabien Potencier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+  ]]></text>
+      </license>
+  <license>
+          <product scope="lib">symfony/error-handler</product>
+          <author>Fabien Potencier - Symfony Community</author>
+          <license_type>MIT</license_type>
+          <text><![CDATA[
+  Copyright (c) 2019-2022 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -6402,7 +4625,33 @@ THE SOFTWARE.
           <author>Fabien Potencier - Symfony Community</author>
           <license_type>MIT</license_type>
           <text><![CDATA[
-  Copyright (c) 2004-2020 Fabien Potencier
+  Copyright (c) 2004-2022 Fabien Potencier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+  ]]></text>
+      </license>
+  <license>
+          <product scope="lib">symfony/event-dispatcher-contracts</product>
+          <author>Nicolas Grekas - Symfony Community</author>
+          <license_type>MIT</license_type>
+          <text><![CDATA[
+  Copyright (c) 2018-2022 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -6428,7 +4677,7 @@ THE SOFTWARE.
           <author>Fabien Potencier - Symfony Community</author>
           <license_type>MIT</license_type>
           <text><![CDATA[
-  Copyright (c) 2004-2020 Fabien Potencier
+  Copyright (c) 2004-2022 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -6454,7 +4703,7 @@ THE SOFTWARE.
           <author>Fabien Potencier - Symfony Community</author>
           <license_type>MIT</license_type>
           <text><![CDATA[
-  Copyright (c) 2004-2020 Fabien Potencier
+  Copyright (c) 2004-2022 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -6480,7 +4729,7 @@ THE SOFTWARE.
           <author>Fabien Potencier - Symfony Community</author>
           <license_type>MIT</license_type>
           <text><![CDATA[
-  Copyright (c) 2004-2020 Fabien Potencier
+  Copyright (c) 2004-2023 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -6506,7 +4755,7 @@ THE SOFTWARE.
           <author>Fabien Potencier - Symfony Community</author>
           <license_type>MIT</license_type>
           <text><![CDATA[
-  Copyright (c) 2004-2020 Fabien Potencier
+  Copyright (c) 2004-2023 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -6532,33 +4781,7 @@ THE SOFTWARE.
           <author>Fabien Potencier - Symfony Community</author>
           <license_type>MIT</license_type>
           <text><![CDATA[
-  Copyright (c) 2004-2020 Fabien Potencier
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-  ]]></text>
-      </license>
-  <license>
-          <product scope="lib">symfony/polyfill-apcu</product>
-          <author>Nicolas Grekas - Symfony Community</author>
-          <license_type>MIT</license_type>
-          <text><![CDATA[
-  Copyright (c) 2015-2019 Fabien Potencier
+  Copyright (c) 2004-2023 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -6606,7 +4829,7 @@ THE SOFTWARE.
   ]]></text>
       </license>
   <license>
-          <product scope="lib">symfony/polyfill-iconv</product>
+          <product scope="lib">symfony/polyfill-intl-grapheme</product>
           <author>Nicolas Grekas - Symfony Community</author>
           <license_type>MIT</license_type>
           <text><![CDATA[
@@ -6700,58 +4923,6 @@ to do so, subject to the following conditions:
 The above copyright notice and this permission notice shall be included in all
 copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-  ]]></text>
-      </license>
-  <license>
-          <product scope="lib">symfony/polyfill-php56</product>
-          <author>Nicolas Grekas - Symfony Community</author>
-          <license_type>MIT</license_type>
-          <text><![CDATA[
-  Copyright (c) 2015-2019 Fabien Potencier
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-  ]]></text>
-      </license>
-  <license>
-          <product scope="lib">symfony/polyfill-php70</product>
-          <author>Nicolas Grekas - Symfony Community</author>
-          <license_type>MIT</license_type>
-          <text><![CDATA[
-  Copyright (c) 2015-2019 Fabien Potencier
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -6788,11 +4959,63 @@ THE SOFTWARE.
   ]]></text>
       </license>
   <license>
-          <product scope="lib">symfony/polyfill-util</product>
+          <product scope="lib">symfony/polyfill-php73</product>
           <author>Nicolas Grekas - Symfony Community</author>
           <license_type>MIT</license_type>
           <text><![CDATA[
-  Copyright (c) 2015-2019 Fabien Potencier
+  Copyright (c) 2018-2019 Fabien Potencier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+  ]]></text>
+      </license>
+  <license>
+          <product scope="lib">symfony/polyfill-php80</product>
+          <author>Ion Bazan - Nicolas Grekas - Symfony Community</author>
+          <license_type>MIT</license_type>
+          <text><![CDATA[
+  Copyright (c) 2020 Fabien Potencier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+  ]]></text>
+      </license>
+  <license>
+          <product scope="lib">symfony/polyfill-php81</product>
+          <author>Nicolas Grekas - Symfony Community</author>
+          <license_type>MIT</license_type>
+          <text><![CDATA[
+  Copyright (c) 2021 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -6818,7 +5041,33 @@ THE SOFTWARE.
           <author>Fabien Potencier - Symfony Community</author>
           <license_type>MIT</license_type>
           <text><![CDATA[
-  Copyright (c) 2004-2020 Fabien Potencier
+  Copyright (c) 2004-2022 Fabien Potencier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+  ]]></text>
+      </license>
+  <license>
+          <product scope="lib">symfony/service-contracts</product>
+          <author>Nicolas Grekas - Symfony Community</author>
+          <license_type>MIT</license_type>
+          <text><![CDATA[
+  Copyright (c) 2018-2022 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -6844,7 +5093,59 @@ THE SOFTWARE.
           <author>Fabien Potencier - Symfony Community</author>
           <license_type>MIT</license_type>
           <text><![CDATA[
-  Copyright (c) 2004-2020 Fabien Potencier
+  Copyright (c) 2004-2023 Fabien Potencier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+  ]]></text>
+      </license>
+  <license>
+          <product scope="lib">symfony/string</product>
+          <author>Nicolas Grekas - Symfony Community</author>
+          <license_type>MIT</license_type>
+          <text><![CDATA[
+  Copyright (c) 2019-2022 Fabien Potencier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+  ]]></text>
+      </license>
+  <license>
+          <product scope="lib">symfony/translation-contracts</product>
+          <author>Nicolas Grekas - Symfony Community</author>
+          <license_type>MIT</license_type>
+          <text><![CDATA[
+  Copyright (c) 2018-2022 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -6870,7 +5171,7 @@ THE SOFTWARE.
           <author>Fabien Potencier - Symfony Community</author>
           <license_type>MIT</license_type>
           <text><![CDATA[
-  Copyright (c) 2004-2020 Fabien Potencier
+  Copyright (c) 2004-2022 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -6896,7 +5197,7 @@ THE SOFTWARE.
           <author>Fabien Potencier - Symfony Community</author>
           <license_type>MIT</license_type>
           <text><![CDATA[
-  Copyright (c) 2004-2020 Fabien Potencier
+  Copyright (c) 2004-2023 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -6922,7 +5223,33 @@ THE SOFTWARE.
           <author>Nicolas Grekas - Symfony Community</author>
           <license_type>MIT</license_type>
           <text><![CDATA[
-  Copyright (c) 2014-2020 Fabien Potencier
+  Copyright (c) 2014-2022 Fabien Potencier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+  ]]></text>
+      </license>
+  <license>
+          <product scope="lib">symfony/var-exporter</product>
+          <author>Nicolas Grekas - Symfony Community</author>
+          <license_type>MIT</license_type>
+          <text><![CDATA[
+  Copyright (c) 2018-2022 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -6948,7 +5275,7 @@ THE SOFTWARE.
           <author>Fabien Potencier - Symfony Community</author>
           <license_type>MIT</license_type>
           <text><![CDATA[
-  Copyright (c) 2004-2020 Fabien Potencier
+  Copyright (c) 2004-2023 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -6974,7 +5301,7 @@ THE SOFTWARE.
           <author>Fabien Potencier - Symfony Community</author>
           <license_type>MIT</license_type>
           <text><![CDATA[
-  Copyright (c) 2004-2020 Fabien Potencier
+  Copyright (c) 2004-2023 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -7024,65 +5351,235 @@ SOFTWARE.
   ]]></text>
       </license>
   <license>
-          <product scope="lib">true/punycode</product>
-          <author>Renan Gon&#xE7;alves</author>
+          <product scope="lib">twig/twig</product>
+          <author>Fabien Potencier - Twig Team - Armin Ronacher</author>
+          <license_type>BSD-3-Clause</license_type>
+          <text><![CDATA[
+  Copyright (c) 2009-2022 by the Twig Team.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+    * Neither the name of Twig nor the names of its contributors
+      may be used to endorse or promote products derived from this software
+      without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  ]]></text>
+      </license>
+  <license>
+          <product scope="lib">webmozart/assert</product>
+          <author>Bernhard Schussek</author>
           <license_type>MIT</license_type>
           <text><![CDATA[
-  Copyright (c) 2014 TrueServer B.V.
+  The MIT License (MIT)
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
+Copyright (c) 2014 Bernhard Schussek
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
 
 The above copyright notice and this permission notice shall be included in all
 copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
   ]]></text>
       </license>
   <license>
-          <product scope="lib">twig/twig</product>
-          <author>Fabien Potencier - Twig Team - Armin Ronacher</author>
-          <license_type>BSD-3-Clause</license_type>
-          <text><![CDATA[
-  Copyright (c) 2009-2020 by the Twig Team.
+    <product scope="media">Freepik images</product>
+    <author>Freepik</author>
+    <license_type>Proprietary licensed</license_type>
+    <text><![CDATA[
+  The Company authorizes the User to download and use the Flaticon Content under the terms of this Section (see Section 7 in relation to the Sponsored Content). The Company and its licensors reserve all rights over the Flaticon Content not expressly granted in this license to the User.
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
+The Company authorizes the User in a non-transferable, limited, non-exclusive, manner and on a worldwide basis for the duration of the relevant rights; to download, use and modify the Flaticon Content, in a device the User owns or controls and only for the purposes and uses allowed in these Terms.
 
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
+The User may use the content in the Flaticon Content provided that it:
 
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
+Does not involve collective use;
+The content in the Flaticon Content is not used in a manner that suggests an association or endorsement by the Company or the Website;
+The content in the Flaticon Content or any derivative work is not used or included (in whole or in part) in a database, archive or in any other media/stock product, collection, set of clips, or library, for distribution or resale or used in any other way that could prevent or limit future visits or downloads from the Website;
+Does not resell, assign, transfer or sublicense the content in the Flaticon Content or any derived work from a content in the Flaticon Content;
+Does not use the content in the Flaticon Content in printed or electronic items (e.g. t-shirts, cups, postcards, birthday or greeting cards, invitations, calendars, web models or electronic devices, apps, videogames, advertising spots, audiovisual animations) aimed to be resold, in which the content in the Flaticon Content is the main element (because of size, relevance or any other cause, in case of doubt about whether the content is main element, it shall be deemed that the content is main element);
+Does not use the content in the Flaticon Content (totally or partially) in any trademark, logo or part of the same, which may be used by any other means to guarantee or to imply a guaranty of any product and/or service, unless the content in the Flaticon Content used in such cases is modified in such a way as to be a new and different content not confusingly similar with the original content in the Flaticon Content or implies a use of the content in the Flaticon Content as a template or test, and not as a final item or material;
+Does not make any use of the content in the Flaticon Content which might be considered defamatory, libellous, obscene, immoral or illegal, including, without limitation, using it in a way that places any person appearing in the content in the Flaticon Content in a negative light or depicts them in a way that they may find offensive such as the use in pornography, advertisements for escort or similar services, political endorsements, birth control products; and
+Does not make any use of the content in the Flaticon Content to slander, libel or to vilify a person, race, sex, culture, religion, country, region, town, village or any other place.
+When any content of the Flaticon Content is marked or identified as for editorial use, or when within the same there are logos, recognizable products, public buildings, public events or images taken in places where recognizable persons appear on the background, the User shall only be entitled to use it for such editorial use. In such cases, the User undertakes not to use that content in any manner that entails advertising, marketing or commercialization of any product or service. The User shall be directly liable and the Company shall not assume any liability as a result of the use for commercial purposes by the User of any content belonging to the Flaticon Content, which according to this paragraph should be for editorial use only.
 
-    * The names of the contributors may not be used to endorse or
-      promote products derived from this software without specific
-      prior written permission.
+The authorization to use the content in the Flaticon Content shall be free provided that any use of the content in the Flaticon Content by the User is credited to the Company/Website as stated by the Company from time to time. In order to benefit from the Service or to use the content in the Flaticon Content without acknowledging the Company/Website, the User must purchase a subscription (hereinafter, the "Subscription") in the Website and download the content in the Flaticon Content during the term of any such Subscription. Conditions in Section 9 shall apply to the purchase of the Subscription.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+It is forbidden for a User to authorize any third parties to use the Flaticon Content (or any modification of any content in the Flaticon Content). As an exception to the prohibition, the User may allow third parties to use the content in the Flaticon Content, when each and every of the following conditions are met:
+
+The third party has professionally instructed the User to produce goods or provide services to it/him/her and the User uses a limited number of items within the content in the Flaticon Content to produce such goods or provide such services to the instructing third party;
+The authorization granted by the User to the third party is in writing and complies with every restriction of the User’s authorization to use the relevant content in the Flaticon Content and includes, without limitation, a restriction for the third party to distribute, resell or license the relevant content in the Flaticon Content (i.e. the third party is the final user of the relevant content in the Flaticon Content);
+None of the contents in the Flaticon Content which are subject to the authorization are used as the main element (because of size, relevance or any other cause; in case of doubt about whether the content is the main element, it shall be deemed as the main element) in printed or electronic items (e.g. t-shirts, cups, postcards, birthday or greeting cards, invitations, calendars, web models or electronic devices, apps, videogames, advertising spots, audiovisual animations) aimed to be resold by the third party;
+The production of goods or provision of services by the User to the third party is not done by automatic means, it is tailor made for the third party (and therefore its use is not authorized by the User to any other third party) and requires a specific substantial human intervention from the User in relation to each third party, and;
+The User -and not the third party- chooses the specific items within the content of the Flaticon Content to be used in the production of goods or provision of services for the third party.
+When all of the above conditions are met, the User shall be entitled to authorize a third party to use the relevant content in the Flaticon Content. This exception refers only to the prohibition for the User to authorize third parties to use the content in the Flaticon Content without affecting or limiting in any way the remaining conditions of the User’s right to use the Flaticon Content. Whether the above conditions regarding the exception to the prohibition for Users to authorize third parties to use the content in the Flaticon Content are met shall be interpreted restrictively so that, in case of doubt, it shall be deemed that the conditions are not met.
+
+The User does not acquire any right as a result of the use of the content in the Flaticon Content. In particular, the User is not authorized to distribute, resell or rent any content in the Flaticon Content (or any modification of any content in the Flaticon Content).
+
+The User rights under this Section will end automatically without any notice if the User breaches any of the Terms. In case of termination of the rights hereunder, the User shall cease using content in the Flaticon Content and will destroy every copy, whether total or partial, thereof.
   ]]></text>
-      </license>
+  </license>
+  <license>
+    <product scope="media">icons8 images</product>
+    <author>icons8</author>
+    <license_type>Proprietary licensed</license_type>
+    <text><![CDATA[
+  Complete license available at https://icons8.com/vue-static/landings/pricing/icons8-license.pdf
+
+  a. Icons8 and its' subsidiaries grant the User or Licensee a worldwide, non-exclusive,
+non-transferable right to use; modify; or reproduce images; icons; photographs; and
+illustrations subject to restrictions or limitations as provided within this Licensing
+Agreement.
+
+Free and paid account holders may provide the third parties with the final product
+containing the Licensed Materials, if the third party agrees to the same terms and
+conditions (this document) as the Licensee. It is the Licensee’s responsibility to
+include a copy of the terms and conditions (this document) when providing third
+parties with the final product. Licensees are obligated to make third parties aware of
+the rules for crediting and distributing Licensed Materials stated in previous
+paragraphs.
+
+There is no restriction on personal or commercial use of any kind providing:
+
+I. Free Account Holders
+
+• Free Account Holders must not make derivative copies of any icons or music
+accessed, used, or downloaded from our website; however, Free Account Holders
+may use Icons8 Desktop Tools (Photo Creator, Ouch Creator, Icon Effects, OMGIMG, Pichon, Lunacy) to modify or change illustrations or photographs;
+• Free Account Holders must provide two hyperlinks to Licensed Materials used or
+embedded in a website or social media site as generated by the Icons8 website (or
+subsidiary site). One link shall be to the Icons8 website, and a secondary link to the
+location of the downloaded work, icon, photograph, illustration, or music. To
+maintain Free Account Holder status usage must comply with terms of this
+Agreement.
+
+II.Paid Users/Licensees
+
+• All paid Users and Licensees may make changes to photographs using our Photo
+Creator: https://photos.icons8.com/creator, including but not limited to derivative
+copies;
+• All paid Users and Licensees may make changes to or derivative copies of all
+Licensed Material found on the Icons8 website or subsidiary website including but
+not limited to: icons; illustrations; photographs; and music.
+• A User or Licensee may not resell or distribute Licensed Materials as stand-alone
+files (Example: Separate icon files in SVG format) without the express written
+consent of Icons8;
+• A User or Licensee is prohibited from exporting, distributing, or otherwise sharing
+our Licensed Content and Materials as stand-alone files (separating, reverse
+engineering, or making derivative copies of our Licensed Materials);
+
+b. Images and Licensed Materials may be used in any manner without restriction as to
+the number of copies, or personal or commercial usage provided such usage complies
+with provisions within this Agreement.
+
+c. The Licensee acknowledges that Icons8 retains all rights, title, and interest in
+copyrighted illustrations, icons, photographs, music, or other media created by Icons8
+staff; employees; or agents. Independent artists that create icons; photographs;
+music; or other Licensed Material for sale or distribution on the Icons8 website retain
+full rights of ownership and interest in their original works as provided herein.
+  ]]></text>
+  </license>
+  <license>
+    <product scope="media">unDraw illustrations</product>
+    <author>Katerina Limpitsouni</author>
+    <license_type>Proprietary licensed</license_type>
+    <text><![CDATA[
+  Copyright 2021 Katerina Limpitsouni
+All images, assets and vectors published on unDraw can be used for free. You can use them for noncommercial and commercial purposes. You do not need to ask permission from or provide credit to the creator or unDraw.
+
+More precisely, unDraw grants you an nonexclusive, worldwide copyright license to download, copy, modify, distribute, perform, and use the assets provided from unDraw for free, including for commercial purposes, without permission from or attributing the creator or unDraw. This license does not include the right to compile assets, vectors or images from unDraw to replicate a similar or competing service, in any form or distribute the assets in packs or otherwise. This extends to automated and non-automated ways to link, embed, scrape, search or download the assets included on the website without our consent.
+
+Regarding brand logos that are included:
+Are registered trademarks of their respected owners. Are included on a promotional basis and do not represent an association with unDraw or its users. Do not indicate any kind of endorsement of the trademark holder towards unDraw, nor vice versa. Are provided with the sole purpose to represent the actual brand/service/company that has registered the trademark and must not be used otherwise.
+  ]]></text>
+  </license>
+  <license>
+    <product scope="npm">bulma-scss</product>
+    <author>Jim Campbell</author>
+    <license_type>MIT</license_type>
+    <text><![CDATA[/node_modules/bulma-scss/LICENSE]]></text>
+  </license>
+  <license>
+    <product scope="npm">datatables.net</product>
+    <author>SpryMedia Ltd</author>
+    <license_type>MIT</license_type>
+    <text><![CDATA[/node_modules/datatables.net/License.txt]]></text>
+  </license>
+  <license>
+    <product scope="npm">datatables.net-fixedheader</product>
+    <author>SpryMedia Ltd</author>
+    <license_type>MIT</license_type>
+    <text><![CDATA[/node_modules/datatables.net-fixedheader/License.txt]]></text>
+  </license>
+  <license>
+    <product scope="npm">datatables.net-responsive</product>
+    <author>SpryMedia Ltd</author>
+    <license_type>MIT</license_type>
+    <text><![CDATA[/node_modules/datatables.net-responsive/License.txt]]></text>
+  </license>
+  <license>
+    <product scope="npm">datatables.net-scroller</product>
+    <author>SpryMedia Ltd</author>
+    <license_type>MIT</license_type>
+    <text><![CDATA[/node_modules/datatables.net-scroller/License.txt]]></text>
+  </license>
+  <license>
+    <product scope="npm">datatables.net-select</product>
+    <author>SpryMedia Ltd</author>
+    <license_type>MIT</license_type>
+    <text><![CDATA[/node_modules/datatables.net-select/License.txt]]></text>
+  </license>
+  <license>
+    <product scope="npm">popperjs/core</product>
+    <author>Federico Zivolo</author>
+    <license_type>MIT</license_type>
+    <text><![CDATA[/node_modules/@popperjs/core/LICENSE.md]]></text>
+  </license>
+  <license>
+    <product scope="npm">raleway-webfont</product>
+    <author>Pablo Impallari</author>
+    <license_type>MIT AND OFL-1.1</license_type>
+    <text><![CDATA[/node_modules/raleway-webfont/LICENSE]]></text>
+  </license>
+  <license>
+    <product scope="npm">scrollmagic</product>
+    <author>Jan Paepke</author>
+    <license_type>MIT OR GPL-3.0+</license_type>
+    <text><![CDATA[/node_modules/scrollmagic/LICENSE.md]]></text>
+  </license>
+  <license>
+    <product scope="npm">tippy.js</product>
+    <author>atomiks</author>
+    <license_type>MIT</license_type>
+    <text><![CDATA[/node_modules/tippy.js/LICENSE]]></text>
+  </license>
 </licenses>
diff --git a/setup/phpinfo.php b/setup/phpinfo.php
index faabf0f08f..6ad54bd7f2 100644
--- a/setup/phpinfo.php
+++ b/setup/phpinfo.php
@@ -17,11 +17,27 @@
  * You should have received a copy of the GNU Affero General Public License
  */
 
+/**
+ * Since N°1934 this page is accessible only to iTop admin users
+ * @since 2.5.2 2.6.1 2.7.0 N°1934 must login as admin user to use
+ *        to check if PHP is up and running, use phpcheck.php !
+ */
 require_once('../approot.inc.php');
 
-require_once(APPROOT.'/application/startup.inc.php');
+try {
+	require_once(APPROOT.'/application/startup.inc.php');
+} catch (Exception $e) {
+	// This means we don't have a valid iTop installation running
+	echo <<<EOF
+No valid installation found, cannot continue !<br>
+If you need to check that PHP is running, use <a href="phpcheck.php">phpcheck.php</a>
+EOF;
+	die(-1);
+}
 
 require_once(APPROOT.'/application/loginwebpage.class.inc.php');
-LoginWebPage::DoLogin(true); // Check user rights and prompt if needed
+LoginWebPage::DoLogin(true); // Check user rights and prompt if needed (N°1934)
+
+/** @noinspection ForgottenDebugOutputInspection */
 phpinfo();
 ?>
diff --git a/setup/xmldataloader.class.inc.php b/setup/xmldataloader.class.inc.php
index 53da7867d8..906389143a 100644
--- a/setup/xmldataloader.class.inc.php
+++ b/setup/xmldataloader.class.inc.php
@@ -189,14 +189,17 @@ class XMLDataLoader
 	function LoadFile($sFilePath, $bUpdateKeyCacheOnly = false, bool $bSearch = false)
 	{
 		global $aKeys;
-		
+
 		$oXml = simplexml_load_file($sFilePath);
-		
-		$aReplicas  = array();
-		foreach($oXml as $sClass => $oXmlObj)
-		{
-			if (!MetaModel::IsValidClass($sClass))
-			{
+
+		if (!$oXml) {
+			SetupLog::Error("Unable to load xml file - $sFilePath");
+			throw(new Exception("Unable to load xml file - $sFilePath"));
+		}
+
+		$aReplicas = array();
+		foreach ($oXml as $sClass => $oXmlObj) {
+			if (!MetaModel::IsValidClass($sClass)) {
 				SetupLog::Error("Unknown class - $sClass");
 				throw(new Exception("Unknown class - $sClass"));
 			}
diff --git a/sources/Application/TwigBase/Controller/Controller.php b/sources/Application/TwigBase/Controller/Controller.php
index 47bf8f9177..87763a40a7 100644
--- a/sources/Application/TwigBase/Controller/Controller.php
+++ b/sources/Application/TwigBase/Controller/Controller.php
@@ -377,7 +377,7 @@ abstract class Controller extends AbstractController
 	}
 
 	/**
-	 * Display an AJAX page (AjaxPage)
+	 * Display an Setup page (SetupPage)
 	 *
 	 * @api
 	 *
diff --git a/sources/Application/UI/Base/Component/DataTable/DataTableUIBlockFactory.php b/sources/Application/UI/Base/Component/DataTable/DataTableUIBlockFactory.php
index 545bb92a36..78c21b2194 100644
--- a/sources/Application/UI/Base/Component/DataTable/DataTableUIBlockFactory.php
+++ b/sources/Application/UI/Base/Component/DataTable/DataTableUIBlockFactory.php
@@ -31,6 +31,8 @@ use DBObjectSet;
 use DeprecatedCallsLog;
 use Dict;
 use DisplayBlock;
+use IssueLog;
+use LogChannels;
 use MenuBlock;
 use MetaModel;
 use UserRights;
@@ -136,7 +138,7 @@ class DataTableUIBlockFactory extends AbstractUIBlockFactory
 			$aExtraParams['filter_this_list_url'] = $sFilterListUrl;
 		}
 
-		if (!isset($aExtraParams['menu']) || $aExtraParams['menu']) {
+		if (!isset($aExtraParams['menu']) || $aExtraParams['menu'] === "1" || $aExtraParams['menu'] === true) {
 			$oMenuBlock = new MenuBlock($oSet->GetFilter(), $sStyle);
 			$aExtraParams['refresh_action'] = $oDataTable->GetJSRefresh();
 			$oBlockMenu = $oMenuBlock->GetRenderContent($oPage, $aExtraParams, $sListId);
@@ -320,7 +322,7 @@ class DataTableUIBlockFactory extends AbstractUIBlockFactory
 					$aExtraFields[$sClassAlias][] = $sAttCode;
 				}
 			} else {
-				$aExtraFields['*'] = $sAttCode;
+				$aExtraFields['*'][] = $sFieldName;
 			}
 		}
 
@@ -333,11 +335,21 @@ class DataTableUIBlockFactory extends AbstractUIBlockFactory
 			}
 		}
 		foreach ($aAuthorizedClasses as $sAlias => $sClassName) {
-			if (array_key_exists($sAlias, $aExtraFields)) {
+			// In case there is only 1 "alias" for the extra fields and it is the fallback ("*"), then consider that all fields are for the current alias.
+			// This is for the particular use case when the zlist is set to false and extra fields are specified.
+			if ( (count($aExtraFields) === 1) && (array_keys($aExtraFields)[0] === '*') ) {
+				$aLists[$sAlias] = $aExtraFields['*'];
+			}
+			// Regular use case, dispatch fields to their corresponding aliases
+			else if (array_key_exists($sAlias, $aExtraFields)) {
 				$aLists[$sAlias] = $aExtraFields[$sAlias];
-			} else {
+			}
+			// Finally, if unknown alias, ignore fields
+			else {
 				$aLists[$sAlias] = array();
 			}
+
+			// If zlist specified, merge its fields with the currently present
 			if ($sZListName !== false) {
 				$aDefaultList = MetaModel::FlattenZList(MetaModel::GetZListItems($sClassName, $sZListName));
 				$aLists[$sAlias] = array_merge($aDefaultList, $aLists[$sAlias]);
@@ -388,6 +400,18 @@ class DataTableUIBlockFactory extends AbstractUIBlockFactory
 			}
 		}
 
+		// N°6356 Check if there is at least 1 class remaining to display
+		if (count($aLists) === 0) {
+			IssueLog::Debug('Could not find any class / attribute to display in the list. Did you ensure the selected classes have the requested zlist? As a fallback, we will just display the friendlyname for the first selected class.', LogChannels::DATATABLE, [
+				'selected_classes' => $aClassAliases,
+				'zlist' => $sZListName,
+			]);
+
+			$sFirstClassAlias = array_keys($aClassAliases)[0];
+			$aAuthorizedClasses[$sFirstClassAlias] = $aClassAliases[$sFirstClassAlias];
+			$aLists[$sFirstClassAlias] = [];
+		}
+
 		$oDefaultSettings = DataTableSettings::GetDataModelSettings($aAuthorizedClasses, $bViewLink, $aLists);
 
 		$bDisplayLimit = isset($aExtraParams['display_limit']) ? $aExtraParams['display_limit'] : true;
diff --git a/sources/Application/UI/Base/Component/DataTable/StaticTable/StaticTable.php b/sources/Application/UI/Base/Component/DataTable/StaticTable/StaticTable.php
index 5aca7b6c20..14eabda123 100644
--- a/sources/Application/UI/Base/Component/DataTable/StaticTable/StaticTable.php
+++ b/sources/Application/UI/Base/Component/DataTable/StaticTable/StaticTable.php
@@ -151,7 +151,10 @@ class StaticTable extends UIContentBlock
 		return "$.post('".utils::GetAbsoluteUrlAppRoot()."pages/ajax.render.php?operation=refreshDashletList', ".json_encode($aParams).", 
 					function (data) {
 						$('#".$this->sId."').DataTable().clear();
-	                    $('#".$this->sId."').dataTable().fnAddData(data);
+						if (data.length>0)
+	                    {
+			                    $('#".$this->sId."').dataTable().fnAddData(data);
+						}
 					});";
 	}
 
diff --git a/sources/Application/UI/Base/Component/Input/Set/Set.php b/sources/Application/UI/Base/Component/Input/Set/Set.php
index d145db15c1..8044449867 100644
--- a/sources/Application/UI/Base/Component/Input/Set/Set.php
+++ b/sources/Application/UI/Base/Component/Input/Set/Set.php
@@ -205,6 +205,16 @@ class Set extends AbstractInput
 		return $this;
 	}
 
+	/**
+	 * HasAddOptionButtonJsOnClick.
+	 *
+	 * @return bool
+	 */
+	public function HasAddOptionButtonJsOnClick(): bool
+	{
+		return $this->sAddOptionButtonJsOnClick != null;
+	}
+
 	/**
 	 * GetAddOptionButtonJsOnClick.
 	 *
diff --git a/sources/Application/UI/Base/Layout/Object/ObjectSummary.php b/sources/Application/UI/Base/Layout/Object/ObjectSummary.php
index 7e2ccebdf2..7925ca46d2 100644
--- a/sources/Application/UI/Base/Layout/Object/ObjectSummary.php
+++ b/sources/Application/UI/Base/Layout/Object/ObjectSummary.php
@@ -172,4 +172,20 @@ class ObjectSummary extends ObjectDetails
 		$this->aObjectDisplayValues = $aObjectDisplayValues;
 		return $this;
 	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public static function GetShortcutKeys(): array
+	{
+		return [];
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public static function GetShortcutTriggeredElementSelector(): string
+	{
+		return "";
+	}
 }
\ No newline at end of file
diff --git a/sources/Application/UI/Links/Direct/BlockDirectLinkSetViewTable.php b/sources/Application/UI/Links/Direct/BlockDirectLinkSetViewTable.php
index 9a8d51a121..831193e9b5 100644
--- a/sources/Application/UI/Links/Direct/BlockDirectLinkSetViewTable.php
+++ b/sources/Application/UI/Links/Direct/BlockDirectLinkSetViewTable.php
@@ -48,9 +48,8 @@ class BlockDirectLinkSetViewTable extends AbstractBlockLinkSetViewTable
 			$aExtraParams['panel_title_tooltip'] = $this->oAttDef->GetDescription();
 		}
 
-		// Add creation in modal if the linkset is not readonly
-		if (!$this->oAttDef->GetReadOnly()
-			&& $this->oAttDef->GetEditMode() != LINKSET_EDITMODE_NONE
+		// Add creation in modal if edit mode is not NONE
+		if ($this->oAttDef->GetEditMode() != LINKSET_EDITMODE_NONE
 			&& $this->bIsAllowCreate) {
 			$aExtraParams['creation_in_modal'] = true;
 			$aExtraParams['creation_in_modal_tooltip'] = $this->oAttDef->GetEditMode() == LINKSET_EDITMODE_ADDREMOVE ? $this->GetDictionaryEntry(static::DICT_ADD_BUTTON_TOOLTIP) : $this->GetDictionaryEntry(static::DICT_CREATE_BUTTON_TOOLTIP);
diff --git a/sources/Application/UI/Links/Indirect/BlockIndirectLinkSetEditTable.php b/sources/Application/UI/Links/Indirect/BlockIndirectLinkSetEditTable.php
index ea716035d3..21346df70b 100644
--- a/sources/Application/UI/Links/Indirect/BlockIndirectLinkSetEditTable.php
+++ b/sources/Application/UI/Links/Indirect/BlockIndirectLinkSetEditTable.php
@@ -67,6 +67,7 @@ class BlockIndirectLinkSetEditTable extends UIContentBlock
 
 	// User rights
 	private bool $bIsAllowCreate;
+	private bool $bIsAllowModify;
 	private bool $bIsAllowDelete;
 
 	/**
diff --git a/sources/Application/UI/Links/Indirect/BlockIndirectLinkSetViewTable.php b/sources/Application/UI/Links/Indirect/BlockIndirectLinkSetViewTable.php
index 94f222f6c1..dbd18fa180 100644
--- a/sources/Application/UI/Links/Indirect/BlockIndirectLinkSetViewTable.php
+++ b/sources/Application/UI/Links/Indirect/BlockIndirectLinkSetViewTable.php
@@ -43,7 +43,7 @@ class BlockIndirectLinkSetViewTable extends AbstractBlockLinkSetViewTable
 			'object_id'     => $this->oDbObject->GetKey(),
 			'target_attr'   => $this->oAttDef->GetExtKeyToRemote(),
 			'view_link'     => false,
-			'menu'          => false,
+			'menu'          => MetaModel::GetConfig()->Get('allow_menu_on_linkset'),
 			'display_limit' => true,
 			'table_id'      => $this->GetTableId(),
 			'zlist'         => false,
@@ -59,9 +59,8 @@ class BlockIndirectLinkSetViewTable extends AbstractBlockLinkSetViewTable
 			$aExtraParams['panel_title_tooltip'] = $this->oAttDef->GetDescription();
 		}
 
-		// Add creation in modal if the linkset is not readonly
-		if (!$this->oAttDef->GetReadOnly()
-			&& $this->bIsAllowCreate) {
+		// Add creation in modal if creation allowed
+		if ( $this->bIsAllowCreate) {
 			$aExtraParams['creation_in_modal'] = true;
 			$aExtraParams['creation_in_modal_tooltip'] = $this->GetDictionaryEntry(static::DICT_ADD_BUTTON_TOOLTIP);
 			$aExtraParams['creation_in_modal_form_title'] = $this->GetDictionaryEntry(static::DICT_ADD_MODAL_TITLE);
diff --git a/sources/Application/WebPage/WebPage.php b/sources/Application/WebPage/WebPage.php
index 7455ee1799..21922b54a6 100644
--- a/sources/Application/WebPage/WebPage.php
+++ b/sources/Application/WebPage/WebPage.php
@@ -836,13 +836,13 @@ class WebPage implements Page
 
 		$sEntriesAsJson = json_encode($aEntries);
 		$sJSFile = <<<JS
-// Create variable so it can be used by the Dict class on initialization
+// Create variable, so it can be used by the Dict class on initialization
 var aDictEntries = {$sEntriesAsJson};
 
 // Check if Dict._entries already exists in order to complete, this is for async calls only.
 // Note: We should not overload the WebPage::get_dict_file_content() in AjaxPage to put the part below as the same dict file can be consumed either by a regular page or an async page.
 if ((typeof Dict != "undefined") && (typeof Dict._entries != "undefined")) {
-	$.extend(Dict._entries, aDictEntries);
+	Object.assign(Dict._entries, aDictEntries);
 }
 JS;
 
diff --git a/sources/Controller/Base/Layout/ObjectController.php b/sources/Controller/Base/Layout/ObjectController.php
index 7479f8a150..1725be8dc4 100644
--- a/sources/Controller/Base/Layout/ObjectController.php
+++ b/sources/Controller/Base/Layout/ObjectController.php
@@ -398,24 +398,31 @@ JS;
 				{
 					IssueLog::Trace(__CLASS__.'::'.__METHOD__.' Object not created (see $aErrors)', $sClass, array(
 						'$sTransactionId' => $sTransactionId,
-						'$aErrors' => $aErrors,
-						'$sUser' => UserRights::GetUser(),
-						'HTTP_REFERER' => @$_SERVER['HTTP_REFERER'],
-						'REQUEST_URI' => @$_SERVER['REQUEST_URI'],
+						'$aErrors'        => $aErrors,
+						'$sUser'          => UserRights::GetUser(),
+						'HTTP_REFERER'    => @$_SERVER['HTTP_REFERER'],
+						'REQUEST_URI'     => @$_SERVER['REQUEST_URI'],
 					));
 
 					throw new CoreCannotSaveObjectException(array('id' => $oObj->GetKey(), 'class' => $sClass, 'issues' => $aErrors));
 				}
 
-				$oObj->DBInsertNoReload();// No need to reload
+				// Transactions are now handled in DBInsert
+				$oObj->SetContextSection('temporary_objects', [
+					'finalize' => [
+						'transaction_id' => $sTransactionId,
+					],
+				]);
+				$oObj->DBInsertNoReload();
+
 
 				IssueLog::Trace(__CLASS__.'::'.__METHOD__.' Object created', $sClass, array(
-					'$id' => $oObj->GetKey(),
+					'$id'             => $oObj->GetKey(),
 					'$sTransactionId' => $sTransactionId,
-					'$aErrors' => $aErrors,
-					'$sUser' => UserRights::GetUser(),
-					'HTTP_REFERER' => @$_SERVER['HTTP_REFERER'],
-					'REQUEST_URI' => @$_SERVER['REQUEST_URI'],
+					'$aErrors'        => $aErrors,
+					'$sUser'          => UserRights::GetUser(),
+					'HTTP_REFERER'    => @$_SERVER['HTTP_REFERER'],
+					'REQUEST_URI'     => @$_SERVER['REQUEST_URI'],
 				));
 
 				utils::RemoveTransaction($sTransactionId);
@@ -596,23 +603,28 @@ JS;
 			else
 			{
 				IssueLog::Trace(__CLASS__.'::'.__METHOD__.' Object updated', $sClass, array(
-					'$id' => $id,
+					'$id'             => $id,
 					'$sTransactionId' => $sTransactionId,
-					'$aErrors' => $aErrors,
-					'IsModified' => $oObj->IsModified(),
-					'$sUser' => UserRights::GetUser(),
-					'HTTP_REFERER' => @$_SERVER['HTTP_REFERER'],
-					'REQUEST_URI' => @$_SERVER['REQUEST_URI'],
+					'$aErrors'        => $aErrors,
+					'IsModified'      => $oObj->IsModified(),
+					'$sUser'          => UserRights::GetUser(),
+					'HTTP_REFERER'    => @$_SERVER['HTTP_REFERER'],
+					'REQUEST_URI'     => @$_SERVER['REQUEST_URI'],
 				));
 
-				try
-				{
-					if (!empty($aErrors))
-					{
+				try {
+					if (!empty($aErrors)) {
 						throw new CoreCannotSaveObjectException(array('id' => $oObj->GetKey(), 'class' => $sClass, 'issues' => $aErrors));
 					}
+
 					// Transactions are now handled in DBUpdate
+					$oObj->SetContextSection('temporary_objects', [
+						'finalize' => [
+							'transaction_id' => $sTransactionId,
+						],
+					]);
 					$oObj->DBUpdate();
+
 					$sMessage = Dict::Format('UI:Class_Object_Updated', MetaModel::GetName(get_class($oObj)), $oObj->GetName());
 					$sSeverity = 'ok';
 					if ($this->IsHandlingXmlHttpRequest()) {
diff --git a/sources/Controller/OAuth/OAuthLandingController.php b/sources/Controller/OAuth/OAuthLandingController.php
index 4b869d8c18..44704cbfce 100644
--- a/sources/Controller/OAuth/OAuthLandingController.php
+++ b/sources/Controller/OAuth/OAuthLandingController.php
@@ -3,11 +3,13 @@
 namespace Combodo\iTop\Controller\OAuth;
 
 use Combodo\iTop\Application\TwigBase\Controller\Controller;
+use utils;
 
 class OAuthLandingController extends Controller
 {
 	public function OperationLanding()
 	{
-		$this->DisplayAjaxPage([]);
+		$this->AddLinkedScript(utils::GetAbsoluteUrlAppRoot().'/js/jquery.min.js');
+		$this->DisplayPage([], null, static::ENUM_PAGE_TYPE_BASIC_HTML);
 	}
 }
\ No newline at end of file
diff --git a/sources/Controller/TemporaryObjects/TemporaryObjectController.php b/sources/Controller/TemporaryObjects/TemporaryObjectController.php
new file mode 100644
index 0000000000..7cbfdc55c2
--- /dev/null
+++ b/sources/Controller/TemporaryObjects/TemporaryObjectController.php
@@ -0,0 +1,80 @@
+<?php
+/*
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+namespace Combodo\iTop\Controller\TemporaryObjects;
+
+use Combodo\iTop\Controller\AbstractController;
+use Combodo\iTop\Service\TemporaryObjects\TemporaryObjectManager;
+use JsonPage;
+use utils;
+
+/**
+ * TemporaryObjectController.
+ *
+ * Temporary object endpoints.
+ *
+ * @experimental do not use, this feature will be part of a future version
+ *
+ * @since 3.1
+ */
+class TemporaryObjectController extends AbstractController
+{
+	public const ROUTE_NAMESPACE = 'temporary_object';
+
+	/** @var \Combodo\iTop\Service\TemporaryObjects\TemporaryObjectManager Temporary object manager */
+	private TemporaryObjectManager $oTemporaryObjectManager;
+
+	/**
+	 * Constructor.
+	 *
+	 */
+	public function __construct()
+	{
+		// Retrieve controller dependencies
+		$this->oTemporaryObjectManager = TemporaryObjectManager::GetInstance();
+	}
+
+	/**
+	 * OperationWatchDog.
+	 *
+	 * Watchdog for delaying expiration date of temporary objects linked to the provided temporary id.
+	 *
+	 * @return JsonPage
+	 */
+	public function OperationWatchDog(): JsonPage
+	{
+		$oPage = new JsonPage();
+
+		// Retrieve temp id
+		$sTempId = utils::ReadParam('temp_id', '', false, utils::ENUM_SANITIZATION_FILTER_STRING);
+
+		// Delay temporary objects expiration
+		$bResult = $this->oTemporaryObjectManager->ExtendTemporaryObjectsLifetime($sTempId);
+
+		return $oPage->SetData([
+			'success' => $bResult,
+		]);
+	}
+
+	/**
+	 * OperationGarbage.
+	 *
+	 * Garbage temporary objects based on expiration date.
+	 *
+	 * @return JsonPage
+	 */
+	public function OperationGarbage(): JsonPage
+	{
+		$oPage = new JsonPage();
+
+		// Garbage expired temporary objects
+		$bResult = $this->oTemporaryObjectManager->GarbageExpiredTemporaryObjects();
+
+		return $oPage->SetData([
+			'success' => $bResult,
+		]);
+	}
+}
\ No newline at end of file
diff --git a/sources/Form/Field/AbstractSimpleField.php b/sources/Form/Field/AbstractSimpleField.php
new file mode 100644
index 0000000000..fc88d412ae
--- /dev/null
+++ b/sources/Form/Field/AbstractSimpleField.php
@@ -0,0 +1,62 @@
+<?php
+/*
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+namespace Combodo\iTop\Form\Field;
+
+use Combodo\iTop\Form\Validator\MandatoryValidator;
+
+/**
+ * @since 3.1.0 N°6414
+ */
+class AbstractSimpleField extends Field
+{
+	final public function Validate()
+	{
+		$this->SetValid(true);
+		$this->EmptyErrorMessages();
+
+		if ($this->bValidationDisabled) {
+			return $this->GetValid();
+		}
+
+		$bEmpty = (($this->GetCurrentValue() === null) || ($this->GetCurrentValue() === ''));
+
+		if (!$bEmpty || $this->GetMandatory()) {
+			foreach ($this->GetValidators() as $oValidator) {
+				$aValidationErrorMessages = $oValidator->Validate($this->GetCurrentValue());
+
+				if (count($aValidationErrorMessages) > 0) {
+					$this->SetValid(false);
+					foreach ($aValidationErrorMessages as $sErrorMessage) {
+						$this->AddErrorMessage($sErrorMessage);
+					}
+				}
+			}
+		}
+
+		return $this->GetValid();
+	}
+
+	public function SetMandatory(bool $bMandatory)
+	{
+		// Before changing the property, we check if it was already mandatory. If not, we had the mandatory validator
+		if ($bMandatory && !$this->bMandatory) {
+			$this->AddValidator($this->GetMandatoryValidatorInstance());
+		}
+
+		if (false === $bMandatory) {
+			foreach ($this->aValidators as $iKey => $oValue) {
+				if ($oValue instanceof MandatoryValidator) {
+					unset($this->aValidators[$iKey]);
+				}
+			}
+		}
+
+		$this->bMandatory = $bMandatory;
+
+		return parent::SetMandatory($bMandatory);
+	}
+}
\ No newline at end of file
diff --git a/sources/Form/Field/BlobField.php b/sources/Form/Field/BlobField.php
index 210f55f119..871f957313 100644
--- a/sources/Form/Field/BlobField.php
+++ b/sources/Form/Field/BlobField.php
@@ -19,15 +19,15 @@
 
 namespace Combodo\iTop\Form\Field;
 
-use utils;
 use Dict;
+use utils;
 
 /**
  * Description of BlobField
  *
  * @author Guillaume Lajarige <guillaume.lajarige@combodo.com>
  */
-class BlobField extends Field
+class BlobField extends AbstractSimpleField
 {
 	/** @var string */
 	protected $sDownloadUrl;
diff --git a/sources/Form/Field/DurationField.php b/sources/Form/Field/DurationField.php
index 469aef11b3..96eeb12bec 100644
--- a/sources/Form/Field/DurationField.php
+++ b/sources/Form/Field/DurationField.php
@@ -19,13 +19,13 @@
 
 namespace Combodo\iTop\Form\Field;
 
-use Str;
 use AttributeDuration;
+use Str;
 
 /**
  * Description of StringField
  */
-class DurationField extends Field
+class DurationField extends AbstractSimpleField
 {
 
 	/**
diff --git a/sources/Form/Field/Field.php b/sources/Form/Field/Field.php
index eeb5c31755..c89a077e79 100644
--- a/sources/Form/Field/Field.php
+++ b/sources/Form/Field/Field.php
@@ -8,8 +8,8 @@
 namespace Combodo\iTop\Form\Field;
 
 use Closure;
+use Combodo\iTop\Form\Validator\AbstractValidator;
 use Combodo\iTop\Form\Validator\MandatoryValidator;
-use Combodo\iTop\Form\Validator\Validator;
 
 /**
  * Description of Field
@@ -68,8 +68,14 @@ abstract class Field
 	protected $bMandatory;
 	/** @var string */
 	protected $sDisplayMode;
-	/** @var array */
+	/** @var AbstractValidator[] */
 	protected $aValidators;
+	/**
+	 * @var bool
+	 * @since 3.1.0 N°6414
+	 */
+	protected $bValidationDisabled;
+
 	/** @var bool */
 	protected $bValid;
 	/** @var array */
@@ -96,6 +102,7 @@ abstract class Field
 		$this->bMandatory = static::DEFAULT_MANDATORY;
 		$this->sDisplayMode = static::DEFAULT_DISPLAY_MODE;
 		$this->aValidators = array();
+		$this->bValidationDisabled = false;
 		$this->bValid = static::DEFAULT_VALID;
 		$this->aErrorMessages = array();
 		$this->onFinalizeCallback = $onFinalizeCallback;
@@ -221,10 +228,6 @@ abstract class Field
         return $this->sDisplayMode;
     }
 
-	/**
-	 *
-	 * @return array
-	 */
 	public function GetValidators()
 	{
 		return $this->aValidators;
@@ -345,38 +348,46 @@ abstract class Field
 	 * Setting the value will automatically add/remove a MandatoryValidator to the Field
 	 *
 	 * @param boolean $bMandatory
+	 *
 	 * @return $this
 	 */
 	public function SetMandatory(bool $bMandatory)
 	{
 		// Before changing the property, we check if it was already mandatory. If not, we had the mandatory validator
-		if ($bMandatory && !$this->bMandatory)
-		{
-			$this->AddValidator(new MandatoryValidator());
+		if ($bMandatory && !$this->bMandatory) {
+			$this->AddValidator($this->GetMandatoryValidatorInstance());
 		}
 
-		if (!$bMandatory)
-		{
-			foreach ($this->aValidators as $iKey => $oValue)
-			{
-				if ($oValue::Getname() === MandatoryValidator::GetName())
-				{
-					unset($this->aValidators[$iKey]);
-				}
-			}
-		}
+		if (false === $bMandatory) {
+			foreach ($this->aValidators as $iKey => $oValue) {
+				if ($oValue instanceof MandatoryValidator) {
+                    unset($this->aValidators[$iKey]);
+                }
+            }
+        }
 
 		$this->bMandatory = $bMandatory;
+
 		return $this;
 	}
 
+    /**
+     * @return AbstractValidator
+     * @since 3.1.0 N°6414
+     */
+	protected function GetMandatoryValidatorInstance(): AbstractValidator
+	{
+		return new MandatoryValidator();
+	}
+
 	/**
 	 * Sets if the field is must change or not.
 	 * Note: This not implemented yet! Just a pre-conception for CaseLogField
 	 *
-	 * @todo Implement
 	 * @param boolean $bMustChange
+	 *
 	 * @return $this
+	 * @todo Implement
 	 */
 	public function SetMustChange(bool $bMustChange)
 	{
@@ -469,43 +480,58 @@ abstract class Field
 		return $this;
 	}
 
-	/**
-	 *
-	 * @param \Combodo\iTop\Form\Validator\Validator $oValidator
-	 * @return $this
-	 */
-	public function AddValidator(Validator $oValidator)
+    /**
+     * @param AbstractValidator $oValidator
+     * @return $this
+     */
+	public function AddValidator(AbstractValidator $oValidator)
 	{
 		$this->aValidators[] = $oValidator;
+
 		return $this;
 	}
 
 	/**
-	 *
-	 * @param \Combodo\iTop\Form\Validator\Validator $oValidator
 	 * @return $this
 	 */
-	public function RemoveValidator(Validator $oValidator)
+	public function RemoveValidator(AbstractValidator $oValidator)
 	{
-		foreach ($this->aValidators as $iKey => $oValue)
-		{
-			if ($oValue === $oValidator)
-			{
+		foreach ($this->aValidators as $iKey => $oValue) {
+			if ($oValue === $oValidator) {
 				unset($this->aValidators[$iKey]);
 			}
 		}
+
 		return $this;
 	}
 
+	/**
+     * @param string $sValidatorClassName validator class name, should be one of {@see AbstractValidator} children
+     * @return $this
+     * @since 3.1.0 N°6414
+     */
+    final public function RemoveValidatorsOfClass(string $sValidatorClassName)
+    {
+        foreach ($this->aValidators as $iKey => $oValue) {
+            if ($oValue instanceof $sValidatorClassName) {
+                unset($this->aValidators[$iKey]);
+            }
+        }
+
+        return $this;
+    }
+
 	/**
 	 * Note : Function is protected as aErrorMessages should not be add from outside
 	 *
 	 * @param string $sErrorMessage
+	 *
 	 * @return $this
 	 */
 	protected function AddErrorMessage(string $sErrorMessage)
 	{
 		$this->aErrorMessages[] = $sErrorMessage;
+
 		return $this;
 	}
 
@@ -522,7 +548,7 @@ abstract class Field
 
 	/**
 	 * Returns if the field is editable. Meaning that it is not editable nor hidden.
-	 * 
+	 *
 	 * @return boolean
 	 */
 	public function IsEditable()
@@ -537,8 +563,7 @@ abstract class Field
 
 	public function OnFinalize()
 	{
-		if ($this->onFinalizeCallback !== null)
-		{
+		if ($this->onFinalizeCallback !== null) {
 			// Note : We MUST have a temp variable to call the Closure. otherwise it won't work when the Closure is a class member
 			$callback = $this->onFinalizeCallback;
 			$callback($this);
@@ -546,30 +571,35 @@ abstract class Field
 	}
 
 	/**
-	 * Checks the validators to see if the field's current value is valid.
-	 * Then sets $bValid and $aErrorMessages.
+	 * @param bool $bValidationDisabled
 	 *
-	 * @return boolean
+	 * @return $this
+	 *
+	 * @since 3.1.0 N°6414
 	 */
-	public function Validate()
+	public function SetValidationDisabled(bool $bValidationDisabled = true): Field
 	{
-		$this->SetValid(true);
-		$this->EmptyErrorMessages();
+		$this->bValidationDisabled = $bValidationDisabled;
 
-		$bEmpty = ( ($this->GetCurrentValue() === null) || ($this->GetCurrentValue() === '') );
-
-		if (!$bEmpty || $this->GetMandatory())
-		{
-			foreach ($this->GetValidators() as $oValidator)
-			{
-				if (!preg_match($oValidator->GetRegExp(true), $this->GetCurrentValue()))
-				{
-					$this->SetValid(false);
-					$this->AddErrorMessage($oValidator->GetErrorMessage());
-				}
-			}
-		}
-
-		return $this->GetValid();
+		return $this;
 	}
+
+	/**
+	 * @return bool
+	 */
+	public function IsValidationDisabled(): bool
+	{
+		return $this->bValidationDisabled;
+	}
+
+	/**
+	 * Validates the field using the validators set.
+	 *
+	 * Before overriding this method in children classes, try to add a custom validator !
+	 *
+	 * @uses GetValidators()
+	 * @uses SetValid()
+	 * @uses AddErrorMessage()
+	 */
+	abstract public function Validate();
 }
diff --git a/sources/Form/Field/FileUploadField.php b/sources/Form/Field/FileUploadField.php
index 7d1c5b6b9a..67074c6d3c 100644
--- a/sources/Form/Field/FileUploadField.php
+++ b/sources/Form/Field/FileUploadField.php
@@ -26,7 +26,7 @@ use Closure;
  *
  * @author Guillaume Lajarige <guillaume.lajarige@combodo.com>
  */
-class FileUploadField extends Field
+class FileUploadField extends AbstractSimpleField
 {
 	/** @var bool DEFAULT_ALLOW_DELETE */
 	const DEFAULT_ALLOW_DELETE = true;
diff --git a/sources/Form/Field/LinkedSetField.php b/sources/Form/Field/LinkedSetField.php
index 22d5f33493..1c76dba905 100644
--- a/sources/Form/Field/LinkedSetField.php
+++ b/sources/Form/Field/LinkedSetField.php
@@ -21,8 +21,7 @@
 namespace Combodo\iTop\Form\Field;
 
 use Closure;
-use Dict;
-use ormLinkSet;
+use Combodo\iTop\Form\Validator\LinkedSetValidator;
 
 /**
  * Description of LinkedSetField
@@ -30,7 +29,7 @@ use ormLinkSet;
  * @author Guillaume Lajarige <guillaume.lajarige@combodo.com>
  * @since 2.3.0
  */
-class LinkedSetField extends Field
+class LinkedSetField extends AbstractSimpleField
 {
 	/** @var bool DEFAULT_INDIRECT */
 	const DEFAULT_INDIRECT = false;
@@ -55,7 +54,7 @@ class LinkedSetField extends Field
 	protected $aLimitedAccessItemIDs;
 	/** @var array $aAttributesToDisplay */
 	protected $aAttributesToDisplay;
-	/** @var array $aLnkAttributesToDisplay */
+	/** @var array $aLnkAttributesToDisplay attcode as key */
 	protected $aLnkAttributesToDisplay;
 	/** @var string $sSearchEndpoint */
 	protected $sSearchEndpoint;
@@ -281,25 +280,25 @@ class LinkedSetField extends Field
 	public function GetLnkAttributesToDisplay(bool $bAttCodesOnly = false)
 	{
 		return ($bAttCodesOnly) ? array_keys($this->aLnkAttributesToDisplay) : $this->aLnkAttributesToDisplay;
-	}
+    }
 
-	/**
-	 *
-	 * @since 3.1
-	 *
-	 * @param array $aAttributesToDisplay
-	 *
-	 * @return $this
-	 */
-	public function SetLnkAttributesToDisplay(array $aAttributesToDisplay)
-	{
-		$this->aLnkAttributesToDisplay = $aAttributesToDisplay;
+    /**
+     * @param array $aAttributesToDisplay
+     * @return $this
+     * @since 3.1.0 N°803
+     */
+    public function SetLnkAttributesToDisplay(array $aAttributesToDisplay)
+    {
+        $this->aLnkAttributesToDisplay = $aAttributesToDisplay;
 
-		return $this;
-	}
+        $this->RemoveValidatorsOfClass(LinkedSetValidator::class);
+        $this->AddValidator(new LinkedSetValidator($aAttributesToDisplay));
 
-	/**
-	 * @return string|null
+        return $this;
+    }
+
+    /**
+     * @return string|null
 	 */
 	public function GetSearchEndpoint()
 	{
@@ -349,39 +348,4 @@ class LinkedSetField extends Field
 	{
 		return in_array($iItemID, $this->aLimitedAccessItemIDs, false);
 	}
-
-	/** @inheritdoc @since 3.1 */
-	public function Validate()
-	{
-		$bValid = parent::Validate();
-
-		/** @var ormLinkSet $oSet */
-		$oSet = $this->GetCurrentValue();
-
-		// retrieve displayed attributes
-		$aAttributesToDisplayCodes = $this->GetLnkAttributesToDisplay(true);
-
-		// validate each links...
-		/** @var \DBObject $oItem */
-		foreach ($oSet as $oItem) {
-			$aChanges = $oItem->ListChanges();
-			foreach ($aChanges as $sAttCode => $value) {
-				if (!in_array($sAttCode, $aAttributesToDisplayCodes)) {
-					continue;
-				}
-				$res = $oItem->CheckValue($sAttCode);
-				if ($res !== true) {
-					$sAttLabel = $this->GetLabel($sAttCode);
-					$sItem = $oItem->Get('friendlyname') != '' ? $oItem->Get('friendlyname') : Dict::S('UI:Links:NewItem');
-					$sIssue = Dict::Format('Core:CheckValueError', $sAttLabel, $sAttCode, $res);
-					$this->AddErrorMessage('<b>'.$sItem.' : </b>'.$sIssue);
-					$bValid = false;
-				}
-			}
-		}
-
-		$oSet->Rewind();
-
-		return $bValid;
-	}
 }
diff --git a/sources/Form/Field/MultipleChoicesField.php b/sources/Form/Field/MultipleChoicesField.php
index f7791acb29..097c3e2787 100644
--- a/sources/Form/Field/MultipleChoicesField.php
+++ b/sources/Form/Field/MultipleChoicesField.php
@@ -20,8 +20,7 @@
 namespace Combodo\iTop\Form\Field;
 
 use Closure;
-use ContextTag;
-use utils;
+use Combodo\iTop\Form\Validator\MultipleChoicesValidator;
 
 /**
  * Description of MultipleChoicesField
@@ -32,7 +31,7 @@ use utils;
  * @author Guillaume Lajarige <guillaume.lajarige@combodo.com>
  * @since 2.3.0
  */
-abstract class MultipleChoicesField extends Field
+abstract class MultipleChoicesField extends AbstractSimpleField
 {
 	/** @var bool DEFAULT_MULTIPLE_VALUES_ENABLED */
 	const DEFAULT_MULTIPLE_VALUES_ENABLED = false;
@@ -51,6 +50,8 @@ abstract class MultipleChoicesField extends Field
 		$this->bMultipleValuesEnabled = static::DEFAULT_MULTIPLE_VALUES_ENABLED;
 		$this->aChoices = array();
 		$this->currentValue = array();
+
+		$this->InitValidators();
 	}
 
 	/**
@@ -179,69 +180,68 @@ abstract class MultipleChoicesField extends Field
 	public function SetChoices(array $aChoices)
 	{
 		$this->aChoices = $aChoices;
+
+		$this->InitValidators();
+
 		return $this;
 	}
 
 	/**
 	 * @param string $sId
-	 * @param null   $choice
+	 * @param null $choice choice value (eg label)
 	 *
 	 * @return $this
 	 */
 	public function AddChoice(string $sId, $choice = null)
 	{
-		if ($choice === null)
-		{
+		if ($choice === null) {
 			$choice = $sId;
 		}
 		$this->aChoices[$sId] = $choice;
-		return $this;
-	}
 
-	/**
-	 * @param string $sId
-	 *
-	 * @return $this
-	 */
-	public function RemoveChoice(string $sId)
-	{
-		if (in_array($sId, $this->aChoices))
-		{
-			unset($this->aChoices[$sId]);
-		}
-		return $this;
-	}
+        $this->InitValidators();
 
-	public function Validate() {
-		$this->SetValid(true);
-		$this->EmptyErrorMessages();
+        return $this;
+    }
 
-		if ((ContextTag::Check(ContextTag::TAG_REST)) && ($this->GetReadOnly() === false)) {
-			// Only doing the check when coming from the REST API, as the user portal might send invalid values (see VerifyCurrentValue() method below)
-			// Also do not check read only fields, are they are send with a null value when submitting request template from the console
-			if (count($this->currentValue) > 0) {
-				foreach ($this->currentValue as $sCode => $value) {
-					if (utils::IsNullOrEmptyString($value)) {
-						continue;
-					}
-					if (false === array_key_exists($value, $this->aChoices)) {
-						$this->SetValid(false);
-						$this->AddErrorMessage("Value ({$value}) is not part of the field possible values list");
-					}
-				}
-			}
-		}
+    /**
+     * @param string $sId
+     *
+     * @return $this
+     */
+    public function RemoveChoice(string $sId)
+    {
+        if (in_array($sId, $this->aChoices)) {
+            unset($this->aChoices[$sId]);
+        }
 
-		foreach ($this->GetValidators() as $oValidator) {
-			foreach ($this->currentValue as $value) {
-				if (!preg_match($oValidator->GetRegExp(true), $value)) {
-					$this->SetValid(false);
-					$this->AddErrorMessage($oValidator->GetErrorMessage());
-				}
-			}
-		}
+        return $this;
+    }
 
-		return $this->GetValid();
-	}
+    /**
+     * @param bool $bReadOnly
+     * @return MultipleChoicesField
+     * @since 3.1.0 N°6414
+     */
+    public function SetReadOnly(bool $bReadOnly)
+    {
+        if ($bReadOnly) {
+            /** @noinspection PhpRedundantOptionalArgumentInspection */
+            $this->SetValidationDisabled(true);
+        } else {
+            $this->SetValidationDisabled(false);
+        }
 
+        return parent::SetReadOnly($bReadOnly);
+    }
+
+    /**
+     * @return void
+     * @since 3.1.0 N°6414
+     */
+    protected function InitValidators(): void
+    {
+        $this->RemoveValidatorsOfClass(MultipleChoicesValidator::class);
+        $this->AddValidator(new MultipleChoicesValidator($this->aChoices));
+    }
 }
diff --git a/sources/Form/Field/MultipleSelectField.php b/sources/Form/Field/MultipleSelectField.php
index 6e131783b9..61199073b3 100644
--- a/sources/Form/Field/MultipleSelectField.php
+++ b/sources/Form/Field/MultipleSelectField.php
@@ -28,5 +28,4 @@ class MultipleSelectField extends SelectField
 {
 	/** @inheritDoc */
 	const DEFAULT_MULTIPLE_VALUES_ENABLED = true;
-
 }
diff --git a/sources/Form/Field/SelectObjectField.php b/sources/Form/Field/SelectObjectField.php
index 2797bb03ad..345f0f8d23 100644
--- a/sources/Form/Field/SelectObjectField.php
+++ b/sources/Form/Field/SelectObjectField.php
@@ -20,16 +20,14 @@
 
 namespace Combodo\iTop\Form\Field;
 
-use BinaryExpression;
 use Closure;
+use Combodo\iTop\Form\Helper\FieldHelper;
+use Combodo\iTop\Form\Validator\AbstractValidator;
 use Combodo\iTop\Form\Validator\NotEmptyExtKeyValidator;
-use ContextTag;
-use DBObjectSet;
+use Combodo\iTop\Form\Validator\SelectObjectValidator;
 use DBSearch;
-use FieldExpression;
+use DeprecatedCallsLog;
 use MetaModel;
-use ScalarExpression;
-use utils;
 
 /**
  * Description of SelectObjectField
@@ -37,7 +35,7 @@ use utils;
  * @author Romain Quetiez <romain.quetiez@combodo.com>
  * @since 2.3.0
  */
-class SelectObjectField extends Field
+class SelectObjectField extends AbstractSimpleField
 {
 	/** @var int CONTROL_SELECT */
 	const CONTROL_SELECT = 1;
@@ -93,6 +91,9 @@ class SelectObjectField extends Field
 	{
 		$this->oSearch = $oSearch;
 
+		$this->RemoveValidatorsOfClass(SelectObjectValidator::class);
+		$this->AddValidator(new SelectObjectValidator($oSearch));
+
 		return $this;
 	}
 
@@ -167,38 +168,15 @@ class SelectObjectField extends Field
 		return $this;
 	}
 
-	/**
-	 * @inheritDoc
-	 */
-	public function SetMandatory(bool $bMandatory)
+	protected function GetMandatoryValidatorInstance(): AbstractValidator
 	{
-		// Before changing the property, we check if it was already mandatory. If not, we had the mandatory validator
-		if ($bMandatory && !$this->bMandatory)
-		{
-			$this->AddValidator(new NotEmptyExtKeyValidator());
-		}
-
-		if (!$bMandatory)
-		{
-			foreach ($this->aValidators as $iKey => $oValue)
-			{
-				if ($oValue::Getname() === NotEmptyExtKeyValidator::GetName())
-				{
-					unset($this->aValidators[$iKey]);
-				}
-			}
-		}
-
-		$this->bMandatory = $bMandatory;
-
-		return $this;
+		return new NotEmptyExtKeyValidator();
 	}
 
 	/**
 	 * @return \DBSearch
 	 */
-	public function GetSearch()
-	{
+	public function GetSearch() {
 		return $this->oSearch;
 	}
 
@@ -250,25 +228,22 @@ class SelectObjectField extends Field
 		return $this->sSearchEndpoint;
 	}
 
-	public function Validate() {
-		if ((ContextTag::Check(ContextTag::TAG_REST)) && ($this->GetReadOnly() === false)) {
-			// Only doing the check when coming from the REST API, as the user portal might send invalid values (see VerifyCurrentValue() method below)
-			// Also do not check read only fields, are they are send with a null value when submitting request template from the console
-			$sCurrentValueForExtKey = $this->currentValue;
-			if (utils::IsNotNullOrEmptyString($sCurrentValueForExtKey) && ($sCurrentValueForExtKey !== 0)) {
-				$oSetForExistingCurrentValue = $this->GetObjectsSet();
-				$iObjectsCount = $oSetForExistingCurrentValue->CountWithLimit(1);
-
-				if ($iObjectsCount === 0) {
-					$this->SetValid(false);
-					$this->AddErrorMessage("Value $sCurrentValueForExtKey does not match the corresponding filter set");
-
-					return $this->GetValid();
-				}
-			}
-		}
-
-		return parent::Validate();
+	/**
+	 * Resets current value if not among allowed ones.
+	 * By default, reset is done ONLY when the field is not read-only.
+	 *
+	 * Called conditionally from {@see \Combodo\iTop\Portal\Form\ObjectFormManager::Build}
+	 * This check isn't in the Validate method as we don't want to check for untouched and invalid values (value was set in the past, it is now invalid, but the user didn't change it)
+	 *
+	 * @param boolean $bAlways Set to true to verify even when the field is read-only.
+	 *
+	 * @throws \CoreException
+	 *
+	 * @deprecated 3.1.0 N°6414 use ResetCurrentValueIfNotAmongAllowedValues instead
+	 */
+	public function VerifyCurrentValue(bool $bAlways = false) {
+		DeprecatedCallsLog::NotifyDeprecatedPhpMethod('3.1.0 N°6414 use ResetCurrentValueIfNotAmongAllowedValues instead');
+		$this->ResetCurrentValueIfNotAmongAllowedValues($bAlways);
 	}
 
 	/**
@@ -281,28 +256,16 @@ class SelectObjectField extends Field
 	 * @param boolean $bAlways Set to true to verify even when the field is read-only.
 	 *
 	 * @throws \CoreException
+	 *
+	 * @since 3.1.0 N°6414 replaces VerifyCurrentValue$
 	 */
-	public function VerifyCurrentValue(bool $bAlways = false) {
+	public function ResetCurrentValueIfNotAmongAllowedValues(bool $bAlways = false) {
 		if (!$this->GetReadOnly() || $bAlways) {
-			$oValuesSet = $this->GetObjectsSet();
+			$oValuesSet = FieldHelper::GetObjectsSetFromSearchAndCurrentValueId($this->oSearch, $this->currentValue);
 
 			if ($oValuesSet->Count() === 0) {
 				$this->currentValue = null;
 			}
 		}
 	}
-
-	final protected function GetObjectsSet() {
-		$sCurrentValueForExtKey = $this->currentValue;
-
-		$oSearchForExistingCurrentValue = $this->oSearch->DeepClone();
-		$oCheckIdAgainstCurrentValueExpression = new BinaryExpression(
-			new FieldExpression('id', $oSearchForExistingCurrentValue->GetClassAlias()),
-			'=',
-			new ScalarExpression($sCurrentValueForExtKey)
-		);
-		$oSearchForExistingCurrentValue->AddConditionExpression($oCheckIdAgainstCurrentValueExpression);
-
-		return new DBObjectSet($oSearchForExistingCurrentValue);
-	}
 }
diff --git a/sources/Form/Field/SetField.php b/sources/Form/Field/SetField.php
index 5174924a5a..fa0e08ac09 100644
--- a/sources/Form/Field/SetField.php
+++ b/sources/Form/Field/SetField.php
@@ -24,7 +24,7 @@ namespace Combodo\iTop\Form\Field;
  *
  * @author Guillaume Lajarige <guillaume.lajarige@combodo.com>
  */
-class SetField extends Field
+class SetField extends AbstractSimpleField
 {
 
 }
diff --git a/sources/Form/Field/SubFormField.php b/sources/Form/Field/SubFormField.php
index 8437382efa..e22af10bc5 100644
--- a/sources/Form/Field/SubFormField.php
+++ b/sources/Form/Field/SubFormField.php
@@ -19,8 +19,8 @@
 
 namespace Combodo\iTop\Form\Field;
 
-use \Closure;
-use \Combodo\iTop\Form\Form;
+use Closure;
+use Combodo\iTop\Form\Form;
 
 /**
  * Description of SubFormField
@@ -29,7 +29,7 @@ use \Combodo\iTop\Form\Form;
  */
 class SubFormField extends Field
 {
-	protected $oForm;
+    protected $oForm;
 
     /**
      * @inheritDoc
@@ -61,12 +61,12 @@ class SubFormField extends Field
 		return $this;
 	}
 
-	/**
-	 * Checks the validators to see if the field's current value is valid.
-	 * Then sets $bValid and $aErrorMessages.
-	 *
-	 * @return boolean
-	 */
+    /**
+     * Checks the validators to see if the field's current value is valid.
+     * Then sets $bValid and $aErrorMessages.
+     *
+     * @inheritDoc
+     */
 	public function Validate()
 	{
 		return $this->oForm->Validate();
@@ -124,13 +124,13 @@ class SubFormField extends Field
 	 * @param boolean $bMandatory
 	 */
 	public function SetMandatory(bool $bMandatory)
-	{
-		foreach ($this->oForm->GetFields() as $oField)
-		{
-			$oField->SetMandatory($bMandatory);
-		}
-		parent::SetMandatory($bMandatory);
-	}
+    {
+        foreach ($this->oForm->GetFields() as $oField) {
+            $oField->SetMandatory($bMandatory);
+        }
+
+        return parent::SetMandatory($bMandatory);
+    }
 
 	/**
 	 * Sets the read-only flag on all the fields on the form
@@ -144,7 +144,7 @@ class SubFormField extends Field
 			$oField->SetReadOnly($bReadOnly);
 			$oField->SetMandatory(false);
 		}
-		parent::SetReadOnly($bReadOnly);
+        return parent::SetReadOnly($bReadOnly);
 	}
 
 	/**
@@ -158,7 +158,7 @@ class SubFormField extends Field
 		{
 			$oField->SetHidden($bHidden);
 		}
-		parent::SetHidden($bHidden);
+        return parent::SetHidden($bHidden);
 	}
 
 	/**
diff --git a/sources/Form/Field/TagSetField.php b/sources/Form/Field/TagSetField.php
index 3eb3e7fcd8..e45cc33ed7 100644
--- a/sources/Form/Field/TagSetField.php
+++ b/sources/Form/Field/TagSetField.php
@@ -24,7 +24,7 @@ namespace Combodo\iTop\Form\Field;
  *
  * @author Guillaume Lajarige <guillaume.lajarige@combodo.com>
  */
-class TagSetField extends Field
+class TagSetField extends AbstractSimpleField
 {
 
 }
diff --git a/sources/Form/Field/TextField.php b/sources/Form/Field/TextField.php
index 62e10b3d5d..3349874398 100644
--- a/sources/Form/Field/TextField.php
+++ b/sources/Form/Field/TextField.php
@@ -24,7 +24,7 @@ namespace Combodo\iTop\Form\Field;
  *
  * @author Guillaume Lajarige <guillaume.lajarige@combodo.com>
  */
-abstract class TextField extends Field
+abstract class TextField extends AbstractSimpleField
 {
 
 }
diff --git a/sources/Form/Form.php b/sources/Form/Form.php
index 3a4c23e94c..dd72126ed0 100644
--- a/sources/Form/Form.php
+++ b/sources/Form/Form.php
@@ -19,11 +19,11 @@
 
 namespace Combodo\iTop\Form;
 
-use \Exception;
-use \Dict;
-use \Combodo\iTop\Form\Field\Field;
-use \Combodo\iTop\Form\Field\CaseLogField;
-use \Combodo\iTop\Form\Field\SubFormField;
+use Combodo\iTop\Form\Field\CaseLogField;
+use Combodo\iTop\Form\Field\Field;
+use Combodo\iTop\Form\Field\SubFormField;
+use Dict;
+use Exception;
 
 /**
  * Description of Form
@@ -34,6 +34,7 @@ class Form
 {
 	protected $sId;
 	protected $sTransactionId;
+	/** @var \Combodo\iTop\Form\Field\Field[] */
 	protected $aFields;
 	protected $aDependencies;
 	protected $bValid;
@@ -566,17 +567,14 @@ class Form
         $this->SetValid(true);
         $this->EmptyErrorMessages();
 
-        foreach ($this->aFields as $oField)
-        {
-            if (!$oField->Validate())
-            {
-                $this->SetValid(false);
-                foreach ($oField->GetErrorMessages() as $sErrorMessage)
-                {
-                    $this->AddErrorMessage(Dict::S($sErrorMessage), $oField->Getid());
-                }
-            }
-        }
+	    foreach ($this->aFields as $oField) {
+		    if (!$oField->Validate()) {
+			    $this->SetValid(false);
+			    foreach ($oField->GetErrorMessages() as $sErrorMessage) {
+				    $this->AddErrorMessage(Dict::S($sErrorMessage), $oField->Getid());
+			    }
+		    }
+	    }
 
         return $this->GetValid();
     }
diff --git a/sources/Form/Helper/FieldHelper.php b/sources/Form/Helper/FieldHelper.php
new file mode 100644
index 0000000000..66d11df2af
--- /dev/null
+++ b/sources/Form/Helper/FieldHelper.php
@@ -0,0 +1,36 @@
+<?php
+/*
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+namespace Combodo\iTop\Form\Helper;
+
+use BinaryExpression;
+use DBObjectSet;
+use DBSearch;
+use FieldExpression;
+use ScalarExpression;
+
+/**
+ * Utility methods for {@see \Combodo\iTop\Form\Field\Field} classes
+ *
+ * @since 3.1.0 N°6414
+ */
+class FieldHelper {
+	/**
+	 * @since 3.1.0 N°6414 Method creation to factorize between uses in {@see \Combodo\iTop\Form\Field\Field} and {@see \Combodo\iTop\Form\Validator\SelectObjectValidator}
+	 */
+	public static function GetObjectsSetFromSearchAndCurrentValueId(DBSearch $oSearch, string $sCurrentValueId) {
+		$oSearchForExistingCurrentValue = $oSearch->DeepClone();
+		$oCheckIdAgainstCurrentValueExpression = new BinaryExpression(
+			new FieldExpression('id', $oSearchForExistingCurrentValue->GetClassAlias()),
+			'=',
+			new ScalarExpression($sCurrentValueId)
+		);
+		$oSearchForExistingCurrentValue->AddConditionExpression($oCheckIdAgainstCurrentValueExpression);
+
+		return new DBObjectSet($oSearchForExistingCurrentValue);
+	}
+
+}
\ No newline at end of file
diff --git a/sources/Form/Validator/AbstractRegexpValidator.php b/sources/Form/Validator/AbstractRegexpValidator.php
new file mode 100644
index 0000000000..d5afa78606
--- /dev/null
+++ b/sources/Form/Validator/AbstractRegexpValidator.php
@@ -0,0 +1,56 @@
+<?php
+/*
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+namespace Combodo\iTop\Form\Validator;
+
+/**
+ * @since 3.1.0 N°6414
+ */
+abstract class AbstractRegexpValidator extends AbstractValidator
+{
+    public const VALIDATOR_NAME = 'abstract_regexp';
+
+    /** @var string Override in children classes to set regexp to use for validation */
+    public const DEFAULT_REGEXP = '';
+
+    protected string $sRegExp;
+
+	public function __construct(?string $sErrorMessage = null)
+	{
+		$this->sRegExp = static::DEFAULT_REGEXP;
+		parent::__construct($sErrorMessage);
+	}
+
+	public function Validate($value): array
+	{
+		if (is_null($value)) {
+			$value = ''; // calling preg_match with null as subject is deprecated since PHP 8.1
+		}
+		if (preg_match($this->GetRegExp(true), $value)) {
+			return [];
+		}
+
+		return [$this->sErrorMessage];
+	}
+
+    /**
+     * Returns the regular expression of the validator.
+     *
+     * @param boolean $bWithSlashes If true, surrounds $sRegExp with '/'. Used with preg_match & co
+     *
+     * @return string
+     */
+    public function GetRegExp($bWithSlashes = false)
+    {
+        if ($bWithSlashes) {
+            $sRet = '/'.str_replace('/', '\\/', $this->sRegExp).'/';
+        } else {
+            $sRet = $this->sRegExp;
+        }
+
+        return $sRet;
+    }
+}
\ No newline at end of file
diff --git a/sources/Form/Validator/AbstractValidator.php b/sources/Form/Validator/AbstractValidator.php
new file mode 100644
index 0000000000..6bfec4928c
--- /dev/null
+++ b/sources/Form/Validator/AbstractValidator.php
@@ -0,0 +1,59 @@
+<?php
+/*
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+namespace Combodo\iTop\Form\Validator;
+
+use utils;
+
+/**
+ * @since 3.1.0 N°6414 Field Validators refactoring
+ */
+abstract class AbstractValidator
+{
+	public const VALIDATOR_NAME = 'abstract';
+
+	/** @var string Default message / dict key when an error occurs, if no custom one is specified in the constructor */
+	public const DEFAULT_ERROR_MESSAGE = 'Core:Validator:Default';
+	/** @var string message / dict key to use when an error occurs */
+	protected string $sErrorMessage;
+
+	public function __construct(?string $sErrorMessage = null)
+	{
+		if (false === utils::IsNullOrEmptyString($sErrorMessage)) {
+			$this->sErrorMessage = $sErrorMessage;
+		}
+		else {
+			$this->sErrorMessage = static::DEFAULT_ERROR_MESSAGE;
+		}
+	}
+
+	/**
+	 * @param mixed $value
+	 *
+	 * @return string[] list of error messages, empty array if no error
+	 */
+	abstract public function Validate($value): array;
+
+	/**
+	 * Name to use for JS counterparts
+	 *
+	 * @return string
+	 */
+	public static function GetName()
+	{
+		return static::VALIDATOR_NAME;
+	}
+
+	/**
+	 * Still used in \Combodo\iTop\Renderer\Console\FieldRenderer\ConsoleSelectObjectFieldRenderer::Render :(
+	 *
+	 * @return string
+	 */
+	public function GetErrorMessage()
+	{
+		return $this->sErrorMessage;
+	}
+}
\ No newline at end of file
diff --git a/sources/Form/Validator/CustomRegexpValidator.php b/sources/Form/Validator/CustomRegexpValidator.php
new file mode 100644
index 0000000000..a4852e9dc1
--- /dev/null
+++ b/sources/Form/Validator/CustomRegexpValidator.php
@@ -0,0 +1,22 @@
+<?php
+/*
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+namespace Combodo\iTop\Form\Validator;
+
+/**
+ * @since 3.1.0 N°6414
+ */
+class CustomRegexpValidator extends AbstractRegexpValidator
+{
+	public const VALIDATOR_NAME = 'custom_regexp';
+
+	public function __construct(string $sRegExp, ?string $sErrorMessage = null)
+	{
+		parent::__construct($sErrorMessage);
+
+		$this->sRegExp = $sRegExp; // must be done after parent constructor call !
+	}
+}
\ No newline at end of file
diff --git a/sources/Form/Validator/IntegerValidator.php b/sources/Form/Validator/IntegerValidator.php
index 2c58418af8..858a7eda24 100644
--- a/sources/Form/Validator/IntegerValidator.php
+++ b/sources/Form/Validator/IntegerValidator.php
@@ -24,10 +24,9 @@ namespace Combodo\iTop\Form\Validator;
  *
  * @author Guillaume Lajarige <guillaume.lajarige@combodo.com>
  */
-class IntegerValidator extends Validator
+class IntegerValidator extends AbstractRegexpValidator
 {
-	const VALIDATOR_NAME = 'integer';
-	const DEFAULT_REGEXP = '^[0-9]+$';
-	const DEFAULT_ERROR_MESSAGE = 'Core:Validator:MustBeInteger';
-
+	public const VALIDATOR_NAME = 'integer';
+	public const DEFAULT_REGEXP = '^[0-9]+$';
+	public const DEFAULT_ERROR_MESSAGE = 'Core:Validator:MustBeInteger';
 }
diff --git a/sources/Form/Validator/LinkedSetValidator.php b/sources/Form/Validator/LinkedSetValidator.php
index 69f7c7e254..dd6d109a75 100644
--- a/sources/Form/Validator/LinkedSetValidator.php
+++ b/sources/Form/Validator/LinkedSetValidator.php
@@ -19,18 +19,56 @@
 
 namespace Combodo\iTop\Form\Validator;
 
+use Dict;
+use ormLinkSet;
+use utils;
+
 /**
  * Description of LinkedSetValidator
  *
- * @since 3.1
+ * @since 3.1.0 N°6414
  */
-class LinkedSetValidator extends Validator
+class LinkedSetValidator extends AbstractRegexpValidator
 {
-	const VALIDATOR_NAME = 'LinkedSetValidator';
+    public const VALIDATOR_NAME = 'linkedset_validator';
+    private $aAttributesToDisplayCodes;
 
-	/** @inheritdoc */
-	public static function GetName()
-	{
-		return static::VALIDATOR_NAME;
-	}
+    public function __construct($aAttributesToDisplayCodes)
+    {
+        $this->aAttributesToDisplayCodes = $aAttributesToDisplayCodes;
+
+        parent::__construct();
+    }
+
+    public function Validate($value): array
+    {
+        $aErrorMessages = [];
+
+        /** @var ormLinkSet $oSet */
+        $oSet = $value;
+
+        // validate each links...
+        /** @var \DBObject $oItem */
+        foreach ($oSet as $oItem) {
+            $aChanges = $oItem->ListChanges();
+            foreach ($aChanges as $sAttCode => $AttValue) {
+                if (!in_array($sAttCode, $this->aAttributesToDisplayCodes)) {
+                    continue;
+                }
+                $res = $oItem->CheckValue($sAttCode);
+                if ($res !== true) {
+                    $sAttLabel = $oItem->GetLabel($sAttCode);
+                    $sItem = utils::IsNullOrEmptyString($oItem->Get('friendlyname'))
+                        ? Dict::S('UI:Links:NewItem')
+                        : $oItem->Get('friendlyname');
+                    $sIssue = Dict::Format('Core:CheckValueError', $sAttLabel, $sAttCode, $res);
+                    $aErrorMessages[] = '<b>' . $sItem . ' : </b>' . $sIssue;
+                }
+            }
+        }
+
+        $oSet->Rewind();
+
+        return $aErrorMessages;
+    }
 }
diff --git a/sources/Form/Validator/MandatoryValidator.php b/sources/Form/Validator/MandatoryValidator.php
index fd9162066a..e08c4471e2 100644
--- a/sources/Form/Validator/MandatoryValidator.php
+++ b/sources/Form/Validator/MandatoryValidator.php
@@ -26,10 +26,10 @@ namespace Combodo\iTop\Form\Validator;
  *
  * @author Guillaume Lajarige <guillaume.lajarige@combodo.com>
  */
-class MandatoryValidator extends Validator
+class MandatoryValidator extends AbstractRegexpValidator
 {
-	const VALIDATOR_NAME = 'mandatory';
-	const DEFAULT_REGEXP = '.*\S.*';
-	const DEFAULT_ERROR_MESSAGE = 'Core:Validator:Mandatory';
+	public const VALIDATOR_NAME = 'mandatory';
+	public const DEFAULT_REGEXP = '.*\S.*';
+	public const DEFAULT_ERROR_MESSAGE = 'Core:Validator:Mandatory';
 
 }
diff --git a/sources/Form/Validator/MultipleChoicesValidator.php b/sources/Form/Validator/MultipleChoicesValidator.php
new file mode 100644
index 0000000000..408ac63509
--- /dev/null
+++ b/sources/Form/Validator/MultipleChoicesValidator.php
@@ -0,0 +1,59 @@
+<?php
+/*
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+namespace Combodo\iTop\Form\Validator;
+
+use utils;
+
+class MultipleChoicesValidator extends AbstractValidator
+{
+    public const VALIDATOR_NAME = 'multiple_choices_validator';
+
+    /** @var array List of possible choices */
+    private array $aChoices;
+
+    public function __construct(array $aChoices)
+    {
+        parent::__construct();
+        $this->aChoices = $aChoices;
+    }
+
+    /**
+     * @param mixed $value Warning can either be an array (if multiple values are allowed in the field) or a primitive : {@see \Combodo\iTop\Form\Field\MultipleChoicesField::GetCurrentValue()}
+     *
+     * @return array|string[]
+     */
+    public function Validate($value): array
+    {
+        $aErrorMessages = [];
+        if (false === is_array($value)) {
+            $this->CheckValueAgainstChoices($value, $aErrorMessages);
+
+            return $aErrorMessages;
+        }
+
+        if (count($value) === 0) {
+            return [];
+        }
+
+        /** @noinspection PhpUnusedLocalVariableInspection */
+        foreach ($value as $sCode => $valueItem) {
+            if (utils::IsNullOrEmptyString($valueItem)) {
+                continue;
+            }
+            $this->CheckValueAgainstChoices($valueItem, $aErrorMessages);
+        }
+
+        return $aErrorMessages;
+    }
+
+    private function CheckValueAgainstChoices(string $sValue, array &$aErrorMessages): void
+    {
+        if (false === array_key_exists($sValue, $this->aChoices)) {
+            $aErrorMessages[] = "Value ({$sValue}) is not part of the field possible values list";
+        }
+    }
+}
\ No newline at end of file
diff --git a/sources/Form/Validator/NotEmptyExtKeyValidator.php b/sources/Form/Validator/NotEmptyExtKeyValidator.php
index aa1965280d..f89b61278d 100644
--- a/sources/Form/Validator/NotEmptyExtKeyValidator.php
+++ b/sources/Form/Validator/NotEmptyExtKeyValidator.php
@@ -24,10 +24,9 @@ namespace Combodo\iTop\Form\Validator;
  *
  * @author Guillaume Lajarige <guillaume.lajarige@combodo.com>
  */
-class NotEmptyExtKeyValidator extends Validator
+class NotEmptyExtKeyValidator extends MandatoryValidator
 {
-	const VALIDATOR_NAME = 'notemptyextkey';
-	const DEFAULT_REGEXP = '^[0-9]*[1-9][0-9]*$';
-	const DEFAULT_ERROR_MESSAGE = 'Core:Validator:MustSelectOne';
-
+	public const VALIDATOR_NAME = 'notemptyextkey';
+	public const DEFAULT_REGEXP = '^[0-9]*[1-9][0-9]*$';
+	public const DEFAULT_ERROR_MESSAGE = 'Core:Validator:MustSelectOne';
 }
diff --git a/sources/Form/Validator/SelectObjectValidator.php b/sources/Form/Validator/SelectObjectValidator.php
new file mode 100644
index 0000000000..8c56fefda7
--- /dev/null
+++ b/sources/Form/Validator/SelectObjectValidator.php
@@ -0,0 +1,45 @@
+<?php
+/*
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+namespace Combodo\iTop\Form\Validator;
+
+use Combodo\iTop\Form\Helper\FieldHelper;
+use DBSearch;
+use utils;
+
+class SelectObjectValidator extends AbstractValidator
+{
+    public const VALIDATOR_NAME = 'select_object_validator';
+
+    /** @var \DBSearch $oSearch */
+    private $oSearch;
+
+    public function __construct(DBSearch $oSearch)
+    {
+        parent::__construct();
+
+        $this->oSearch = $oSearch;
+    }
+
+    public function Validate($value): array
+    {
+        if (utils::IsNullOrEmptyString($value)) {
+            return [];
+        }
+        if (($value === 0) || ($value === '0')) {
+            return [];
+        }
+
+        $oSetForExistingCurrentValue = FieldHelper::GetObjectsSetFromSearchAndCurrentValueId($this->oSearch, $value);
+        $iObjectsCount = $oSetForExistingCurrentValue->CountWithLimit(1);
+
+        if ($iObjectsCount === 0) {
+            return ["Value $value does not match the corresponding filter set"];
+        }
+
+        return [];
+    }
+}
\ No newline at end of file
diff --git a/sources/Form/Validator/Validator.php b/sources/Form/Validator/Validator.php
index 3d25a569aa..8f526be885 100644
--- a/sources/Form/Validator/Validator.php
+++ b/sources/Form/Validator/Validator.php
@@ -19,99 +19,22 @@
 
 namespace Combodo\iTop\Form\Validator;
 
+use DeprecatedCallsLog;
+
+
 /**
  * Description of Validator
  *
- * @author Guillaume Lajarige <guillaume.lajarige@combodo.com>
+ * @deprecated 3.1.0 N°6414 use {@see \Combodo\iTop\Form\Validator\CustomRegexpValidator} instead
  */
-class Validator
+class Validator extends CustomRegexpValidator
 {
-	const VALIDATOR_NAME = 'expression';
-	const DEFAULT_REGEXP = '';
-	const DEFAULT_ERROR_MESSAGE = 'Core:Validator:Default';
-
-	protected $sRegExp;
-	protected $sErrorMessage;
-
-	public static function GetName()
-	{
-		return static::VALIDATOR_NAME;
-	}
-
-    /**
-     *
-     * @param string $sRegExp
-     * @param string $sErrorMessage
-     */
 	public function __construct($sRegExp = null, $sErrorMessage = null)
 	{
-		$this->sRegExp = ($sRegExp === null) ? static::DEFAULT_REGEXP : $sRegExp;
-		$this->sErrorMessage = ($sErrorMessage === null) ? static::DEFAULT_ERROR_MESSAGE : $sErrorMessage;
-		$this->ComputeConstraints();
-	}
+		// cannot use DeprecatedCallsLog::NotifyDeprecatedFile as it would trigger an exception on dev env
+		// because all autoloader files are loaded during MetaModel::Startup (calling \Combodo\iTop\Service\Events\EventService::InitService calling \utils::GetClassesForInterface)
+		DeprecatedCallsLog::NotifyDeprecatedPhpMethod('3.1.0 N°6414 use '.CustomRegexpValidator::class.' instead');
 
-	/**
-	 * Returns the regular expression of the validator.
-	 *
-	 * @param boolean $bWithSlashes If true, surrounds $sRegExp with '/'. Used with preg_match & co
-	 * @return string
-	 */
-	public function GetRegExp($bWithSlashes = false)
-	{
-		if ($bWithSlashes)
-		{
-			$sRet = '/' . str_replace('/', '\\/', $this->sRegExp) . '/';
-		}
-		else
-		{
-			$sRet = $this->sRegExp;
-		}
-		return $sRet;
+		parent::__construct($sRegExp, $sErrorMessage);
 	}
-
-	public function GetErrorMessage()
-	{
-		return $this->sErrorMessage;
-	}
-
-	public function SetRegExp($sRegExp)
-	{
-		$this->sRegExp = $sRegExp;
-		$this->ComputeConstraints();
-		return $this;
-	}
-
-	public function SetErrorMessage($sErrorMessage)
-	{
-		$this->sErrorMessage = $sErrorMessage;
-		$this->ComputeConstraints();
-		return $this;
-	}
-
-	/**
-	 * Computes the regular expression and error message when changing constraints on the validator.
-	 * Should be called in the validator's setters.
-	 */
-	public function ComputeConstraints()
-	{
-		$this->ComputeRegularExpression();
-		$this->ComputeErrorMessage();
-	}
-
-	/**
-	 * Computes the regular expression when changing constraints on the validator.
-	 */
-	public function ComputeRegularExpression()
-	{
-		// Overload when necessary
-	}
-
-	/**
-	 * Computes the error message when changing constraints on the validator.
-	 */
-	public function ComputeErrorMessage()
-	{
-		// Overload when necessary
-	}
-
 }
diff --git a/sources/Renderer/Bootstrap/FieldRenderer/BsLinkedSetFieldRenderer.php b/sources/Renderer/Bootstrap/FieldRenderer/BsLinkedSetFieldRenderer.php
index 4d89534faf..408744c696 100644
--- a/sources/Renderer/Bootstrap/FieldRenderer/BsLinkedSetFieldRenderer.php
+++ b/sources/Renderer/Bootstrap/FieldRenderer/BsLinkedSetFieldRenderer.php
@@ -412,23 +412,23 @@ JS
 					<<<JS
                 $("[data-field-id='{$this->oField->GetId()}'][data-form-path='{$this->oField->GetFormPath()}']").portal_form_field({
 					'validators': {$this->GetValidatorsAsJson()},
-					'on_validation_callback': function(){
-                        	const aLinkedSetInputs = $('#{$sFieldWrapperId} input,select,textarea', this.element);
+					'on_validation_callback': function(oFormField){
+                        	const aLinkedSetInputs = $('#{$sFieldWrapperId} input,select,textarea', oFormField.element);
 							aLinkedSetInputs.each(function(e){
 								const oInput = $(this);
 								const aInputValidity = oInput[0].validity;
-								const oFormField = oInput.closest('.form_field_control');
+								const oFormFieldControl = oInput.closest('.form_field_control');
 								if(aInputValidity.valueMissing){
-									 oFormField.toggleClass('has-error', true);
-									 $('.help-block', oFormField).html('$aErrorMessagesMandatory');
+									 oFormFieldControl.toggleClass('has-error', true);
+									 $('.help-block', oFormFieldControl).html('$aErrorMessagesMandatory');
 								}
 								else if(aInputValidity.patternMismatch){
-									 oFormField.toggleClass('has-error', true);
-									 $('.help-block', oFormField).html('$aErrorMessagesDefault');
+									 oFormFieldControl.toggleClass('has-error', true);
+									 $('.help-block', oFormFieldControl).html('$aErrorMessagesDefault');
 								}
                                 else{
-                                     oFormField.toggleClass('has-error', false);
-									 $('.help-block', oFormField).empty();
+                                     oFormFieldControl.toggleClass('has-error', false);
+									 $('.help-block', oFormFieldControl).empty();
                                 }
 							});
 					},
diff --git a/sources/Renderer/Bootstrap/FieldRenderer/BsSimpleFieldRenderer.php b/sources/Renderer/Bootstrap/FieldRenderer/BsSimpleFieldRenderer.php
index e2df1cb1ab..e523c2d037 100644
--- a/sources/Renderer/Bootstrap/FieldRenderer/BsSimpleFieldRenderer.php
+++ b/sources/Renderer/Bootstrap/FieldRenderer/BsSimpleFieldRenderer.php
@@ -28,8 +28,8 @@ use Combodo\iTop\Form\Field\DateTimeField;
 use Combodo\iTop\Form\Field\Field;
 use Combodo\iTop\Form\Field\MultipleChoicesField;
 use Combodo\iTop\Form\Field\TextAreaField;
+use Combodo\iTop\Form\Validator\AbstractRegexpValidator;
 use Combodo\iTop\Form\Validator\MandatoryValidator;
-use Combodo\iTop\Form\Validator\Validator;
 use Combodo\iTop\Renderer\RenderingOutput;
 use Dict;
 use InlineImage;
@@ -458,9 +458,14 @@ EOF
 			// JS Form field widget construct
 			$aValidators = array();
 			foreach ($this->oField->GetValidators() as $oValidator) {
+				if (false === ($oValidator instanceof AbstractRegexpValidator)) {
+					// no JS counterpart, so skipping !
+					continue;
+				}
+
 				$aValidators[$oValidator::GetName()] = array(
 					'reg_exp' => $oValidator->GetRegExp(),
-					'message' => Dict::S($oValidator->GetErrorMessage())
+					'message' => Dict::S($oValidator->GetErrorMessage()),
 				);
 			}
 
@@ -758,7 +763,7 @@ JS
 		foreach ($oField->GetValidators() as $oValidator) {
 
 			// Validator
-			if (get_class($oValidator) === Validator::class) {
+			if ($oValidator instanceof AbstractRegexpValidator) {
 				if (!($oField instanceof DateField || $oField instanceof DateTimeField)) { // unrecognized regular expression
 					$sTags .= ' pattern="'.$oValidator->GetRegExp().'" ';
 				}
diff --git a/sources/Renderer/Console/FieldRenderer/ConsoleSelectObjectFieldRenderer.php b/sources/Renderer/Console/FieldRenderer/ConsoleSelectObjectFieldRenderer.php
index d8f2bb3504..c679ac93e0 100644
--- a/sources/Renderer/Console/FieldRenderer/ConsoleSelectObjectFieldRenderer.php
+++ b/sources/Renderer/Console/FieldRenderer/ConsoleSelectObjectFieldRenderer.php
@@ -27,7 +27,9 @@ use Combodo\iTop\Application\UI\Base\Component\Input\Select\SelectOptionUIBlockF
 use Combodo\iTop\Application\UI\Base\Component\Input\SelectUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Layout\UIContentBlockUIBlockFactory;
 use Combodo\iTop\Form\Field\SelectObjectField;
+use Combodo\iTop\Form\Validator\AbstractRegexpValidator;
 use Combodo\iTop\Form\Validator\MandatoryValidator;
+use Combodo\iTop\Form\Validator\NotEmptyExtKeyValidator;
 use Combodo\iTop\Renderer\BlockRenderer;
 use Combodo\iTop\Renderer\FieldRenderer;
 use DBObjectSet;
@@ -245,16 +247,19 @@ JS
 		$oOutput->AddHtml((BlockRenderer::RenderBlockTemplates($oBlock)));
 		// JS Form field widget construct
 		$aValidators = array();
-		foreach ($this->oField->GetValidators() as $oValidator)
-		{
-			if ($oValidator::GetName() == 'notemptyextkey')
-			{
+		foreach ($this->oField->GetValidators() as $oValidator) {
+			if (false === ($oValidator instanceof AbstractRegexpValidator)) {
+				// no JS counterpart, so skipping !
+				continue;
+			}
+
+			if ($oValidator instanceof NotEmptyExtKeyValidator) {
 				// The autocomplete widget returns an empty string if the value is undefined (and the select has been aligned with this behavior)
 				$oValidator = new MandatoryValidator();
 			}
 			$aValidators[$oValidator::GetName()] = array(
 				'reg_exp' => $oValidator->GetRegExp(),
-				'message' => Dict::S($oValidator->GetErrorMessage())
+				'message' => Dict::S($oValidator->GetErrorMessage()),
 			);
 		}
 		$sValidators = json_encode($aValidators);
diff --git a/sources/Renderer/Console/FieldRenderer/ConsoleSimpleFieldRenderer.php b/sources/Renderer/Console/FieldRenderer/ConsoleSimpleFieldRenderer.php
index 3ad09f162b..a259ad3efa 100644
--- a/sources/Renderer/Console/FieldRenderer/ConsoleSimpleFieldRenderer.php
+++ b/sources/Renderer/Console/FieldRenderer/ConsoleSimpleFieldRenderer.php
@@ -33,6 +33,7 @@ use Combodo\iTop\Application\UI\Base\Component\Input\TextArea;
 use Combodo\iTop\Application\UI\Base\Component\Text\Text;
 use Combodo\iTop\Application\UI\Base\Layout\UIContentBlockUIBlockFactory;
 use Combodo\iTop\Form\Field\TextAreaField;
+use Combodo\iTop\Form\Validator\AbstractRegexpValidator;
 use Combodo\iTop\Renderer\BlockRenderer;
 use Combodo\iTop\Renderer\FieldRenderer;
 use DateTimeFormat;
@@ -433,16 +434,20 @@ EOF
 
 		// JS Form field widget construct
 		$aValidators = array();
-		foreach ($this->oField->GetValidators() as $oValidator)
-		{
+		foreach ($this->oField->GetValidators() as $oValidator) {
+			if (false === ($oValidator instanceof AbstractRegexpValidator)) {
+				// no JS counterpart, so skipping !
+				continue;
+			}
+
 			$aValidators[$oValidator::GetName()] = array(
 				'reg_exp' => $oValidator->GetRegExp(),
-				'message' => Dict::S($oValidator->GetErrorMessage())
+				'message' => Dict::S($oValidator->GetErrorMessage()),
 			);
 		}
 		$sValidators = json_encode($aValidators);
 		$sFormFieldOptions =
-<<<EOF
+			<<<EOF
 {
 	validators: $sValidators,
 	on_validation_callback: function(me, oResult) {
diff --git a/sources/Renderer/FieldRenderer.php b/sources/Renderer/FieldRenderer.php
index 7c6de22eaf..ba10f7981a 100644
--- a/sources/Renderer/FieldRenderer.php
+++ b/sources/Renderer/FieldRenderer.php
@@ -21,6 +21,7 @@
 namespace Combodo\iTop\Renderer;
 
 use Combodo\iTop\Form\Field\Field;
+use Combodo\iTop\Form\Validator\AbstractRegexpValidator;
 use Dict;
 use utils;
 
@@ -84,9 +85,14 @@ abstract class FieldRenderer
 		$aValidators = array();
 		foreach ($this->oField->GetValidators() as $oValidator)
 		{
+			if (false === ($oValidator instanceof AbstractRegexpValidator)) {
+				// no JS counterpart, so skipping !
+				continue;
+			}
+
 			$aValidators[$oValidator::GetName()] = array(
 				'reg_exp' => $oValidator->GetRegExp(),
-				'message' => Dict::S($oValidator->GetErrorMessage())
+				'message' => Dict::S($oValidator->GetErrorMessage()),
 			);
 		}
 		// - Formatting options
diff --git a/sources/Service/Base/ObjectRepository.php b/sources/Service/Base/ObjectRepository.php
index c2a4ace716..f8ada588a5 100644
--- a/sources/Service/Base/ObjectRepository.php
+++ b/sources/Service/Base/ObjectRepository.php
@@ -6,6 +6,7 @@
 
 namespace Combodo\iTop\Service\Base;
 
+use cmdbAbstractObject;
 use Combodo\iTop\Core\MetaModel\FriendlyNameType;
 use DBObject;
 use DBObjectSearch;
@@ -299,4 +300,40 @@ class ObjectRepository
 		return ObjectRepository::ComputeOthersData($oObject, $sObjectClass, $aObjectData, $aComplementAttributeSpec, $sObjectImageAttCode);
 	}
 
+
+	/**
+	 * DeleteFromOql.
+	 *
+	 * @param string $sOql OQL expression
+	 *
+	 * @return bool
+	 */
+	static public function DeleteFromOql(string $sOql): bool
+	{
+		try {
+
+			// Create db search
+			$oDbObjectSearch = DBSearch::FromOQL($sOql);
+
+			// Create db set from db search
+			$oDbObjectSet = new DBObjectSet($oDbObjectSearch);
+
+			// Delete objects
+			while ($oObject = $oDbObjectSet->Fetch()) {
+				$oObject->DBDelete();
+			}
+
+			// return operation success
+			return true;
+		}
+		catch (Exception $e) {
+
+			ExceptionLog::LogException($e);
+
+			return false;
+		}
+
+	}
+
+
 }
\ No newline at end of file
diff --git a/sources/Service/Events/EventService.php b/sources/Service/Events/EventService.php
index 85db6e0dad..072b774736 100644
--- a/sources/Service/Events/EventService.php
+++ b/sources/Service/Events/EventService.php
@@ -95,7 +95,7 @@ final class EventService
 		self::$aEventListeners[$sEvent] = $aEventCallbacks;
 
 		$sSource = self::GetSourcesAsString($sEventSource);
-		EventServiceLog::Debug("Registering Listener '$sName' for event '$sEvent' source '$sSource' from '$sModuleId'");
+		EventServiceLog::Trace("Registering Listener '$sName' for event '$sEvent' source '$sSource' from '$sModuleId'");
 
 		return $sId;
 	}
diff --git a/sources/Service/Router/Router.php b/sources/Service/Router/Router.php
index 1566a4c90f..4c11f8fab2 100644
--- a/sources/Service/Router/Router.php
+++ b/sources/Service/Router/Router.php
@@ -138,12 +138,24 @@ class Router
 	{
 		$aRoutes = [];
 		$bUseCache = false === utils::IsDevelopmentEnvironment();
+		$bMustWriteCache = false;
 		$sCacheFilePath = $this->GetCacheFileAbsPath();
 
 		// Try to read from cache
 		if ($bUseCache) {
 			if (is_file($sCacheFilePath)) {
-				$aRoutes = include $sCacheFilePath;
+				$aCachedRoutes = include $sCacheFilePath;
+
+				// N°6618 - Protection against corrupted cache returning `1` instead of an array of routes
+				if (is_array($aCachedRoutes)) {
+					$aRoutes = $aCachedRoutes;
+				} else {
+					// Invalid cache force re-generation
+					// Note that even if it is re-generated corrupted again, this protection should prevent crashes
+					$bMustWriteCache = true;
+				}
+			} else {
+				$bMustWriteCache = true;
 			}
 		}
 
@@ -180,11 +192,11 @@ class Router
 			}
 		}
 
-		// Save to cache
-		if ($bUseCache) {
+		// Save to cache if it doesn't exist already
+		if ($bMustWriteCache) {
 			$sCacheContent = "<?php\n\nreturn ".var_export($aRoutes, true).";";
 			SetupUtils::builddir(dirname($sCacheFilePath));
-			file_put_contents($sCacheFilePath, $sCacheContent);
+			file_put_contents($sCacheFilePath, $sCacheContent, LOCK_EX);
 		}
 
 		return $aRoutes;
diff --git a/sources/Service/TemporaryObjects/TemporaryObjectConfig.php b/sources/Service/TemporaryObjects/TemporaryObjectConfig.php
new file mode 100644
index 0000000000..c5b0d81da9
--- /dev/null
+++ b/sources/Service/TemporaryObjects/TemporaryObjectConfig.php
@@ -0,0 +1,120 @@
+<?php
+/*
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+namespace Combodo\iTop\Service\TemporaryObjects;
+
+use MetaModel;
+
+/**
+ * TemporaryObjectConfig.
+ *
+ * Handle temporary object configuration.
+ *
+ * @experimental do not use, this feature will be part of a future version
+ *
+ * @since 3.1
+ */
+class TemporaryObjectConfig
+{
+
+	private int $iGarbageInterval;
+	private int $iConfigTemporaryLifetime;
+	private bool $bConfigTemporaryForce;
+	private int $iWatchdogInterval;
+	private static ?TemporaryObjectConfig $oSingletonInstance = null;
+
+	/**
+	 * Constructor.
+	 *
+	 */
+	private function __construct()
+	{
+		// Retrieve service configuration
+		$oConfig = MetaModel::GetConfig();
+		$this->iGarbageInterval = $oConfig->Get(TemporaryObjectHelper::CONFIG_GARBAGE_INTERVAL);
+		$this->iConfigTemporaryLifetime = $oConfig->Get(TemporaryObjectHelper::CONFIG_TEMP_LIFETIME);
+		$this->bConfigTemporaryForce = $oConfig->Get(TemporaryObjectHelper::CONFIG_FORCE);
+		$this->iWatchdogInterval = $oConfig->Get(TemporaryObjectHelper::CONFIG_GARBAGE_INTERVAL);
+	}
+
+	/**
+	 * GetInstance.
+	 *
+	 * @return TemporaryObjectConfig
+	 */
+	public static function GetInstance(): TemporaryObjectConfig
+	{
+		if (is_null(self::$oSingletonInstance)) {
+			self::$oSingletonInstance = new TemporaryObjectConfig();
+		}
+
+		return self::$oSingletonInstance;
+	}
+	/**
+	 * @return int
+	 */
+	public function GetGarbageInterval(): int
+	{
+		return $this->iGarbageInterval;
+	}
+
+	/**
+	 * @param int $iGarbageInterval
+	 */
+	public function SetGarbageInterval(int $iGarbageInterval): void
+	{
+		$this->iGarbageInterval = $iGarbageInterval;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function GetConfigTemporaryLifetime(): int
+	{
+		return $this->iConfigTemporaryLifetime;
+	}
+
+	/**
+	 * @param int $iConfigTemporaryLifetime
+	 */
+	public function SetConfigTemporaryLifetime(int $iConfigTemporaryLifetime): void
+	{
+		$this->iConfigTemporaryLifetime = $iConfigTemporaryLifetime;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function GetConfigTemporaryForce(): bool
+	{
+		return $this->bConfigTemporaryForce;
+	}
+
+	/**
+	 * @param bool $bConfigTemporaryForce
+	 */
+	public function SetConfigTemporaryForce(bool $bConfigTemporaryForce): void
+	{
+		$this->bConfigTemporaryForce = $bConfigTemporaryForce;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function GetWatchdogInterval(): int
+	{
+		return $this->iWatchdogInterval;
+	}
+
+	/**
+	 * @param int $iWatchdogInterval
+	 */
+	public function SetWatchdogInterval(int $iWatchdogInterval): void
+	{
+		$this->iWatchdogInterval = $iWatchdogInterval;
+	}
+
+}
\ No newline at end of file
diff --git a/sources/Service/TemporaryObjects/TemporaryObjectGC.php b/sources/Service/TemporaryObjects/TemporaryObjectGC.php
new file mode 100644
index 0000000000..0c59b51ae2
--- /dev/null
+++ b/sources/Service/TemporaryObjects/TemporaryObjectGC.php
@@ -0,0 +1,47 @@
+<?php
+/*
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+namespace Combodo\iTop\Service\TemporaryObjects;
+
+use iBackgroundProcess;
+
+/**
+ * TemporaryObjectGC.
+ *
+ * Background task to collect and garbage expired temporary objects..
+ *
+ * @experimental do not use, this feature will be part of a future version
+ *
+ * @since 3.1
+ */
+class TemporaryObjectGC implements iBackgroundProcess
+{
+	/** @var TemporaryObjectManager */
+	private TemporaryObjectManager $oTemporaryObjectManager;
+
+	/**
+	 * Constructor.
+	 *
+	 */
+	public function __construct()
+	{
+		// Retrieve service dependencies
+		$this->oTemporaryObjectManager = TemporaryObjectManager::GetInstance();
+	}
+
+	/** @inheritDoc * */
+	public function GetPeriodicity()
+	{
+		return TemporaryObjectConfig::GetInstance()->GetWatchdogInterval();
+	}
+
+	/** @inheritDoc * */
+	public function Process($iUnixTimeLimit)
+	{
+		// Garbage temporary objects
+		$this->oTemporaryObjectManager->GarbageExpiredTemporaryObjects();
+	}
+}
\ No newline at end of file
diff --git a/sources/Service/TemporaryObjects/TemporaryObjectHelper.php b/sources/Service/TemporaryObjects/TemporaryObjectHelper.php
new file mode 100644
index 0000000000..0759981b63
--- /dev/null
+++ b/sources/Service/TemporaryObjects/TemporaryObjectHelper.php
@@ -0,0 +1,47 @@
+<?php
+/*
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+namespace Combodo\iTop\Service\TemporaryObjects;
+
+/**
+ * TemporaryObjectHelper.
+ *
+ * Helper with useful functions.
+ *
+ * @experimental do not use, this feature will be part of a future version
+ *
+ * @since 3.1
+ */
+class TemporaryObjectHelper
+{
+	// Global configuration
+	const CONFIG_FORCE             = 'temporary_object.force_creation';
+	const CONFIG_TEMP_LIFETIME     = 'temporary_object.lifetime';
+	const CONFIG_WATCHDOG_INTERVAL = 'temporary_object.watchdog_interval';
+	const CONFIG_GARBAGE_INTERVAL  = 'temporary_object.garbage_interval';
+
+	// Temporary descriptor operation
+	const OPERATION_CREATE = 'create';
+	const OPERATION_DELETE = 'delete';
+
+	/**
+	 * GetWatchDogJS.
+	 *
+	 * @param string $sTempId
+	 *
+	 * @return string
+	 */
+	static public function GetWatchDogJS(string $sTempId): string
+	{
+		$iWatchdogInterval = TemporaryObjectConfig::GetInstance()->GetWatchdogInterval();
+
+		return <<<JS
+			window.setInterval(function() {
+				$.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php?route=temporary_object.watch_dog', {temp_id: '$sTempId'});
+			}, $iWatchdogInterval * 1000)
+JS;
+	}
+}
diff --git a/sources/Service/TemporaryObjects/TemporaryObjectManager.php b/sources/Service/TemporaryObjects/TemporaryObjectManager.php
new file mode 100644
index 0000000000..74228df1d3
--- /dev/null
+++ b/sources/Service/TemporaryObjects/TemporaryObjectManager.php
@@ -0,0 +1,402 @@
+<?php
+/*
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+namespace Combodo\iTop\Service\TemporaryObjects;
+
+use DateTime;
+use DBObject;
+use Exception;
+use ExceptionLog;
+use IssueLog;
+use LogChannels;
+use MetaModel;
+use TemporaryObjectDescriptor;
+use utils;
+
+/**
+ * TemporaryObjectManager.
+ *
+ * Manager class to perform global temporary objects tasks.
+ *
+ * @experimental do not use, this feature will be part of a future version
+ *
+ * @since 3.1
+ */
+class TemporaryObjectManager
+{
+	/** @var TemporaryObjectManager|null Singleton */
+	static private ?TemporaryObjectManager $oSingletonInstance = null;
+
+	/** @var TemporaryObjectRepository $oTemporaryObjectRepository */
+	private TemporaryObjectRepository $oTemporaryObjectRepository;
+
+	/**
+	 * GetInstance.
+	 *
+	 * @return TemporaryObjectManager
+	 */
+	public static function GetInstance(): TemporaryObjectManager
+	{
+		if (is_null(self::$oSingletonInstance)) {
+			self::$oSingletonInstance = new TemporaryObjectManager();
+		}
+
+		return self::$oSingletonInstance;
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 */
+	private function __construct()
+	{
+		// Retrieve service dependencies
+		$this->oTemporaryObjectRepository = TemporaryObjectRepository::GetInstance();
+	}
+
+	/**
+	 * CreateTemporaryObject.
+	 *
+	 * @param string $sTempId Temporary id context for the temporary object
+	 * @param string $sObjectClass Temporary object class
+	 * @param string $sObjectKey Temporary object key
+	 * @param string $sOperation temporary operation on file TemporaryObjectHelper::OPERATION_CREATE or TemporaryObjectHelper::OPERATION_DELETE
+	 *
+	 * @return TemporaryObjectDescriptor|null
+	 */
+	public function CreateTemporaryObject(string $sTempId, string $sObjectClass, string $sObjectKey, string $sOperation): ?TemporaryObjectDescriptor
+	{
+		$result = $this->oTemporaryObjectRepository->Create($sTempId, $sObjectClass, $sObjectKey, $sOperation);
+
+		// Log
+		IssueLog::Debug("TemporaryObjectsManager: Create a temporary object attached to temporary id $sTempId", LogChannels::TEMPORARY_OBJECTS, [
+			'temp_id'    => $sTempId,
+			'item_class' => $sObjectClass,
+			'item_id'    => $sObjectKey,
+			'succeeded'  => $result != null,
+		]);
+
+		return $result;
+	}
+
+	/**
+	 * Cancel the ongoing operation (create or delete) on all the temporary objects impacted by this transaction id
+	 *
+	 * @param string $sTransactionId form transaction id
+	 *
+	 * @return bool true if success
+	 */
+	public function CancelAllTemporaryObjects(string $sTransactionId): bool
+	{
+		try {
+			// Get temporary object descriptors
+			$oDbObjectSet = $this->oTemporaryObjectRepository->SearchByTempId($sTransactionId, true);
+
+			// Cancel temporary objects...
+			$bResult = $this->CancelTemporaryObjects($oDbObjectSet->ToArray());
+
+			// Log
+			IssueLog::Debug("TemporaryObjectsManager: Cancel all temporary objects attached to temporary id $sTransactionId", LogChannels::TEMPORARY_OBJECTS, [
+				'temp_id'   => $sTransactionId,
+				'succeeded' => $bResult,
+			]);
+
+			// return operation success
+			return true;
+		}
+		catch (Exception $e) {
+			ExceptionLog::LogException($e);
+
+			return false;
+		}
+
+	}
+
+	/**
+	 * Cancel the ongoing operation (create or delete) on the given temporary objects
+	 *
+	 * @param array{\TemporaryObjectDescriptor} $aTemporaryObjectDescriptor
+	 *
+	 * @return bool true if success
+	 */
+	private function CancelTemporaryObjects(array $aTemporaryObjectDescriptor): bool
+	{
+		try {
+			// All operations succeeded
+			$bResult = true;
+
+			/** @var TemporaryObjectDescriptor $oTemporaryObjectDescriptor */
+			foreach ($aTemporaryObjectDescriptor as $oTemporaryObjectDescriptor) {
+
+				// Cancel temporary objects
+				if (!$this->CancelTemporaryObject($oTemporaryObjectDescriptor)) {
+					$bResult = false;
+				}
+			}
+
+			return $bResult;
+		}
+		catch (Exception $e) {
+			ExceptionLog::LogException($e);
+
+			return false;
+		}
+
+	}
+
+
+	/**
+	 * Extends the temporary object descriptor lifetime
+	 *
+	 * @param string $sTransactionId
+	 *
+	 * @return bool
+	 */
+	public function ExtendTemporaryObjectsLifetime(string $sTransactionId): bool
+	{
+		try {
+			// Create db set from db search
+			$oDbObjectSet = $this->oTemporaryObjectRepository->SearchByTempId($sTransactionId);
+
+			// Expiration date
+			$iExpirationDate = time() + TemporaryObjectConfig::GetInstance()->GetConfigTemporaryLifetime();
+
+			// Delay objects expiration
+			while ($oObject = $oDbObjectSet->Fetch()) {
+				$oObject->Set('expiration_date', $iExpirationDate);
+				$oObject->DBUpdate();
+			}
+
+			// Log
+			$date = new DateTime();
+			$date->setTimestamp($iExpirationDate);
+			IssueLog::Debug("TemporaryObjectsManager: Delay all temporary objects descriptors expiration date attached to temporary id $sTransactionId", LogChannels::TEMPORARY_OBJECTS, [
+				'temp_id'                 => $sTransactionId,
+				'expiration_date'         => date_format($date, 'Y-m-d H:i:s'),
+				'total_temporary_objects' => $this->oTemporaryObjectRepository->CountTemporaryObjectsByTempId($sTransactionId),
+			]);
+
+			// return operation success
+			return true;
+		}
+		catch (Exception $e) {
+			ExceptionLog::LogException($e);
+
+			return false;
+		}
+	}
+
+	/**
+	 * Accept all the temporary objects operations
+	 *
+	 * @param string $sTransactionId
+	 *
+	 * @return void
+	 * @throws \ArchivedObjectException
+	 * @throws \CoreException
+	 * @throws \CoreUnexpectedValue
+	 * @throws \MySQLException
+	 * @throws \OQLException
+	 */
+	private function FinalizeTemporaryObjects(string $sTransactionId)
+	{
+		// All operations succeeded
+		$bResult = true;
+
+		// Get temporary object descriptors
+		$oDBObjectSet = $this->oTemporaryObjectRepository->SearchByTempId($sTransactionId, true);
+
+		// Iterate throw descriptors...
+		/** @var TemporaryObjectDescriptor $oTemporaryObjectDescriptor */
+		while ($oTemporaryObjectDescriptor = $oDBObjectSet->Fetch()) {
+			// Retrieve attributes values
+			$sHostClass = $oTemporaryObjectDescriptor->Get('host_class');
+			$sHostId = $oTemporaryObjectDescriptor->Get('host_id');
+
+			// No host object
+			if ($sHostId === 0) {
+				$bResult = $bResult && $this->CancelTemporaryObject($oTemporaryObjectDescriptor);
+				continue;
+			}
+
+			// Host object pointed by descriptor doesn't exist anymore
+			$oHostObject = MetaModel::GetObject($sHostClass, $sHostId, false);
+			if (is_null($oHostObject)) {
+				$bResult = $bResult && $this->CancelTemporaryObject($oTemporaryObjectDescriptor);
+				continue;
+			}
+
+			// Otherwise confirm
+			$bResult = $bResult && $this->ConfirmTemporaryObject($oTemporaryObjectDescriptor);
+		}
+
+		// Log
+		IssueLog::Debug("TemporaryObjectsManager: Finalize all temporary objects attached to temporary id $sTransactionId", LogChannels::TEMPORARY_OBJECTS, [
+			'temp_id'   => $sTransactionId,
+			'succeeded' => $bResult,
+		]);
+
+	}
+
+	/**
+	 * Accept operation on the given temporary object
+	 *
+	 * @param TemporaryObjectDescriptor $oTemporaryObjectDescriptor
+	 *
+	 * @return bool
+	 */
+	private function ConfirmTemporaryObject(TemporaryObjectDescriptor $oTemporaryObjectDescriptor): bool
+	{
+		try {
+			// Retrieve attributes values
+			$sOperation = $oTemporaryObjectDescriptor->Get('operation');
+			$sItemClass = $oTemporaryObjectDescriptor->Get('item_class');
+			$sItemId = $oTemporaryObjectDescriptor->Get('item_id');
+
+			// Get temporary object
+			$oTemporaryObject = MetaModel::GetObject($sItemClass, $sItemId);
+
+			if ($sOperation === TemporaryObjectHelper::OPERATION_DELETE) {
+				// Delete temporary object
+				$oTemporaryObject->DBDelete();
+				IssueLog::Info("Temporary Object [$sItemClass:$sItemId] removed (operation: $sOperation)", LogChannels::TEMPORARY_OBJECTS, utils::GetStackTraceAsArray());
+			} elseif ($sOperation === TemporaryObjectHelper::OPERATION_CREATE) {
+				// Send an event in case of creation confirmation
+				$oTemporaryObject->FireEvent(TemporaryObjectsEvents::TEMPORARY_OBJECT_EVENT_CONFIRM_CREATE);
+			}
+
+			// Remove temporary object descriptor entry
+			$oTemporaryObjectDescriptor->DBDelete();
+
+			// Log
+			IssueLog::Debug("Temporary Object [$sItemClass:$sItemId] $sOperation confirmed", LogChannels::TEMPORARY_OBJECTS, utils::GetStackTraceAsArray());
+
+			return true;
+		}
+		catch (Exception $e) {
+			ExceptionLog::LogException($e);
+
+			return false;
+		}
+	}
+
+	/**
+	 * CancelTemporaryObject.
+	 *
+	 * @param TemporaryObjectDescriptor $oTemporaryObjectDescriptor
+	 *
+	 * @return bool
+	 */
+	private function CancelTemporaryObject(TemporaryObjectDescriptor $oTemporaryObjectDescriptor): bool
+	{
+		try {
+			// Retrieve attributes values
+			$sOperation = $oTemporaryObjectDescriptor->Get('operation');
+			$sItemClass = $oTemporaryObjectDescriptor->Get('item_class');
+			$sItemId = $oTemporaryObjectDescriptor->Get('item_id');
+
+			if ($sOperation === TemporaryObjectHelper::OPERATION_CREATE) {
+
+				// Get temporary object
+				$oTemporaryObject = MetaModel::GetObject($sItemClass, $sItemId, false);
+
+				// Delete temporary object
+				if (!is_null($oTemporaryObject)) {
+					$oTemporaryObject->DBDelete();
+				}
+
+				IssueLog::Info("Temporary Object [$sItemClass:$sItemId] removed (operation: $sOperation)", LogChannels::TEMPORARY_OBJECTS, utils::GetStackTraceAsArray());
+			}
+
+			// Remove temporary object descriptor entry
+			$oTemporaryObjectDescriptor->DBDelete();
+
+			return true;
+		}
+		catch (Exception $e) {
+			ExceptionLog::LogException($e);
+
+			return false;
+		}
+	}
+
+	/**
+	 * Handle temporary objects.
+	 *
+	 * @param \DBObject $oDBObject
+	 * @param array $aContext
+	 *
+	 * @return void
+	 * @throws \ArchivedObjectException
+	 * @throws \CoreException
+	 * @throws \CoreUnexpectedValue
+	 * @throws \MySQLException
+	 * @throws \OQLException
+	 */
+	public function HandleTemporaryObjects(DBObject $oDBObject, array $aContext)
+	{
+		if (array_key_exists('create', $aContext)) {
+			// Retrieve context information
+			$aContextCreation = $aContext['create'];
+			$sTransactionId = $aContextCreation['transaction_id'] ?? null;
+			$sHostClass = $aContextCreation['host_class'] ?? null;
+			$sHostAttCode = $aContextCreation['host_att_code'] ?? null;
+
+			// Security
+			if (is_null($sTransactionId) || is_null($sHostClass) || is_null($sHostAttCode)) {
+				return;
+			}
+
+			// Get host class attribute definition
+			try {
+				$oAttDef = MetaModel::GetAttributeDef($sHostClass, $sHostAttCode);
+			}
+			catch (Exception $e) {
+				ExceptionLog::LogException($e);
+
+				return;
+			}
+
+			// If creation as temporary object requested or force for all objects
+			if (($oAttDef->IsParam('create_temporary_object') && $oAttDef->Get('create_temporary_object'))
+				|| TemporaryObjectConfig::GetInstance()->GetConfigTemporaryForce()) {
+
+				$this->CreateTemporaryObject($sTransactionId, get_class($oDBObject), $oDBObject->GetKey(), TemporaryObjectHelper::OPERATION_CREATE);
+			}
+		}
+		if (array_key_exists('finalize', $aContext)) {
+			// Retrieve context information
+			$aContextFinalize = $aContext['finalize'];
+			$sTransactionId = $aContextFinalize['transaction_id'] ?? null;
+
+			// validate temporary objects
+			$this->FinalizeTemporaryObjects($sTransactionId);
+		}
+	}
+
+	/**
+	 * GarbageExpiredTemporaryObjects.
+	 *
+	 * @return bool
+	 */
+	public function GarbageExpiredTemporaryObjects(): bool
+	{
+		try {
+			// Search for expired temporary objects
+			$oDBObjectSet = $this->oTemporaryObjectRepository->SearchByExpired();
+
+			// Cancel temporary objects
+			$this->CancelTemporaryObjects($oDBObjectSet->ToArray());
+
+			return true;
+		}
+		catch (Exception $e) {
+			ExceptionLog::LogException($e);
+
+			return false;
+		}
+	}
+}
diff --git a/sources/Service/TemporaryObjects/TemporaryObjectRepository.php b/sources/Service/TemporaryObjects/TemporaryObjectRepository.php
new file mode 100644
index 0000000000..26215d9eec
--- /dev/null
+++ b/sources/Service/TemporaryObjects/TemporaryObjectRepository.php
@@ -0,0 +1,205 @@
+<?php
+/*
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+namespace Combodo\iTop\Service\TemporaryObjects;
+
+use AttributeDateTime;
+use DBObjectSet;
+use DBSearch;
+use Exception;
+use ExceptionLog;
+use MetaModel;
+use TemporaryObjectDescriptor;
+
+/**
+ * TemporaryObjectRepository.
+ *
+ * Repository class to perform ORM tasks.
+ *
+ * @experimental do not use, this feature will be part of a future version
+ *
+ * @since 3.1
+ */
+class TemporaryObjectRepository
+{
+	/** @var TemporaryObjectRepository|null Singleton */
+	static private ?TemporaryObjectRepository $oSingletonInstance = null;
+
+	/**
+	 * GetInstance.
+	 *
+	 * @return TemporaryObjectRepository
+	 */
+	public static function GetInstance(): TemporaryObjectRepository
+	{
+		if (is_null(self::$oSingletonInstance)) {
+			self::$oSingletonInstance = new TemporaryObjectRepository();
+		}
+
+		return self::$oSingletonInstance;
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 */
+	private function __construct()
+	{
+	}
+
+	/**
+	 * Create.
+	 *
+	 * @param string $sTempId Temporary id
+	 * @param string $sObjectClass Object class
+	 * @param string $sObjectKey Object key
+	 * @param string $sOperation temporary operation on file TemporaryObjectHelper::OPERATION_CREATE or TemporaryObjectHelper::OPERATION_DELETE
+	 *
+	 * @return TemporaryObjectDescriptor|null
+	 */
+	public function Create(string $sTempId, string $sObjectClass, string $sObjectKey, string $sOperation): ?TemporaryObjectDescriptor
+	{
+		try {
+			if (!MetaModel::IsValidClass($sObjectClass)) {
+				throw new Exception("Class $sObjectClass is not a valid class");
+			}
+			if (MetaModel::GetObject($sObjectClass, $sObjectKey, false) === false) {
+				throw new Exception("Object $sObjectClass:$sObjectKey is not a valid object");
+			}
+
+			// Create a temporary object descriptor
+			/** @var \TemporaryObjectDescriptor $oTemporaryObjectDescriptor */
+			$oTemporaryObjectDescriptor = MetaModel::NewObject(TemporaryObjectDescriptor::class, [
+				'operation'       => $sOperation,
+				'temp_id'         => $sTempId,
+				'expiration_date' => time() + TemporaryObjectConfig::GetInstance()->GetConfigTemporaryLifetime(),
+				'item_class'      => $sObjectClass,
+				'item_id'         => $sObjectKey,
+			]);
+			$oTemporaryObjectDescriptor->DBInsert();
+
+			return $oTemporaryObjectDescriptor;
+		}
+		catch (Exception $e) {
+
+			ExceptionLog::LogException($e);
+
+			return null;
+		}
+	}
+
+	/**
+	 * SearchByTempId.
+	 *
+	 * @param string $sTempId temporary id
+	 * @param bool $bReverseOrder reverse order of result
+	 *
+	 * @return \DBObjectSet
+	 * @throws \MySQLException
+	 * @throws \OQLException
+	 */
+	public function SearchByTempId(string $sTempId, bool $bReverseOrder = false): DBObjectSet
+	{
+		// Prepare OQL
+		$sOQL = sprintf('SELECT `%s` WHERE temp_id=:temp_id', TemporaryObjectDescriptor::class);
+
+		// Create db search
+		$oDbObjectSearch = DBSearch::FromOQL($sOQL);
+
+		// Create db set from db search
+		$oDbObjectSet = new DBObjectSet($oDbObjectSearch, [], [
+			'temp_id' => $sTempId,
+		]);
+
+		// Reverse order
+		if ($bReverseOrder) {
+			$oDbObjectSet->SetOrderBy([
+				'id' => false,
+			]);
+		}
+
+		return $oDbObjectSet;
+	}
+
+	/**
+	 * SearchByItem.
+	 *
+	 * @param string $sItemClass
+	 * @param string $sItemId
+	 * @param bool $bReverseOrder reverse order of result
+	 *
+	 * @return \DBObjectSet
+	 * @throws \MySQLException
+	 * @throws \OQLException
+	 */
+	public function SearchByItem(string $sItemClass, string $sItemId, bool $bReverseOrder = false): DBObjectSet
+	{
+		// Prepare OQL
+		$sOQL = sprintf('SELECT `%s` WHERE item_class=:item_class AND item_id=:item_id', TemporaryObjectDescriptor::class);
+
+		// Create db search
+		$oDbObjectSearch = DBSearch::FromOQL($sOQL);
+
+		// Create db set from db search
+		$oDbObjectSet = new DBObjectSet($oDbObjectSearch, [], [
+			'item_class' => $sItemClass,
+			'item_id'    => $sItemId,
+		]);
+
+		// Reverse order
+		if ($bReverseOrder) {
+			$oDbObjectSet->SetOrderBy([
+				'id' => false,
+			]);
+		}
+
+		return $oDbObjectSet;
+	}
+
+	/**
+	 * CountTemporaryObjectsByTempId.
+	 *
+	 * @param string $sTempId
+	 *
+	 * @return int
+	 */
+	public function CountTemporaryObjectsByTempId(string $sTempId): int
+	{
+		try {
+
+			$oDbObjectSet = $this->SearchByTempId($sTempId);
+
+			// return operation success
+			return $oDbObjectSet->count();
+		}
+		catch (Exception $e) {
+
+			ExceptionLog::LogException($e);
+
+			return -1;
+		}
+	}
+
+	/**
+	 * SearchByExpired.
+	 *
+	 * @return DBObjectSet
+	 * @throws \OQLException
+	 */
+	public function SearchByExpired(): DBObjectSet
+	{
+		// Prepare OQL
+		$sOQL = sprintf('SELECT `%s` WHERE expiration_date<:now', TemporaryObjectDescriptor::class);
+
+		// Create db search
+		$oDbObjectSearch = DBSearch::FromOQL($sOQL);
+
+		// Create db set from db search
+		$sDateNow = date(AttributeDateTime::GetSQLFormat(), time());
+
+		return new DBObjectSet($oDbObjectSearch, ['id' => false], ['now' => $sDateNow]);
+	}
+}
diff --git a/sources/Service/TemporaryObjects/TemporaryObjectsEvents.php b/sources/Service/TemporaryObjects/TemporaryObjectsEvents.php
new file mode 100644
index 0000000000..5bcc743e2e
--- /dev/null
+++ b/sources/Service/TemporaryObjects/TemporaryObjectsEvents.php
@@ -0,0 +1,56 @@
+<?php
+/*
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+namespace Combodo\iTop\Service\TemporaryObjects;
+
+use Combodo\iTop\Service\Events\Description\EventDataDescription;
+use Combodo\iTop\Service\Events\Description\EventDescription;
+use Combodo\iTop\Service\Events\EventService;
+use Combodo\iTop\Service\Events\iEventServiceSetup;
+
+/**
+ * TemporaryObjectsEvents.
+ *
+ * Handle temporary objects events
+ *
+ * @experimental do not use, this feature will be part of a future version
+ *
+ * @since 3.1
+ */
+class TemporaryObjectsEvents implements iEventServiceSetup
+{
+
+	// Startup events
+	const TEMPORARY_OBJECT_EVENT_CONFIRM_CREATE = 'TEMPORARY_OBJECT_EVENT_CONFIRM_CREATE';
+
+	/**
+	 * @inheritDoc
+	 */
+	public function RegisterEventsAndListeners()
+	{
+		EventService::RegisterEvent(new EventDescription(
+			self::TEMPORARY_OBJECT_EVENT_CONFIRM_CREATE,
+			[
+				'cmdbAbstractObject' => 'cmdbAbstractObject',
+			],
+			'The MetaModel is fully started',
+			'',
+			[
+				new EventDataDescription(
+					'object',
+					'The object concerned by the creation confirmation',
+					'DBObject',
+				),
+				new EventDataDescription(
+					'debug_info',
+					'Debug string',
+					'string',
+				),
+			],
+			'application'));
+	}
+
+}
\ No newline at end of file
diff --git a/synchro/synchro_exec.php b/synchro/synchro_exec.php
index 276d4ad30f..e658148981 100644
--- a/synchro/synchro_exec.php
+++ b/synchro/synchro_exec.php
@@ -136,12 +136,13 @@ else {
 		exit - 1;
 	}
 
-	$bSimulate = (utils::ReadParam('simulate', '0', true) == '1');
-	$sDataSourcesList = ReadMandatoryParam($oP, 'data_sources', 'raw_data'); // May contain commas
+}
 
-	if ($sDataSourcesList == null) {
-		UsageAndExit($oP);
-	}
+$bSimulate = (utils::ReadParam('simulate', '0', true) == '1');
+$sDataSourcesList = ReadMandatoryParam($oP, 'data_sources', 'raw_data'); // May contain commas
+
+if ($sDataSourcesList == null) {
+	UsageAndExit($oP);
 }
 
 foreach(explode(',', $sDataSourcesList) as $iSDS)
diff --git a/templates/application/object/set/set_renderer.html.twig b/templates/application/object/set/set_renderer.html.twig
index bf81b427c1..3f0cea05f3 100644
--- a/templates/application/object/set/set_renderer.html.twig
+++ b/templates/application/object/set/set_renderer.html.twig
@@ -1,4 +1,4 @@
-<div data-template-attr-title="friendlyname">
+<span data-template-attr-title="friendlyname">
 
     {# obsolescence #}
     {% if obsolescence_flag %}
@@ -10,4 +10,4 @@
     {# friendly name #}
     <span data-template-text="friendlyname">{{ friendlyname }}</span>
 
-</div>
\ No newline at end of file
+</span>
\ No newline at end of file
diff --git a/templates/base/components/input/set/layout.ready.js.twig b/templates/base/components/input/set/layout.ready.js.twig
index dd19ed2b18..104c6aceda 100644
--- a/templates/base/components/input/set/layout.ready.js.twig
+++ b/templates/base/components/input/set/layout.ready.js.twig
@@ -19,7 +19,7 @@ let oWidget{{ oUIBlock.GetId() }} = $('#{{ oUIBlock.GetId() }}').selectize({
     plugins: {
         {# PLUGIN update operations  #}
         'combodo_update_operations' : {
-            initial: {{ oUIBlock.GetInitialValue()|raw }},
+            initial: {{ oUIBlock.GetInitialValue()|raw }}
         },
         {# PLUGIN combodo auto position  #}
         'combodo_auto_position' : {
@@ -42,7 +42,7 @@ let oWidget{{ oUIBlock.GetId() }} = $('#{{ oUIBlock.GetId() }}').selectize({
             tooltip_links_will_be_deleted_from_x_objects: '{{ 'UI:Links:Bulk:LinkWillBeDeletedFromXObjects'|dict_s }}',
             tooltip_links_exist_for_all_objects: '{{ 'UI:Links:Bulk:LinkExistForAllObjects'|dict_s }}',
             tooltip_links_exist_for_one_object: '{{ 'UI:Links:Bulk:LinkExistForOneObject'|dict_s }}',
-            tooltip_links_exist_for_x_objects: '{{ 'UI:Links:Bulk:LinkExistForXObjects'|dict_s }}',
+            tooltip_links_exist_for_x_objects: '{{ 'UI:Links:Bulk:LinkExistForXObjects'|dict_s }}'
         },
         {% endif %}
         {# PLUGIN remove button  #}
@@ -200,7 +200,7 @@ let oWidget{{ oUIBlock.GetId() }} = $('#{{ oUIBlock.GetId() }}').selectize({
     },
 
     {# plugin combodo_add_button #}
-    {% if oUIBlock.HasAddOptionButton() %}
+    {% if oUIBlock.HasAddOptionButton() and oUIBlock.HasAddOptionButtonJsOnClick() %}
     onAdd: function(){
         {{ oUIBlock.GetAddOptionButtonJsOnClick()|raw }}
 
diff --git a/templates/pages/backoffice/ajaxpage/layout.html.twig b/templates/pages/backoffice/ajaxpage/layout.html.twig
index 0d2c754b06..0551301dac 100644
--- a/templates/pages/backoffice/ajaxpage/layout.html.twig
+++ b/templates/pages/backoffice/ajaxpage/layout.html.twig
@@ -62,6 +62,26 @@
                      * ]
                      * ```
                      */
+                    
+                     // If these constants aren't defined by the main page, define them (global) ourselves
+                    if (typeof aLoadedJsFilesRegister === "undefined") {
+                        Object.defineProperty(window, "aLoadedJsFilesRegister", {
+                            value: new Map(),
+                            writable: false,
+                            configurable: false,
+                            enumerable: true
+                        });
+                    }      
+                    
+                    if (typeof aLoadedJsFilesResolveCallbacks === "undefined") {
+                        Object.defineProperty(window, "aLoadedJsFilesResolveCallbacks", {
+                            value: new Map(),
+                            writable: false,
+                            configurable: false,
+                            enumerable: true
+                        });
+                    }
+                    
                     let aJsFilesToLoad = [];
                     /**
                      * @type {Array} aJsFilesToLoadByOtherRequests Files required by the current \AjaxPage but that are already being handled by another request (done or ongoing)
diff --git a/tests/manual-visual-tests/Backoffice/RenderAllUiBlocks.php b/tests/manual-visual-tests/Backoffice/RenderAllUiBlocks.php
index 769d1f6dba..5d2e4defc4 100644
--- a/tests/manual-visual-tests/Backoffice/RenderAllUiBlocks.php
+++ b/tests/manual-visual-tests/Backoffice/RenderAllUiBlocks.php
@@ -334,7 +334,8 @@ $oPage->AddUiBlock(TitleUIBlockFactory::MakeNeutral('Fieldset/field examples', 2
 $oDashletFieldset1 = new FieldSet('Fieldset 1');
 $oDashletField1 = FieldUIBlockFactory::MakeStandard('Field A');
 $oDashletInput1 = InputUIBlockFactory::MakeStandard('text', 'input1', 'Input 1');
-$oDashletField2 = FieldUIBlockFactory::MakeStandard('Field B');
+$oDashletField2 = FieldUIBlockFactory::MakeStandard('Field B (with a description in a tooltip)')
+	->SetDescription('Description for the field B');
 $oDashletInput2 = InputUIBlockFactory::MakeStandard('text', 'input2', 'Input 2');
 $oDashletField3 = FieldUIBlockFactory::MakeStandard('Field C');
 $oDashletInput3 = InputUIBlockFactory::MakeStandard('text', 'input3', 'Input 3');
diff --git a/tests/php-unit-tests/ItopDataTestCase.php b/tests/php-unit-tests/ItopDataTestCase.php
index 657521ef95..d28fb40a52 100644
--- a/tests/php-unit-tests/ItopDataTestCase.php
+++ b/tests/php-unit-tests/ItopDataTestCase.php
@@ -44,6 +44,7 @@ use lnkContactToTicket;
 use lnkFunctionalCIToTicket;
 use MetaModel;
 use Person;
+use PluginManager;
 use Server;
 use TagSetFieldData;
 use Ticket;
@@ -146,6 +147,24 @@ class ItopDataTestCase extends ItopTestCase
 		return $this->iTestOrgId;
 	}
 
+	/////////////////////////////////////////////////////////////////////////////
+	/// MetaModel Utilities
+	/////////////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Allow test iApplicationObjectExtension objects to be added to the list of plugins without setup
+	 * just require the class file containing the object implementing iApplicationObjectExtension before calling ResetApplicationObjectExtensions()
+	 *
+	 * @return void
+	 */
+	protected function ResetApplicationObjectExtensions()
+	{
+		// Add ObjectModifyExtension to the plugin list
+		$this->InvokeNonPublicStaticMethod(MetaModel::class, 'InitExtensions', []);
+		// Instantiate the new object
+		$this->InvokeNonPublicStaticMethod(PluginManager::class, 'ResetPlugins', []);
+	}
+
 	/////////////////////////////////////////////////////////////////////////////
 	/// Database Utilities
 	/////////////////////////////////////////////////////////////////////////////
diff --git a/tests/php-unit-tests/integration-tests/DictionariesConsistencyTest.php b/tests/php-unit-tests/integration-tests/DictionariesConsistencyTest.php
index 401aa889c3..c6a51e2b40 100644
--- a/tests/php-unit-tests/integration-tests/DictionariesConsistencyTest.php
+++ b/tests/php-unit-tests/integration-tests/DictionariesConsistencyTest.php
@@ -18,6 +18,9 @@ namespace Combodo\iTop\Test\UnitTest\Integration;
 use Combodo\iTop\Test\UnitTest\ItopTestCase;
 use Dict;
 
+/**
+ * @group beforeSetup
+ */
 class DictionariesConsistencyTest extends ItopTestCase
 {
 	/**
@@ -111,7 +114,6 @@ class DictionariesConsistencyTest extends ItopTestCase
 	 *
 	 * @param string $sDictFile
 	 *
-	 * @group beforeSetup
 	 *
 	 * @uses         CheckDictionarySyntax
 	 */
diff --git a/tests/php-unit-tests/post-build-integration-tests/iTopDesignFormatChecklistTest.php b/tests/php-unit-tests/post-build-integration-tests/iTopDesignFormatChecklistTest.php
index 875fd01ece..d707ace63f 100644
--- a/tests/php-unit-tests/post-build-integration-tests/iTopDesignFormatChecklistTest.php
+++ b/tests/php-unit-tests/post-build-integration-tests/iTopDesignFormatChecklistTest.php
@@ -15,7 +15,7 @@ use PHPUnit\Exception;
  *
  * @package Combodo\iTop\Test\UnitTest\Setup
  */
-class TestForITopDesignFormatClass extends ItopTestCase
+class iTopDesignFormatChecklistTest extends ItopTestCase
 {
 	protected function setUp(): void
 	{
@@ -47,7 +47,7 @@ class TestForITopDesignFormatClass extends ItopTestCase
 						$aErrors[] = "cannot retrieve itop_design datamodel version in $sDataModelFile:1";
 						continue;
 					}
-					
+
 					$aDatamodelCurrentVersions[$sVersion] = $sVersion;
 				}
 			}
@@ -159,4 +159,4 @@ class TestForITopDesignFormatClass extends ItopTestCase
 		}
 		return $aDataModelFiles;
 	}
-}
\ No newline at end of file
+}
diff --git a/tests/php-unit-tests/postbuild_integration.xml.dist b/tests/php-unit-tests/postbuild_integration.xml.dist
index b45e634bb6..df0cee5e02 100644
--- a/tests/php-unit-tests/postbuild_integration.xml.dist
+++ b/tests/php-unit-tests/postbuild_integration.xml.dist
@@ -16,6 +16,7 @@
         stopOnRisky="false"
         stopOnSkipped="false"
         verbose="true"
+        printerClass="\Sempro\PHPUnitPrettyPrinter\PrettyPrinterForPhpUnit9"
 >
 
     <php>
@@ -23,6 +24,7 @@
         <ini name="display_errors" value="On"/>
         <ini name="log_errors" value="On"/>
         <ini name="html_errors" value="Off"/>
+        <env name="PHPUNIT_PRETTY_PRINT_PROGRESS" value="true"/>
     </php>
 
     <testsuites>
diff --git a/tests/php-unit-tests/unitary-tests/application/ApplicationObjectExtensionTest.php b/tests/php-unit-tests/unitary-tests/application/ApplicationObjectExtensionTest.php
new file mode 100644
index 0000000000..81dca922c4
--- /dev/null
+++ b/tests/php-unit-tests/unitary-tests/application/ApplicationObjectExtensionTest.php
@@ -0,0 +1,108 @@
+<?php
+/*
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+/**
+ * @runTestsInSeparateProcesses
+ * @preserveGlobalState disabled
+ * @backupGlobals disabled
+ */
+class ApplicationObjectExtensionTest extends \Combodo\iTop\Test\UnitTest\ItopDataTestCase
+{
+	const CREATE_TEST_ORG = true;
+
+	// Count the calls by name
+	private static array $aCalls = [];
+	private static int $iCalls = 0;
+
+	protected function setUp(): void
+	{
+		parent::setUp();
+
+		$this->RequireOnceUnitTestFile('iApplicationObjectExtension/MockApplicationObjectExtensionForTest1.php');
+		$this->ResetApplicationObjectExtensions();
+		// Count all the calls to this object
+		MockApplicationObjectExtensionForTest1::SetCallBack([ApplicationObjectExtensionTest::class, 'IncrementCallCount']);
+	}
+
+	public function tearDown(): void
+	{
+		MockApplicationObjectExtensionForTest1::SetModifications('Person', 'name', 0);
+		MockApplicationObjectExtensionForTest1::SetCallBack(null);
+		parent::tearDown();
+	}
+
+	public static function IncrementCallCount(string $sOrigin)
+	{
+		self::$aCalls[$sOrigin] = (self::$aCalls[$sOrigin] ?? 0) + 1;
+		self::$iCalls++;
+	}
+
+	public static function ResetCallCount()
+	{
+		self::$aCalls = [];
+		self::$iCalls = 0;
+	}
+
+	public function testExtensionCalled()
+	{
+		// Check that extension is called
+		$oPerson = $this->CreatePerson(1);
+		$oPerson->Set('first_name', 'testUpdateReentranceProtection');
+		MockApplicationObjectExtensionForTest1::SetModifications('Person', 'name', 1);
+		self::ResetCallCount();
+		$oPerson->DBUpdate();
+		// Called twice, the first call will provoke the DBUpdate and call again the object extension
+		$this->assertEquals(2, self::$iCalls);
+	}
+
+	public function testUpdateReentranceProtection()
+	{
+		$oPerson = $this->CreatePerson(1);
+
+		// Check that loop limit is 10
+		$i = 15;
+		self::ResetCallCount();
+		MockApplicationObjectExtensionForTest1::SetModifications('Person', 'name', $i);
+		$oPerson->Set('first_name', 'testUpdateReentranceProtection');
+		$oPerson->DBUpdate();
+		$this->assertEquals(10, self::$iCalls);
+	}
+
+	public function testModificationsOnUpdate()
+	{
+		$oPerson = $this->CreatePerson(1);
+		$oPerson->Set('first_name', 'testUpdateReentranceProtection');
+
+		self::ResetCallCount();
+		MockApplicationObjectExtensionForTest1::SetModifications('Person', 'name', 1);
+		$oPerson->DBUpdate();
+		$this->assertEquals(2, self::$iCalls);
+	}
+
+	public function testModificationsOnInsert()
+	{
+		self::ResetCallCount();
+		MockApplicationObjectExtensionForTest1::SetModifications('Person', 'name', 1);
+		$oPerson = $this->CreatePerson(1);
+		$this->assertEquals(2, self::$iCalls);
+	}
+
+
+	public function testModificationsOnInsertWith2Extensions()
+	{
+		self::ResetCallCount();
+		$this->RequireOnceUnitTestFile('iApplicationObjectExtension/MockApplicationObjectExtensionForTest2.php');
+		$this->ResetApplicationObjectExtensions();
+		// Count all the calls to this object
+		MockApplicationObjectExtensionForTest2::SetCallBack([ApplicationObjectExtensionTest::class, 'IncrementCallCount']);
+
+		MockApplicationObjectExtensionForTest1::SetModifications('Person', 'name', 2);
+		MockApplicationObjectExtensionForTest2::SetModifications('Person', 'first_name', 2);
+		$oPerson = $this->CreatePerson(1);
+		$this->assertEquals(6, self::$iCalls);
+	}
+
+}
\ No newline at end of file
diff --git a/tests/php-unit-tests/unitary-tests/application/DesignerFormFieldTest.php b/tests/php-unit-tests/unitary-tests/application/DesignerFormFieldTest.php
new file mode 100644
index 0000000000..eae8975eba
--- /dev/null
+++ b/tests/php-unit-tests/unitary-tests/application/DesignerFormFieldTest.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * Copyright (C) 2018 Dennis Lassiter
+ *
+ * This file is part of iTop.
+ *
+ *  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.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with iTop. If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace Combodo\iTop\Test\UnitTest\Application;
+
+use Combodo\iTop\Test\UnitTest\ItopTestCase;
+use DesignerXMLField;
+use utils;
+
+/**
+ * @covers DesignerFormField
+ */
+class DesignerFormFieldTest extends ItopTestCase
+{
+	/**
+	 * @param string $sFieldFQCN
+	 * @param string $sInputValue
+	 * @param string $sExpectedValue
+	 *
+	 * @return void
+	 * @throws \ReflectionException
+	 * @covers DesignerLongTextField::PrepareValueForRendering
+	 * @dataProvider PrepareValueForRenderingProvider
+	 */
+	public function testPrepareValueForRendering(string $sFieldFQCN, string $sInputValue, string $sExpectedValue)
+	{
+		$oField = new $sFieldFQCN('field_code', 'Field label', $sInputValue);
+
+		$sTestedValue = $this->InvokeNonPublicMethod($sFieldFQCN, 'PrepareValueForRendering', $oField, []);
+		$this->assertEquals($sExpectedValue, $sTestedValue);
+	}
+
+	public function PrepareValueForRenderingProvider(): array
+	{
+		return [
+			'DesignerLongTextField should not double encode XML' => [
+				'\\DesignerLongTextField',
+				<<<XML
+<root>
+	<title id="title">Foo &amp; Bar</title>
+</root>
+XML,
+				<<<HTML
+&lt;root&gt;
+	&lt;title id=&quot;title&quot;&gt;Foo &amp; Bar&lt;/title&gt;
+&lt;/root&gt;
+HTML
+			],
+			'DesignerXMLField should double encode XML' => [
+				'\\DesignerXMLField',
+				<<<XML
+<root>
+	<title id="title">Foo &amp; Bar</title>
+</root>
+XML,
+				<<<HTML
+&lt;root&gt;
+	&lt;title id=&quot;title&quot;&gt;Foo &amp;amp; Bar&lt;/title&gt;
+&lt;/root&gt;
+HTML
+			],
+		];
+	}
+}
diff --git a/tests/php-unit-tests/unitary-tests/application/iApplicationObjectExtension/MockApplicationObjectExtensionForTest1.php b/tests/php-unit-tests/unitary-tests/application/iApplicationObjectExtension/MockApplicationObjectExtensionForTest1.php
new file mode 100644
index 0000000000..7e10e67506
--- /dev/null
+++ b/tests/php-unit-tests/unitary-tests/application/iApplicationObjectExtension/MockApplicationObjectExtensionForTest1.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+/**
+ * Test object for AbstractApplicationObjectExtension API
+ */
+class MockApplicationObjectExtensionForTest1 extends AbstractApplicationObjectExtension
+{
+	protected static $iCountModify;
+	protected static $sClass;
+	protected static $sAttCodeToModify;
+	protected static $callBack;
+
+
+	public function __construct()
+	{
+	}
+
+	public static function SetCallBack($callBack)
+	{
+		static::$callBack = $callBack;
+	}
+
+	public static function SetModifications($sClass, $sAttCodeToModify, $iCountModify)
+	{
+		static::$sClass = $sClass;
+		static::$sAttCodeToModify = $sAttCodeToModify;
+		if (!MetaModel::IsValidClass($sClass) || !MetaModel::IsValidAttCode($sClass, $sAttCodeToModify)) {
+			throw new Exception("Invalid class $sClass or attcode $sAttCodeToModify");
+		}
+		static::$iCountModify = $iCountModify;
+	}
+
+	public function OnDBUpdate($oObject, $oChange = null)
+	{
+		if (get_class($oObject) !== static::$sClass) {
+			return;
+		}
+
+		if (!is_null(static::$callBack)) {
+			call_user_func(static::$callBack, 'OnDBUpdate');
+		}
+
+		$aPreviousValues = $oObject->ListPreviousValuesForUpdatedAttributes();
+		$sPreviousValues = print_r($aPreviousValues, true);
+
+		IssueLog::Info(__METHOD__." received previous values:\n$sPreviousValues");
+
+		if (static::$iCountModify > 0) {
+			static::$iCountModify--;
+			$oObject->Set(static::$sAttCodeToModify, 'Value_'.rand());
+			$oObject->DBUpdate();
+		}
+	}
+
+	public function OnDBInsert($oObject, $oChange = null)
+	{
+		if (get_class($oObject) !== static::$sClass) {
+			return;
+		}
+
+		if (!is_null(static::$callBack)) {
+			call_user_func(static::$callBack, 'OnDBInsert');
+		}
+
+		if (static::$iCountModify > 0) {
+			static::$iCountModify--;
+			$oObject->Set(static::$sAttCodeToModify, 'Value_'.rand());
+			$oObject->DBUpdate();
+		}
+	}
+}
\ No newline at end of file
diff --git a/tests/php-unit-tests/unitary-tests/application/iApplicationObjectExtension/MockApplicationObjectExtensionForTest2.php b/tests/php-unit-tests/unitary-tests/application/iApplicationObjectExtension/MockApplicationObjectExtensionForTest2.php
new file mode 100644
index 0000000000..55871b1275
--- /dev/null
+++ b/tests/php-unit-tests/unitary-tests/application/iApplicationObjectExtension/MockApplicationObjectExtensionForTest2.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+/**
+ * Test object for AbstractApplicationObjectExtension API
+ */
+class MockApplicationObjectExtensionForTest2 extends AbstractApplicationObjectExtension
+{
+	protected static $iCountModify;
+	protected static $sClass;
+	protected static $sAttCodeToModify;
+	protected static $callBack;
+
+
+	public function __construct()
+	{
+	}
+
+	public static function SetCallBack($callBack)
+	{
+		static::$callBack = $callBack;
+	}
+
+	public static function SetModifications($sClass, $sAttCodeToModify, $iCountModify)
+	{
+		static::$sClass = $sClass;
+		static::$sAttCodeToModify = $sAttCodeToModify;
+		if (!MetaModel::IsValidClass($sClass) || !MetaModel::IsValidAttCode($sClass, $sAttCodeToModify)) {
+			throw new Exception("Invalid class $sClass or attcode $sAttCodeToModify");
+		}
+		static::$iCountModify = $iCountModify;
+	}
+
+	public function OnDBUpdate($oObject, $oChange = null)
+	{
+		if (get_class($oObject) !== static::$sClass) {
+			return;
+		}
+
+		if (!is_null(static::$callBack)) {
+			call_user_func(static::$callBack, 'OnDBUpdate');
+		}
+
+		$aPreviousValues = $oObject->ListPreviousValuesForUpdatedAttributes();
+		$sPreviousValues = print_r($aPreviousValues, true);
+
+		IssueLog::Info(__METHOD__." received previous values:\n$sPreviousValues");
+
+		if (static::$iCountModify > 0) {
+			static::$iCountModify--;
+			$oObject->Set(static::$sAttCodeToModify, 'Value_'.rand());
+			$oObject->DBUpdate();
+		}
+	}
+
+	public function OnDBInsert($oObject, $oChange = null)
+	{
+		if (get_class($oObject) !== static::$sClass) {
+			return;
+		}
+
+		if (!is_null(static::$callBack)) {
+			call_user_func(static::$callBack, 'OnDBInsert');
+		}
+
+		if (static::$iCountModify > 0) {
+			static::$iCountModify--;
+			$oObject->Set(static::$sAttCodeToModify, 'Value_'.rand());
+			$oObject->DBUpdate();
+		}
+	}
+}
\ No newline at end of file
diff --git a/tests/php-unit-tests/unitary-tests/application/utilsTest.php b/tests/php-unit-tests/unitary-tests/application/utilsTest.php
index fb55caeb96..4e4209c7ac 100644
--- a/tests/php-unit-tests/unitary-tests/application/utilsTest.php
+++ b/tests/php-unit-tests/unitary-tests/application/utilsTest.php
@@ -841,17 +841,19 @@ class utilsTest extends ItopTestCase
 	 *
 	 * @dataProvider escapeHtmlProvider
 	 */
-	public function testEscapeHtml($sInput, $sExpectedEscaped)
+	public function testEscapeHtml($sInput, $sExpectedEscaped, $bDoubleEncode = false)
 	{
 		if (is_null($sExpectedEscaped)) {
 			$sExpectedEscaped = $sInput;
 		}
 
-		$sEscaped = utils::EscapeHtml($sInput);
+		$sEscaped = utils::EscapeHtml($sInput, $bDoubleEncode);
 		self::assertSame($sExpectedEscaped, $sEscaped);
 
 		$sEscapedDecoded = utils::EscapedHtmlDecode($sEscaped);
-		self::assertSame($sInput, $sEscapedDecoded);
+		if (false === $bDoubleEncode) {
+			self::assertSame($sInput, $sEscapedDecoded);
+		}
 	}
 
 	public function escapeHtmlProvider()
@@ -859,8 +861,17 @@ class utilsTest extends ItopTestCase
 		return [
 			'no escape' => ['abcdefghijklmnop', null],
 			'&amp;'     => ['abcdefghijklmnop&0123456789', 'abcdefghijklmnop&amp;0123456789'],
-			['"double quotes"', '&quot;double quotes&quot;'],
-			["'simple quotes'", '&apos;simple quotes&apos;'],
+			'double quotes' => ['"double quotes"', '&quot;double quotes&quot;'],
+			'simple quotes' => ["'simple quotes'", '&apos;simple quotes&apos;'],
+			'no double encode' => [
+				'<root><title>Foo & Bar</title></root>',
+				'&lt;root&gt;&lt;title&gt;Foo &amp; Bar&lt;/title&gt;&lt;/root&gt;'
+			],
+			'double encode forced (for XML mostly)' => [
+				'<root><title>Foo &amp; Bar</title></root>',
+				'&lt;root&gt;&lt;title&gt;Foo &amp;amp; Bar&lt;/title&gt;&lt;/root&gt;',
+				true
+			],
 		];
 	}
 }
diff --git a/tests/php-unit-tests/unitary-tests/core/AttributeDefinitionTest.php b/tests/php-unit-tests/unitary-tests/core/AttributeDefinitionTest.php
index b8abf5d752..dac1b06087 100644
--- a/tests/php-unit-tests/unitary-tests/core/AttributeDefinitionTest.php
+++ b/tests/php-unit-tests/unitary-tests/core/AttributeDefinitionTest.php
@@ -181,4 +181,17 @@ PHP
 			],
 		];
 	}
+
+	public function testMakeFormField(): void
+	{
+		$oPerson = $this->CreatePerson(1);
+		$oPerson->Set('email', 'toto@tutu.com');
+		$oAttDef = MetaModel::GetAttributeDef(get_class($oPerson), 'email');
+		$oFormFieldWithTouchedAtt = $oAttDef->MakeFormField($oPerson);
+		$this->assertFalse($oFormFieldWithTouchedAtt->IsValidationDisabled(), 'email is part of modified fields, we must have field validation');
+
+		$oPerson->DBUpdate(); // reset list of changed attributes
+		$oFormFieldNoTouchedAtt = $oAttDef->MakeFormField($oPerson);
+		$this->assertTrue($oFormFieldNoTouchedAtt->IsValidationDisabled(), 'email wasn\'t modified, we must not validate the corresponding field');
+	}
 }
\ No newline at end of file
diff --git a/tests/php-unit-tests/unitary-tests/core/CRUDEventTest.php b/tests/php-unit-tests/unitary-tests/core/CRUDEventTest.php
index 37ea5d69d8..95dc968db2 100644
--- a/tests/php-unit-tests/unitary-tests/core/CRUDEventTest.php
+++ b/tests/php-unit-tests/unitary-tests/core/CRUDEventTest.php
@@ -284,8 +284,6 @@ class CRUDEventTest extends ItopDataTestCase
 	 */
 	public function testInfiniteUpdateDoneLoop()
 	{
-		$this->markTestSkipped('TEST Skipped: Protection not working.');
-
 		$oPerson = $this->CreatePerson(1);
 		$this->assertIsObject($oPerson);
 
@@ -343,7 +341,8 @@ class CRUDEventTest extends ItopDataTestCase
 		$this->assertEquals(4, self::$aEventCalls[EVENT_DB_CHECK_TO_WRITE]);
 		$this->assertEquals(4, self::$aEventCalls[EVENT_DB_BEFORE_WRITE]);
 		$this->assertEquals(4, self::$aEventCalls[EVENT_DB_AFTER_WRITE]);
-		$this->assertEquals(16, self::$iEventCalls);
+		$this->assertEquals(4, self::$aEventCalls[EVENT_DB_LINKS_CHANGED]);
+		$this->assertEquals(20, self::$iEventCalls);
 	}
 
 	/**
@@ -391,7 +390,8 @@ class CRUDEventTest extends ItopDataTestCase
 		$this->assertEquals(4, self::$aEventCalls[EVENT_DB_CHECK_TO_WRITE]);
 		$this->assertEquals(4, self::$aEventCalls[EVENT_DB_BEFORE_WRITE]);
 		$this->assertEquals(4, self::$aEventCalls[EVENT_DB_AFTER_WRITE]);
-		$this->assertEquals(16, self::$iEventCalls);
+		$this->assertEquals(3, self::$aEventCalls[EVENT_DB_LINKS_CHANGED]);
+		$this->assertEquals(19, self::$iEventCalls);
 
 		// Read the object explicitly from the DB to check that the role has been set
 		$oSet = new DBObjectSet(DBSearch::FromOQL('SELECT Team WHERE id=:id'), [], ['id' => $oTeam->GetKey()]);
@@ -480,9 +480,52 @@ class CRUDEventTest extends ItopDataTestCase
 		$this->assertTrue(CRUDEventReceiver::$bIsObjectInCrudStack);
 	}
 
+	public function testLinksAdded()
+	{
+		// Create a Person
+		$oPerson = $this->CreatePerson(1);
+
+		// Create a Team
+		$oTeam = MetaModel::NewObject(Team::class, ['name' => 'TestTeamWithLinkToAPerson', 'org_id' => $this->getTestOrgId()]);
+		$oTeam->DBInsert();
+
+		// Start receiving events
+		$oEventReceiver = new CRUDEventReceiver();
+		$oEventReceiver->RegisterCRUDListeners();
+
+		// Create a link between Person and Team => generate 2 EVENT_DB_LINKS_CHANGED
+		$oLnk = MetaModel::NewObject(lnkPersonToTeam::class, ['person_id' => $oPerson->GetKey(), 'team_id' => $oTeam->GetKey()]);
+		$oLnk->DBInsert();
+
+		$this->assertEquals(2, self::$aEventCalls[EVENT_DB_LINKS_CHANGED]);
+	}
+
+	public function testLinksDeleted()
+	{
+		// Create a Person
+		$oPerson = $this->CreatePerson(1);
+
+		// Create a Team
+		$oTeam = MetaModel::NewObject(Team::class, ['name' => 'TestTeamWithLinkToAPerson', 'org_id' => $this->getTestOrgId()]);
+		$oTeam->DBInsert();
+
+		// Create a link between Person and Team => generate 2 EVENT_DB_LINKS_CHANGED
+		$oLnk = MetaModel::NewObject(lnkPersonToTeam::class, ['person_id' => $oPerson->GetKey(), 'team_id' => $oTeam->GetKey()]);
+		$oLnk->DBInsert();
+
+		// Start receiving events
+		$oEventReceiver = new CRUDEventReceiver();
+		$oEventReceiver->RegisterCRUDListeners();
+
+		$oLnk->DBDelete();
+
+		$this->assertEquals(2, self::$aEventCalls[EVENT_DB_LINKS_CHANGED]);
+	}
 }
 
-
+/**
+ * Add debug feature to test support class
+ */
 class ClassesWithDebug
 {
 	/**
@@ -505,7 +548,7 @@ class ClassesWithDebug
 }
 
 /**
- * Count events received
+ * Test support class used to count events received
  * And allow callbacks on events
  */
 class CRUDEventReceiver extends ClassesWithDebug
@@ -514,6 +557,18 @@ class CRUDEventReceiver extends ClassesWithDebug
 
 	public static $bIsObjectInCrudStack;
 
+	//
+
+	/**
+	 * Add a specific callback for an event
+	 *
+	 * @param string $sEvent event name
+	 * @param string $sClass event source class name
+	 * @param string $sFct   function to call on CRUDEventReceiver object
+	 * @param int $iCount    limit the number of calls to the callback
+	 *
+	 * @return void
+	 */
 	public function AddCallback(string $sEvent, string $sClass, string $sFct, int $iCount = 1): void
 	{
 		$this->aCallbacks[$sEvent][$sClass] = [
@@ -527,7 +582,15 @@ class CRUDEventReceiver extends ClassesWithDebug
 		$this->aCallbacks = [];
 	}
 
-	// Event callbacks
+
+	/**
+	 * Event callbacks => this function counts the received events by event name and source class
+	 * If AddCallback() method has been called a specific callback is called, else only the count is done
+	 *
+	 * @param \Combodo\iTop\Service\Events\EventData $oData
+	 *
+	 * @return void
+	 */
 	public function OnEvent(EventData $oData)
 	{
 		$sEvent = $oData->GetEvent();
@@ -556,6 +619,7 @@ class CRUDEventReceiver extends ClassesWithDebug
 			EventService::RegisterListener(EVENT_DB_BEFORE_WRITE, [$this, 'OnEvent']);
 			EventService::RegisterListener(EVENT_DB_AFTER_WRITE, [$this, 'OnEvent']);
 			EventService::RegisterListener(EVENT_DB_AFTER_DELETE, [$this, 'OnEvent']);
+			EventService::RegisterListener(EVENT_DB_LINKS_CHANGED, [$this, 'OnEvent']);
 
 			return;
 		}
diff --git a/tests/php-unit-tests/unitary-tests/core/DBObjectTest.php b/tests/php-unit-tests/unitary-tests/core/DBObjectTest.php
index b2f75b80d8..23e9bd592d 100644
--- a/tests/php-unit-tests/unitary-tests/core/DBObjectTest.php
+++ b/tests/php-unit-tests/unitary-tests/core/DBObjectTest.php
@@ -116,13 +116,13 @@ class DBObjectTest extends ItopDataTestCase
 		$oOrg->DBUpdate();
 
 		$this->assertCount(0, $oOrg->ListChanges());
-		$this->assertCount(0, $oOrg->ListPreviousValuesForUpdatedAttributes());
+		$this->assertCount(1, $oOrg->ListPreviousValuesForUpdatedAttributes());
 
 		$oOrg->Set('name', $oOrg->Get('name'));
 		$this->assertCount(0, $oOrg->ListChanges());
 		$oOrg->DBUpdate();
 		$this->assertCount(0, $oOrg->ListChanges());
-		$this->assertCount(0, $oOrg->ListPreviousValuesForUpdatedAttributes());
+		$this->assertCount(1, $oOrg->ListPreviousValuesForUpdatedAttributes());
 
 		$oOrg->DBDelete();
 
@@ -132,7 +132,7 @@ class DBObjectTest extends ItopDataTestCase
 		$oOrg->Set('code', strtoupper('testListPreviousValuesForUpdatedAttributes'));
 		$oOrg->DBUpdate();
 		$oOrg->DBUpdate();
-		$this->assertCount(0, $oOrg->ListPreviousValuesForUpdatedAttributes());
+		$this->assertCount(1, $oOrg->ListPreviousValuesForUpdatedAttributes());
 	}
 
 	/**
@@ -140,7 +140,7 @@ class DBObjectTest extends ItopDataTestCase
 	 * @covers DBObject::Get
 	 * @covers DBObject::Set
 	 */
-	public function testAttributeRefresh_FriendlyName()
+	public function testAttributeRefresh_FriendlyNameWithoutCascade()
 	{
 		$oObject = \MetaModel::NewObject('Person', array('name' => 'Foo', 'first_name' => 'John', 'org_id' => 3, 'location_id' => 2));
 
@@ -149,6 +149,21 @@ class DBObjectTest extends ItopDataTestCase
 		static::assertEquals('John Who', $oObject->Get('friendlyname'));
 	}
 
+	/**
+	 * @covers DBObject::NewObject
+	 * @covers DBObject::Get
+	 * @covers DBObject::Set
+	 */
+	public function testAttributeRefresh_FriendlyNameWithCascade()
+	{
+		$oServer = \MetaModel::NewObject('Server', ['name' => 'ServerTest', 'org_id' => 3]);
+		$oServer->DBInsert();
+		$oDBServer = \MetaModel::NewObject('DBServer', ['name' => 'DBServerTest', 'org_id' => 3, 'system_id' => $oServer]);
+
+		static::assertEquals('ServerTest', $oDBServer->Get('system_name'));
+		static::assertEquals('DBServerTest ServerTest', $oDBServer->Get('friendlyname'));
+	}
+
 	/**
 	 * @covers MetaModel::GetObject
 	 * @covers DBObject::Get
@@ -174,8 +189,7 @@ class DBObjectTest extends ItopDataTestCase
 	public function testPartialAttributeEvaluation()
 	{
 		$oObject = \MetaModel::NewObject('Person', array('name' => 'Foo', 'org_id' => 3, 'location_id' => 2));
-
-		static::assertEquals('', $oObject->Get('friendlyname'));
+		static::assertEquals(' Foo', $oObject->Get('friendlyname'));
 	}
 
 	/**
@@ -186,7 +200,7 @@ class DBObjectTest extends ItopDataTestCase
 	{
 		$oObject = \MetaModel::NewObject('Person', array('org_id' => 3, 'location_id' => 2));
 
-		static::assertEquals('', $oObject->Get('friendlyname'));
+		static::assertEquals(' ', $oObject->Get('friendlyname'));
 	}
 
 	/**
@@ -198,7 +212,7 @@ class DBObjectTest extends ItopDataTestCase
 		$oUserProfile = new \URP_UserProfile();
 		$oUserProfile->Set('profileid', 2);
 
-		static::assertEquals('', $oUserProfile->Get('friendlyname'));
+		static::assertEquals('Link between  and Portal user', $oUserProfile->Get('friendlyname'));
 	}
 
 	/**
@@ -206,7 +220,7 @@ class DBObjectTest extends ItopDataTestCase
 	 * @covers DBObject::Get
 	 * @covers DBObject::Set
 	 */
-	public function testAttributeRefresh_ObsolescenceFlag()
+	public function testAttributeRefresh_ObsolescenceFlagWithoutCascade()
 	{
 		$oObject = \MetaModel::NewObject('Person', array('name' => 'Foo', 'first_name' => 'John', 'org_id' => 3, 'location_id' => 2));
 
@@ -215,6 +229,24 @@ class DBObjectTest extends ItopDataTestCase
 		static::assertEquals(true, (bool)$oObject->Get('obsolescence_flag'));
 	}
 
+	/**
+	 * @covers DBObject::NewObject
+	 * @covers DBObject::Get
+	 * @covers DBObject::Set
+	 */
+	public function testAttributeRefresh_ObsolescenceFlagWithCascade()
+	{
+		$this->markTestSkipped('Postponed');
+		// Necessary ext. key for $oDBServer
+		$oServer = \MetaModel::NewObject('Server', ['name' => 'ServerTest', 'org_id' => 3]);
+		$oServer->DBInsert();
+		$oDBServer = \MetaModel::NewObject('DBServer', ['name' => 'DBServerTest', 'org_id' => 3, 'system_id' => $oServer, 'status' => 'inactive']);
+		$oDBServer->DBInsert();
+
+		$oDBSchema = \MetaModel::NewObject('DatabaseSchema', ['name' => 'DBSchemaTest', 'org_id' => 3, 'dbserver_id' => $oDBServer]);
+		static::assertEquals(true, $oDBSchema->Get('obsolescence_flag'));
+	}
+
 	/**
 	 * @covers DBObject::NewObject
 	 * @covers DBObject::Get
@@ -520,7 +552,8 @@ class DBObjectTest extends ItopDataTestCase
 		$oPerson = $this->CreatePersonInstance();
 
 		// Insert without Reload
-		$oPerson->DBInsert();
+		$key = $oPerson->DBInsert();
+		$this->assertSame($key, $oPerson->GetKey());
 
 		// Get initial values
 		$aValues1 = [];
@@ -539,6 +572,9 @@ class DBObjectTest extends ItopDataTestCase
 
 		// 1st Reload
 		$oPerson->Reload(true);
+		// N°6281 - Rest API core/create key value is no more between quote
+		$this->assertSame($key, $oPerson->GetKey());
+
 		$sPerson2 = print_r($oPerson, true);
 		$this->assertNotEquals($sPerson1, $sPerson2);
 
diff --git a/tests/php-unit-tests/unitary-tests/core/ExpressionEvaluateTest.php b/tests/php-unit-tests/unitary-tests/core/ExpressionEvaluateTest.php
index d3216a4352..71428ab099 100644
--- a/tests/php-unit-tests/unitary-tests/core/ExpressionEvaluateTest.php
+++ b/tests/php-unit-tests/unitary-tests/core/ExpressionEvaluateTest.php
@@ -319,7 +319,7 @@ class ExpressionEvaluateTest extends iTopDataTestCase
 			['URP_UserProfile', ['profileid' => 2], 'friendlyname', ''],
 			['Location', ['name' => 'Grenoble', 'org_id' => 2], 'name', 'Grenoble'],
 			['Location', ['name' => 'Grenoble', 'org_id' => 2], 'friendlyname', ''],
-			['Location', ['name' => 'Grenoble', 'org_id' => 2], 'org_name', ''],
+			['Location', ['name' => 'Grenoble', 'org_id' => 2], 'org_name', 'IT Department'],
 			['Location', ['name' => 'Grenoble', 'org_id' => 2], 'org_id_friendlyname', ''],
 			['Location', ['name' => 'Grenoble', 'org_id' => 2], 'org_id', 2],
 			['Location', ['name' => 'Grenoble', 'org_id' => 2], 'CONCAT(SUBSTR(name, 4), " cause")', 'noble cause'],
diff --git a/tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/3.0_to_3.1.expected.xml b/tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/3.0_to_3.1.expected.xml
index a9efc79cc2..bcd33d37d7 100644
--- a/tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/3.0_to_3.1.expected.xml
+++ b/tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/3.0_to_3.1.expected.xml
@@ -1,66 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
-  <classes>
-    <class id="ClassWithAttributeLinkedSetEditModeNone">
-      <fields>
-        <field id="status" xsi:type="AttributeLinkedSet">
-          <edit_mode>none</edit_mode>
-          <relation_type>link</relation_type>
-          <read_only>true</read_only>
-        </field>
-      </fields>
-    </class>
-    <class id="ClassWithAttributeLinkedSetEditModeAddOnly">
-      <fields>
-        <field id="status" xsi:type="AttributeLinkedSet">
-          <edit_mode>add_only</edit_mode>
-          <relation_type>link</relation_type>
-          <read_only>false</read_only>
-        </field>
-      </fields>
-    </class>
-    <class id="ClassWithAttributeLinkedSetEditModeAddRemove">
-      <fields>
-        <field id="status" xsi:type="AttributeLinkedSet">
-          <edit_mode>add_remove</edit_mode>
-          <relation_type>link</relation_type>
-          <read_only>false</read_only>
-        </field>
-      </fields>
-    </class>
-    <class id="ClassWithAttributeLinkedSetEditModeActions">
-      <fields>
-        <field id="status" xsi:type="AttributeLinkedSet">
-          <edit_mode>actions</edit_mode>
-          <relation_type>link</relation_type>
-          <read_only>false</read_only>
-        </field>
-      </fields>
-    </class>
-    <class id="ClassWithAttributeLinkedSetEditModeInPlace">
-      <fields>
-        <field id="status" xsi:type="AttributeLinkedSet">
-          <edit_mode>in_place</edit_mode>
-          <relation_type>property</relation_type>
-          <read_only>false</read_only>
-        </field>
-      </fields>
-    </class>
-    <class id="ClassWithAttributeLinkedSetNoEditMode">
-      <fields>
-        <field id="status" xsi:type="AttributeLinkedSet">
-          <linked_class>Ticket</linked_class>
-          <relation_type>link</relation_type>
-          <read_only>false</read_only>
-        </field>
-      </fields>
-    </class>
-    <class id="ClassWithAttributeLinkedSetIndirect">
-      <fields>
-        <field id="status" xsi:type="AttributeLinkedSetIndirect">
-          <read_only>false</read_only>
-        </field>
-      </fields>
-    </class>
-  </classes>
 </itop_design>
diff --git a/tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/3.0_to_3.1.input.xml b/tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/3.0_to_3.1.input.xml
index 345edfd059..42642225cf 100644
--- a/tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/3.0_to_3.1.input.xml
+++ b/tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/3.0_to_3.1.input.xml
@@ -1,52 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.0">
-  <classes>
-    <class id="ClassWithAttributeLinkedSetEditModeNone">
-      <fields>
-        <field id="status" xsi:type="AttributeLinkedSet">
-          <edit_mode>none</edit_mode>
-        </field>
-      </fields>
-    </class>
-    <class id="ClassWithAttributeLinkedSetEditModeAddOnly">
-      <fields>
-        <field id="status" xsi:type="AttributeLinkedSet">
-          <edit_mode>add_only</edit_mode>
-        </field>
-      </fields>
-    </class>
-    <class id="ClassWithAttributeLinkedSetEditModeAddRemove">
-      <fields>
-        <field id="status" xsi:type="AttributeLinkedSet">
-          <edit_mode>add_remove</edit_mode>
-        </field>
-      </fields>
-    </class>
-    <class id="ClassWithAttributeLinkedSetEditModeActions">
-      <fields>
-        <field id="status" xsi:type="AttributeLinkedSet">
-          <edit_mode>actions</edit_mode>
-        </field>
-      </fields>
-    </class>
-    <class id="ClassWithAttributeLinkedSetEditModeInPlace">
-      <fields>
-        <field id="status" xsi:type="AttributeLinkedSet">
-          <edit_mode>in_place</edit_mode>
-        </field>
-      </fields>
-    </class>
-    <class id="ClassWithAttributeLinkedSetNoEditMode">
-      <fields>
-        <field id="status" xsi:type="AttributeLinkedSet">
-          <linked_class>Ticket</linked_class>
-        </field>
-      </fields>
-    </class>
-    <class id="ClassWithAttributeLinkedSetIndirect">
-      <fields>
-        <field id="status" xsi:type="AttributeLinkedSetIndirect"/>
-      </fields>
-    </class>
-  </classes>
 </itop_design>
diff --git a/tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/3.1_to_3.0.expected.xml b/tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/3.1_to_3.0.expected.xml
index 53caee4008..e2b62fe890 100644
--- a/tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/3.1_to_3.0.expected.xml
+++ b/tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/3.1_to_3.0.expected.xml
@@ -4,53 +4,6 @@
     <class id="ClassWithCustomZlist">
       <presentation/>
     </class>
-    <class id="ClassWithAttributeLinkedSetEditModeNone">
-      <fields>
-        <field id="status" xsi:type="AttributeLinkedSet">
-          <edit_mode>none</edit_mode>
-        </field>
-      </fields>
-    </class>
-    <class id="ClassWithAttributeLinkedSetEditModeAddOnly">
-      <fields>
-        <field id="status" xsi:type="AttributeLinkedSet">
-          <edit_mode>add_only</edit_mode>
-        </field>
-      </fields>
-    </class>
-    <class id="ClassWithAttributeLinkedSetEditModeAddRemove">
-      <fields>
-        <field id="status" xsi:type="AttributeLinkedSet">
-          <edit_mode>add_remove</edit_mode>
-        </field>
-      </fields>
-    </class>
-    <class id="ClassWithAttributeLinkedSetEditModeActions">
-      <fields>
-        <field id="status" xsi:type="AttributeLinkedSet">
-          <edit_mode>actions</edit_mode>
-        </field>
-      </fields>
-    </class>
-    <class id="ClassWithAttributeLinkedSetEditModeInPlace">
-      <fields>
-        <field id="status" xsi:type="AttributeLinkedSet">
-          <edit_mode>in_place</edit_mode>
-        </field>
-      </fields>
-    </class>
-    <class id="ClassWithAttributeLinkedSetNoEditMode">
-      <fields>
-        <field id="status" xsi:type="AttributeLinkedSet">
-          <linked_class>Ticket</linked_class>
-        </field>
-      </fields>
-    </class>
-    <class id="ClassWithAttributeLinkedSetIndirect">
-      <fields>
-        <field id="status" xsi:type="AttributeLinkedSetIndirect"/>
-      </fields>
-    </class>
     <class id="ClassWithAttributeLinkedSetDisplayStyle">
       <fields>
         <field id="status" xsi:type="AttributeLinkedSet"/>
diff --git a/tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/3.1_to_3.0.input.xml b/tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/3.1_to_3.0.input.xml
index df08e12600..1e6eaecf80 100644
--- a/tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/3.1_to_3.0.input.xml
+++ b/tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/3.1_to_3.0.input.xml
@@ -14,67 +14,6 @@
         </custom_presentations>
       </presentation>
     </class>
-    <class id="ClassWithAttributeLinkedSetEditModeNone">
-      <fields>
-        <field id="status" xsi:type="AttributeLinkedSet">
-          <edit_mode>none</edit_mode>
-          <relation_type>link</relation_type>
-          <read_only>true</read_only>
-        </field>
-      </fields>
-    </class>
-    <class id="ClassWithAttributeLinkedSetEditModeAddOnly">
-      <fields>
-        <field id="status" xsi:type="AttributeLinkedSet">
-          <edit_mode>add_only</edit_mode>
-          <relation_type>link</relation_type>
-          <read_only>false</read_only>
-        </field>
-      </fields>
-    </class>
-    <class id="ClassWithAttributeLinkedSetEditModeAddRemove">
-      <fields>
-        <field id="status" xsi:type="AttributeLinkedSet">
-          <edit_mode>add_remove</edit_mode>
-          <relation_type>link</relation_type>
-          <read_only>false</read_only>
-        </field>
-      </fields>
-    </class>
-    <class id="ClassWithAttributeLinkedSetEditModeActions">
-      <fields>
-        <field id="status" xsi:type="AttributeLinkedSet">
-          <edit_mode>actions</edit_mode>
-          <relation_type>link</relation_type>
-          <read_only>false</read_only>
-        </field>
-      </fields>
-    </class>
-    <class id="ClassWithAttributeLinkedSetEditModeInPlace">
-      <fields>
-        <field id="status" xsi:type="AttributeLinkedSet">
-          <edit_mode>in_place</edit_mode>
-          <relation_type>property</relation_type>
-          <read_only>false</read_only>
-        </field>
-      </fields>
-    </class>
-    <class id="ClassWithAttributeLinkedSetNoEditMode">
-      <fields>
-        <field id="status" xsi:type="AttributeLinkedSet">
-          <linked_class>Ticket</linked_class>
-          <relation_type>link</relation_type>
-          <read_only>false</read_only>
-        </field>
-      </fields>
-    </class>
-    <class id="ClassWithAttributeLinkedSetIndirect">
-      <fields>
-        <field id="status" xsi:type="AttributeLinkedSetIndirect">
-          <read_only>false</read_only>
-        </field>
-      </fields>
-    </class>
     <class id="ClassWithAttributeLinkedSetDisplayStyle">
       <fields>
         <field id="status" xsi:type="AttributeLinkedSet">
diff --git a/tests/php-unit-tests/unitary-tests/sources/Form/Field/FieldTest.php b/tests/php-unit-tests/unitary-tests/sources/Form/Field/FieldTest.php
new file mode 100644
index 0000000000..d915082efa
--- /dev/null
+++ b/tests/php-unit-tests/unitary-tests/sources/Form/Field/FieldTest.php
@@ -0,0 +1,127 @@
+<?php
+/*
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+namespace Combodo\iTop\Test\UnitTest\Sources\Form\Field;
+
+use Combodo\iTop\Form\Field\StringField;
+use Combodo\iTop\Form\Field\SubFormField;
+use Combodo\iTop\Form\Validator\CustomRegexpValidator;
+use Combodo\iTop\Form\Validator\IntegerValidator;
+use Combodo\iTop\Form\Validator\MandatoryValidator;
+use Combodo\iTop\Test\UnitTest\ItopTestCase;
+
+class FieldTest extends ItopTestCase
+{
+    public function testIsValidationDisabled(): void
+	{
+		$oField = new StringField('test');
+		$oField->SetCurrentValue('toto@johny.invalid');
+		$sDumbEmailValidatorErrorMessage = 'dumb email validator error message';
+		$oDumbEmailValidator = new CustomRegexpValidator('\d+@\d+\.\d{2,3}', $sDumbEmailValidatorErrorMessage);
+		$oField->AddValidator($oDumbEmailValidator);
+
+		$bIsFieldValid = $oField->Validate();
+		$this->assertFalse($bIsFieldValid);
+		$this->assertCount(1, $oField->GetErrorMessages());
+		$this->assertSame($sDumbEmailValidatorErrorMessage, $oField->GetErrorMessages()[0]);
+
+		/** @noinspection PhpRedundantOptionalArgumentInspection */
+		$oField->SetValidationDisabled(true);
+		$this->assertTrue($oField->Validate());
+	}
+
+	public function testSetMandatory(): void
+	{
+		$oField = new StringField('test');
+		$this->assertCount(0, $oField->GetValidators());
+
+		$oField->SetMandatory(true);
+		$aValidatorsAfterSetMandatoryTrue = $oField->GetValidators();
+		$this->assertCount(1, $aValidatorsAfterSetMandatoryTrue);
+		$this->assertIsObject($aValidatorsAfterSetMandatoryTrue[0]);
+		$this->assertSame(MandatoryValidator::class, get_class($aValidatorsAfterSetMandatoryTrue[0]));
+
+		$oField->SetMandatory(false);
+		$this->assertCount(0, $oField->GetValidators());
+	}
+
+	public function testAddValidator(): void
+	{
+		$oField = new StringField('test');
+		$this->assertCount(0, $oField->GetValidators());
+
+		$oField->SetCurrentValue('not a numeric value');
+		$this->assertTrue($oField->Validate());
+
+		$oField->AddValidator(new IntegerValidator());
+		$aValidatorsAfterAddingIntegerValidator = $oField->GetValidators();
+		$this->assertCount(1, $aValidatorsAfterAddingIntegerValidator);
+		$this->assertIsObject($aValidatorsAfterAddingIntegerValidator[0]);
+		$this->assertSame(IntegerValidator::class, get_class($aValidatorsAfterAddingIntegerValidator[0]));
+		$this->assertFalse($oField->Validate());
+		$this->assertCount(1, $oField->GetErrorMessages());
+	}
+
+	public function testValidateWithTwoValidatorsFirstWrong(): void
+	{
+		$oField = new StringField('test');
+		$oField->SetCurrentValue('string with spaces');
+
+		$sFirstValidatorInvalidResultErrorMsg = 'dumb email validator error message';
+		$oFirstValidatorInvalidResult = new CustomRegexpValidator('^[a-z]+$', $sFirstValidatorInvalidResultErrorMsg);
+		$oField->AddValidator($oFirstValidatorInvalidResult);
+
+		$oSecondValidatorValidResult = new CustomRegexpValidator('^.+$', 'valid');
+		$oField->AddValidator($oSecondValidatorValidResult);
+
+		$this->assertFalse($oField->Validate());
+		$this->assertCount(1, $oField->GetErrorMessages());
+		$this->assertSame($sFirstValidatorInvalidResultErrorMsg, $oField->GetErrorMessages()[0]);
+	}
+
+	public function testSubFormFieldValidation(): void
+	{
+		$oSubFormField = new SubFormField('test_subformfield');
+
+		$oField = new StringField('test_field');
+		$oField->SetMandatory(true);
+
+		$oSubFormField->GetForm()->AddField($oField);
+
+		$bIsSubFormFieldValid = $oSubFormField->Validate();
+		$this->assertFalse($bIsSubFormFieldValid);
+		$this->assertCount(1, $oSubFormField->GetErrorMessages());
+
+		$oField->SetCurrentValue('test string');
+		$bIsSubFormFieldValidAfterFieldUpdate = $oSubFormField->Validate();
+		$this->assertTrue($bIsSubFormFieldValidAfterFieldUpdate);
+		$this->assertCount(0, $oSubFormField->GetErrorMessages());
+	}
+
+	public function testRemoveValidatorsOfClass(): void {
+		$oField = new StringField('test');
+
+		$this->assertCount(0, $oField->GetValidators());
+		$oField->RemoveValidatorsOfClass(CustomRegexpValidator::class);
+		$this->assertCount(0, $oField->GetValidators());
+
+		$oField->AddValidator(new IntegerValidator());
+		$this->assertCount(1, $oField->GetValidators());
+		$oField->RemoveValidatorsOfClass(CustomRegexpValidator::class);
+		$this->assertCount(1, $oField->GetValidators());
+
+		$oField->AddValidator(new CustomRegexpValidator('^.*$'));
+		$this->assertCount(2, $oField->GetValidators());
+		$oField->RemoveValidatorsOfClass(CustomRegexpValidator::class);
+		$this->assertCount(1, $oField->GetValidators());
+
+		$oField->AddValidator(new CustomRegexpValidator('^.*$'));
+		$oField->AddValidator(new CustomRegexpValidator('^.*$'));
+		$this->assertCount(3, $oField->GetValidators());
+		$oField->RemoveValidatorsOfClass(CustomRegexpValidator::class);
+		$this->assertCount(1, $oField->GetValidators());
+	}
+}
\ No newline at end of file
diff --git a/tests/php-unit-tests/unitary-tests/sources/Form/LinkedSetFieldTest.php b/tests/php-unit-tests/unitary-tests/sources/Form/LinkedSetFieldTest.php
new file mode 100644
index 0000000000..6d006257e5
--- /dev/null
+++ b/tests/php-unit-tests/unitary-tests/sources/Form/LinkedSetFieldTest.php
@@ -0,0 +1,40 @@
+<?php
+/*
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+namespace Form;
+
+use Combodo\iTop\Form\Field\LinkedSetField;
+use Combodo\iTop\Test\UnitTest\ItopDataTestCase;
+use ormLinkSet;
+use Person;
+
+class LinkedSetFieldTest extends ItopDataTestCase {
+	public function testValidate(): void {
+		$sLinkedClass = Ticket::class;
+		$oLinkedSetField = new LinkedSetField('test');
+		$oLinkedSetField->SetIndirect(false);
+		$oLinkedSetField->SetTargetClass($sLinkedClass);
+		$oLinkedSetField->SetLinkedClass($sLinkedClass);
+		$oLinkedSetField->SetLnkAttributesToDisplay(['title' => 'title']);
+
+		$oSetThreeExistingTickets = new ormLinkSet(Person::class, 'tickets_list');
+		$this->CreateTestOrganization();
+		$oUserRequest1 = $this->CreateUserRequest(1);
+		$oUserRequest2 = $this->CreateUserRequest(2);
+		$oUserRequest3 = $this->CreateUserRequest(3);
+		$oSetThreeExistingTickets->AddItem($oUserRequest1);
+		$oSetThreeExistingTickets->AddItem($oUserRequest2);
+		$oSetThreeExistingTickets->AddItem($oUserRequest3);
+		$oLinkedSetField->SetCurrentValue($oSetThreeExistingTickets);
+		$this->assertTrue($oLinkedSetField->Validate(), 'A set with existing objects and no modifications must be OK');
+
+		$oUserRequest1->Set('title', 'this a modified title !');
+		$this->assertTrue($oLinkedSetField->Validate(), 'A set with existing objects and a valid modification must be OK');
+
+		$oUserRequest1->Set('title', '');
+		$this->assertFalse($oLinkedSetField->Validate(), 'A set with existing objects and an invalid modification must be KO');
+	}
+}
\ No newline at end of file
diff --git a/tests/php-unit-tests/unitary-tests/sources/Form/MultipleChoicesFieldTest.php b/tests/php-unit-tests/unitary-tests/sources/Form/MultipleChoicesFieldTest.php
new file mode 100644
index 0000000000..8724502e24
--- /dev/null
+++ b/tests/php-unit-tests/unitary-tests/sources/Form/MultipleChoicesFieldTest.php
@@ -0,0 +1,107 @@
+<?php
+/*
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+namespace Form;
+
+use Combodo\iTop\Form\Field\MultipleChoicesField;
+use Combodo\iTop\Form\Field\MultipleSelectField;
+use Combodo\iTop\Form\Field\SelectField;
+use Combodo\iTop\Test\UnitTest\ItopTestCase;
+use ContextTag;
+
+class MultipleChoicesFieldTest extends ItopTestCase
+{
+	public function testValidateForMultipleSelectField(): void
+	{
+		$oMultipleChoicesField = new MultipleSelectField('test');
+		$oMultipleChoicesField->AddChoice('A');
+		$oMultipleChoicesField->AddChoice('B');
+		$oMultipleChoicesField->AddChoice('C');
+		$oMultipleChoicesField->AddChoice('D');
+
+		// N°1150 the control was added for the REST API initially and was only triggered with the corresponding ContextTag
+		$oRestContext = new ContextTag(ContextTag::TAG_REST);
+		$this->ValidateMultipleSelectField($oMultipleChoicesField);
+
+		// retrying without REST context
+		unset($oRestContext);
+		$this->ValidateMultipleSelectField($oMultipleChoicesField);
+	}
+
+	private function ValidateMultipleSelectField(MultipleChoicesField $oMultipleChoicesField): void
+	{
+		$oMultipleChoicesField->SetCurrentValue(null);
+		$this->assertTrue($oMultipleChoicesField->Validate(), 'No value must be valid');
+
+		$sExistingValue = 'A';
+		$sNonExistingValue = 'Non existing choice';
+		$sNonExistingValue1 = 'Non existing choice 1';
+		$sNonExistingValue2 = 'Non existing choice 2';
+
+		$oMultipleChoicesField->SetCurrentValue($sExistingValue);
+		$this->assertTrue($oMultipleChoicesField->Validate(), 'Value among possible ones is valid');
+
+		$oMultipleChoicesField->SetCurrentValue($sNonExistingValue);
+		$this->assertFalse($oMultipleChoicesField->Validate(), 'Value not among possible ones is invalid');
+		$this->assertCount(1, $oMultipleChoicesField->GetErrorMessages());
+		$this->assertStringContainsString($sNonExistingValue, $oMultipleChoicesField->GetErrorMessages()[0]);
+
+		$oMultipleChoicesField->SetCurrentValue([$sNonExistingValue1, $sNonExistingValue2]);
+		$this->assertFalse($oMultipleChoicesField->Validate(), 'Multiple values not among possible ones is invalid');
+		$this->assertCount(2, $oMultipleChoicesField->GetErrorMessages());
+		$this->assertStringContainsString($sNonExistingValue1, $oMultipleChoicesField->GetErrorMessages()[0]);
+		$this->assertStringContainsString($sNonExistingValue2, $oMultipleChoicesField->GetErrorMessages()[1]);
+
+		$oMultipleChoicesField->SetCurrentValue([$sExistingValue, $sNonExistingValue]);
+		$this->assertFalse($oMultipleChoicesField->Validate(), 'Valid value + Value not among possible ones is invalid');
+		$this->assertCount(1, $oMultipleChoicesField->GetErrorMessages());
+		$this->assertStringContainsString($sNonExistingValue, $oMultipleChoicesField->GetErrorMessages()[0]);
+
+		$oMultipleChoicesField->SetCurrentValue([$sExistingValue, $sNonExistingValue1, $sNonExistingValue2]);
+		$this->assertFalse($oMultipleChoicesField->Validate(), 'Valid value + Multiple values not among possible ones is invalid');
+		$this->assertCount(2, $oMultipleChoicesField->GetErrorMessages());
+		$this->assertStringContainsString($sNonExistingValue1, $oMultipleChoicesField->GetErrorMessages()[0]);
+		$this->assertStringContainsString($sNonExistingValue2, $oMultipleChoicesField->GetErrorMessages()[1]);
+	}
+
+	public function testValidateForSelectField(): void
+	{
+		$oMultipleChoicesField = new SelectField('test');
+		$oMultipleChoicesField->AddChoice('A');
+		$oMultipleChoicesField->AddChoice('B');
+		$oMultipleChoicesField->AddChoice('C');
+		$oMultipleChoicesField->AddChoice('D');
+
+		// N°1150 the control was added for the REST API initially and was only triggered with the corresponding ContextTag
+		$oRestContext = new ContextTag(ContextTag::TAG_REST);
+		$this->ValidateSelectField($oMultipleChoicesField);
+
+		// retrying without REST context
+		unset($oRestContext);
+		$this->ValidateSelectField($oMultipleChoicesField);
+
+		$oMultipleChoicesField = new SelectField('test');
+		$oMultipleChoicesField->SetChoices(['A' => 'A', 'B' => 'B', 'C' => 'C', 'D' => 'D']);
+		$this->ValidateSelectField($oMultipleChoicesField);
+	}
+
+	private function ValidateSelectField(MultipleChoicesField $oMultipleChoicesField): void
+	{
+		$oMultipleChoicesField->SetCurrentValue(null);
+		$this->assertTrue($oMultipleChoicesField->Validate(), 'No value must be valid');
+
+		$sExistingValue = 'A';
+		$sNonExistingValue = 'Non existing choice';
+
+		$oMultipleChoicesField->SetCurrentValue($sExistingValue);
+		$this->assertTrue($oMultipleChoicesField->Validate(), 'Value among possible ones is valid');
+
+		$oMultipleChoicesField->SetCurrentValue($sNonExistingValue);
+		$this->assertFalse($oMultipleChoicesField->Validate(), 'Value not among possible ones is invalid');
+		$this->assertCount(1, $oMultipleChoicesField->GetErrorMessages());
+		$this->assertStringContainsString($sNonExistingValue, $oMultipleChoicesField->GetErrorMessages()[0]);
+	}
+}
\ No newline at end of file
diff --git a/tests/php-unit-tests/unitary-tests/sources/Form/SelectObjectFieldTest.php b/tests/php-unit-tests/unitary-tests/sources/Form/SelectObjectFieldTest.php
new file mode 100644
index 0000000000..1f788f043f
--- /dev/null
+++ b/tests/php-unit-tests/unitary-tests/sources/Form/SelectObjectFieldTest.php
@@ -0,0 +1,43 @@
+<?php
+/*
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+namespace Form;
+
+use Combodo\iTop\Form\Field\SelectObjectField;
+use Combodo\iTop\Test\UnitTest\ItopDataTestCase;
+use ContextTag;
+use DBObjectSearch;
+use Organization;
+
+class SelectObjectFieldTest extends ItopDataTestCase {
+	public function testValidate(): void {
+		$oSelectObjectField = new SelectObjectField('test');
+		$oSelectObjectField->SetSearch(DBObjectSearch::FromOQL('SELECT '.Organization::class));
+
+		// N°1150 the control was added for the REST API initially and was only triggered with the corresponding ContextTag
+		$oRestContext = new ContextTag(ContextTag::TAG_REST);
+		$this->ValidateSelectObjectField($oSelectObjectField);
+
+		// retrying without REST context
+		unset($oRestContext);
+		$this->ValidateSelectObjectField($oSelectObjectField);
+	}
+
+	private function ValidateSelectObjectField(SelectObjectField $oSelectObjectField): void {
+		$oSelectObjectField->SetCurrentValue(null);
+		$this->assertTrue($oSelectObjectField->Validate(), 'No value must be valid');
+
+		$sExistingOrganizationId = 1;
+		$oSelectObjectField->SetCurrentValue($sExistingOrganizationId);
+		$this->assertTrue($oSelectObjectField->Validate(), 'An existing object id must be valid');
+
+		$sNonExistingOrganizationId = 999999;
+		$oSelectObjectField->SetCurrentValue($sNonExistingOrganizationId);
+		$this->assertFalse($oSelectObjectField->Validate(), 'An non existing object id must be invalid');
+		$this->assertCount(1, $oSelectObjectField->GetErrorMessages());
+		$this->assertStringContainsString($sNonExistingOrganizationId, $oSelectObjectField->GetErrorMessages()[0]);
+	}
+}
\ No newline at end of file
diff --git a/tests/php-unit-tests/unitary-tests/sources/Form/Validator/ValidatorTest.php b/tests/php-unit-tests/unitary-tests/sources/Form/Validator/ValidatorTest.php
new file mode 100644
index 0000000000..2f87eacc12
--- /dev/null
+++ b/tests/php-unit-tests/unitary-tests/sources/Form/Validator/ValidatorTest.php
@@ -0,0 +1,31 @@
+<?php
+/*
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+namespace Combodo\iTop\Test\UnitTest\Sources\Form\Validator;
+
+use Combodo\iTop\Form\Field\StringField;
+use Combodo\iTop\Form\Validator\MandatoryValidator;
+use Combodo\iTop\Test\UnitTest\ItopTestCase;
+
+class ValidatorTest extends ItopTestCase
+{
+	public function testMandatoryValidator()
+	{
+		$oField = new StringField('test');
+		$oField->SetMandatory(true);
+		$oField->SetCurrentValue('there is a value !');
+
+		$bIsMandatoryFieldValidWithExistingValue = $oField->Validate();
+		$this->assertTrue($bIsMandatoryFieldValidWithExistingValue);
+
+		$oField->SetCurrentValue(null);
+		$bIsMandatoryFieldValidWithNoValue = $oField->Validate();
+		$this->assertFalse($bIsMandatoryFieldValidWithNoValue);
+		$this->assertNotEmpty($oField->GetErrorMessages());
+		$this->assertCount(1, $oField->GetErrorMessages());
+		$this->assertStringContainsString(MandatoryValidator::DEFAULT_ERROR_MESSAGE, $oField->GetErrorMessages()[0]);
+	}
+}
\ No newline at end of file
diff --git a/tests/php-unit-tests/unitary-tests/sources/Service/Router/RouterTest.php b/tests/php-unit-tests/unitary-tests/sources/Service/Router/RouterTest.php
index f110c6b537..f616c77c2a 100644
--- a/tests/php-unit-tests/unitary-tests/sources/Service/Router/RouterTest.php
+++ b/tests/php-unit-tests/unitary-tests/sources/Service/Router/RouterTest.php
@@ -20,6 +20,16 @@ use utils;
  */
 class RouterTest extends ItopTestCase
 {
+	/**
+	 * @inheritDoc
+	 */
+	protected function setUp(): void
+	{
+		parent::setUp();
+
+		$this->RequireOnceItopFile('setup/setuputils.class.inc.php');
+	}
+
 	/**
 	 * @covers \Combodo\iTop\Service\Router\Router::GenerateUrl
 	 * @dataProvider GenerateUrlProvider
@@ -169,6 +179,94 @@ class RouterTest extends ItopTestCase
 		$this->assertEquals($bShouldBePresent, $bIsPresent, "Route '$sRoute' was not expected amongst the available routes.");
 	}
 
+	/**
+	 * @covers \Combodo\iTop\Service\Router\Router::GetRoutes
+	 * @return void
+	 *
+	 * @since N°6618 Covers that the cache isn't re-generated at each call of the GetRoutes method
+	 */
+	public function testGetRoutesCacheGeneratedOnlyOnce(): void
+	{
+		$oRouter = Router::GetInstance();
+		$sRoutesCacheFilePath = $this->InvokeNonPublicMethod(Router::class, 'GetCacheFileAbsPath', $oRouter, []);
+
+		// Developer mode must be disabled for the routes cache to be used
+		$oConf = utils::GetConfig();
+		$mDeveloperModePreviousValue = $oConf->Get('developer_mode.enabled');
+		$oConf->Set('developer_mode.enabled', false);
+
+		// Generate cache for first time
+		$this->InvokeNonPublicMethod(Router::class, 'GetRoutes', $oRouter, []);
+
+		// Check that file exists and retrieve modification timestamp
+		if (false === is_file($sRoutesCacheFilePath)) {
+			$this->fail("Cache file was not generated ($sRoutesCacheFilePath)");
+		}
+
+		clearstatcache();
+		$iFirstModificationTimestamp = filemtime($sRoutesCacheFilePath);
+		$this->debug("Initial timestamp: $iFirstModificationTimestamp");
+
+		// Wait for just 1s to ensure timestamps would be different is the file is re-generated
+		sleep(1);
+
+		// Call GetRoutes() again to see if cache gets re-generated or not
+		$this->InvokeNonPublicMethod(Router::class, 'GetRoutes', $oRouter, []);
+
+		// Check that file still exists and that modification timestamp has not changed
+		if (false === is_file($sRoutesCacheFilePath)) {
+			$this->fail("Cache file is no longer present, that should not happen! ($sRoutesCacheFilePath)");
+		}
+
+		clearstatcache();
+		$iSecondModificationTimestamp = filemtime($sRoutesCacheFilePath);
+		$this->debug("Second timestamp: $iSecondModificationTimestamp");
+
+		$this->assertSame($iFirstModificationTimestamp, $iSecondModificationTimestamp, "Cache file timestamp changed, seems like cache is not working and was re-generated when it should not!");
+
+		// Restore previous value for following tests
+		$oConf->Set('developer_mode.enabled', $mDeveloperModePreviousValue);
+	}
+
+	/**
+	 * @covers \Combodo\iTop\Service\Router\Router::GetRoutes
+	 * @return void
+	 *
+	 * @since N°6618 Covers that the cache is re-generated correctly if corrupted
+	 */
+	public function testGetRoutesCacheRegeneratedCorrectlyIfCorrupted(): void
+	{
+		$oRouter = Router::GetInstance();
+		$sRoutesCacheFilePath = $this->InvokeNonPublicMethod(Router::class, 'GetCacheFileAbsPath', $oRouter, []);
+
+		// Developer mode must be disabled for the routes cache to be used
+		$oConf = utils::GetConfig();
+		$mDeveloperModePreviousValue = $oConf->Get('developer_mode.enabled');
+		$oConf->Set('developer_mode.enabled', false);
+
+		// Generate corrupted cache manually
+		$sFaultyStatement = 'return 1;';
+		file_put_contents($sRoutesCacheFilePath, <<<PHP
+<?php
+
+{$sFaultyStatement}
+PHP
+		);
+
+		// Retrieve routes to access / fix cache in the process
+		$aRoutes = $this->InvokeNonPublicMethod(Router::class, 'GetRoutes', $oRouter, []);
+
+		// Check that routes are an array
+		$this->assertTrue(is_array($aRoutes));
+
+		// Check that file content doesn't contain `return 1`
+		clearstatcache();
+		$this->assertStringNotContainsString($sFaultyStatement, file_get_contents($sRoutesCacheFilePath), "Cache file still contains the faulty statement ($sFaultyStatement)");
+
+		// Restore previous value for following tests
+		$oConf->Set('developer_mode.enabled', $mDeveloperModePreviousValue);
+	}
+
 	public function GetRoutesProvider(): array
 	{
 		return [
diff --git a/tests/php-unit-tests/unitary-tests/sources/Service/TemporaryObjects/TemporaryObjectManagerTest.php b/tests/php-unit-tests/unitary-tests/sources/Service/TemporaryObjects/TemporaryObjectManagerTest.php
new file mode 100644
index 0000000000..86c49529d0
--- /dev/null
+++ b/tests/php-unit-tests/unitary-tests/sources/Service/TemporaryObjects/TemporaryObjectManagerTest.php
@@ -0,0 +1,172 @@
+<?php
+/*
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+namespace Combodo\iTop\Test\UnitTest\Service\TemporaryObjects;
+
+use Combodo\iTop\Service\TemporaryObjects\TemporaryObjectConfig;
+use Combodo\iTop\Service\TemporaryObjects\TemporaryObjectHelper;
+use Combodo\iTop\Service\TemporaryObjects\TemporaryObjectManager;
+use Combodo\iTop\Service\TemporaryObjects\TemporaryObjectRepository;
+use Combodo\iTop\Test\UnitTest\ItopDataTestCase;
+
+/**
+ * @runTestsInSeparateProcesses
+ * @preserveGlobalState disabled
+ * @backupGlobals disabled
+ */
+class TemporaryObjectManagerTest extends ItopDataTestCase
+{
+	const USE_TRANSACTION = true;
+	const CREATE_TEST_ORG = false;
+
+	private TemporaryObjectConfig $oConfig;
+	private $oManager;
+
+	protected function setUp(): void
+	{
+		parent::setUp();
+
+		$this->oConfig = TemporaryObjectConfig::GetInstance();
+		$this->oManager = TemporaryObjectManager::GetInstance();
+	}
+
+	public function testCreateTemporaryObject()
+	{
+		$sTempId = 'testCreateTemporaryObject';
+		$this->oConfig->SetConfigTemporaryLifetime(3000);
+		$this->oConfig->SetConfigTemporaryForce(true);
+
+		$oDescriptor = $this->oManager->CreateTemporaryObject($sTempId, 'FakedClass', -1, TemporaryObjectHelper::OPERATION_CREATE);
+
+		$this->assertNull( $oDescriptor);
+
+		$oOrg = $this->CreateTestOrganization();
+		$oDescriptor = $this->CreateTemporaryObject($sTempId, $oOrg, 3000, TemporaryObjectHelper::OPERATION_CREATE);
+
+		$this->assertNotNull( $oDescriptor);
+	}
+
+	public function testCancelAllTemporaryObjects()
+	{
+		$sTempId = 'testCancelAllTemporaryObjects';
+		$oRepository = TemporaryObjectRepository::GetInstance();
+
+		$oOrg = $this->CreateTestOrganization();
+		$this->CreateTemporaryObject($sTempId, $oOrg, 3000, TemporaryObjectHelper::OPERATION_CREATE);
+		$this->assertEquals(1, $oRepository->CountTemporaryObjectsByTempId($sTempId));
+
+		$this->oManager->CancelAllTemporaryObjects($sTempId);
+		$this->assertEquals(0, $oRepository->CountTemporaryObjectsByTempId($sTempId));
+
+		$oOrg = $this->CreateTestOrganization();
+		$this->CreateTemporaryObject($sTempId, $oOrg, 3000, TemporaryObjectHelper::OPERATION_CREATE);
+		$oOrg = $this->CreateTestOrganization();
+		$this->CreateTemporaryObject($sTempId, $oOrg, 3000, TemporaryObjectHelper::OPERATION_CREATE);
+		$this->assertEquals(2, $oRepository->CountTemporaryObjectsByTempId($sTempId));
+
+		$this->oManager->CancelAllTemporaryObjects($sTempId);
+		$this->assertEquals(0, $oRepository->CountTemporaryObjectsByTempId($sTempId));
+	}
+
+	public function testExtendTemporaryObjectsLifetime()
+	{
+		$sTempId = 'testExtendTemporaryObjectsLifetime';
+		$oRepository = TemporaryObjectRepository::GetInstance();
+
+		$oOrg = $this->CreateTestOrganization();
+		$this->CreateTemporaryObject($sTempId, $oOrg, -1, TemporaryObjectHelper::OPERATION_CREATE);
+		$this->assertEquals(1, $oRepository->CountTemporaryObjectsByTempId($sTempId));
+		$this->assertEquals(1, $oRepository->SearchByExpired()->Count());
+
+		$this->oConfig->SetConfigTemporaryLifetime(3000);
+		$this->oManager->ExtendTemporaryObjectsLifetime($sTempId);
+		$this->assertEquals(0, $oRepository->SearchByExpired()->Count());
+	}
+
+	public function testGarbageExpiredTemporaryObjects()
+	{
+		$sTempId = 'testGarbageExpiredTemporaryObjects';
+		$oRepository = TemporaryObjectRepository::GetInstance();
+
+		$oOrg = $this->CreateTestOrganization();
+		$this->CreateTemporaryObject($sTempId, $oOrg, -1, TemporaryObjectHelper::OPERATION_CREATE);
+		$this->assertEquals(1, $oRepository->CountTemporaryObjectsByTempId($sTempId));
+		$this->assertEquals(1, $oRepository->SearchByExpired()->Count());
+
+		$this->oManager->GarbageExpiredTemporaryObjects();
+		$this->assertEquals(0, $oRepository->CountTemporaryObjectsByTempId($sTempId));
+
+		$oOrg = $this->CreateTestOrganization();
+		$this->CreateTemporaryObject($sTempId, $oOrg, -1, TemporaryObjectHelper::OPERATION_CREATE);
+		$oOrg = $this->CreateTestOrganization();
+		$this->CreateTemporaryObject($sTempId, $oOrg, -1, TemporaryObjectHelper::OPERATION_CREATE);
+		$this->assertEquals(2, $oRepository->SearchByExpired()->Count());
+
+		$this->oManager->GarbageExpiredTemporaryObjects();
+		$this->assertEquals(0, $oRepository->CountTemporaryObjectsByTempId($sTempId));
+
+		$this->oManager->GarbageExpiredTemporaryObjects();
+		$this->assertEquals(0, $oRepository->CountTemporaryObjectsByTempId($sTempId));
+	}
+
+	public function testHandleCreatedTemporaryObjects()
+	{
+		$sTempId = 'testHandleTemporaryObjects';
+		$oRepository = TemporaryObjectRepository::GetInstance();
+
+		$oOrg = $this->CreateTestOrganization();
+		$oOrgTemp = $this->CreateTestOrganization();
+		$oOrg->Set('parent_id', $oOrgTemp->GetKey());
+		$oOrg->DBUpdate();
+
+		$aContext = ['create' => ['transaction_id' => $sTempId, 'host_class' => get_class($oOrg), 'host_att_code' => 'parent_id',]];
+		$this->oConfig->SetConfigTemporaryForce(true);
+		$this->oConfig->SetConfigTemporaryLifetime(3000);
+
+		$this->assertEquals(0, $oRepository->CountTemporaryObjectsByTempId($sTempId));
+		$this->oManager->HandleTemporaryObjects($oOrg, $aContext);
+		$this->assertEquals(1, $oRepository->CountTemporaryObjectsByTempId($sTempId));
+
+		$aContext = ['finalize' => ['transaction_id' => $sTempId,]];
+		$this->oManager->HandleTemporaryObjects($oOrg, $aContext);
+		$this->assertEquals(0, $oRepository->CountTemporaryObjectsByTempId($sTempId));
+	}
+
+	public function testHandleDeletedTemporaryObjects()
+	{
+		$sTempId = 'testHandleTemporaryObjectsDelete';
+		$oRepository = TemporaryObjectRepository::GetInstance();
+
+		$oOrg = $this->CreateTestOrganization();
+		$oOrgTemp = $this->CreateTestOrganization();
+		$oOrg->Set('parent_id', $oOrgTemp->GetKey());
+		$oOrg->DBUpdate();
+
+		// Create a temporary delete
+		$this->assertEquals(0, $oRepository->CountTemporaryObjectsByTempId($sTempId));
+		$oTemporaryObjectDescriptor = TemporaryObjectManager::GetInstance()->CreateTemporaryObject($sTempId, get_class($oOrgTemp), $oOrgTemp->Get('id'), TemporaryObjectHelper::OPERATION_DELETE);
+		$oTemporaryObjectDescriptor->Set('host_class', get_class($oOrg));
+		$oTemporaryObjectDescriptor->Set('host_id', $oOrg->GetKey());
+		$oTemporaryObjectDescriptor->Set('host_att_code', 'parent_id');
+		$oTemporaryObjectDescriptor->DBUpdate();
+		$this->assertEquals(1, $oRepository->CountTemporaryObjectsByTempId($sTempId));
+
+		$aContext = ['finalize' => ['transaction_id' => $sTempId,]];
+		$this->oManager->HandleTemporaryObjects($oOrg, $aContext);
+		$this->assertEquals(0, $oRepository->CountTemporaryObjectsByTempId($sTempId));
+		$oDeletedObject = \MetaModel::GetObject(get_class($oOrgTemp), $oOrgTemp->Get('id'), false);
+		$this->assertNull($oDeletedObject);
+	}
+
+
+	private function CreateTemporaryObject($sTempId, $oDBObject, int $iLifetime, string $sOperation)
+	{
+		$this->oConfig->SetConfigTemporaryLifetime($iLifetime);
+		$this->oConfig->SetConfigTemporaryForce(true);
+
+		return $this->oManager->CreateTemporaryObject($sTempId, get_class($oDBObject), $oDBObject->GetKey(), $sOperation);
+	}
+}
diff --git a/tests/php-unit-tests/unitary-tests/sources/Service/TemporaryObjects/TemporaryObjectRepositoryTest.php b/tests/php-unit-tests/unitary-tests/sources/Service/TemporaryObjects/TemporaryObjectRepositoryTest.php
new file mode 100644
index 0000000000..c560ee7deb
--- /dev/null
+++ b/tests/php-unit-tests/unitary-tests/sources/Service/TemporaryObjects/TemporaryObjectRepositoryTest.php
@@ -0,0 +1,103 @@
+<?php
+/*
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+namespace Service\TemporaryObjects;
+
+use Combodo\iTop\Service\TemporaryObjects\TemporaryObjectConfig;
+use Combodo\iTop\Service\TemporaryObjects\TemporaryObjectHelper;
+use Combodo\iTop\Service\TemporaryObjects\TemporaryObjectManager;
+use Combodo\iTop\Service\TemporaryObjects\TemporaryObjectRepository;
+use Combodo\iTop\Test\UnitTest\ItopDataTestCase;
+use DBObject;
+
+/**
+ * @runTestsInSeparateProcesses
+ * @preserveGlobalState disabled
+ * @backupGlobals disabled
+ */
+class TemporaryObjectRepositoryTest extends ItopDataTestCase
+{
+	const USE_TRANSACTION = true;
+	const CREATE_TEST_ORG = false;
+
+	private TemporaryObjectConfig $oTemporaryObjectConfig;
+
+	protected function setUp(): void
+	{
+		parent::setUp();
+
+		$this->oTemporaryObjectConfig = TemporaryObjectConfig::GetInstance();
+	}
+
+	public function testSearchByExpired()
+	{
+		$sTempId = 'testSearchByExpired';
+
+		$oOrg = $this->CreateTestOrganization();
+		$oRepository = TemporaryObjectRepository::GetInstance();
+		$this->CreateTemporaryObject($sTempId, $oOrg, 3000);
+		$oObjectSet = $oRepository->SearchByExpired();
+		$this->assertEquals(0, $oObjectSet->Count());
+
+		$this->CreateTemporaryObject($sTempId, $oOrg, -1);
+		$oObjectSet = $oRepository->SearchByExpired();
+		$this->assertEquals(1, $oObjectSet->Count());
+
+		$oOrg = $this->CreateTestOrganization();
+		$this->CreateTemporaryObject($sTempId, $oOrg, -1);
+		$oObjectSet = $oRepository->SearchByExpired();
+		$this->assertEquals(2, $oObjectSet->Count());
+	}
+
+	public function testSearchByTempId()
+	{
+		$sTempId = 'testSearchByTempId';
+
+		// First temp object
+		$oOrg = $this->CreateTestOrganization();
+		$oDescriptor = $this->CreateTemporaryObject($sTempId, $oOrg, 3000);
+		$oRepository = TemporaryObjectRepository::GetInstance();
+		$oObjectSet = $oRepository->SearchByTempId($sTempId);
+		$this->assertEquals(1, $oObjectSet->Count());
+		$oDBObject = $oObjectSet->Fetch();
+		$this->assertEquals($oDescriptor->GetKey(), $oDBObject->GetKey());
+		$this->assertEquals(get_class($oDescriptor), get_class($oDBObject));
+
+		// Second temp object
+		$oOrg = $this->CreateTestOrganization();
+		$this->CreateTemporaryObject($sTempId, $oOrg, 3000);
+		$oObjectSet = $oRepository->SearchByTempId($sTempId);
+		$this->assertEquals(2, $oObjectSet->Count());
+	}
+
+	public function testCountTemporaryObjectsByTempId()
+	{
+		$sTempId = 'testCountTemporaryObjectsByTempId';
+
+		// First temp object
+		$oOrg = $this->CreateTestOrganization();
+		$this->CreateTemporaryObject($sTempId, $oOrg, 3000);
+		$oRepository = TemporaryObjectRepository::GetInstance();
+		$iCount = $oRepository->CountTemporaryObjectsByTempId($sTempId);
+		$this->assertEquals(1, $iCount);
+
+		// Second temp object
+		$oOrg = $this->CreateTestOrganization();
+		$this->CreateTemporaryObject($sTempId, $oOrg, 3000);
+		$iCount = $oRepository->CountTemporaryObjectsByTempId($sTempId);
+		$this->assertEquals(2, $iCount);
+	}
+
+	private function CreateTemporaryObject($sTempId, DBObject $oDBObject, int $iLifetime)
+	{
+		$this->oTemporaryObjectConfig->SetConfigTemporaryLifetime($iLifetime);
+		$this->oTemporaryObjectConfig->SetConfigTemporaryForce(true);
+
+		$oManager = TemporaryObjectManager::GetInstance();
+
+		return $oManager->CreateTemporaryObject($sTempId, get_class($oDBObject), $oDBObject->GetKey(), TemporaryObjectHelper::OPERATION_CREATE);
+	}
+}
diff --git a/tests/php-unit-tests/unitary-tests/webservices/RestTest.php b/tests/php-unit-tests/unitary-tests/webservices/RestTest.php
index 0e63a594e4..5c1fc46762 100644
--- a/tests/php-unit-tests/unitary-tests/webservices/RestTest.php
+++ b/tests/php-unit-tests/unitary-tests/webservices/RestTest.php
@@ -106,7 +106,7 @@ JSON;
 		$iId = $aJson['objects'][$sUserRequestKey]['key'];
 
 		$sExpectedJsonOuput = <<<JSON
-{"objects":{"UserRequest::$iId":{"code":0,"message":"created","class":"UserRequest","key":$iId,"fields":{"id":$iId}}},"code":0,"message":null}
+{"objects":{"UserRequest::$iId":{"code":0,"message":"created","class":"UserRequest","key":"$iId","fields":{"id":"$iId"}}},"code":0,"message":null}
 JSON;
 		$this->assertJsonStringEqualsJsonString($sExpectedJsonOuput, $sOutputJson);
 
diff --git a/webservices/export-v2.php b/webservices/export-v2.php
index 4acdcc5708..2bd91c1438 100644
--- a/webservices/export-v2.php
+++ b/webservices/export-v2.php
@@ -548,6 +548,12 @@ function DoExport(WebPage $oP, BulkExport $oExporter, $bInteractive = false)
 // Command Line mode
 //
 /////////////////////////////////////////////////////////////////////////////
+///
+/**
+ * @since 3.1.0 N°6047
+ */
+$oCtx = new ContextTag(ContextTag::TAG_EXPORT);
+
 if (utils::IsModeCLI()) {
 	SetupUtils::CheckPhpAndExtensionsForCli(new CLIPage('iTop - Export'));
 
@@ -722,4 +728,4 @@ catch (Exception $e) {
 	$oP->add('Error: '.utils::HtmlEntities($e->getMessage()));
 	IssueLog::Error(utils::HtmlEntities($e->getMessage())."\n".$e->getTraceAsString());
 	$oP->output();
-}
\ No newline at end of file
+}
diff --git a/webservices/export.php b/webservices/export.php
index 59ff077ca6..454fb9eebb 100644
--- a/webservices/export.php
+++ b/webservices/export.php
@@ -48,29 +48,33 @@ catch(Exception $e)
 	exit(EXIT_CODE_FATAL);
 }
 
-if (utils::IsModeCLI()) 
+/**
+ * @since 3.1.0 N°6047
+ */
+$oCtx = new ContextTag(ContextTag::TAG_EXPORT);
+if (utils::IsModeCLI())
 {
 	$oP = new CLIPage("iTop - Export");
 	SetupUtils::CheckPhpAndExtensionsForCli($oP, EXIT_CODE_FATAL);
 
 	$sAuthUser = utils::ReadParam('auth_user', null, true /* Allow CLI */, 'raw_data');
-	$sAuthPwd = utils::ReadParam('auth_pwd', null, true /* Allow CLI */, 'raw_data'); 
+	$sAuthPwd = utils::ReadParam('auth_pwd', null, true /* Allow CLI */, 'raw_data');
 
-	if (UserRights::CheckCredentials($sAuthUser, $sAuthPwd)) 
-	{ 
-		UserRights::Login($sAuthUser); // Login & set the user's language 
-	} 
-	else 
-	{ 
+	if (UserRights::CheckCredentials($sAuthUser, $sAuthPwd))
+	{
+		UserRights::Login($sAuthUser); // Login & set the user's language
+	}
+	else
+	{
 		$oP->p("Access restricted or wrong credentials ('$sAuthUser')");
-		$oP->output(); 
+		$oP->output();
 		exit(EXIT_CODE_ERROR);
 	}
-} 
-else 
+}
+else
 {
-	require_once(APPROOT.'/application/loginwebpage.class.inc.php'); 
-	LoginWebPage::DoLogin(); // Check user rights and prompt if needed 
+	require_once(APPROOT.'/application/loginwebpage.class.inc.php');
+	LoginWebPage::DoLogin(); // Check user rights and prompt if needed
 }
 ApplicationContext::SetUrlMakerClass('iTopStandardURLMaker');
 
@@ -111,7 +115,7 @@ if (strlen($sExpression) == 0)
 			if (strlen($sFields) == 0)
 			{
 				$sFields = trim($oQuery->Get('fields'));
-			} 
+			}
 		}
 	}
 }
@@ -279,13 +283,13 @@ if (!empty($sExpression))
 				}
 				$oP->add($sOutputData);
 				break;
-				
+
 				case 'spreadsheet':
 				$oP = new WebPage("iTop - Export for spreadsheet");
 
 				// Integration within MS-Excel web queries + HTTPS + IIS:
 				// MS-IIS set these header values with no-cache... while Excel fails to do the job if using HTTPS
-				// Then the fix is to force the reset of header values Pragma and Cache-control 
+				// Then the fix is to force the reset of header values Pragma and Cache-control
 				header("Pragma:", true);
 				header("Cache-control:", true);
 
@@ -298,12 +302,12 @@ if (!empty($sExpression))
 				$oP = new XMLPage("iTop - Export", true /* passthrough */);
 				cmdbAbstractObject::DisplaySetAsXML($oP, $oSet, array('localize_values' => $bLocalize));
 				break;
-				
+
 				case 'xlsx':
 				$oP = new AjaxPage('');
 				$oExporter = new ExcelExporter();
 				$oExporter->SetObjectList($oFilter);
-				
+
 				// Run the export by chunk of 1000 objects to limit memory usage
 				$oExporter->SetChunkSize(1000);
 				do
@@ -311,7 +315,7 @@ if (!empty($sExpression))
 					$aStatus = $oExporter->Run(); // process one chunk
 				}
 				while( ($aStatus['code'] != 'done') && ($aStatus['code'] != 'error'));
-				
+
 				if ($aStatus['code'] == 'done')
 				{
 					$oP->SetContentType('application/vnd.openxmlformats-officedocument.spreadsheetml.sheet');
@@ -324,7 +328,7 @@ if (!empty($sExpression))
 					$oP->add('Error, xlsx export failed: '.$aStatus['message']);
 				}
 				break;
-				
+
 				default:
 				$oP = new WebPage("iTop - Export");
 				$oP->add("Unsupported format '$sFormat'. Possible values are: html, csv, spreadsheet or xml.");
@@ -336,13 +340,13 @@ if (!empty($sExpression))
 		$oP = new WebPage("iTop - Export");
 		$oP->p("Error the query can not be executed.");
 		if ($e instanceof CoreException)
-		{		
+		{
 			$oP->p($e->GetHtmlDesc());
 		}
 		else
 		{
 			$oP->p($e->getMessage());
-		}		
+		}
 	}
 }
 if (!$oP)
@@ -356,7 +360,7 @@ if (!$oP)
 	else
 	{
 		$oP = new WebPage("iTop - Export");
-	} 
+	}
 	$oP->p("General purpose export page.");
 	$oP->p("Parameters:");
 	$oP->p(" * expression: an OQL expression (URL encoded if needed)");
diff --git a/webservices/import.php b/webservices/import.php
index 3eb79a992d..cabf629ec2 100644
--- a/webservices/import.php
+++ b/webservices/import.php
@@ -206,6 +206,10 @@ function ReadMandatoryParam($oP, $sParam, $sSanitizationFilter)
 /////////////////////////////////
 // Main program
 
+/**
+ * @since 3.1.0 N°6047
+ */
+$oCtx = new ContextTag(ContextTag::TAG_IMPORT);
 if (utils::IsModeCLI())
 {
 	$oP = new CLIPage("iTop - Bulk import");