N°7438 - Dashboard: Fix crash when closing the editor modal

# Conflicts:
#	css/setup.css

.github/pull_request_template.md

@@ -0,0 +1,83 @@
+<!--
+
+IMPORTANT: Please follow the guidelines within this PR template before submitting it, it will greatly help us process your PR. 🙏
+
+Any PRs not following the guidelines or with missing information will not be considered.
+
+-->
+
+## Base information
+| Question                                                      | Answer 
+|---------------------------------------------------------------|--------
+| Related to a SourceForge thead / Another PR / Combodo ticket? | <!-- Put the URL -->
+| Type of change?                                               | Bug fix / Enhancement / Translations
+
+
+## Symptom (bug) / Objective (enhancement)
+<!--
+If it's a bug
+  - Explain the symptom in details
+  - If possible put error messages, logs or screenshots (you can paste image directly in this editor).
+
+If it's an enhancement
+  - Describe what is blocking you, what is the objective with as much details as possible.
+  - Add screenshots if it's related to UI.
+-->
+
+
+## Reproduction procedure (bug)
+<!--
+Remove this section only if it's NOT a bug.
+
+Otherwise, explain step by step how to reproduce the issue on a standard iTop Community.
+
+If it requires a custom datamodel, provide the minimal XML delta to reproduce it on a standard iTop Community.
+-->
+
+1. On iTop x.y.z <!-- Put complete iTop version (eg. 3.1.0-2) -->
+2. With PHP x.y.z <!-- Put complete PHP version (eg. 8.1.24) -->
+2. First go there
+2. Then do that
+3. ...
+4. Finally, see that...
+
+
+## Cause (bug)
+<!--
+Remove this section only if it's NOT a bug.
+
+Otherwise, explain what is the cause of the issue (where in the code and why)
+-->
+
+
+## Proposed solution (bug and enhancement)
+<!--
+Explain in details how you are proposing to solve this:
+  - What did you do in the code and why
+  - If you changed something in the UI, put before / after screenshots (you can paste image directly in this editor)
+-->
+
+
+## Checklist before requesting a review
+<!--
+Don't remove these lines, check them once done.
+-->
+- [ ] I have performed a self-review of my code
+- [ ] I have tested all changes I made on an iTop instance
+- [ ] I have added a unit test, otherwise I have explained why I couldn't
+- [ ] Is the PR clear and detailed enough so anyone can understand digging in the code?
+
+## Checklist of things to do before PR is ready to merge
+<!--
+Things that needs to be done in the PR before it can be considered as ready to be merged
+
+Examples:
+- Changes requested in the review
+- Unit test to add
+- Dictionary entries to translate
+- ...
+-->
+
+- [ ] ...
+- [ ] ...
+- [ ] ...

README.md

@@ -107,7 +107,8 @@ We would like to give a special thank you 🤗 to the people from the community
 - Rudner, Björn (a.k.a [@rudnerbjoern](https://github.com/rudnerbjoern))
 - Seki, Shoji
 - Shilov, Vladimir
-- Stukalov, Ilya (a.k.a [@ilya](https://www.github.com/ilya)-stukalov)
+- Stukalov, Ilya (a.k.a [@ilya](https://www.github.com/ilya-stukalov))
+- Tarjányi, Csaba (a.k.a [@tacsaby](https://github.com/tacsaby))
 - Tulio, Marco
 - Turrubiates, Miguel
 

application/applicationextension.inc.php

@@ -2103,8 +2103,16 @@ class RestUtils
 		elseif (is_string($key))
 		{
 			// OQL
-			$oSearch = DBObjectSearch::FromOQL($key);
-		}
+            try {
+                $oSearch = DBObjectSearch::FromOQL($key);
+            } catch (Exception $e) {
+                throw new CoreOqlException('Query failed to execute', [
+                        'query' => $key,
+                        'exception_class' => get_class($e),
+                        'exception_message' => $e->getMessage(),
+                ]);
+            }
+        }
 		else
 		{
 			throw new Exception("Wrong format for key");

application/audit.domain.class.inc.php

@@ -86,7 +86,7 @@ class lnkAuditCategoryToAuditDomain extends cmdbAbstractObject
 	{
 		$aParams = array
 		(
-			"category"            => "application, grant_by_profile",
+			"category"            => "application,grant_by_profile",
 			"key_type"            => "autoincrement",
 			"name_attcode"        => "",
 			"state_attcode"       => "",

application/cmdbabstract.class.inc.php

@@ -134,6 +134,8 @@ abstract class cmdbAbstractObject extends CMDBObject implements iDisplay
 	/** @var string */
 	public const ENUM_INPUT_TYPE_TAGSET = 'tagset';
 	/** @var string */
+	public const ENUM_INPUT_TYPE_TAGSET_LINKEDSET = 'tagset_linkedset';
+	/** @var string */
 	public const ENUM_INPUT_TYPE_RADIO = 'radio';
 	/** @var string */
 	public const ENUM_INPUT_TYPE_CHECKBOX = 'checkbox';
@@ -2359,6 +2361,7 @@ EOF
 
 				case 'LinkedSet':
 					if ($oAttDef->GetDisplayStyle() === LINKSET_DISPLAY_STYLE_PROPERTY) {
+						$sInputType = self::ENUM_INPUT_TYPE_TAGSET_LINKEDSET;
 						if (array_key_exists('bulk_context', $aArgs)) {
 							$oTagSetBlock = LinkSetUIBlockFactory::MakeForBulkLinkSet($iId, $oAttDef, $value, $sWizardHelperJsVarName, $aArgs['bulk_context']);
 						} else {
@@ -3709,7 +3712,7 @@ HTML;
 			if ($oAttDef->GetEditClass() == 'Document') {
 				/** @var \ormDocument $oDocument */
 				$oDocument = $this->Get($sAttCode);
-				if (!$oDocument->IsEmpty()) {
+				if (is_object($oDocument) && !$oDocument->IsEmpty()) {
 					$sFieldAsHtml = $this->GetAsHTML($sAttCode);
 
 					$sDisplayLabel = Dict::S('UI:OpenDocumentInNewWindow_');
@@ -5951,6 +5954,16 @@ JS
 		$this->FireEvent(EVENT_DB_CHECK_TO_DELETE, ['deletion_plan' => $oDeletionPlan]);
 	}
 
+	/**
+	 * @return void
+	 * @throws \CoreException
+	 * @since 3.1.2
+	 */
+	final protected function FireEventAboutToDelete(): void
+	{
+		$this->FireEvent(EVENT_DB_ABOUT_TO_DELETE);
+	}
+
 	/**
 	 * @return void
 	 * @throws \CoreException

application/datamodel.application.xml

@@ -187,7 +187,9 @@
   </menus>
   <events>
     <event id="EVENT_DB_BEFORE_WRITE" _delta="define">
-      <description>An object is about to be written into the database. The object can be modified.</description>
+      <name>Before create or update</name>
+      <description><![CDATA[An object is about to be written into the database.
+The object can be modified.]]></description>
       <sources>
         <source id="cmdbAbstractObject">cmdbAbstractObject</source>
       </sources>
@@ -208,7 +210,9 @@
       </event_data>
     </event>
     <event id="EVENT_DB_CHECK_TO_WRITE" _delta="define">
-      <description>Check an object before it is written into the database (no change possible). Call DBObject::AddCheckIssue() to signal an issue</description>
+      <name>Check to write</name>
+      <description><![CDATA[Check an object before it is written into the database (no change possible).
+Call $this->AddCheckIssue() to signal an issue.]]></description>
       <sources>
         <source id="cmdbAbstractObject">cmdbAbstractObject</source>
       </sources>
@@ -229,7 +233,9 @@
       </event_data>
     </event>
     <event id="EVENT_DB_AFTER_WRITE" _delta="define">
-      <description>An object has been written into the database. The modifications can be propagated to other objects.</description>
+      <name>After create or update</name>
+      <description><![CDATA[An object has been written into the database.
+The modifications can be propagated to other objects.]]></description>
       <sources>
         <source id="cmdbAbstractObject">cmdbAbstractObject</source>
       </sources>
@@ -244,7 +250,7 @@
           <type>boolean</type>
         </event_datum>
         <event_datum id="changes">
-          <description>For updates, the list of changes done during this operation</description>
+          <description><![CDATA[For updates, the list of changes done during this operation]]></description>
           <type>array</type>
         </event_datum>
         <event_datum id="debug_info">
@@ -254,7 +260,9 @@
       </event_data>
     </event>
     <event id="EVENT_DB_CHECK_TO_DELETE" _delta="define">
-      <description>Check an object before it is deleted from the database. Call DBObject::AddDeleteIssue() to signal an issue</description>
+      <name>Check to delete</name>
+      <description><![CDATA[Check an object before it is deleted from the database.
+Call $this->AddDeleteIssue() to signal an issue.]]></description>
       <sources>
         <source id="cmdbAbstractObject">cmdbAbstractObject</source>
       </sources>
@@ -270,8 +278,27 @@
         </event_datum>
       </event_data>
     </event>
+    <event id="EVENT_DB_ABOUT_TO_DELETE" _delta="define">
+      <name>Before delete</name>
+      <description><![CDATA[An object is about to be deleted from the database]]></description>
+      <sources>
+        <source id="cmdbAbstractObject">cmdbAbstractObject</source>
+      </sources>
+      <replaces>cmdbAbstractObject::OnDelete</replaces>
+      <event_data>
+        <event_datum id="object">
+          <description>The object about to be deleted</description>
+          <type>DBObject</type>
+        </event_datum>
+        <event_datum id="debug_info">
+          <description>Debug string</description>
+          <type>string</type>
+        </event_datum>
+      </event_data>
+    </event>
     <event id="EVENT_DB_AFTER_DELETE" _delta="define">
-      <description>An object has been deleted into the database</description>
+      <name>After delete</name>
+      <description><![CDATA[An object has been deleted into the database]]></description>
       <sources>
         <source id="cmdbAbstractObject">cmdbAbstractObject</source>
       </sources>
@@ -287,8 +314,10 @@
         </event_datum>
       </event_data>
     </event>
-    <event id="EVENT_DB_BEFORE_APPLY_STIMULUS" _delta="define">
-      <description>A stimulus is about to be applied to an object</description>
+    <event id="EVENT_ENUM_TRANSITIONS" _delta="define">
+      <name>Enum transitions</name>
+      <description><![CDATA[Manage the allowed transitions in current object state.
+The only action allowed is to deny transitions with $this->DenyTransition()]]></description>
       <sources>
         <source id="cmdbAbstractObject">cmdbAbstractObject</source>
       </sources>
@@ -297,89 +326,9 @@
           <description>The object where the stimulus is targeted</description>
           <type>DBObject</type>
         </event_datum>
-        <event_datum id="stimulus">
-          <description>Current stimulus applied</description>
-          <type>string</type>
-        </event_datum>
-        <event_datum id="previous_state">
-          <description>Object previous state</description>
-          <type>string</type>
-        </event_datum>
-        <event_datum id="new_state">
-          <description>Object new state</description>
-          <type>string</type>
-        </event_datum>
-        <event_datum id="save_object">
-          <description>The object must be saved in the database</description>
-          <type>boolean</type>
-        </event_datum>
-        <event_datum id="debug_info">
-          <description>Debug string</description>
-          <type>string</type>
-        </event_datum>
-      </event_data>
-    </event>
-    <event id="EVENT_DB_AFTER_APPLY_STIMULUS" _delta="define">
-      <description>A stimulus has been applied to an object</description>
-      <sources>
-        <source id="cmdbAbstractObject">cmdbAbstractObject</source>
-      </sources>
-      <event_data>
-        <event_datum id="object">
-          <description>The object where the stimulus is targeted</description>
-          <type>DBObject</type>
-        </event_datum>
-        <event_datum id="stimulus">
-          <description>Current stimulus applied</description>
-          <type>string</type>
-        </event_datum>
-        <event_datum id="previous_state">
-          <description>Object previous state</description>
-          <type>string</type>
-        </event_datum>
-        <event_datum id="new_state">
-          <description>Object new state</description>
-          <type>string</type>
-        </event_datum>
-        <event_datum id="save_object">
-          <description>The object is asked to be saved in the database</description>
-          <type>boolean</type>
-        </event_datum>
-        <event_datum id="debug_info">
-          <description>Debug string</description>
-          <type>string</type>
-        </event_datum>
-      </event_data>
-    </event>
-    <event id="EVENT_DB_APPLY_STIMULUS_FAILED" _delta="define">
-      <description>A stimulus has failed</description>
-      <sources>
-        <source id="cmdbAbstractObject">cmdbAbstractObject</source>
-      </sources>
-      <event_data>
-        <event_datum id="action">
-          <description>The action that failed to apply the stimulus</description>
-          <type>string</type>
-        </event_datum>
-        <event_datum id="object">
-          <description>The object where the stimulus is targeted</description>
-          <type>DBObject</type>
-        </event_datum>
-        <event_datum id="stimulus">
-          <description>Current stimulus applied</description>
-          <type>string</type>
-        </event_datum>
-        <event_datum id="previous_state">
-          <description>Object previous state</description>
-          <type>string</type>
-        </event_datum>
-        <event_datum id="new_state">
-          <description>Object new state</description>
-          <type>string</type>
-        </event_datum>
-        <event_datum id="save_object">
-          <description>The object must be saved in the database</description>
-          <type>boolean</type>
+        <event_datum id="allowed_stimuli">
+          <description>The list of available stimuli in the current state</description>
+          <type>array</type>
         </event_datum>
         <event_datum id="debug_info">
           <description>Debug string</description>
@@ -388,7 +337,8 @@
       </event_data>
     </event>
     <event id="EVENT_DB_LINKS_CHANGED" _delta="define">
-      <description>At least one link class was changed</description>
+      <name>Links on object have changed</name>
+      <description><![CDATA[At least one link class was changed]]></description>
       <sources>
         <source id="cmdbAbstractObject">cmdbAbstractObject</source>
       </sources>
@@ -404,7 +354,9 @@
       </event_data>
     </event>
     <event id="EVENT_DB_OBJECT_RELOAD" _delta="define">
-      <description>An object has been re-loaded from the database</description>
+      <name>Object reload</name>
+      <internal>true</internal>
+      <description><![CDATA[An object has been re-loaded from the database]]></description>
       <sources>
         <source id="cmdbAbstractObject">cmdbAbstractObject</source>
       </sources>
@@ -420,7 +372,8 @@
       </event_data>
     </event>
     <event id="EVENT_DB_COMPUTE_VALUES" _delta="define">
-      <description>An object needs to be recomputed after changes</description>
+      <name>Recompute object values</name>
+      <description><![CDATA[An object needs to be recomputed after changes]]></description>
       <sources>
         <source id="cmdbAbstractObject">cmdbAbstractObject</source>
       </sources>
@@ -437,7 +390,8 @@
       </event_data>
     </event>
     <event id="EVENT_DB_ARCHIVE" _delta="define">
-      <description>An object has been archived</description>
+      <name>Object archived</name>
+      <description><![CDATA[An object has been archived]]></description>
       <sources>
         <source id="cmdbAbstractObject">cmdbAbstractObject</source>
       </sources>
@@ -453,7 +407,8 @@
       </event_data>
     </event>
     <event id="EVENT_DB_UNARCHIVE" _delta="define">
-      <description>An object has been unarchived</description>
+      <name>Object unarchived</name>
+      <description><![CDATA[An object has been unarchived]]></description>
       <sources>
         <source id="cmdbAbstractObject">cmdbAbstractObject</source>
       </sources>
@@ -469,7 +424,9 @@
       </event_data>
     </event>
     <event id="EVENT_DB_SET_ATTRIBUTES_FLAGS" _delta="define">
-      <description>Set object attributes flags. Call cmdbAbstractObject::AddAttributeFlags() for all the attributes to be set for this target state.</description>
+      <name>Set attributes flags</name>
+      <description><![CDATA[Set object attributes flags.
+Call $this->AddAttributeFlags() for all the attributes to be set for this target state.]]></description>
       <sources>
         <source id="cmdbAbstractObject">cmdbAbstractObject</source>
       </sources>
@@ -480,7 +437,7 @@
         </event_datum>
         <event_datum id="target_state">
           <description>The target state in which to evaluate the flags</description>
-          <type>array</type>
+          <type>string</type>
         </event_datum>
         <event_datum id="debug_info">
           <description>Debug string</description>
@@ -489,7 +446,9 @@
       </event_data>
     </event>
     <event id="EVENT_DB_SET_INITIAL_ATTRIBUTES_FLAGS" _delta="define">
-      <description>Set object initial attributes flags. Call cmdbAbstractObject::AddInitialAttributeFlags() for all the initial attributes to be set initially.</description>
+      <name>Set initial attributes flags</name>
+      <description><![CDATA[Set object initial attributes flags.
+Call $this->AddInitialAttributeFlags() for all the initial attributes to be set initially.]]></description>
       <sources>
         <source id="cmdbAbstractObject">cmdbAbstractObject</source>
       </sources>
@@ -505,7 +464,8 @@
       </event_data>
     </event>
     <event id="EVENT_DOWNLOAD_DOCUMENT" _delta="define">
-      <description>A document has been downloaded from the GUI</description>
+      <name>Document downloaded</name>
+      <description><![CDATA[A document has been downloaded from the GUI]]></description>
       <sources>
         <source id="Document">Document</source>
       </sources>
@@ -525,7 +485,9 @@
       </event_data>
     </event>
     <event id="EVENT_LOGIN" _delta="define">
-      <description>Inform the listeners about the connection states</description>
+      <name>Login</name>
+      <internal>true</internal>
+      <description><![CDATA[Inform the listeners about the connection states]]></description>
       <event_data>
         <event_datum id="code">
           <description>The login step result code (LoginWebPage::EXIT_CODE_...) </description>

application/logindefault.class.inc.php

@@ -119,6 +119,11 @@ class LoginDefaultAfter extends AbstractLoginFSMExtension implements iLogoutExte
 	protected function OnConnected(&$iErrorCode)
 	{
 		Session::Unset('login_temp_auth_user');
+		if (is_null(UserRights::GetUserObject())){
+			//N°7085 avoid infinite loop
+			IssueLog::Error("No user logged in. exit");
+			exit(-1);
+		}
 		return LoginWebPage::LOGIN_FSM_CONTINUE;
 	}
 
@@ -134,4 +139,4 @@ class LoginDefaultAfter extends AbstractLoginFSMExtension implements iLogoutExte
 			}
 		}
 	}
-}
+}

application/loginwebpage.class.inc.php

@@ -90,7 +90,7 @@ class LoginWebPage extends NiceWebPage
 		parent::__construct($sTitle);
 		$this->SetStyleSheet();
 		$this->no_cache();
-		$this->add_xframe_options();
+		$this->add_http_headers();
 	}
 	
 	public function SetStyleSheet()

application/ui.htmleditorwidget.class.inc.php

@@ -71,15 +71,16 @@ class UIHTMLEditorWidget
 		// To change the default settings of the editor,
 		// a) edit the file /js/ckeditor/config.js
 		// b) or override some of the configuration settings, using the second parameter of ckeditor()
+		$sJSDefineWidth = '';
 		$aConfig = utils::GetCkeditorPref();
 		$sWidthSpec = addslashes(trim($this->m_oAttDef->GetWidth()));
-		if ($sWidthSpec != '')
-		{
-			$aConfig['width'] = $sWidthSpec;
+		if ($sWidthSpec != '') {
+			/*N°6543 - the function min allow to keep text inside the column when width is defined*/
+			$aConfig['width'] = "min($sWidthSpec,100%)";
+			$sJSDefineWidth = '$("#cke_'.$iId.' iframe").contents().find("body").css("width", "'.$sWidthSpec.'")';
 		}
 		$sHeightSpec = addslashes(trim($this->m_oAttDef->GetHeight()));
-		if ($sHeightSpec != '')
-		{
+		if ($sHeightSpec != '') {
 			$aConfig['height'] = $sHeightSpec;
 		}
 		$sConfigJS = json_encode($aConfig);
@@ -110,6 +111,7 @@ $('#$iId').on('update', function(evt){
 		else
 		{
 			oMe.data('ckeditorInstance').setReadOnly(oMe.prop('disabled'));
+			$sJSDefineWidth
 		}
 	};
 	setTimeout(delayedSetReadOnly, 50);

core/action.class.inc.php

@@ -629,9 +629,7 @@ class ActionEmail extends ActionNotification
 				$oLog->Set('body', HTMLSanitizer::Sanitize($aMessageContent['body']));
 			}
 		}
-		$sStyles = file_get_contents(APPROOT.'css/email.css');
-		$sStyles .= MetaModel::GetConfig()->Get('email_css');
-		
+
 		if ($this->IsBeingTested()) {
 			$sTestBody = $aMessageContent['body'];
 			$sTestBody .= "<div style=\"border: dashed;\">\n";

core/attributedef.class.inc.php

@@ -3061,6 +3061,11 @@ class AttributeObjectKey extends AttributeDBFieldVoid
 		return ((int) $proposedValue) !== 0;
 	}
 
+    /**
+     * @inheritDoc
+     *
+     * @param int|DBObject $proposedValue Object key or valid ({@see MetaModel::IsValidObject()}) datamodel object
+     */
 	public function MakeRealValue($proposedValue, $oHostObj)
 	{
 		if (is_null($proposedValue))
@@ -3073,7 +3078,6 @@ class AttributeObjectKey extends AttributeDBFieldVoid
 		}
 		if (MetaModel::IsValidObject($proposedValue))
 		{
-			/** @var \DBObject $proposedValue */
 			return $proposedValue->GetKey();
 		}
 
@@ -4530,7 +4534,6 @@ class AttributeText extends AttributeString
 		$sStyle = '';
 		if (count($aStyles) > 0)
 		{
-			$aStyles[] = 'overflow:auto';
 			$sStyle = 'style="'.implode(';', $aStyles).'"';
 		}
 
@@ -6510,6 +6513,11 @@ class AttributeDateTime extends AttributeDBField
 		}
 	}
 
+    /**
+     * @inheritDoc
+     *
+     * @param int|string $proposedValue timestamp ({@see DateTime::getTimestamp()) or date as string, following the {@see GetInternalFormat} format.
+     */
 	public function MakeRealValue($proposedValue, $oHostObj)
 	{
 		if (is_null($proposedValue))
@@ -8299,9 +8307,9 @@ class AttributeBlob extends AttributeDefinition
 	}
 
 	/**
-	 * Users can provide the document from an URL (including an URL on iTop itself)
-	 * for CSV import. Administrators can even provide the path to a local file
-	 * {@inheritDoc}
+     * {@inheritDoc}
+     *
+     * @param string $proposedValue Can be an URL (including an URL to iTop itself), or a local path (CSV import)
 	 *
 	 * @see AttributeDefinition::MakeRealValue()
 	 */
@@ -8542,7 +8550,7 @@ class AttributeBlob extends AttributeDefinition
 		$sFingerprint = '';
 		if ($value instanceOf ormDocument)
 		{
-			$sFingerprint = md5($value->GetData());
+			$sFingerprint = $value->GetSignature();
 		}
 
 		return $sFingerprint;

core/bulkchange.class.inc.php

@@ -160,7 +160,7 @@ class CellStatus_SearchIssue extends CellStatus_Issue
 	 * @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, string $sAllowedValuesSearch=null)
+	public function __construct($sSerializedSearch, $sReason, $sClass = null, $sAllowedValues = null, string $sAllowedValuesSearch = null)
 	{
 		parent::__construct(null, null, $sReason);
 		$this->sSerializedSearch = $sSerializedSearch;
@@ -195,7 +195,7 @@ class CellStatus_SearchIssue extends CellStatus_Issue
 	public function GetSearchLinkUrl()
 	{
 		return sprintf("UI.php?operation=search&filter=%s",
-			rawurlencode($this->sSerializedSearch)
+			rawurlencode($this->sSerializedSearch ?? "")
 		);
 	}
 
@@ -206,7 +206,7 @@ class CellStatus_SearchIssue extends CellStatus_Issue
 	public function GetAllowedValuesLinkUrl(): ?string
 	{
 		return sprintf("UI.php?operation=search&filter=%s",
-			rawurlencode($this->sAllowedValuesSearch)
+			rawurlencode($this->sAllowedValuesSearch ?? "")
 		);
 	}
 }
@@ -262,7 +262,7 @@ class CellStatus_Ambiguous extends CellStatus_Issue
 	public function GetSearchLinkUrl()
 	{
 		return sprintf("UI.php?operation=search&filter=%s",
-			rawurlencode($this->sSerializedSearch)
+			rawurlencode($this->sSerializedSearch ?? "")
 		);
 	}
 }

core/cmdbobject.class.inc.php

@@ -335,7 +335,7 @@ abstract class CMDBObject extends DBObject
 		$oMyChangeOp->Set("objclass", MetaModel::GetRootClass(get_class($this)));
 		$oMyChangeOp->Set("objkey", $objkey);
 		$oMyChangeOp->Set("fclass", get_class($this));
-		$oMyChangeOp->Set("fname", substr($this->GetRawName(), 0, 255)); // Protect against very long friendly names
+		$oMyChangeOp->SetTrim("fname", $this->GetRawName()); // Protect against very long friendly names
 		$iId = $oMyChangeOp->DBInsertNoReload();
 	}
 

core/cmdbsource.class.inc.php

@@ -42,6 +42,12 @@ class CMDBSource
 	const ENUM_DB_VENDOR_MARIADB = 'MariaDB';
 	const ENUM_DB_VENDOR_PERCONA = 'Percona';
 
+	/**
+	 * @since 2.7.10 3.0.4 3.1.2 3.0.2 N°6889 constant creation
+	 * @internal will be removed in a future version
+	 */
+	const MYSQL_DEFAULT_PORT = 3306;
+
 	/**
 	 * Error: 1205 SQLSTATE: HY000 (ER_LOCK_WAIT_TIMEOUT)
 	 *   Message: Lock wait timeout exceeded; try restarting transaction
@@ -212,16 +218,19 @@ class CMDBSource
 	/**
 	 * @param string $sDbHost initial value ("p:domain:port" syntax)
 	 * @param string $sServer server variable to update
-	 * @param int $iPort port variable to update
+	 * @param int|null $iPort port variable to update, will return null if nothing is specified in $sDbHost
+	 *
+	 * @since 2.7.10 3.0.4 3.1.2 3.2.0 N°6889 will return null in $iPort if port isn't present in $sDbHost. Use {@see MYSQL_DEFAULT_PORT} if needed
+	 *
+	 * @link http://php.net/manual/en/mysqli.persistconns.php documentation for the "p:" prefix (persistent connexion)
 	 */
 	public static function InitServerAndPort($sDbHost, &$sServer, &$iPort)
 	{
 		$aConnectInfo = explode(':', $sDbHost);
 
 		$bUsePersistentConnection = false;
-		if (strcasecmp($aConnectInfo[0], 'p') == 0)
+		if (strcasecmp($aConnectInfo[0], 'p') === 0)
 		{
-			// we might have "p:" prefix to use persistent connections (see http://php.net/manual/en/mysqli.persistconns.php)
 			$bUsePersistentConnection = true;
 			$sServer = $aConnectInfo[0].':'.$aConnectInfo[1];
 		}
@@ -239,10 +248,6 @@ class CMDBSource
 		{
 			$iPort = (int)($aConnectInfo[1]);
 		}
-		else
-		{
-			$iPort = 3306;
-		}
 	}
 
 	/**
@@ -544,10 +549,9 @@ class CMDBSource
 	/**
 	 * @param string $sSQLQuery
 	 *
-	 * @return \mysqli_result|null
-	 * @throws \MySQLException
-	 * @throws \MySQLHasGoneAwayException
-	 * @throws \CoreException
+     * @return mysqli_result|null
+     * @throws MySQLException
+     * @throws MySQLHasGoneAwayException
 	 *
 	 * @since 2.7.0 N°679 handles nested transactions
 	 */

core/config.class.inc.php

@@ -1643,6 +1643,14 @@ class Config
 			'source_of_value' => '',
 			'show_in_conf_sample' => false,
 		],
+		'security.enable_header_xcontent_type_options' => [
+			'type' => 'bool',
+			'description' => 'If set to false, iTop will stop sending the X-Content-Type-Options HTTP header. This header could trigger CORB protection on certain resources (JSON, XML, HTML, text) therefore blocking them.',
+			'default' => true,
+			'value' => '',
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		],
 		'security.disable_inline_documents_sandbox' => [
 			'type' => 'bool',
 			'description' => 'If true then the sandbox for documents displayed in a browser tab will be disabled; enabling scripts and other interactive content. Note that setting this to true will open the application to potential XSS attacks!',
@@ -2313,6 +2321,24 @@ class Config
 		$this->m_sAllowedLoginTypes = implode('|', $aAllowedLoginTypes);
 	}
 
+	/**
+	 * @since 2.7.11 N°7085
+	 * Add login mode if not configured already
+	 * @param string $sLoginMode
+	 *
+	 * @return void
+	 */
+	public function AddAllowedLoginTypes($sLoginMode)
+	{
+		$aAllowedLoginTypes = $this->GetAllowedLoginTypes();
+		if (in_array($sLoginMode, $aAllowedLoginTypes)){
+			return;
+		}
+
+		$aAllowedLoginTypes[] = $sLoginMode;
+		$this->SetAllowedLoginTypes($aAllowedLoginTypes);
+	}
+
 	public function SetExternalAuthenticationVariable($sExtAuthVariable)
 	{
 		$this->m_sExtAuthVariable = $sExtAuthVariable;

core/dbobject.class.php

@@ -208,6 +208,7 @@ abstract class DBObject implements iDisplay
 	const MAX_UPDATE_LOOP_COUNT = 10;
 
 	private $aEventListeners = [];
+	private array $aAllowedTransitions = [];
 
 	/**
 	 * DBObject constructor.
@@ -606,11 +607,10 @@ abstract class DBObject implements iDisplay
      * Attributes setter
      *
      * Set $sAttCode to $value.
-     * The value must be valid according to the type of attribute.
+     * The value must be valid according to the type of attribute : see the different {@see AttributeDefinition::MakeRealValue()} implementations
      * The value will not be recorded into the DB until DBObject::DBWrite() is called.
      *
      * @api
-     * @see DBWrite()
      *
      * @param string $sAttCode
      * @param mixed $value
@@ -618,6 +618,8 @@ abstract class DBObject implements iDisplay
      * @return bool
      * @throws CoreException
      * @throws CoreUnexpectedValue
+     *
+     * @see DBWrite()
      */
 	public function Set($sAttCode, $value)
 	{
@@ -756,9 +758,10 @@ abstract class DBObject implements iDisplay
 	{
 		$oAttDef = MetaModel::GetAttributeDef(get_class($this), $sAttCode);
 		$iMaxSize = $oAttDef->GetMaxSize();
-		if ($iMaxSize && (strlen($sValue) > $iMaxSize))
-		{
-			$sValue = substr($sValue, 0, $iMaxSize);
+		$sLength = mb_strlen($sValue);
+		if ($iMaxSize && ($sLength > $iMaxSize)) {
+			$sMessage = " -truncated ($sLength chars)";
+			$sValue = mb_substr($sValue, 0, $iMaxSize - mb_strlen($sMessage)).$sMessage;
 		}
 		$this->Set($sAttCode, $sValue);
 	}
@@ -2110,33 +2113,26 @@ abstract class DBObject implements iDisplay
 				return true;
 			}
 
-			if ($toCheck instanceof ormSet)
-			{
+			if ($toCheck instanceof ormSet) {
 				return true;
 			}
 
 			return "Bad type";
-		}
-		elseif ($oAtt->IsScalar())
-		{
+		} elseif ($oAtt->IsScalar()) {
+
 			$aValues = $oAtt->GetAllowedValues($this->ToArgsForQuery());
-			if (is_array($aValues) && (count($aValues) > 0))
-			{
-				if (!array_key_exists($toCheck, $aValues))
-				{
+			if (is_array($aValues) && (count($aValues) > 0)) {
+				if (!array_key_exists($toCheck, $aValues)) {
 					return "Value not allowed [$toCheck]";
 				}
 			}
-			if (!is_null($iMaxSize = $oAtt->GetMaxSize()))
-			{
-				$iLen = strlen($toCheck);
-				if ($iLen > $iMaxSize)
-				{
+			if (!is_null($iMaxSize = $oAtt->GetMaxSize())) {
+				$iLen = mb_strlen($toCheck);
+				if ($iLen > $iMaxSize) {
 					return "String too long (found $iLen, limited to $iMaxSize)";
 				}
 			}
-			if (!$oAtt->CheckFormat($toCheck))
-			{
+			if (!$oAtt->CheckFormat($toCheck)) {
 				return "Wrong format [$toCheck]";
 			}
 		}
@@ -2321,16 +2317,17 @@ abstract class DBObject implements iDisplay
 	}
 
 	/**
+     * @param array $aUniquenessRuleProperties uniqueness rule properties
+	 *
+     * @param string $sUniquenessRuleId uniqueness rule ID
+	 * @return \DBSearch
+	 * @throws \OQLException
+     * @throws \CoreException
+     *
      * @internal
      *
-	 * @param string $sUniquenessRuleId uniqueness rule ID
-	 * @param array $aUniquenessRuleProperties uniqueness rule properties
-	 *
-	 * @return \DBSearch
-	 * @throws \CoreException
-	 * @throws \OQLException
-	 * @since 2.6.0 N°659 uniqueness constraint
-	 * @api
+     * @since 2.6.0 N°659 uniqueness constraint
+     * @since 2.7.11 3.1.2 3.2.0 N°4314 Fix Uniqueness rules not working with Silo
 	 */
 	protected function GetSearchForUniquenessRule($sUniquenessRuleId, $aUniquenessRuleProperties)
 	{
@@ -2359,8 +2356,10 @@ abstract class DBObject implements iDisplay
 			$oUniquenessQuery->AddConditionForInOperatorUsingParam('finalclass', $aChildClassesWithRuleDisabled, false);
 		}
 
-		return $oUniquenessQuery;
-	}
+        $oUniquenessQuery->AllowAllData();
+
+        return $oUniquenessQuery;
+    }
 
 	/**
 	 * @param string $sAttCode
@@ -4106,6 +4105,8 @@ abstract class DBObject implements iDisplay
 			return;
 		}
 
+		$this->SetReadOnly("No modification allowed before delete");
+		$this->FireEventAboutToDelete();
 		$oKPI = new ExecutionKPI();
 		$this->OnDelete();
 		$oKPI->ComputeStatsForExtension($this, 'OnDelete');
@@ -4403,9 +4404,32 @@ abstract class DBObject implements iDisplay
 				]);
 		}
 
+		$this->aAllowedTransitions = $aSortedTransitions;
+		$this->FireEvent(EVENT_ENUM_TRANSITIONS, ['allowed_stimuli' => array_keys($aSortedTransitions)]);
+		$aSortedTransitions = $this->aAllowedTransitions;
+		$this->aAllowedTransitions = [];
+
 		return $aSortedTransitions;
 	}
 
+	/**
+	 * Remove a transition for a specific stimulus.
+	 * This is only usable by EVENT_ENUM_TRANSITIONS listeners in order
+	 * to manage the allowed transitions in the current object state.
+	 *
+	 * @param string $sStimulus
+	 *
+	 * @return void
+	 * @api
+	 * @since 3.1.2
+	 */
+	public function DenyTransition(string $sStimulus): void
+	{
+		if (isset($this->aAllowedTransitions[$sStimulus])) {
+			unset($this->aAllowedTransitions[$sStimulus]);
+		}
+	}
+
     /**
      * Helper to reset a stop-watch
      * Suitable for use as a lifecycle action
@@ -4491,14 +4515,6 @@ abstract class DBObject implements iDisplay
 		$sNewState = $aTransitionDef['target_state'];
 		$this->Set($sStateAttCode, $sNewState);
 
-		$aEventData = [
-			'stimulus' => $sStimulusCode,
-			'previous_state' => $sPreviousState,
-			'new_state' => $sNewState,
-			'save_object' => !$bDoNotWrite,
-		];
-		$this->FireEvent(EVENT_DB_BEFORE_APPLY_STIMULUS, $aEventData);
-
 		// $aTransitionDef is an
 		//    array('target_state'=>..., 'actions'=>array of handlers procs, 'user_restriction'=>TBD
 
@@ -4583,8 +4599,6 @@ abstract class DBObject implements iDisplay
 			if (!$bDoNotWrite) {
 				$this->DBWrite();
 			}
-
-			$this->FireEvent(EVENT_DB_AFTER_APPLY_STIMULUS, $aEventData);
 		}
 		else
 		{
@@ -4593,8 +4607,6 @@ abstract class DBObject implements iDisplay
 			{
 				$this->m_aCurrValues[$sAttCode] = $aBackupValues[$sAttCode];
 			}
-			$aEventData['action'] = $sActionDesc;
-			$this->FireEvent(EVENT_DB_APPLY_STIMULUS_FAILED, $aEventData);
 		}
 		return $bSuccess;
 	}
@@ -4731,7 +4743,7 @@ abstract class DBObject implements iDisplay
 			}
 		}
 		$oDate->modify($sModifier);
-		$this->Set($sAttCode, $oDate->format('Y-m-d H:i:s'));
+		$this->Set($sAttCode, $oDate->getTimestamp());
 	}
 
 	/**
@@ -6625,6 +6637,14 @@ abstract class DBObject implements iDisplay
 	{
 	}
 
+	/**
+	 * @return void
+	 * @since 3.1.2
+	 */
+	protected function FireEventAboutToDelete(): void
+	{
+	}
+
 	/**
 	 * @return void
 	 * @since 3.1.0

core/dbsearch.class.php

@@ -851,11 +851,11 @@ abstract class DBSearch
 			return;
 		}
 
-		if (count($aColumns) == 0)
-		{
-			$aColumns = array_keys(MetaModel::ListAttributeDefs($this->GetClass()));
-			// Add the standard id (as first column)
-			array_unshift($aColumns, 'id');
+        if (count($aColumns) == 0)
+        {
+            $aColumns = array_keys(MetaModel::ListAttributeDefs($this->GetClass()));
+            // Add the standard id (as first column)
+            array_unshift($aColumns, 'id');
 		}
 
 		$aQueryCols = CMDBSource::GetColumns($resQuery, $sSQL);
@@ -885,6 +885,55 @@ abstract class DBSearch
 		return $aRes;
 	}
 
+    /**
+     * Selects a column ($sAttCode) from the specified class ($sClassAlias - default main class) of the DBsearch object and gives the result as an array
+     * @param string $sAttCode
+     * @param string|null $sClassAlias
+     *
+     * @return array
+     * @throws ConfigException
+     * @throws CoreException
+     * @throws MissingQueryArgument
+     * @throws MySQLException
+     * @throws MySQLHasGoneAwayException
+     */
+    public function SelectAttributeToArray(string $sAttCode, ?string $sClassAlias = null):array
+    {
+       if(is_null($sClassAlias)) {
+           $sClassAlias = $this->GetClassAlias();
+       }
+
+       $sClass = $this->GetClass();
+       if($sAttCode === 'id'){
+           $aAttToLoad[$sClassAlias]=[];
+       } else {
+           $aAttToLoad[$sClassAlias][$sAttCode] = MetaModel::GetAttributeDef($sClass, $sAttCode);
+       }
+
+        $sSQL = $this->MakeSelectQuery([], [], $aAttToLoad);
+        $resQuery = CMDBSource::Query($sSQL);
+        if (!$resQuery)
+        {
+            return [];
+        }
+
+        $sColName = $sClassAlias.$sAttCode;
+
+        $aRes = [];
+        while ($aRow = CMDBSource::FetchArray($resQuery))
+        {
+            $aMappedRow = array();
+            if($sAttCode === 'id') {
+                $aMappedRow[$sAttCode] = $aRow[$sColName];
+            } else {
+                $aMappedRow[$sAttCode] = $aAttToLoad[$sClassAlias][$sAttCode]->FromSQLToValue($aRow, $sColName);
+            }
+            $aRes[] = $aMappedRow;
+        }
+        CMDBSource::FreeResult($resQuery);
+        return $aRes;
+    }
+
 	////////////////////////////////////////////////////////////////////////////
 	//
 	// Construction of the SQL queries

core/designdocument.class.inc.php

@@ -28,8 +28,13 @@ namespace Combodo\iTop;
 
 use DOMDocument;
 use DOMFormatException;
+use DOMNode;
+use DOMNodeList;
+use DOMXPath;
+use Exception;
 use IssueLog;
 use LogAPI;
+use MFElement;
 use utils;
 
 /**
@@ -41,6 +46,11 @@ use utils;
  */
 class DesignDocument extends DOMDocument
 {
+
+	/** To fix DOMNode::getLineNo() ref https://www.php.net/manual/en/domnode.getlineno.php */
+	public const XML_PARSE_BIG_LINES = 4194304;
+
+
 	/**
 	 * @throws \Exception
 	 */
@@ -69,10 +79,12 @@ class DesignDocument extends DOMDocument
 	 */
 	public function load($filename, $options = null)
 	{
-		libxml_clear_errors();
-		if (parent::load($filename, LIBXML_NOBLANKS) === false) {
-			$aErrors = libxml_get_errors();
-			IssueLog::Error("Error loading $filename", LogAPI::CHANNEL_DEFAULT, $aErrors);
+		if (is_file($filename)) {
+			libxml_clear_errors();
+			if (parent::load($filename, LIBXML_NOBLANKS | LIBXML_BIGLINES | LIBXML_PARSEHUGE | self::XML_PARSE_BIG_LINES) === false) {
+				$aErrors = libxml_get_errors();
+				IssueLog::Error("Error loading $filename", LogAPI::CHANNEL_DEFAULT, $aErrors);
+			}
 		}
 	}
 
@@ -227,6 +239,56 @@ class DesignElement extends \DOMElement
 
 		return '';
 	}
+
+	/**
+	 * Compatibility with PHP8.0
+	 *
+	 * @return \DOMElement|null
+	 *
+	 * @since 3.1.2
+	 */
+	public function GetFirstElementChild()
+	{
+		if (property_exists($this, 'firstElementChild')) {
+			return $this->firstElementChild;
+		}
+
+		$oChildNode = $this->firstChild;
+		while (!is_null($oChildNode)) {
+			if ($oChildNode instanceof \DOMElement) {
+				return $oChildNode;
+			}
+			$oChildNode = $oChildNode->nextSibling;
+		}
+
+		return null;
+	}
+
+	/**
+	 * Compatibility with PHP8.0
+	 *
+	 * @return \DOMElement|null
+	 *
+	 * @since 3.1.2
+	 */
+	public function GetNextElementSibling()
+	{
+		if (property_exists($this, 'nextElementSibling')) {
+			return $this->nextElementSibling;
+		}
+
+		$oSibling = $this->nextSibling;
+		while (!is_null($oSibling)) {
+			if ($oSibling instanceof \DOMElement) {
+				return $oSibling;
+			}
+			$oSibling = $oSibling->nextSibling;
+		}
+
+		return null;
+
+	}
+
 	/**
 	 * Returns the node directly under the given node
 	 * @param $sTagName
@@ -307,4 +369,146 @@ class DesignElement extends \DOMElement
 		}
 		return $sRet;
 	}
+
+	/**
+	 * Check that the current node is actually a class node, under classes
+	 * @since 3.1.2 3.2.0 N°6974
+	 */
+	public function IsClassNode(): bool
+	{
+		if ($this->tagName == 'class') {
+			// Beware: classes/class also exists in the group definition
+			if (($this->parentNode->tagName == 'classes') && ($this->parentNode->parentNode->tagName == 'itop_design')) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * True if the node is contained in a _delta="merge" tree
+	 * @return bool
+	 */
+	public function IsInSpecifiedMerge(): bool
+	{
+		// Iterate through the parents: reset the flag if any of them has a flag set
+		for ($oParent = $this; $oParent instanceof MFElement; $oParent = $oParent->parentNode) {
+			$sDeltaSpec = $oParent->getAttribute('_delta');
+			if ($sDeltaSpec === 'merge') {
+				return true;
+			}
+			if (in_array($sDeltaSpec, ['define', 'define_if_not_exists', 'force', 'redefine'])) {
+				return false;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Find the child node matching the given node.
+	 * UNSAFE: may return nodes marked as _alteration="removed"
+	 * A method with the same signature MUST exist in MFDocument for the recursion to work fine
+	 *
+	 * @param DesignElement $oRefNode The node to search for
+	 * @param null|string $sSearchId substitutes to the value of the 'id' attribute
+	 *
+	 * @return DesignElement|null
+	 * @throws \Exception
+	 * @since 3.1.2 3.2.0 N°6974
+	 */
+	public function _FindChildNode(DesignElement $oRefNode, $sSearchId = null): ?DesignElement
+	{
+		return self::_FindNode($this, $oRefNode, $sSearchId);
+	}
+
+
+	/**
+	 * Find the child node matching the given node.
+	 * UNSAFE: may return nodes marked as _alteration="removed"
+	 * A method with the same signature MUST exist in MFDocument for the recursion to work fine
+	 *
+	 * @param DesignElement $oRefNode The node to search for
+	 *
+	 * @return DesignElement|null
+	 * @throws \Exception
+	 * @since 3.1.2 3.2.0 N°6974
+	 */
+	public function _FindChildNodes(DesignElement $oRefNode): ?DesignElement
+	{
+		return self::_FindNodes($this, $oRefNode);
+	}
+
+	/**
+	 * Find the child node matching the given node under the specified parent.
+	 * UNSAFE: may return nodes marked as _alteration="removed"
+	 *
+	 * @param \DOMNode $oParent
+	 * @param DesignElement $oRefNode
+	 * @param string|null $sSearchId
+	 *
+	 * @return DesignElement|null
+	 * @throws Exception
+	 * @since 3.1.2 3.2.0 N°6974
+	 */
+	public static function _FindNode(DOMNode $oParent, DesignElement $oRefNode, string $sSearchId = null): ?DesignElement
+	{
+		$oNodes = self::_FindNodes($oParent, $oRefNode, $sSearchId);
+		if ($oNodes instanceof DOMNodeList) {
+			/** @var DesignElement $oNode */
+			$oNode = $oNodes->item(0);
+
+			return $oNode;
+		}
+
+		return null;
+	}
+
+	/**
+	 * Find the child node matching the given node under the specified parent.
+	 * UNSAFE: may return nodes marked as _alteration="removed"
+	 *
+	 * @param \DOMNode $oParent
+	 * @param DesignElement $oRefNode
+	 * @param string|null $sSearchId
+	 *
+	 * @return \DOMNodeList|false|mixed
+	 * @since 3.1.2 3.2.0 N°6974
+	 */
+	public static function _FindNodes(DOMNode $oParent, DesignElement $oRefNode, string $sSearchId = null)
+	{
+		if ($oParent instanceof DOMDocument)
+		{
+			$oDoc = $oParent->firstChild->ownerDocument;
+			$oRoot = $oParent;
+		}
+		else
+		{
+			$oDoc = $oParent->ownerDocument;
+			$oRoot = $oParent;
+		}
+
+		$oXPath = new DOMXPath($oDoc);
+		if ($oRefNode->hasAttribute('id'))
+		{
+			// Find the elements having the same tag name and id
+			if (!$sSearchId)
+			{
+				$sSearchId = $oRefNode->getAttribute('id');
+			}
+			$sXPath = './'.$oRefNode->tagName."[@id='$sSearchId']";
+
+			$oRes = $oXPath->query($sXPath, $oRoot);
+		}
+		else
+		{
+			// Get the elements having the same tag name
+			$sXPath = './'.$oRefNode->tagName;
+
+			$oRes = $oXPath->query($sXPath, $oRoot);
+		}
+
+		return $oRes;
+	}
 }

core/displayablegraph.class.inc.php

@@ -62,7 +62,7 @@ class DisplayableNode extends GraphNode
 
 	public function GetWidth()
 	{
-		return max(32, 5*strlen($this->GetProperty('label'))); // approximation of the text's bounding box
+		return max(32, 5 * mb_strlen($this->GetProperty('label'))); // approximation of the text's bounding box
 	}
 
 	public function GetHeight()
@@ -491,7 +491,7 @@ class DisplayableNode extends GraphNode
 		if ($bNoLabel)
 		{
 			// simulate a fake label with the approximate same size as the true label
-			$sLabel = str_repeat('x',strlen($this->GetProperty('label', $this->GetId())));
+			$sLabel = str_repeat('x', mb_strlen($this->GetProperty('label', $this->GetId())));
 			$sDot = 'label="'.$sLabel.'"';
 		}
 		else

core/event.class.inc.php

@@ -242,44 +242,33 @@ class EventIssue extends Event
 			{
 				if (is_string($sValue))
 				{
-					if (strlen($sValue) < 256)
-					{
+					if (mb_strlen($sValue) < 256) {
 						$aPost[$sKey] = $sValue;
+					} else {
+						$aPost[$sKey] = "!long string: ".mb_strlen($sValue)." chars";
 					}
-					else
-					{
-						$aPost[$sKey] = "!long string: ".strlen($sValue). " chars";
-					}
-				}
-				else
-				{
+				} else {
 					// Not a string (avoid warnings in case the value cannot be easily casted into a string)
-					$aPost[$sKey] = @(string) $sValue;
+					$aPost[$sKey] = @(string)$sValue;
 				}
 			}
 			$this->Set('arguments_post', $aPost);
-		}
-		else
-		{
+		} else {
 			$this->Set('arguments_post', array());
 		}
-
-		$sLength = strlen($this->Get('issue'));
-		if ($sLength > 255)
-		{
-			$this->Set('issue', substr($this->Get('issue'), 0, 200)." -truncated ($sLength chars)");
+		$sLength = mb_strlen($this->Get('issue'));
+		if ($sLength > 255) {
+			$this->Set('issue', mb_substr($this->Get('issue'), 0, 210)." -truncated ($sLength chars)");
 		}
 
-		$sLength = strlen($this->Get('impact'));
-		if ($sLength > 255)
-		{
-			$this->Set('impact', substr($this->Get('impact'), 0, 200)." -truncated ($sLength chars)");
+		$sLength = mb_strlen($this->Get('impact'));
+		if ($sLength > 255) {
+			$this->Set('impact', mb_substr($this->Get('impact'), 0, 210)." -truncated ($sLength chars)");
 		}
 
-		$sLength = strlen($this->Get('page'));
-		if ($sLength > 255)
-		{
-			$this->Set('page', substr($this->Get('page'), 0, 200)." -truncated ($sLength chars)");
+		$sLength = mb_strlen($this->Get('page'));
+		if ($sLength > 255) {
+			$this->Set('page', mb_substr($this->Get('page'), 0, 210)." -truncated ($sLength chars)");
 		}
 	}
 }

core/expressioncache.class.inc.php

@@ -101,7 +101,7 @@ EOF;
 EOF;
 
 				SetupUtils::builddir(dirname($sFilePath));
-				file_put_contents($sFilePath, $content);
+				file_put_contents($sFilePath, $content, LOCK_EX);
 			}
 		}
 		Dict::SetUserLanguage($sUserLang);

core/log.class.inc.php

@@ -1301,19 +1301,7 @@ class DeprecatedCallsLog extends LogAPI
 		}
 
 		$aStack = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 3);
-		$iStackDeprecatedMethodLevel = 1; // level 0 = current method, level 1 = method containing the `NotifyDeprecatedPhpMethod` call
-		$sDeprecatedObject = $aStack[$iStackDeprecatedMethodLevel]['class'];
-		$sDeprecatedMethod = $aStack[$iStackDeprecatedMethodLevel]['function'];
-		$sCallerFile = $aStack[$iStackDeprecatedMethodLevel]['file'];
-		$sCallerLine = $aStack[$iStackDeprecatedMethodLevel]['line'];
-		$sMessage = "Call to {$sDeprecatedObject}::{$sDeprecatedMethod} in {$sCallerFile}#L{$sCallerLine}";
-
-		$iStackCallerMethodLevel = $iStackDeprecatedMethodLevel + 1; // level 2 = caller of the deprecated method
-		if (array_key_exists($iStackCallerMethodLevel, $aStack)) {
-			$sCallerObject = $aStack[$iStackCallerMethodLevel]['class'];
-			$sCallerMethod = $aStack[$iStackCallerMethodLevel]['function'];
-			$sMessage .= " ({$sCallerObject}::{$sCallerMethod})";
-		}
+		$sMessage = self::GetMessageFromStack($aStack);
 
 		if (!is_null($sAdditionalMessage)) {
 			$sMessage .= ' : '.$sAdditionalMessage;
@@ -1322,6 +1310,45 @@ class DeprecatedCallsLog extends LogAPI
 		static::Warning($sMessage, self::ENUM_CHANNEL_PHP_METHOD);
 	}
 
+	/**
+	 * @param array $aDebugBacktrace data from {@see debug_backtrace()}
+	 *
+	 * @return string message to print to the log
+	 */
+	private static function GetMessageFromStack(array $aDebugBacktrace): string
+	{
+		// level 0 = current method
+		// level 1 = deprecated method, containing the `NotifyDeprecatedPhpMethod` call
+		$sMessage = 'Call'.self::GetMessageForCurrentStackLevel($aDebugBacktrace[1], " to ");
+
+		// level 2 = caller of the deprecated method
+		if (array_key_exists(2, $aDebugBacktrace)) {
+			$sMessage .= ' (from ';
+			$sMessage .= self::GetMessageForCurrentStackLevel($aDebugBacktrace[2]);
+			$sMessage .= ')';
+		}
+
+		return $sMessage;
+	}
+
+	private static function GetMessageForCurrentStackLevel(array $aCurrentLevelDebugTrace, ?string $sPrefix = ""): string
+	{
+		$sMessage = "";
+		if (array_key_exists('class', $aCurrentLevelDebugTrace)) {
+			$sDeprecatedObject = $aCurrentLevelDebugTrace['class'];
+			$sDeprecatedMethod = $aCurrentLevelDebugTrace['function'] ?? "";
+			$sMessage = "{$sPrefix}{$sDeprecatedObject}::{$sDeprecatedMethod} in ";
+		}
+
+		if (array_key_exists('file', $aCurrentLevelDebugTrace)) {
+			$sCallerFile = $aCurrentLevelDebugTrace['file'];
+			$sCallerLine = $aCurrentLevelDebugTrace['line'] ?? "";
+			$sMessage .= "{$sCallerFile}#L{$sCallerLine}";
+		}
+
+		return $sMessage;
+	}
+
 	/**
 	 * @param string|null $sAdditionalMessage
 	 * @since 3.1.0

core/metamodel.class.php

@@ -6846,18 +6846,6 @@ abstract class MetaModel
 			$sClass = $aRow[$sClassAlias."finalclass"];
 		}
 
-		// if an object is already being updated, then this method will return this object instead of recreating a new one.
-		// At this point the method DBUpdate of a new object with the same class and id won't do anything due to reentrance protection,
-		// so to ensure that the potential modifications are correctly saved, the object currently being updated is returned.
-		// DBUpdate() method then will take care that all the modifications will be saved.
-		if (array_key_exists($sClassAlias.'id', $aRow)) {
-			$iKey = $aRow[$sClassAlias."id"];
-			$oObject = self::GetReentranceObject($sClass, $iKey);
-			if ($oObject !== false) {
-				return $oObject;
-			}
-		}
-
 		return new $sClass($aRow, $sClassAlias, $aAttToLoad, $aExtendedDataSpec);
 	}
 

core/ormcaselog.class.inc.php

@@ -169,7 +169,7 @@ class ormCaseLog {
 		}
 
 		// Process the case of an eventual remainder (quick migration of AttributeText fields)
-		if ($iPos < (strlen($this->m_sLog) - 1))
+		if ($iPos < (utils::StrLen($this->m_sLog) - 1))
 		{
 			$sTextEntry = substr($this->m_sLog, $iPos);
 
@@ -292,7 +292,7 @@ class ormCaseLog {
 		}
 
 		// Process the case of an eventual remainder (quick migration of AttributeText fields)
-		if ($iPos < (strlen($this->m_sLog) - 1)) {
+		if ($iPos < (utils::StrLen($this->m_sLog) - 1)) {
 			$sTextEntry = substr($this->m_sLog, $iPos);
 			$sTextEntry = str_replace(array("\r\n", "\n", "\r"), "<br/>", utils::EscapeHtml($sTextEntry));
 
@@ -373,7 +373,7 @@ class ormCaseLog {
 		}
 
 		// Process the case of an eventual remainder (quick migration of AttributeText fields)
-		if ($iPos < (strlen($this->m_sLog) - 1)) {
+		if ($iPos < (utils::StrLen($this->m_sLog) - 1)) {
 			$sTextEntry = substr($this->m_sLog, $iPos);
 			$sTextEntry = str_replace(array("\r\n", "\n", "\r"), "<br/>", utils::EscapeHtml($sTextEntry));
 
@@ -467,7 +467,7 @@ class ormCaseLog {
 			$oBlock->AddSubBlock($oCollapsibleBlock);
 		}
 		// Process the case of an eventual remainder (quick migration of AttributeText fields)
-		if ($iPos < (strlen($this->m_sLog) - 1)) {
+		if ($iPos < (utils::StrLen($this->m_sLog) - 1)) {
 			// In this case the format is always "text"
 			$sTextEntry = substr($this->m_sLog, $iPos);
 			$sTextEntry = str_replace(array("\r\n", "\n", "\r"), "<br/>", utils::EscapeHtml($sTextEntry));

core/ormdocument.class.inc.php

@@ -343,6 +343,6 @@ class ormDocument
 	 */
 	public function GetSignature(): string
 	{
-		return md5($this->GetData());
+		return md5($this->GetData() ?? '');
 	}
 }

core/userrights.class.inc.php

@@ -161,7 +161,7 @@ abstract class UserRightsAddOnAPI
 				$oSearchSharers->AllowAllData();
 				$oSearchSharers->AddCondition_ReferencedBy($oShareSearch, 'sharing_org_id');
 				$aSharers = array();
-				foreach($oSearchSharers->ToDataArray(array('id')) as $aRow)
+				foreach($oSearchSharers->SelectAttributeToArray('id') as $aRow)
 				{
 					$aSharers[] = $aRow['id'];
 				}
@@ -186,7 +186,7 @@ abstract class UserRightsAddOnAPI
 				$oOrgField = new FieldExpression('org_id', $sShareClass);
 				$oSearchShares->AddConditionExpression(new BinaryExpression($oOrgField, 'IN', $oListExpr));
 				$aShared = array();
-				foreach($oSearchShares->ToDataArray(array($sShareAttCode)) as $aRow)
+				foreach($oSearchShares->SelectAttributeToArray($sShareAttCode) as $aRow)
 				{
 					$aShared[] = $aRow[$sShareAttCode];
 				}

css/backoffice/components/_field.scss

@@ -80,16 +80,29 @@ $ibo-field--enable-bulk--checkbox--margin-left: $ibo-spacing-300 !default;
       }
     }
   }
+
+  /*N°6543 - We need the rule to keep text inside the column when width is defined*/
+  &[data-attribute-type="AttributeHtml"],
+  &[data-attribute-type="AttributeText"] {
+    &[data-attribute-flag-read-only="true"] {
+      display: grid;
+
+      > .ibo-field--value {
+        max-width: 100%;
+        overflow: auto;
+      }
+    }
+  }
 }
 
-/* Large field = Label on top, value below */
-.ibo-field-large {
-  display: block;
+  /* Large field = Label on top, value below */
+  .ibo-field-large {
+    display: block;
 
-  .ibo-field--label {
-    position: relative; /* Necessary for fullscreen toggler */
-    display: flex;
-    align-items: center;
+    .ibo-field--label {
+      position: relative; /* Necessary for fullscreen toggler */
+      display: flex;
+      align-items: center;
     max-width: initial;
     width: 100%;
   }

css/backoffice/components/datatable/_datatable.scss

@@ -123,6 +123,13 @@ $ibo-fieldsorter--selected--background-color: $ibo-color-blue-200 !default;
     .ibo-datatable--row-actions-toolbar{
       justify-content: end;
     }
+    /* N°6543 - We need the rule to keep text inside the column when width is defined */
+    > [data-attribute-type="AttributeHtml"],
+    > [data-attribute-type="AttributeText"] {
+          max-width: 100%;
+          overflow: auto;
+    }
+
   }
 }
 

css/setup.scss

@@ -58,6 +58,9 @@ $progress-bar-error-bg-color: #F56565 !default;
 .center {
   text-align: center;
 }
+.hidden {
+  display: none;
+}
 
 /* Animations */
 @keyframes progress_bar_color_ongoing {

datamodels/2.x/authent-ldap/dictionaries/hu.dict.authent-ldap.php

@@ -21,6 +21,6 @@
  */
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:UserLDAP' => 'LDAP felhasználó',
-	'Class:UserLDAP+' => '',
+	'Class:UserLDAP+' => 'LDAP vagy AD felhasználó',
 	'UserLDAP:server' => 'LDAP specifics~~',
 ));

datamodels/2.x/authent-local/dictionaries/cs.dict.authent-local.php

@@ -50,7 +50,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:UserLocal/Attribute:expiration/Value:force_expire+' => '~~',
 	'Class:UserLocal/Attribute:expiration/Value:otp_expire' => 'One-time Password~~',
 	'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' => 'Password renewed on~~',
 	'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~~',

datamodels/2.x/authent-local/dictionaries/da.dict.authent-local.php

@@ -35,7 +35,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:UserLocal/Attribute:expiration/Value:force_expire+' => '~~',
 	'Class:UserLocal/Attribute:expiration/Value:otp_expire' => 'One-time Password~~',
 	'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' => 'Password renewed on~~',
 	'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~~',

datamodels/2.x/authent-local/dictionaries/hu.dict.authent-local.php

@@ -21,7 +21,7 @@
  */
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:UserLocal' => ITOP_APPLICATION_SHORT.' felhasználó',
-	'Class:UserLocal+' => '',
+    'Class:UserLocal+' => 'Rendszeren belül létrehozott felhasználó',
 	'Class:UserLocal/Attribute:password' => 'Jelszó',
 	'Class:UserLocal/Attribute:password+' => '',
 	'Class:UserLocal/Attribute:expiration' => 'Jelszó lejárati ideje',

datamodels/2.x/authent-local/dictionaries/it.dict.authent-local.php

@@ -48,7 +48,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:UserLocal/Attribute:expiration/Value:force_expire+' => '~~',
 	'Class:UserLocal/Attribute:expiration/Value:otp_expire' => 'One-time Password~~',
 	'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' => 'Password renewed on~~',
 	'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~~',

datamodels/2.x/authent-local/dictionaries/ja.dict.authent-local.php

@@ -35,7 +35,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:UserLocal/Attribute:expiration/Value:force_expire+' => '~~',
 	'Class:UserLocal/Attribute:expiration/Value:otp_expire' => 'One-time Password~~',
 	'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' => 'Password renewed on~~',
 	'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~~',

datamodels/2.x/authent-local/dictionaries/sk.dict.authent-local.php

@@ -47,7 +47,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:UserLocal/Attribute:expiration/Value:force_expire+' => '~~',
 	'Class:UserLocal/Attribute:expiration/Value:otp_expire' => 'One-time Password~~',
 	'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' => 'Password renewed on~~',
 	'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~~',

datamodels/2.x/authent-local/dictionaries/tr.dict.authent-local.php

@@ -49,7 +49,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:UserLocal/Attribute:expiration/Value:force_expire+' => '~~',
 	'Class:UserLocal/Attribute:expiration/Value:otp_expire' => 'One-time Password~~',
 	'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' => 'Password renewed on~~',
 	'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~~',

datamodels/2.x/combodo-backoffice-darkmoon-theme/dictionaries/hu.dict.combodo-backoffice-darkmoon-theme.php

@@ -22,4 +22,4 @@
  */
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'theme:darkmoon' => 'Dark moon',
-));
+));

datamodels/2.x/combodo-db-tools/dictionaries/cs.dict.combodo-db-tools.php

@@ -23,9 +23,9 @@
 // Database inconsistencies
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	// Dictionary entries go here
-	'Menu:DBToolsMenu' => 'DB Tools~~',
+	'Menu:DBToolsMenu' => 'Database integrity~~',
 	'DBTools:Class' => 'Class~~',
-	'DBTools:Title' => 'Database Maintenance Tools~~',
+	'DBTools:Title' => 'Database integrity check~~',
 	'DBTools:ErrorsFound' => 'Errors Found~~',
 	'DBTools:Indication' => 'Important: after fixing errors in the database you\'ll have to run the analysis again as new inconsistencies will be generated~~',
 	'DBTools:Disclaimer' => 'DISCLAIMER: BACKUP YOUR DATABASE BEFORE RUNNING THE FIXES~~',

datamodels/2.x/combodo-db-tools/dictionaries/da.dict.combodo-db-tools.php

@@ -23,9 +23,9 @@
 // Database inconsistencies
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	// Dictionary entries go here
-	'Menu:DBToolsMenu' => 'DB Tools~~',
+	'Menu:DBToolsMenu' => 'Database integrity~~',
 	'DBTools:Class' => 'Class~~',
-	'DBTools:Title' => 'Database Maintenance Tools~~',
+	'DBTools:Title' => 'Database integrity check~~',
 	'DBTools:ErrorsFound' => 'Errors Found~~',
 	'DBTools:Indication' => 'Important: after fixing errors in the database you\'ll have to run the analysis again as new inconsistencies will be generated~~',
 	'DBTools:Disclaimer' => 'DISCLAIMER: BACKUP YOUR DATABASE BEFORE RUNNING THE FIXES~~',

datamodels/2.x/combodo-db-tools/dictionaries/hu.dict.combodo-db-tools.php

@@ -42,15 +42,15 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'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:Details' => 'Részletek megjelenítése',
+    'DBTools:ShowAll' => 'Minden hiba megjelenítése',
 	'DBTools:Inconsistencies' => 'Adatbázis inkonzisztenciák',
 	'DBTools:DetailedErrorTitle' => '%2$s hiba a %1$s osztályban: %3$s',
 	'DBTools:DetailedErrorLimit' => 'List limited to %1$s errors~~',
 	'DBAnalyzer-Integrity-OrphanRecord' => 'Árva rekord a `%1$s` -ban, kell hogy legyen megfelelője a `%2$s` táblázatban',
 	'DBAnalyzer-Integrity-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`)~~',
+	'DBAnalyzer-Integrity-InvalidValue' => '%1$s értéke érvénytelen (oszlop: `%2$s.%3$s`)',
 	'DBAnalyzer-Integrity-UsersWithoutProfile' => 'Néhány felhasználónak egyáltalán nincs fiókja',
 	'DBAnalyzer-Integrity-HKInvalid' => 'Sérült a `%1$s` hierarchikus kulcs',
 	'DBAnalyzer-Fetch-Count-Error' => 'Lekérési hiba a `%1$s` -nál, %2$d bejegyzés lekérve / %3$d megszámlálva',

datamodels/2.x/combodo-db-tools/dictionaries/it.dict.combodo-db-tools.php

@@ -23,9 +23,9 @@
 // Database inconsistencies
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	// Dictionary entries go here
-	'Menu:DBToolsMenu' => 'DB Tools~~',
+	'Menu:DBToolsMenu' => 'Database integrity~~',
 	'DBTools:Class' => 'Class~~',
-	'DBTools:Title' => 'Database Maintenance Tools~~',
+	'DBTools:Title' => 'Database integrity check~~',
 	'DBTools:ErrorsFound' => 'Errors Found~~',
 	'DBTools:Indication' => 'Important: after fixing errors in the database you\'ll have to run the analysis again as new inconsistencies will be generated~~',
 	'DBTools:Disclaimer' => 'DISCLAIMER: BACKUP YOUR DATABASE BEFORE RUNNING THE FIXES~~',

datamodels/2.x/combodo-db-tools/dictionaries/ja.dict.combodo-db-tools.php

@@ -23,9 +23,9 @@
 // Database inconsistencies
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	// Dictionary entries go here
-	'Menu:DBToolsMenu' => 'DB Tools~~',
+	'Menu:DBToolsMenu' => 'Database integrity~~',
 	'DBTools:Class' => 'Class~~',
-	'DBTools:Title' => 'Database Maintenance Tools~~',
+	'DBTools:Title' => 'Database integrity check~~',
 	'DBTools:ErrorsFound' => 'Errors Found~~',
 	'DBTools:Indication' => 'Important: after fixing errors in the database you\'ll have to run the analysis again as new inconsistencies will be generated~~',
 	'DBTools:Disclaimer' => 'DISCLAIMER: BACKUP YOUR DATABASE BEFORE RUNNING THE FIXES~~',

datamodels/2.x/combodo-db-tools/dictionaries/ru.dict.combodo-db-tools.php

@@ -12,7 +12,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	// Dictionary entries go here
 	'Menu:DBToolsMenu' => 'Инструменты БД',
 	'DBTools:Class' => 'Класс',
-	'DBTools:Title' => 'Инструменты обслуживания базы данных~~',
+	'DBTools:Title' => 'Инструменты обслуживания базы данных',
 	'DBTools:ErrorsFound' => 'Найденные ошибки',
 	'DBTools:Indication' => 'Important: after fixing errors in the database you\'ll have to run the analysis again as new inconsistencies will be generated~~',
 	'DBTools:Disclaimer' => 'DISCLAIMER: BACKUP YOUR DATABASE BEFORE RUNNING THE FIXES~~',

datamodels/2.x/combodo-db-tools/dictionaries/sk.dict.combodo-db-tools.php

@@ -25,7 +25,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	// Dictionary entries go here
 	'Menu:DBToolsMenu' => 'Database integrity~~',
 	'DBTools:Class' => 'Class~~',
-	'DBTools:Title' => 'Database Maintenance Tools~~',
+	'DBTools:Title' => 'Database integrity check~~',
 	'DBTools:ErrorsFound' => 'Errors Found~~',
 	'DBTools:Indication' => 'Important: after fixing errors in the database you\'ll have to run the analysis again as new inconsistencies will be generated~~',
 	'DBTools:Disclaimer' => 'DISCLAIMER: BACKUP YOUR DATABASE BEFORE RUNNING THE FIXES~~',

datamodels/2.x/combodo-db-tools/dictionaries/tr.dict.combodo-db-tools.php

@@ -23,9 +23,9 @@
 // Database inconsistencies
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	// Dictionary entries go here
-	'Menu:DBToolsMenu' => 'DB Tools~~',
+	'Menu:DBToolsMenu' => 'Database integrity~~',
 	'DBTools:Class' => 'Class~~',
-	'DBTools:Title' => 'Database Maintenance Tools~~',
+	'DBTools:Title' => 'Database integrity check~~',
 	'DBTools:ErrorsFound' => 'Errors Found~~',
 	'DBTools:Indication' => 'Important: after fixing errors in the database you\'ll have to run the analysis again as new inconsistencies will be generated~~',
 	'DBTools:Disclaimer' => 'DISCLAIMER: BACKUP YOUR DATABASE BEFORE RUNNING THE FIXES~~',

datamodels/2.x/itop-attachments/datamodel.itop-attachments.xml

@@ -260,19 +260,19 @@
   </classes>
   <events>
     <event id="EVENT_ADD_ATTACHMENT_TO_OBJECT" _delta="define">
-      <description>An attachment has been added to an object</description>
+      <name>Attachment added</name>
+      <description><![CDATA[An attachment has been added to an object]]></description>
       <replaces>Attachment::AfterUpdate</replaces>
       <sources>
-        <source id="Attachment">Attachment</source>
         <source id="cmdbAbstractObject">cmdbAbstractObject</source>
       </sources>
       <event_data>
         <event_datum id="object">
-          <description>The attachment updated</description>
+          <description>The object where the attachment is added</description>
           <type>DBObject</type>
         </event_datum>
-        <event_datum id="target_object">
-          <description>The object to which the attachment is linked</description>
+        <event_datum id="attachment">
+          <description>The attachment added to the objet</description>
           <type>DBObject</type>
         </event_datum>
         <event_datum id="debug_info">
@@ -282,19 +282,19 @@
       </event_data>
     </event>
     <event id="EVENT_REMOVE_ATTACHMENT_FROM_OBJECT" _delta="define">
-      <description>An attachment has been removed from an object</description>
+      <name>Attachment removed</name>
+      <description><![CDATA[An attachment has been removed from an object]]></description>
       <replaces>Attachment::AfterUpdate</replaces>
       <sources>
-        <source id="Attachment">Attachment</source>
         <source id="cmdbAbstractObject">cmdbAbstractObject</source>
       </sources>
       <event_data>
         <event_datum id="object">
-          <description>The attachment updated</description>
+          <description>The object where the attachment is removed</description>
           <type>DBObject</type>
         </event_datum>
-        <event_datum id="target_object">
-          <description>The object to which the attachment is linked</description>
+        <event_datum id="attachment">
+          <description>The attachment removed</description>
           <type>DBObject</type>
         </event_datum>
         <event_datum id="debug_info">

datamodels/2.x/itop-attachments/dictionaries/en.dict.itop-attachments.php

@@ -26,9 +26,9 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Attachments:History_File_Removed' => 'Attachment %1$s removed.',
 	'Attachments:AddAttachment' => 'Add attachment: ',
 	'Attachments:UploadNotAllowedOnThisSystem' => 'File upload in NOT allowed on this system.',
-	'Attachment:Max_Go' => '(Maximum file size: %1$s Go)',
-	'Attachment:Max_Mo' => '(Maximum file size: %1$s Mo)',
-	'Attachment:Max_Ko' => '(Maximum file size: %1$s Ko)',
+	'Attachment:Max_Go' => '(Maximum file size: %1$s GB)',
+	'Attachment:Max_Mo' => '(Maximum file size: %1$s MB)',
+	'Attachment:Max_Ko' => '(Maximum file size: %1$s KB)',
 	'Attachments:NoAttachment' => 'No attachment. ',
 	'Attachments:PreviewNotAvailable' => 'Preview not available for this type of attachment.',
 	'Attachments:Error:FileTooLarge' => 'File is too large to be uploaded. %1$s',

datamodels/2.x/itop-attachments/dictionaries/hu.dict.itop-attachments.php

@@ -34,7 +34,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Attachment:Max_Ko' => '(Maximum fájlméret: %1$s KB)',
 	'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:FileTooLarge' => 'Túl nagy a %1$s fájl a feltöltéshez.',
 	'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',
@@ -52,7 +52,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:Attachment/Attribute:expire+' => '~~',
 	'Class:Attachment/Attribute:temp_id' => 'Átmeneti azonosító',
 	'Class:Attachment/Attribute:temp_id+' => '~~',
-	'Class:Attachment/Attribute:item_class' => 'Elem osztály',
+    'Class:Attachment/Attribute:item_class' => 'Elem típus',
 	'Class:Attachment/Attribute:item_class+' => '~~',
 	'Class:Attachment/Attribute:item_id' => 'Elem',
 	'Class:Attachment/Attribute:item_id+' => '~~',

datamodels/2.x/itop-attachments/dictionaries/it.dict.itop-attachments.php

@@ -29,9 +29,9 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Attachments:History_File_Removed' => 'Attachment %1$s removed.~~',
 	'Attachments:AddAttachment' => 'Add attachment: ~~',
 	'Attachments:UploadNotAllowedOnThisSystem' => 'File upload in NOT allowed on this system.~~',
-	'Attachment:Max_Go' => '(Maximum file size: %1$s Go)~~',
-	'Attachment:Max_Mo' => '(Maximum file size: %1$s Mo)~~',
-	'Attachment:Max_Ko' => '(Maximum file size: %1$s Ko)~~',
+	'Attachment:Max_Go' => '(Maximum file size: %1$s GB)~~',
+	'Attachment:Max_Mo' => '(Maximum file size: %1$s MB)~~',
+	'Attachment:Max_Ko' => '(Maximum file size: %1$s KB)~~',
 	'Attachments:NoAttachment' => 'No attachment. ~~',
 	'Attachments:PreviewNotAvailable' => 'Preview not available for this type of attachment.~~',
 	'Attachments:Error:FileTooLarge' => 'File is too large to be uploaded. %1$s~~',

datamodels/2.x/itop-attachments/dictionaries/tr.dict.itop-attachments.php

@@ -29,9 +29,9 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Attachments:History_File_Removed' => 'Attachment %1$s removed.~~',
 	'Attachments:AddAttachment' => 'Add attachment: ~~',
 	'Attachments:UploadNotAllowedOnThisSystem' => 'File upload in NOT allowed on this system.~~',
-	'Attachment:Max_Go' => '(Maximum file size: %1$s Go)~~',
-	'Attachment:Max_Mo' => '(Maximum file size: %1$s Mo)~~',
-	'Attachment:Max_Ko' => '(Maximum file size: %1$s Ko)~~',
+	'Attachment:Max_Go' => '(Maximum file size: %1$s GB)~~',
+	'Attachment:Max_Mo' => '(Maximum file size: %1$s MB)~~',
+	'Attachment:Max_Ko' => '(Maximum file size: %1$s KB)~~',
 	'Attachments:NoAttachment' => 'No attachment. ~~',
 	'Attachments:PreviewNotAvailable' => 'Preview not available for this type of attachment.~~',
 	'Attachments:Error:FileTooLarge' => 'File is too large to be uploaded. %1$s~~',

datamodels/2.x/itop-attachments/main.itop-attachments.php

@@ -262,10 +262,26 @@ class AttachmentPlugIn implements iApplicationUIExtension, iApplicationObjectExt
 		else
 		{
 			$oAttachmentsRenderer->RenderViewAttachmentsList();
-
 		}
 	}
 
+	/**
+	 *
+	 * @see ObjectFormManager::FinalizeAttachments() for the portal version
+	 *
+	 * @param $oObject
+	 * @param $oChange
+	 *
+	 * @return void
+	 * @throws \ArchivedObjectException
+	 * @throws \CoreCannotSaveObjectException
+	 * @throws \CoreException
+	 * @throws \CoreUnexpectedValue
+	 * @throws \DeleteException
+	 * @throws \MySQLException
+	 * @throws \MySQLHasGoneAwayException
+	 * @throws \OQLException
+	 */
 	protected static function UpdateAttachments($oObject, $oChange = null)
 	{
 		self::$m_bIsModified = false;
@@ -291,8 +307,8 @@ class AttachmentPlugIn implements iApplicationUIExtension, iApplicationObjectExt
 				// Remove attachments that are no longer attached to the current object
 				if (in_array($oAttachment->GetKey(), $aRemovedAttachmentIds))
 				{
-					$aData = ['target_object' => $oObject];
-					$oAttachment->FireEvent(EVENT_REMOVE_ATTACHMENT_FROM_OBJECT, $aData);
+					$aData = ['attachment' => $oAttachment];
+					$oObject->FireEvent(EVENT_REMOVE_ATTACHMENT_FROM_OBJECT, $aData);
 					$oAttachment->DBDelete();
 					$aActions[] = self::GetActionChangeOp($oAttachment, false /* false => deletion */);
 				}
@@ -320,8 +336,8 @@ class AttachmentPlugIn implements iApplicationUIExtension, iApplicationObjectExt
 					$oAttachment->DBUpdate();
 					// temporary attachment confirmed, list it in the history
 					$aActions[] = self::GetActionChangeOp($oAttachment, true /* true => creation */);
-					$aData = ['target_object' => $oObject];
-					$oAttachment->FireEvent(EVENT_ADD_ATTACHMENT_TO_OBJECT, $aData);
+					$aData = ['attachment' => $oAttachment];
+					$oObject->FireEvent(EVENT_ADD_ATTACHMENT_TO_OBJECT, $aData);
 				}
 			}
 			if (count($aActions) > 0)

datamodels/2.x/itop-backup/dictionaries/da.dict.itop-backup.php

@@ -23,8 +23,8 @@
 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~~',
+	'Menu:BackupStatus' => 'Backups~~',
+	'bkp-status-title' => 'Backups~~',
 	'bkp-status-checks' => 'Settings and checks~~',
 	'bkp-mysqldump-ok' => 'mysqldump is present: %1$s~~',
 	'bkp-mysqldump-notfound' => 'mysqldump could not be found: %1$s - Please make sure it is installed and in the path, or edit the configuration file to tune mysql_bindir.~~',
@@ -46,7 +46,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'bkp-status-backups-auto' => 'Scheduled backups~~',
 	'bkp-status-backups-manual' => 'Manual backups~~',
 	'bkp-status-backups-none' => 'No backup yet~~',
-	'bkp-next-backup' => 'The next backup will occur on <b>%1$s</b> (%2$s) at %3$s~~',
+	'bkp-next-backup' => 'The next backup will occur on <b>%1$s</b> (%2$s) at %3$s.~~',
 	'bkp-next-backup-unknown' => 'The next backup is <b>not scheduled</b> yet.~~',
 	'bkp-button-backup-now' => 'Backup now!~~',
 	'bkp-button-restore-now' => 'Restore!~~',

datamodels/2.x/itop-backup/dictionaries/hu.dict.itop-backup.php

@@ -23,8 +23,8 @@
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'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' => 'Biztonsági mentés',
+    'bkp-status-title' => 'Adatbázis 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..',
@@ -43,7 +43,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'bkp-table-size+' => '~~',
 	'bkp-table-actions' => 'Műveletek',
 	'bkp-table-actions+' => '~~',
-	'bkp-status-backups-auto' => 'Ütemezett biztonsági mentés',
+    'bkp-status-backups-auto' => 'Automatikus 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',

datamodels/2.x/itop-backup/dictionaries/it.dict.itop-backup.php

@@ -23,8 +23,8 @@
 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~~',
+	'Menu:BackupStatus' => 'Backups~~',
+	'bkp-status-title' => 'Backups~~',
 	'bkp-status-checks' => 'Settings and checks~~',
 	'bkp-mysqldump-ok' => 'mysqldump is present: %1$s~~',
 	'bkp-mysqldump-notfound' => 'mysqldump could not be found: %1$s - Please make sure it is installed and in the path, or edit the configuration file to tune mysql_bindir.~~',
@@ -46,7 +46,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'bkp-status-backups-auto' => 'Scheduled backups~~',
 	'bkp-status-backups-manual' => 'Manual backups~~',
 	'bkp-status-backups-none' => 'No backup yet~~',
-	'bkp-next-backup' => 'The next backup will occur on <b>%1$s</b> (%2$s) at %3$s~~',
+	'bkp-next-backup' => 'The next backup will occur on <b>%1$s</b> (%2$s) at %3$s.~~',
 	'bkp-next-backup-unknown' => 'The next backup is <b>not scheduled</b> yet.~~',
 	'bkp-button-backup-now' => 'Backup now!~~',
 	'bkp-button-restore-now' => 'Restore!~~',

datamodels/2.x/itop-backup/dictionaries/ja.dict.itop-backup.php

@@ -23,8 +23,8 @@
 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~~',
+	'Menu:BackupStatus' => 'Backups~~',
+	'bkp-status-title' => 'Backups~~',
 	'bkp-status-checks' => 'Settings and checks~~',
 	'bkp-mysqldump-ok' => 'mysqldump is present: %1$s~~',
 	'bkp-mysqldump-notfound' => 'mysqldump could not be found: %1$s - Please make sure it is installed and in the path, or edit the configuration file to tune mysql_bindir.~~',
@@ -46,7 +46,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'bkp-status-backups-auto' => 'Scheduled backups~~',
 	'bkp-status-backups-manual' => 'Manual backups~~',
 	'bkp-status-backups-none' => 'No backup yet~~',
-	'bkp-next-backup' => 'The next backup will occur on <b>%1$s</b> (%2$s) at %3$s~~',
+	'bkp-next-backup' => 'The next backup will occur on <b>%1$s</b> (%2$s) at %3$s.~~',
 	'bkp-next-backup-unknown' => 'The next backup is <b>not scheduled</b> yet.~~',
 	'bkp-button-backup-now' => 'Backup now!~~',
 	'bkp-button-restore-now' => 'Restore!~~',

datamodels/2.x/itop-backup/dictionaries/sk.dict.itop-backup.php

@@ -23,8 +23,8 @@
 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~~',
+	'Menu:BackupStatus' => 'Backups~~',
+	'bkp-status-title' => 'Backups~~',
 	'bkp-status-checks' => 'Settings and checks~~',
 	'bkp-mysqldump-ok' => 'mysqldump is present: %1$s~~',
 	'bkp-mysqldump-notfound' => 'mysqldump could not be found: %1$s - Please make sure it is installed and in the path, or edit the configuration file to tune mysql_bindir.~~',
@@ -46,7 +46,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'bkp-status-backups-auto' => 'Scheduled backups~~',
 	'bkp-status-backups-manual' => 'Manual backups~~',
 	'bkp-status-backups-none' => 'No backup yet~~',
-	'bkp-next-backup' => 'The next backup will occur on <b>%1$s</b> (%2$s) at %3$s~~',
+	'bkp-next-backup' => 'The next backup will occur on <b>%1$s</b> (%2$s) at %3$s.~~',
 	'bkp-next-backup-unknown' => 'The next backup is <b>not scheduled</b> yet.~~',
 	'bkp-button-backup-now' => 'Backup now!~~',
 	'bkp-button-restore-now' => 'Restore!~~',

datamodels/2.x/itop-backup/dictionaries/tr.dict.itop-backup.php

@@ -23,8 +23,8 @@
 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~~',
+	'Menu:BackupStatus' => 'Backups~~',
+	'bkp-status-title' => 'Backups~~',
 	'bkp-status-checks' => 'Settings and checks~~',
 	'bkp-mysqldump-ok' => 'mysqldump is present: %1$s~~',
 	'bkp-mysqldump-notfound' => 'mysqldump could not be found: %1$s - Please make sure it is installed and in the path, or edit the configuration file to tune mysql_bindir.~~',
@@ -46,7 +46,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'bkp-status-backups-auto' => 'Scheduled backups~~',
 	'bkp-status-backups-manual' => 'Manual backups~~',
 	'bkp-status-backups-none' => 'No backup yet~~',
-	'bkp-next-backup' => 'The next backup will occur on <b>%1$s</b> (%2$s) at %3$s~~',
+	'bkp-next-backup' => 'The next backup will occur on <b>%1$s</b> (%2$s) at %3$s.~~',
 	'bkp-next-backup-unknown' => 'The next backup is <b>not scheduled</b> yet.~~',
 	'bkp-button-backup-now' => 'Backup now!~~',
 	'bkp-button-restore-now' => 'Restore!~~',

datamodels/2.x/itop-bridge-cmdb-services/dictionaries/hu.dict.itop-bridge-cmdb-services.php

@@ -79,7 +79,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:Document/Attribute:contracts_list' => 'Szerződések',
-	'Class:Document/Attribute:contracts_list+' => 'All the contracts linked to this document~~',
+	'Class:Document/Attribute:contracts_list+' => 'Ehhez a dokumentumhoz kapcsolódó szerződések',
 	'Class:Document/Attribute:services_list' => 'Szolgáltatások',
-	'Class:Document/Attribute:services_list+' => 'All the services linked to this document~~',
-));
+	'Class:Document/Attribute:services_list+' => 'Ehhez a dokumentumhoz kapcsolódó szolgáltatások',
+));

datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/hu.dict.itop-bridge-cmdb-ticket.php

@@ -36,9 +36,9 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:lnkFunctionalCIToTicket/Name' => '%1$s / %2$s~~',
 	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id' => 'Hibajegy',
 	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id+' => '~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref' => 'Ref',
+    'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref' => 'Referenciaszám',
 	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref+' => '~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title' => 'Hibajegy cím',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title' => 'Hibajegy tárgya',
 	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title+' => '~~',
 	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id' => 'CI',
 	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id+' => '~~',
@@ -46,7 +46,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name+' => '~~',
 	'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ás kód',
 	'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',

datamodels/2.x/itop-change-mgmt-itil/dictionaries/hu.dict.itop-change-mgmt-itil.php

@@ -22,21 +22,21 @@
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'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+' => '~~',
-	'Menu:WaitingAcceptance' => 'Elfogadásra váró változások',
-	'Menu:WaitingAcceptance+' => '~~',
-	'Menu:WaitingApproval' => 'Jóváhagyásra váró változások',
-	'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)~~',
+    'Menu:Change:Overview+' => 'Áttekintő oldal',
+    '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+' => 'Gyorselérés gombok',
+    'Menu:WaitingAcceptance' => 'Elfogadásra váró változások',
+    'Menu:WaitingAcceptance+' => 'Elfogadásra váró változások',
+    'Menu:WaitingApproval' => 'Jóváhagyásra váró változások',
+    'Menu:WaitingApproval+' => 'Jóváhagyásra váró változások',
+    'Menu:Changes' => 'Nyitott változási kérelmek',
+    'Menu:Changes+' => 'Nyitott változási kérelmek összesítése',
+    'Menu:MyChanges' => 'Hozzám rendelt változások',
+    'Menu:MyChanges+' => 'Ügyintézőként hozzám rendelt változások',
 	'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',
@@ -119,22 +119,22 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:Change/Attribute:outage/Value:yes+' => '',
 	'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+' => '~~',
-	'Class:Change/Attribute:related_request_list' => 'Kapcsolódó kérelmek',
-	'Class:Change/Attribute:related_request_list+' => 'All the user requests linked to this change~~',
-	'Class:Change/Attribute:related_problems_list' => 'Kapcsolódó problémák',
-	'Class:Change/Attribute:related_problems_list+' => 'All the problems linked to this change~~',
-	'Class:Change/Attribute:related_incident_list' => 'Kapcsolódó incidensek',
-	'Class:Change/Attribute:related_incident_list+' => 'All the incidents linked to this change~~',
-	'Class:Change/Attribute:child_changes_list' => 'Gyermek változások',
-	'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/Attribute:parent_id_finalclass_recall' => 'Változás típus',
-	'Class:Change/Attribute:parent_id_finalclass_recall+' => '~~',
+    'Class:Change/Attribute:parent_id' => 'Fölérendelt változás',
+    'Class:Change/Attribute:parent_id+' => '',
+    'Class:Change/Attribute:parent_name' => 'Referenciaszám',
+    'Class:Change/Attribute:parent_name+' => '',
+    'Class:Change/Attribute:related_request_list' => 'Kapcsolódó kérelmek',
+    'Class:Change/Attribute:related_request_list+' => 'Ehhez a változáshoz kapcsolódó felhasználói kérelmek',
+    'Class:Change/Attribute:related_problems_list' => 'Kapcsolódó problémák',
+    'Class:Change/Attribute:related_problems_list+' => 'Ehhez a változáshoz kapcsolódó problémák',
+    'Class:Change/Attribute:related_incident_list' => 'Kapcsolódó incidensek',
+    'Class:Change/Attribute:related_incident_list+' => 'Ehhez a változáshoz kapcsolódó incidensek',
+    'Class:Change/Attribute:child_changes_list' => 'Kapcsolódó változások',
+    'Class:Change/Attribute:child_changes_list+' => 'Ehhez a változáshoz kapcsolódó változások',
+    'Class:Change/Attribute:parent_id_friendlyname' => 'Fölérendelt változás rövid név',
+    'Class:Change/Attribute:parent_id_friendlyname+' => '',
+    'Class:Change/Attribute:parent_id_finalclass_recall' => 'Változás típus',
+    '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',

datamodels/2.x/itop-change-mgmt/dictionaries/hu.dict.itop-change-mgmt.php

@@ -21,23 +21,23 @@
  * 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: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+' => '~~',
-	'Menu:WaitingAcceptance' => 'Elfogadásra váró változások',
-	'Menu:WaitingAcceptance+' => '~~',
-	'Menu:WaitingApproval' => 'Jóváhagyásra váró változások',
-	'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)~~',
+    'Menu:ChangeManagement' => 'Változáskezelés',
+    'Menu:Change:Overview' => 'Áttekintő',
+    'Menu:Change:Overview+' => 'Áttekintő oldal',
+    '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+' => 'Gyorselérés gombok',
+    'Menu:WaitingAcceptance' => 'Elfogadásra váró változások',
+    'Menu:WaitingAcceptance+' => 'Elfogadásra váró változások',
+    'Menu:WaitingApproval' => 'Jóváhagyásra váró változások',
+    'Menu:WaitingApproval+' => 'Jóváhagyásra váró változások',
+    'Menu:Changes' => 'Nyitott változási kérelmek',
+    'Menu:Changes+' => 'Nyitott változási kérelmek összesítése',
+    'Menu:MyChanges' => 'Hozzám rendelt változások',
+    'Menu:MyChanges+' => 'Ügyintézőként hozzám rendelt változások',
 	'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',
@@ -81,26 +81,26 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:Change/Attribute:category' => 'Kategória',
 	'Class:Change/Attribute:category+' => '~~',
 	'Class:Change/Attribute:category/Value:application' => 'Alkalmazás',
-	'Class:Change/Attribute:category/Value:application+' => 'application~~',
+	'Class:Change/Attribute:category/Value:application+' => '',
 	'Class:Change/Attribute:category/Value:hardware' => 'Hardver',
-	'Class:Change/Attribute:category/Value:hardware+' => 'hardware~~',
+	'Class:Change/Attribute:category/Value:hardware+' => '',
 	'Class:Change/Attribute:category/Value:network' => 'Hálózat',
-	'Class:Change/Attribute:category/Value:network+' => 'network~~',
+	'Class:Change/Attribute:category/Value:network+' => '',
 	'Class:Change/Attribute:category/Value:other' => 'Egyéb',
-	'Class:Change/Attribute:category/Value:other+' => 'other~~',
+	'Class:Change/Attribute:category/Value:other+' => '',
 	'Class:Change/Attribute:category/Value:software' => 'Szoftver',
-	'Class:Change/Attribute:category/Value:software+' => 'software~~',
+	'Class:Change/Attribute:category/Value:software+' => '',
 	'Class:Change/Attribute:category/Value:system' => 'Rendszer',
-	'Class:Change/Attribute:category/Value:system+' => 'system~~',
+	'Class:Change/Attribute:category/Value:system+' => '',
 	'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+' => '~~',
-	'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_id' => 'Fölérendelt változás',
+    'Class:Change/Attribute:parent_id+' => '~~',
+    'Class:Change/Attribute:parent_name' => 'Referenciaszám',
 	'Class:Change/Attribute:parent_name+' => '~~',
 	'Class:Change/Attribute:creation_date' => 'Létrehozás dátuma',
 	'Class:Change/Attribute:creation_date+' => '~~',
@@ -109,14 +109,14 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:Change/Attribute:fallback_plan' => 'Tartalék terv',
 	'Class:Change/Attribute:fallback_plan+' => '~~',
 	'Class:Change/Attribute:related_request_list' => 'Kapcsolódó kérelmek',
-	'Class:Change/Attribute:related_request_list+' => 'All the user requests linked to this change~~',
-	'Class:Change/Attribute:related_incident_list' => 'Kapcsolódó incidensek',
-	'Class:Change/Attribute:related_incident_list+' => 'All the incidents linked to this change~~',
-	'Class:Change/Attribute:related_problems_list' => 'Kapcsolódó problémák',
-	'Class:Change/Attribute:related_problems_list+' => 'All the problems linked to this change~~',
-	'Class:Change/Attribute:child_changes_list' => 'Gyermek változások',
-	'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:related_request_list+' => 'Ehhez a változáshoz kapcsolódó felhasználói kérelmek',
+    'Class:Change/Attribute:related_incident_list' => 'Kapcsolódó incidensek',
+    'Class:Change/Attribute:related_incident_list+' => 'Ehhez a változáshoz kapcsolódó incidensek',
+    'Class:Change/Attribute:related_problems_list' => 'Kapcsolódó problémák',
+    'Class:Change/Attribute:related_problems_list+' => 'Ehhez a változáshoz kapcsolódó problémák',
+    'Class:Change/Attribute:child_changes_list' => 'Kapcsolódó változások',
+    'Class:Change/Attribute:child_changes_list+' => 'Ehhez a változáshoz kapcsolódó változások',
+    'Class:Change/Attribute:parent_id_friendlyname' => 'Fölérendelt 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+' => '~~',

datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml

@@ -77,7 +77,7 @@
           <default_value/>
           <is_null_allowed>true</is_null_allowed>
         </field>
-        <field id="contacts_list" xsi:type="AttributeLinkedSetIndirect" _delta="define">
+        <field id="contacts_list" xsi:type="AttributeLinkedSetIndirect">
           <linked_class>lnkContactToFunctionalCI</linked_class>
           <ext_key_to_me>functionalci_id</ext_key_to_me>
           <count_min>0</count_min>

datamodels/2.x/itop-config-mgmt/dictionaries/da.dict.itop-config-mgmt.php

@@ -1282,7 +1282,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:VLAN/Attribute:org_id' => 'Organization~~',
 	'Class:VLAN/Attribute:org_id+' => '~~',
 	'Class:VLAN/Attribute:org_name' => 'Organization name~~',
-	'Class:VLAN/Attribute:org_name+' => 'Common name~~',
+	'Class:VLAN/Attribute:org_name+' => '',
 	'Class:VLAN/Attribute:subnets_list' => 'Subnets~~',
 	'Class:VLAN/Attribute:subnets_list+' => '~~',
 	'Class:VLAN/Attribute:physicalinterfaces_list' => 'Physical network interfaces~~',

datamodels/2.x/itop-config-mgmt/dictionaries/de.dict.itop-config-mgmt.php

@@ -34,7 +34,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Relation:depends on/UpStream'    => 'Wirkt auf ...',
 	'Relation:impacts/LoadData'       => 'Daten laden',
 	'Relation:impacts/FilteredData'   => 'Daten sind über den Tab "Grafische Ansicht" gefiltert',
-	'Relation:impacts/NoFilteredData' => 'Bitte wählen Sie Objekte ~~',
+	'Relation:impacts/NoFilteredData' => 'Bitte wählen Sie Objekte',
 ));
 
 

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' => 'please select objects and load data~~',
+    'Relation:impacts/Description' => 'Konfigurációs elem működését befolyásolják',
+    'Relation:impacts/DownStream' => 'Hatáselemzé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áselemzés',
+    'Relation:impacts/LoadData'       => 'Adat betöltés',
+    'Relation:impacts/NoFilteredData' => 'kérjük, válassza ki az objektumokat a grafikus nézetben',
 	'Relation:impacts/FilteredData'   => 'Filtered data~~',
 ));
 
@@ -97,16 +97,16 @@ 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' => 'CI 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:description+' => '',
+	'Class:FunctionalCI/Attribute:org_id' => 'Tulajdonos szervezeti 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+' => '',
 	'Class:FunctionalCI/Attribute:business_criticity/Value:high' => 'magas',
 	'Class:FunctionalCI/Attribute:business_criticity/Value:high+' => 'high~~',
 	'Class:FunctionalCI/Attribute:business_criticity/Value:low' => 'alacsony',
@@ -114,7 +114,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'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: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',
@@ -123,9 +123,9 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'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/Attribute:finalclass' => 'CI típus',
+    'Class:FunctionalCI/Attribute:finalclass+' => '',
+    'Class:FunctionalCI/Tab:OpenedTickets' => 'Nyitott hibajegyek',
 	'Class:FunctionalCI/Tab:OpenedTickets+' => 'Active Tickets which are impacting this functional CI~~',
 ));
 
@@ -146,10 +146,10 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'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:implementation+' => 'implementation',
 	'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' => 'Bevezetve',
 	'Class:PhysicalDevice/Attribute:status/Value:production+' => 'production~~',
 	'Class:PhysicalDevice/Attribute:status/Value:stock' => 'Készleten',
 	'Class:PhysicalDevice/Attribute:status/Value:stock+' => 'stock~~',
@@ -159,7 +159,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'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' => 'Modell név',
 	'Class:PhysicalDevice/Attribute:model_name+' => '~~',
 	'Class:PhysicalDevice/Attribute:asset_number' => 'Leltári szám',
 	'Class:PhysicalDevice/Attribute:asset_number+' => '~~',
@@ -181,8 +181,8 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'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/Attribute:enclosure_list' => 'Beépítőkeretek',
+    'Class:Rack/Attribute:enclosure_list+' => 'Minden beépítőkeret ebben a rack-ben',
 ));
 
 //
@@ -262,14 +262,14 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'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:enclosure_id' => 'Beépítőkeret',
+    'Class:DatacenterDevice/Attribute:enclosure_id+' => '~~',
+    'Class:DatacenterDevice/Attribute:enclosure_name' => 'Beépítőkeret 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+' => 'Az eszköz konfigurációs felületének az ip címe',
 	'Class:DatacenterDevice/Attribute:powerA_id' => 'PowerA áramforrás',
 	'Class:DatacenterDevice/Attribute:powerA_id+' => '~~',
 	'Class:DatacenterDevice/Attribute:powerA_name' => 'PowerA áramforrás név',
@@ -304,11 +304,11 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'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/Attribute:iosversion_id+' => 'A hálózati eszköz firmware-je',
+    'Class:NetworkDevice/Attribute:iosversion_name' => 'IOS verzió név',
+    'Class:NetworkDevice/Attribute:iosversion_name+' => '',
+    'Class:NetworkDevice/Attribute:ram' => 'RAM',
+    'Class:NetworkDevice/Attribute:ram+' => 'Műveleti memória',
 ));
 
 //
@@ -320,21 +320,21 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'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_id+' => '',
 	'Class:Server/Attribute:osfamily_name' => 'OS család név',
-	'Class:Server/Attribute:osfamily_name+' => '~~',
+	'Class:Server/Attribute:osfamily_name+' => '',
 	'Class:Server/Attribute:osversion_id' => 'OS verzió',
-	'Class:Server/Attribute:osversion_id+' => '~~',
+	'Class:Server/Attribute:osversion_id+' => '',
 	'Class:Server/Attribute:osversion_name' => 'OS verzió név',
-	'Class:Server/Attribute:osversion_name+' => '~~',
+	'Class:Server/Attribute:osversion_name+' => '',
 	'Class:Server/Attribute:oslicence_id' => 'OS licenc',
-	'Class:Server/Attribute:oslicence_id+' => '~~',
+	'Class:Server/Attribute:oslicence_id+' => '',
 	'Class:Server/Attribute:oslicence_name' => 'OS licenc név',
-	'Class:Server/Attribute:oslicence_name+' => '~~',
+	'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:cpu+' => 'Processzor típus',
+    'Class:Server/Attribute:ram' => 'RAM',
+    'Class:Server/Attribute:ram+' => 'Műveleti memória',
 	'Class:Server/Attribute:logicalvolumes_list' => 'Logikai kötetek',
 	'Class:Server/Attribute:logicalvolumes_list+' => 'Logikai kötetek, melyek ehhez a szerverhez kapcsolódnak',
 ));
@@ -345,7 +345,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:StorageSystem' => 'Tárolórendszer',
-	'Class:StorageSystem+' => '~~',
+	'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',
@@ -357,7 +357,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:SANSwitch' => 'SAN Switch',
-	'Class:SANSwitch+' => '~~',
+    'Class:SANSwitch+' => 'Tárolórendszer switch',
 	'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',
@@ -369,10 +369,10 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:TapeLibrary' => 'Szalagos tároló',
-	'Class:TapeLibrary+' => '~~',
+    'Class:TapeLibrary+' => 'Mágnesszalagos tároló',
 	'Class:TapeLibrary/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:TapeLibrary/Attribute:tapes_list' => 'Szalagok',
-	'Class:TapeLibrary/Attribute:tapes_list+' => 'Szalagok a szalagos tárolóhoz',
+    'Class:TapeLibrary/Attribute:tapes_list+' => 'Szalagok (kazetták) a szalagos tárolóhoz',
 ));
 
 //
@@ -381,7 +381,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:NAS' => 'NAS',
-	'Class:NAS+' => '~~',
+    'Class:NAS+' => 'Hálózati adattároló',
 	'Class:NAS/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:NAS/Attribute:nasfilesystem_list' => 'Fájlrendszerek',
 	'Class:NAS/Attribute:nasfilesystem_list+' => 'A NAS fájlrendszerei',
@@ -393,22 +393,22 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:PC' => 'PC',
-	'Class:PC+' => '',
+    'Class:PC+' => 'Személyi számítógép',
 	'Class:PC/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:PC/Attribute:osfamily_id' => 'OS család',
-	'Class:PC/Attribute:osfamily_id+' => '~~',
+	'Class:PC/Attribute:osfamily_id+' => '',
 	'Class:PC/Attribute:osfamily_name' => 'OS család név',
-	'Class:PC/Attribute:osfamily_name+' => '~~',
+	'Class:PC/Attribute:osfamily_name+' => '',
 	'Class:PC/Attribute:osversion_id' => 'OS verzió',
-	'Class:PC/Attribute:osversion_id+' => '~~',
+	'Class:PC/Attribute:osversion_id+' => '',
 	'Class:PC/Attribute:osversion_name' => 'OS verzió név',
-	'Class:PC/Attribute:osversion_name+' => '~~',
+	'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+' => '',
 	'Class:PC/Attribute:type/Value:desktop' => 'Desktop',
 	'Class:PC/Attribute:type/Value:desktop+' => 'desktop~~',
 	'Class:PC/Attribute:type/Value:laptop' => 'Laptop',
@@ -441,7 +441,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:PowerSource' => 'Áramforrás',
-	'Class:PowerSource+' => '~~',
+    'Class:PowerSource+' => 'UPS, generátor, akkumulátor stb.',
 	'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',
@@ -453,16 +453,16 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:PDU' => 'PDU',
-	'Class:PDU+' => '~~',
+    'Class:PDU+' => 'Tápelosztó a rack-ben',
 	'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+' => '~~',
+    'Class:PDU/Attribute:powerstart_id' => 'Áramforrás',
+    'Class:PDU/Attribute:powerstart_id+' => '~~',
+    'Class:PDU/Attribute:powerstart_name' => 'Áramforrás név',
+    'Class:PDU/Attribute:powerstart_name+' => '~~',
 ));
 
 //
@@ -480,8 +480,8 @@ 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' => 'Beépítőkeret',
+    'Class:Enclosure+' => 'Rack-be szerelhető készülékszerelvény',
 	'Class:Enclosure/ComplementaryName' => '%1$s - %2$s - %3$s~~',
 	'Class:Enclosure/Attribute:rack_id' => 'Rack',
 	'Class:Enclosure/Attribute:rack_id+' => '~~',
@@ -498,14 +498,14 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-	'Class:ApplicationSolution' => 'Egyedi alkalmazás',
-	'Class:ApplicationSolution+' => '',
+    'Class:ApplicationSolution' => 'Alkalmazásmegoldás',
+    'Class:ApplicationSolution+' => 'Több alkalmazás és CI kombinációja egy adott feladatra',
 	'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+' => '',
 	'Class:ApplicationSolution/Attribute:status/Value:active' => 'Aktív',
 	'Class:ApplicationSolution/Attribute:status/Value:active+' => 'active~~',
 	'Class:ApplicationSolution/Attribute:status/Value:inactive' => 'Inaktív',
@@ -522,11 +522,11 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:BusinessProcess' => 'Üzleti folyamat',
-	'Class:BusinessProcess+' => '',
+    'Class:BusinessProcess+' => 'Személyek, szolgáltatások és CI-k értékteremtő kombinációja',
 	'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+' => '',
 	'Class:BusinessProcess/Attribute:status/Value:active' => 'Aktív',
 	'Class:BusinessProcess/Attribute:status/Value:active+' => 'active~~',
 	'Class:BusinessProcess/Attribute:status/Value:inactive' => 'Inaktív',
@@ -539,27 +539,27 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:SoftwareInstance' => 'Szoftverpéldány',
-	'Class:SoftwareInstance+' => '',
+    'Class:SoftwareInstance+' => 'A szoftver telepített példányai',
 	'Class:SoftwareInstance/Attribute:system_id' => 'Rendszer',
-	'Class:SoftwareInstance/Attribute:system_id+' => '~~',
+	'Class:SoftwareInstance/Attribute:system_id+' => '',
 	'Class:SoftwareInstance/Attribute:system_name' => 'Rendszer név',
-	'Class:SoftwareInstance/Attribute:system_name+' => '~~',
+	'Class:SoftwareInstance/Attribute:system_name+' => '',
 	'Class:SoftwareInstance/Attribute:software_id' => 'Szoftver',
-	'Class:SoftwareInstance/Attribute:software_id+' => '~~',
+	'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_id+' => '',
 	'Class:SoftwareInstance/Attribute:softwarelicence_name' => 'Szoftver licenc név',
-	'Class:SoftwareInstance/Attribute:softwarelicence_name+' => '~~',
+	'Class:SoftwareInstance/Attribute:softwarelicence_name+' => '',
 	'Class:SoftwareInstance/Attribute:path' => 'Elérési út',
-	'Class:SoftwareInstance/Attribute:path+' => '~~',
+	'Class:SoftwareInstance/Attribute:path+' => '',
 	'Class:SoftwareInstance/Attribute:status' => 'Állapot',
-	'Class:SoftwareInstance/Attribute:status+' => '~~',
+	'Class:SoftwareInstance/Attribute:status+' => '',
 	'Class:SoftwareInstance/Attribute:status/Value:active' => 'Aktív',
-	'Class:SoftwareInstance/Attribute:status/Value:active+' => 'active~~',
+	'Class:SoftwareInstance/Attribute:status/Value:active+' => '',
 	'Class:SoftwareInstance/Attribute:status/Value:inactive' => 'Inaktív',
-	'Class:SoftwareInstance/Attribute:status/Value:inactive+' => 'inactive~~',
+	'Class:SoftwareInstance/Attribute:status/Value:inactive+' => '',
 ));
 
 //
@@ -568,9 +568,9 @@ 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+' => 'Köztes szoftver rendszerek összekötéséhez',
+    'Class:Middleware/Attribute:middlewareinstance_list' => 'Middleware példányok',
+    'Class:Middleware/Attribute:middlewareinstance_list+' => 'Middleware példányok melyeket ez a middleware biztosít',
 ));
 
 //
@@ -578,8 +578,8 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-	'Class:DBServer' => 'Adatbázis',
-	'Class:DBServer+' => '',
+    'Class:DBServer' => 'Adatbázis szerver',
+    'Class:DBServer+' => 'Adatbázis kiszolgáló',
 	'Class:DBServer/Attribute:dbschema_list' => 'DB sémák',
 	'Class:DBServer/Attribute:dbschema_list+' => 'A DB szerver adatbázis sémái',
 ));
@@ -590,7 +590,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:WebServer' => 'Webszerver',
-	'Class:WebServer+' => '~~',
+    'Class:WebServer+' => 'Webkiszolgáló',
 	'Class:WebServer/Attribute:webapp_list' => 'Webalkalmazások',
 	'Class:WebServer/Attribute:webapp_list+' => 'Webalkalmazások, melyek elérhetőek ezen a webszerveren',
 ));
@@ -601,7 +601,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:PCSoftware' => 'PC Szoftver',
-	'Class:PCSoftware+' => '~~',
+    'Class:PCSoftware+' => 'Személyi számítógép szoftverei',
 ));
 
 //
@@ -671,7 +671,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'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' => 'Bevezetve',
 	'Class:VirtualDevice/Attribute:status/Value:production+' => 'production~~',
 	'Class:VirtualDevice/Attribute:status/Value:stock' => 'Készleten',
 	'Class:VirtualDevice/Attribute:status/Value:stock+' => 'stock~~',
@@ -696,7 +696,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:Hypervisor' => 'Hypervisor',
-	'Class:Hypervisor+' => '~~',
+    'Class:Hypervisor+' => 'Virtuális gépeket futtató szoftver',
 	'Class:Hypervisor/Attribute:farm_id' => 'Szerverfarm',
 	'Class:Hypervisor/Attribute:farm_id+' => '~~',
 	'Class:Hypervisor/Attribute:farm_name' => 'Szerverfarm név',
@@ -713,9 +713,9 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:Farm' => 'Szerverfarm',
-	'Class:Farm+' => '~~',
+    'Class:Farm+' => 'Szerverek egy klaszterben',
 	'Class:Farm/Attribute:hypervisor_list' => 'Hypervisor-ok',
-	'Class:Farm/Attribute:hypervisor_list+' => 'All the hypervisors that compose this farm~~',
+    'Class:Farm/Attribute:hypervisor_list+' => 'Hypervisor-ok amelyek a farmot alkotják',
 	'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',
@@ -771,7 +771,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'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' => 'Tárhely',
 	'Class:LogicalVolume/Attribute:size+' => '~~',
 	'Class:LogicalVolume/Attribute:storagesystem_id' => 'Tárolórendszer',
 	'Class:LogicalVolume/Attribute:storagesystem_id+' => '~~',
@@ -799,7 +799,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'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' => 'Felhasznált tárhely',
 	'Class:lnkServerToVolume/Attribute:size_used+' => '~~',
 ));
 
@@ -819,7 +819,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'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' => 'Felhasznált tárhely',
 	'Class:lnkVirtualDeviceToVolume/Attribute:size_used+' => '~~',
 ));
 
@@ -852,11 +852,11 @@ 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' => 'Szalag 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' => 'Tárhely',
 	'Class:Tape/Attribute:size+' => '~~',
 	'Class:Tape/Attribute:tapelibrary_id' => 'Szalagos tároló',
 	'Class:Tape/Attribute:tapelibrary_id+' => '~~',
@@ -871,13 +871,13 @@ 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' => 'Fájlrendszer 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' => 'Tárhely',
 	'Class:NASFileSystem/Attribute:size+' => '~~',
 	'Class:NASFileSystem/Attribute:nas_id' => 'NAS',
 	'Class:NASFileSystem/Attribute:nas_id+' => '~~',
@@ -926,16 +926,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' => 'Szervizcsomag',
+    'Class:Patch+' => 'Szoftver patch',
+    'Class:Patch/Attribute:name' => 'Szervizcsomag név',
+    'Class:Patch/Attribute:name+' => '',
+    'Class:Patch/Attribute:documents_list' => 'Dokumentumok',
+    'Class:Patch/Attribute:documents_list+' => 'A szervizcsomag dokumentumai',
+    'Class:Patch/Attribute:description' => 'Leírás',
+    'Class:Patch/Attribute:description+' => '',
+    'Class:Patch/Attribute:finalclass' => 'Szervizcsomag típus',
+    'Class:Patch/Attribute:finalclass+' => 'A végső osztály neve',
 ));
 
 //
@@ -944,7 +944,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:OSPatch' => 'OS javítócsomag',
-	'Class:OSPatch+' => '~~',
+    'Class:OSPatch+' => 'Operációs rendszer szervizcsomag',
 	'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ó',
@@ -958,7 +958,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-	'Class:SoftwarePatch' => 'Szoftver javítócsomag',
+    'Class:SoftwarePatch' => 'Szoftver szervizcsomag',
 	'Class:SoftwarePatch+' => '~~',
 	'Class:SoftwarePatch/Attribute:software_id' => 'Szoftver',
 	'Class:SoftwarePatch/Attribute:software_id+' => '~~',
@@ -973,34 +973,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' => 'Licenc',
+    'Class:Licence+' => '',
+    'Class:Licence/Attribute:name' => 'Licenc 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 szervezeti 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' => 'Érvényesség kezdete',
+    'Class:Licence/Attribute:start_date+' => '',
+    'Class:Licence/Attribute:end_date' => 'Érvényesség vége',
+    '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' => 'Licenc típus',
+    'Class:Licence/Attribute:finalclass+' => 'A végső osztály neve',
 ));
 
 //
@@ -1108,12 +1108,12 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'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:Enclosure' => 'Beépítőkeret',
+	'Class:Model/Attribute:type/Value:Enclosure+' => '',
 	'Class:Model/Attribute:type/Value:IPPhone' => 'Egyéb eszköz',
-	'Class:Model/Attribute:type/Value:IPPhone+' => 'IP Phone~~',
+    'Class:Model/Attribute:type/Value:IPPhone+' => 'pl.IP telefon',
 	'Class:Model/Attribute:type/Value:MobilePhone' => 'Mobiltelefon',
-	'Class:Model/Attribute:type/Value:MobilePhone+' => 'Mobile Phone~~',
+	'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' => 'Hálózati eszköz',
@@ -1143,7 +1143,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'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/UniquenessRule:name_brand' => 'A gyártó ezen modellje már létezik',
 ));
 
 //
@@ -1163,7 +1163,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:IOSVersion' => 'IOS Verzió',
-	'Class:IOSVersion+' => '~~',
+    'Class:IOSVersion+' => 'A hálózati eszköz firmware-je',
 	'Class:IOSVersion/Attribute:brand_id' => 'Gyártó',
 	'Class:IOSVersion/Attribute:brand_id+' => '~~',
 	'Class:IOSVersion/Attribute:brand_name' => 'Gyártó név',
@@ -1175,12 +1175,12 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-	'Class:lnkDocumentToPatch' => 'Dokumentum / Javítócsomag',
+    'Class:lnkDocumentToPatch' => 'Dokumentum / Szervizcsomag',
 	'Class:lnkDocumentToPatch+' => '~~',
 	'Class:lnkDocumentToPatch/Name' => '%1$s / %2$s~~',
-	'Class:lnkDocumentToPatch/Attribute:patch_id' => 'Javítócsomag',
+    'Class:lnkDocumentToPatch/Attribute:patch_id' => 'Szervízcsomag',
 	'Class:lnkDocumentToPatch/Attribute:patch_id+' => '~~',
-	'Class:lnkDocumentToPatch/Attribute:patch_name' => 'Javítócsomag név',
+    'Class:lnkDocumentToPatch/Attribute:patch_name' => 'Szervizcsomag név',
 	'Class:lnkDocumentToPatch/Attribute:patch_name+' => '~~',
 	'Class:lnkDocumentToPatch/Attribute:document_id' => 'Dokumentum',
 	'Class:lnkDocumentToPatch/Attribute:document_id+' => '~~',
@@ -1193,12 +1193,12 @@ 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' => 'Szoftverpéldány / Szoftver szervizcsomag',
 	'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_id' => 'Szoftver szervizcsomag',
+    'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id+' => '~~',
+    'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_name' => 'Szoftver szervizcsomag név',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_name+' => '~~',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_id' => 'Szoftverpéldány',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_id+' => '~~',
@@ -1211,12 +1211,12 @@ 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' => 'Funkcionális CI / OS szervizcsomag',
 	'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_id' => 'OS szervizcsomag',
+    'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id+' => '~~',
+    'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_name' => 'OS szervizcsomag név',
 	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_name+' => '~~',
 	'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_id' => 'Funkcionális CI',
 	'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_id+' => '~~',
@@ -1254,17 +1254,17 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'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:subnet_name+' => '',
+    'Class:Subnet/Attribute:org_id' => 'Tulajdonos szervezeti egység',
+    'Class:Subnet/Attribute:org_id+' => '',
+    'Class:Subnet/Attribute:org_name' => 'Szervezeti egység 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/Attribute:vlans_list+' => '',
 ));
 
 //
@@ -1278,11 +1278,11 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'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' => 'Tulajdonos 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' => 'Alhálózatok',
 	'Class:VLAN/Attribute:subnets_list+' => '~~',
 	'Class:VLAN/Attribute:physicalinterfaces_list' => 'Fizikai hálózati csatolók',
 	'Class:VLAN/Attribute:physicalinterfaces_list+' => '~~',
@@ -1317,7 +1317,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:NetworkInterface+' => '',
 	'Class:NetworkInterface/Attribute:name' => 'Név',
 	'Class:NetworkInterface/Attribute:name+' => '~~',
-	'Class:NetworkInterface/Attribute:finalclass' => 'Típus',
+    'Class:NetworkInterface/Attribute:finalclass' => 'Hálózati csatoló típus',
 	'Class:NetworkInterface/Attribute:finalclass+' => 'A végső osztály neve',
 ));
 
@@ -1419,7 +1419,7 @@ 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+' => 'Hálózati csatlakozással rendelkező eszközök',
 	'Class:lnkConnectableCIToNetworkDevice/Name' => '%1$s / %2$s~~',
 	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id' => 'Hálózati eszköz',
 	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id+' => '~~',
@@ -1430,15 +1430,15 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'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/Attribute:network_port+' => 'Ennek az eszköznek a hálózat felé',
+    'Class:lnkConnectableCIToNetworkDevice/Attribute:device_port' => 'Eszköz port',
+    'Class:lnkConnectableCIToNetworkDevice/Attribute:device_port+' => 'A másik csatlakoztatott eszköz portja',
+    'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type' => 'Csatlakozás típus',
+    'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type+' => 'A hálózati topológia iránya az eszközök között',
+    'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type/Value:downlink' => 'Bejövő',
+    'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type/Value:downlink+' => 'bejövő link',
+    'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type/Value:uplink' => 'Kimenő',
+    'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type/Value:uplink+' => 'kimenő link',
 ));
 
 //
@@ -1485,7 +1485,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:Group' => 'Csoport',
 	'Class:Group+' => '',
 	'Class:Group/ComplementaryName' => '%1$s - %2$s~~',
-	'Class:Group/Attribute:name' => 'Név',
+    'Class:Group/Attribute:name' => 'CI csoport név',
 	'Class:Group/Attribute:name+' => '',
 	'Class:Group/Attribute:status' => 'Állapot',
 	'Class:Group/Attribute:status+' => '',
@@ -1493,24 +1493,24 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'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:status/Value:production' => 'Bevezetve',
+    'Class:Group/Attribute:status/Value:production+' => '',
+    'Class:Group/Attribute:org_id' => 'Tulajdonos szervezeti egység',
+    'Class:Group/Attribute:org_id+' => '',
+    'Class:Group/Attribute:owner_name' => 'Tulajdonos 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' => 'Fölérendelt csoport név',
+    'Class:Group/Attribute:parent_name+' => '',
+    'Class:Group/Attribute:ci_list' => 'Kapcsolódó CI-k',
+    'Class:Group/Attribute:ci_list+' => '',
+    'Class:Group/Attribute:parent_id_friendlyname' => 'Fölérendelt csoport név',
+    'Class:Group/Attribute:parent_id_friendlyname+' => '',
 ));
 
 //
@@ -1518,19 +1518,19 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-	'Class:lnkGroupToCI' => 'Csoport / CI',
+    'Class:lnkGroupToCI' => 'CI 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+' => '',
+    'Class:lnkGroupToCI/Attribute:group_id' => 'CI csoport',
+    'Class:lnkGroupToCI/Attribute:group_id+' => '',
+    'Class:lnkGroupToCI/Attribute:group_name' => 'CI csoport név',
+    'Class:lnkGroupToCI/Attribute:group_name+' => '',
+    'Class:lnkGroupToCI/Attribute:ci_id' => 'CI',
+    'Class:lnkGroupToCI/Attribute:ci_id+' => '',
+    'Class:lnkGroupToCI/Attribute:ci_name' => 'CI név',
+    'Class:lnkGroupToCI/Attribute:ci_name+' => '',
+    'Class:lnkGroupToCI/Attribute:reason' => 'Indoklás',
+    'Class:lnkGroupToCI/Attribute:reason+' => '',
 ));
 
 // Add translation for Fieldsets
@@ -1574,49 +1574,48 @@ 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' => 'Alkalmazásmegoldások',
+    'Menu:ApplicationSolution+' => '',
+    'Menu:ConfigManagementSoftware' => 'Alkalmazás kezelés',
+    'Menu:Licence' => 'Licencek',
+    'Menu:Licence+' => '',
+    'Menu:Patch' => 'Szervizcsomagok',
+    '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 konfigurációs elem (CI)',
+    'Menu:NewCI+' => 'Eszköz, szoftver, licenc, stb.',
+    '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 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+' => 'Szoftverek',
 ));
-?>

datamodels/2.x/itop-config-mgmt/dictionaries/it.dict.itop-config-mgmt.php

@@ -105,7 +105,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:FunctionalCI/Attribute:org_id+' => '',
 	'Class:FunctionalCI/Attribute:organization_name' => 'Organization name~~',
 	'Class:FunctionalCI/Attribute:organization_name+' => 'Common name~~',
-	'Class:FunctionalCI/Attribute:business_criticity' => 'Business criticity~~',
+	'Class:FunctionalCI/Attribute:business_criticity' => 'Business criticality~~',
 	'Class:FunctionalCI/Attribute:business_criticity+' => '~~',
 	'Class:FunctionalCI/Attribute:business_criticity/Value:high' => 'high~~',
 	'Class:FunctionalCI/Attribute:business_criticity/Value:high+' => 'high~~',
@@ -268,7 +268,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:DatacenterDevice/Attribute:enclosure_name+' => '~~',
 	'Class:DatacenterDevice/Attribute:nb_u' => 'Rack units~~',
 	'Class:DatacenterDevice/Attribute:nb_u+' => '~~',
-	'Class:DatacenterDevice/Attribute:managementip' => 'Management ip~~',
+	'Class:DatacenterDevice/Attribute:managementip' => 'Management IP~~',
 	'Class:DatacenterDevice/Attribute:managementip+' => '~~',
 	'Class:DatacenterDevice/Attribute:powerA_id' => 'PowerA source~~',
 	'Class:DatacenterDevice/Attribute:powerA_id+' => '~~',
@@ -327,9 +327,9 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:Server/Attribute:osversion_id+' => '~~',
 	'Class:Server/Attribute:osversion_name' => 'OS version name~~',
 	'Class:Server/Attribute:osversion_name+' => '~~',
-	'Class:Server/Attribute:oslicence_id' => 'OS licence~~',
+	'Class:Server/Attribute:oslicence_id' => 'OS license~~',
 	'Class:Server/Attribute:oslicence_id+' => '~~',
-	'Class:Server/Attribute:oslicence_name' => 'OS licence name~~',
+	'Class:Server/Attribute:oslicence_name' => 'OS license name~~',
 	'Class:Server/Attribute:oslicence_name+' => '~~',
 	'Class:Server/Attribute:cpu' => 'CPU',
 	'Class:Server/Attribute:cpu+' => '',
@@ -548,9 +548,9 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:SoftwareInstance/Attribute:software_id+' => '~~',
 	'Class:SoftwareInstance/Attribute:software_name' => 'Software',
 	'Class:SoftwareInstance/Attribute:software_name+' => '',
-	'Class:SoftwareInstance/Attribute:softwarelicence_id' => 'Software licence~~',
+	'Class:SoftwareInstance/Attribute:softwarelicence_id' => 'Software license~~',
 	'Class:SoftwareInstance/Attribute:softwarelicence_id+' => '~~',
-	'Class:SoftwareInstance/Attribute:softwarelicence_name' => 'Software licence name~~',
+	'Class:SoftwareInstance/Attribute:softwarelicence_name' => 'Software license name~~',
 	'Class:SoftwareInstance/Attribute:softwarelicence_name+' => '~~',
 	'Class:SoftwareInstance/Attribute:path' => 'Path~~',
 	'Class:SoftwareInstance/Attribute:path+' => '~~',
@@ -742,9 +742,9 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:VirtualMachine/Attribute:osversion_id+' => '~~',
 	'Class:VirtualMachine/Attribute:osversion_name' => 'OS version name~~',
 	'Class:VirtualMachine/Attribute:osversion_name+' => '~~',
-	'Class:VirtualMachine/Attribute:oslicence_id' => 'OS licence~~',
+	'Class:VirtualMachine/Attribute:oslicence_id' => 'OS license~~',
 	'Class:VirtualMachine/Attribute:oslicence_id+' => '~~',
-	'Class:VirtualMachine/Attribute:oslicence_name' => 'OS licence name~~',
+	'Class:VirtualMachine/Attribute:oslicence_name' => 'OS license name~~',
 	'Class:VirtualMachine/Attribute:oslicence_name+' => '~~',
 	'Class:VirtualMachine/Attribute:cpu' => 'CPU~~',
 	'Class:VirtualMachine/Attribute:cpu+' => '~~',
@@ -895,7 +895,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:Software/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Software/Attribute:name' => 'Nome',
 	'Class:Software/Attribute:name+' => '',
-	'Class:Software/Attribute:vendor' => 'vendor~~',
+	'Class:Software/Attribute:vendor' => 'Vendor~~',
 	'Class:Software/Attribute:vendor+' => '~~',
 	'Class:Software/Attribute:version' => 'Version~~',
 	'Class:Software/Attribute:version+' => '~~',
@@ -917,8 +917,8 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:Software/Attribute:softwareinstance_list+' => 'All the software instances for this software~~',
 	'Class:Software/Attribute:softwarepatch_list' => 'Software Patches~~',
 	'Class:Software/Attribute:softwarepatch_list+' => 'All the patchs for this software~~',
-	'Class:Software/Attribute:softwarelicence_list' => 'Software Licences~~',
-	'Class:Software/Attribute:softwarelicence_list+' => 'All the licences for this software~~',
+	'Class:Software/Attribute:softwarelicence_list' => 'Software Licenses~~',
+	'Class:Software/Attribute:softwarelicence_list+' => 'All the licenses for this software~~',
 ));
 
 //
@@ -934,7 +934,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:Patch/Attribute:documents_list+' => 'All the documents linked to this patch~~',
 	'Class:Patch/Attribute:description' => 'Descrizione',
 	'Class:Patch/Attribute:description+' => '',
-	'Class:Patch/Attribute:finalclass' => 'Type~~',
+	'Class:Patch/Attribute:finalclass' => 'Patch sub-class~~',
 	'Class:Patch/Attribute:finalclass+' => 'Name of the final class~~',
 ));
 
@@ -978,7 +978,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:Licence/Attribute:name' => 'Nome',
 	'Class:Licence/Attribute:name+' => '',
 	'Class:Licence/Attribute:documents_list' => 'Documents~~',
-	'Class:Licence/Attribute:documents_list+' => 'All the documents linked to this licence~~',
+	'Class:Licence/Attribute:documents_list+' => 'All the documents linked to this license~~',
 	'Class:Licence/Attribute:org_id' => 'Proprietario',
 	'Class:Licence/Attribute:org_id+' => '',
 	'Class:Licence/Attribute:organization_name' => 'Organization name~~',
@@ -999,7 +999,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:Licence/Attribute:perpetual/Value:no+' => 'no~~',
 	'Class:Licence/Attribute:perpetual/Value:yes' => 'yes~~',
 	'Class:Licence/Attribute:perpetual/Value:yes+' => 'yes~~',
-	'Class:Licence/Attribute:finalclass' => 'Type~~',
+	'Class:Licence/Attribute:finalclass' => 'License sub-class~~',
 	'Class:Licence/Attribute:finalclass+' => 'Name of the final class~~',
 ));
 
@@ -1008,7 +1008,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 //
 
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:OSLicence' => 'OS Licence~~',
+	'Class:OSLicence' => 'OS License~~',
 	'Class:OSLicence+' => '~~',
 	'Class:OSLicence/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:OSLicence/Attribute:osversion_id' => 'OS version~~',
@@ -1016,9 +1016,9 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:OSLicence/Attribute:osversion_name' => 'OS version name~~',
 	'Class:OSLicence/Attribute:osversion_name+' => '~~',
 	'Class:OSLicence/Attribute:virtualmachines_list' => 'Virtual machines~~',
-	'Class:OSLicence/Attribute:virtualmachines_list+' => 'All the virtual machines where this licence is used~~',
-	'Class:OSLicence/Attribute:servers_list' => 'servers~~',
-	'Class:OSLicence/Attribute:servers_list+' => 'All the servers where this licence is used~~',
+	'Class:OSLicence/Attribute:virtualmachines_list+' => 'All the virtual machines where this license is used~~',
+	'Class:OSLicence/Attribute:servers_list' => 'Servers~~',
+	'Class:OSLicence/Attribute:servers_list+' => 'All the servers where this license is used~~',
 ));
 
 //
@@ -1026,7 +1026,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 //
 
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:SoftwareLicence' => 'Software Licence~~',
+	'Class:SoftwareLicence' => 'Software License~~',
 	'Class:SoftwareLicence+' => '~~',
 	'Class:SoftwareLicence/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:SoftwareLicence/Attribute:software_id' => 'Software~~',
@@ -1034,7 +1034,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:SoftwareLicence/Attribute:software_name' => 'Software name~~',
 	'Class:SoftwareLicence/Attribute:software_name+' => '~~',
 	'Class:SoftwareLicence/Attribute:softwareinstance_list' => 'Software instances~~',
-	'Class:SoftwareLicence/Attribute:softwareinstance_list+' => 'All the systems where this licence is used~~',
+	'Class:SoftwareLicence/Attribute:softwareinstance_list+' => 'All the systems where this license is used~~',
 ));
 
 //
@@ -1042,12 +1042,12 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 //
 
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:lnkDocumentToLicence' => 'Link Document / Licence~~',
+	'Class:lnkDocumentToLicence' => 'Link Document / License~~',
 	'Class:lnkDocumentToLicence+' => '~~',
 	'Class:lnkDocumentToLicence/Name' => '%1$s / %2$s~~',
-	'Class:lnkDocumentToLicence/Attribute:licence_id' => 'Licence~~',
+	'Class:lnkDocumentToLicence/Attribute:licence_id' => 'License~~',
 	'Class:lnkDocumentToLicence/Attribute:licence_id+' => '~~',
-	'Class:lnkDocumentToLicence/Attribute:licence_name' => 'Licence name~~',
+	'Class:lnkDocumentToLicence/Attribute:licence_name' => 'License name~~',
 	'Class:lnkDocumentToLicence/Attribute:licence_name+' => '~~',
 	'Class:lnkDocumentToLicence/Attribute:document_id' => 'Document~~',
 	'Class:lnkDocumentToLicence/Attribute:document_id+' => '~~',
@@ -1257,8 +1257,8 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:Subnet/Attribute:subnet_name+' => '~~',
 	'Class:Subnet/Attribute:org_id' => 'Organizzazione proprietaria',
 	'Class:Subnet/Attribute:org_id+' => '',
-	'Class:Subnet/Attribute:org_name' => 'Name~~',
-	'Class:Subnet/Attribute:org_name+' => 'Common name~~',
+	'Class:Subnet/Attribute:org_name' => 'Organization name~~',
+	'Class:Subnet/Attribute:org_name+' => '~~',
 	'Class:Subnet/Attribute:ip' => 'IP',
 	'Class:Subnet/Attribute:ip+' => '',
 	'Class:Subnet/Attribute:ip_mask' => 'IP Mask',
@@ -1281,7 +1281,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:VLAN/Attribute:org_id' => 'Organization~~',
 	'Class:VLAN/Attribute:org_id+' => '~~',
 	'Class:VLAN/Attribute:org_name' => 'Organization name~~',
-	'Class:VLAN/Attribute:org_name+' => 'Common name~~',
+	'Class:VLAN/Attribute:org_name+' => '~~',
 	'Class:VLAN/Attribute:subnets_list' => 'Subnets~~',
 	'Class:VLAN/Attribute:subnets_list+' => '~~',
 	'Class:VLAN/Attribute:physicalinterfaces_list' => 'Physical network interfaces~~',
@@ -1317,7 +1317,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:NetworkInterface+' => '',
 	'Class:NetworkInterface/Attribute:name' => 'Name~~',
 	'Class:NetworkInterface/Attribute:name+' => '~~',
-	'Class:NetworkInterface/Attribute:finalclass' => 'Type~~',
+	'Class:NetworkInterface/Attribute:finalclass' => 'NetworkInterface sub-class~~',
 	'Class:NetworkInterface/Attribute:finalclass+' => 'Name of the final class~~',
 ));
 

datamodels/2.x/itop-config-mgmt/dictionaries/ja.dict.itop-config-mgmt.php

@@ -1281,7 +1281,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:VLAN/Attribute:org_id' => 'Organization~~',
 	'Class:VLAN/Attribute:org_id+' => '~~',
 	'Class:VLAN/Attribute:org_name' => 'Organization name~~',
-	'Class:VLAN/Attribute:org_name+' => 'Common name~~',
+	'Class:VLAN/Attribute:org_name+' => '~~',
 	'Class:VLAN/Attribute:subnets_list' => 'Subnets~~',
 	'Class:VLAN/Attribute:subnets_list+' => '~~',
 	'Class:VLAN/Attribute:physicalinterfaces_list' => 'Physical network interfaces~~',

datamodels/2.x/itop-config-mgmt/dictionaries/sk.dict.itop-config-mgmt.php

@@ -1286,7 +1286,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:VLAN/Attribute:org_id' => 'Organization~~',
 	'Class:VLAN/Attribute:org_id+' => '~~',
 	'Class:VLAN/Attribute:org_name' => 'Organization name~~',
-	'Class:VLAN/Attribute:org_name+' => 'Common name~~',
+	'Class:VLAN/Attribute:org_name+' => '~~',
 	'Class:VLAN/Attribute:subnets_list' => 'Subnets~~',
 	'Class:VLAN/Attribute:subnets_list+' => '~~',
 	'Class:VLAN/Attribute:physicalinterfaces_list' => 'Physical network interfaces~~',

datamodels/2.x/itop-config/dictionaries/da.dict.itop-config.php

@@ -21,7 +21,7 @@
  * along with iTop. If not, see <http://www.gnu.org/licenses/>
  */
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
-	'Menu:ConfigEditor' => 'Configuration~~',
+	'Menu:ConfigEditor' => 'General configuration~~',
 	'config-edit-title' => 'Configuration File Editor~~',
 	'config-edit-intro' => 'Be very cautious when editing the configuration file.~~',
 	'config-apply' => 'Apply~~',

datamodels/2.x/itop-config/dictionaries/it.dict.itop-config.php

@@ -21,7 +21,7 @@
  * along with iTop. If not, see <http://www.gnu.org/licenses/>
  */
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Menu:ConfigEditor' => 'Configuration~~',
+	'Menu:ConfigEditor' => 'General configuration~~',
 	'config-edit-title' => 'Configuration File Editor~~',
 	'config-edit-intro' => 'Be very cautious when editing the configuration file.~~',
 	'config-apply' => 'Apply~~',

datamodels/2.x/itop-config/dictionaries/ja.dict.itop-config.php

@@ -21,7 +21,7 @@
  * along with iTop. If not, see <http://www.gnu.org/licenses/>
  */
 Dict::Add('JA JP', 'Japanese', '日本語', array(
-	'Menu:ConfigEditor' => 'Configuration~~',
+	'Menu:ConfigEditor' => 'General configuration~~',
 	'config-edit-title' => 'Configuration File Editor~~',
 	'config-edit-intro' => 'Be very cautious when editing the configuration file.~~',
 	'config-apply' => 'Apply~~',

datamodels/2.x/itop-config/dictionaries/sk.dict.itop-config.php

@@ -21,7 +21,7 @@
  * along with iTop. If not, see <http://www.gnu.org/licenses/>
  */
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
-	'Menu:ConfigEditor' => 'Configuration~~',
+	'Menu:ConfigEditor' => 'General configuration~~',
 	'config-edit-title' => 'Configuration File Editor~~',
 	'config-edit-intro' => 'Be very cautious when editing the configuration file.~~',
 	'config-apply' => 'Apply~~',

datamodels/2.x/itop-config/dictionaries/tr.dict.itop-config.php

@@ -21,7 +21,7 @@
  * along with iTop. If not, see <http://www.gnu.org/licenses/>
  */
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Menu:ConfigEditor' => 'Configuration~~',
+	'Menu:ConfigEditor' => 'General configuration~~',
 	'config-edit-title' => 'Configuration File Editor~~',
 	'config-edit-intro' => 'Be very cautious when editing the configuration file.~~',
 	'config-apply' => 'Apply~~',

datamodels/2.x/itop-core-update/dictionaries/cs.dict.itop-core-update.php

@@ -23,9 +23,9 @@
 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~~',
-	'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:ConfirmUpdate' => 'Confirm Application Upgrade~~',
+	'itop-core-update:UI:UpdateCoreFiles' => 'Application Upgrading~~',
+	'iTopUpdate:UI:MaintenanceModeActive' => 'The application is currently under maintenance in read-only mode. You have to run a setup 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~~',
@@ -62,10 +62,10 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'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:Loading' => 'Checking files~~',
+	'iTopUpdate:UI:CanCoreUpdate:Error' => 'Checking files failed (%1$s)~~',
+	'iTopUpdate:UI:CanCoreUpdate:ErrorFileNotExist' => 'Checking files failed (File not exist %1$s)~~',
+	'iTopUpdate:UI:CanCoreUpdate:Failed' => 'Checking files 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~~',
@@ -81,7 +81,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'iTopUpdate:UI:SetupMessage:FilesArchive' => 'Archive application 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:Compile' => 'Upgrade application~~',
 	'iTopUpdate:UI:SetupMessage:UpdateDatabase' => 'Upgrade database~~',
 	'iTopUpdate:UI:SetupMessage:ExitMaintenance' => 'Exiting maintenance mode~~',
 	'iTopUpdate:UI:SetupMessage:UpdateDone' => 'Upgrade completed~~',

datamodels/2.x/itop-core-update/dictionaries/da.dict.itop-core-update.php

@@ -23,9 +23,9 @@
 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~~',
-	'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:ConfirmUpdate' => 'Confirm Application Upgrade~~',
+	'itop-core-update:UI:UpdateCoreFiles' => 'Application Upgrading~~',
+	'iTopUpdate:UI:MaintenanceModeActive' => 'The application is currently under maintenance in read-only mode. You have to run a setup 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~~',
@@ -62,10 +62,10 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'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:Loading' => 'Checking files~~',
+	'iTopUpdate:UI:CanCoreUpdate:Error' => 'Checking files failed (%1$s)~~',
+	'iTopUpdate:UI:CanCoreUpdate:ErrorFileNotExist' => 'Checking files failed (File not exist %1$s)~~',
+	'iTopUpdate:UI:CanCoreUpdate:Failed' => 'Checking files 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~~',
@@ -81,7 +81,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'iTopUpdate:UI:SetupMessage:FilesArchive' => 'Archive application 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:Compile' => 'Upgrade application~~',
 	'iTopUpdate:UI:SetupMessage:UpdateDatabase' => 'Upgrade database~~',
 	'iTopUpdate:UI:SetupMessage:ExitMaintenance' => 'Exiting maintenance mode~~',
 	'iTopUpdate:UI:SetupMessage:UpdateDone' => 'Upgrade completed~~',

datamodels/2.x/itop-core-update/dictionaries/hu.dict.itop-core-update.php

@@ -49,7 +49,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'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:Status' => 'Állapotjelentés',
 	'iTopUpdate:UI:Action' => 'Frissítés',
 	'iTopUpdate:UI:Setup' => ITOP_APPLICATION_SHORT.' Setup~~',
 	'iTopUpdate:UI:History' => 'Verziótörténet',
@@ -69,7 +69,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'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:CannotUpdateUseSetup' => '<b>Néhány manuálisan módosított fájlt észleltünk</b>, a részleges frissítés nem hajtható végre.</br>Kövesse ezt az <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?~~',
@@ -111,5 +111,3 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:ModuleInstallation/Attribute:version' => 'Verzió',
 	'Class:ModuleInstallation/Attribute:comment' => 'Megjegyzés',
 ));
-
-

datamodels/2.x/itop-core-update/dictionaries/it.dict.itop-core-update.php

@@ -23,9 +23,9 @@
 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~~',
-	'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:ConfirmUpdate' => 'Confirm Application Upgrade~~',
+	'itop-core-update:UI:UpdateCoreFiles' => 'Application Upgrading~~',
+	'iTopUpdate:UI:MaintenanceModeActive' => 'The application is currently under maintenance in read-only mode. You have to run a setup 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~~',
@@ -62,10 +62,10 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'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:Loading' => 'Checking files~~',
+	'iTopUpdate:UI:CanCoreUpdate:Error' => 'Checking files failed (%1$s)~~',
+	'iTopUpdate:UI:CanCoreUpdate:ErrorFileNotExist' => 'Checking files failed (File not exist %1$s)~~',
+	'iTopUpdate:UI:CanCoreUpdate:Failed' => 'Checking files 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~~',
@@ -81,7 +81,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'iTopUpdate:UI:SetupMessage:FilesArchive' => 'Archive application 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:Compile' => 'Upgrade application~~',
 	'iTopUpdate:UI:SetupMessage:UpdateDatabase' => 'Upgrade database~~',
 	'iTopUpdate:UI:SetupMessage:ExitMaintenance' => 'Exiting maintenance mode~~',
 	'iTopUpdate:UI:SetupMessage:UpdateDone' => 'Upgrade completed~~',

datamodels/2.x/itop-core-update/dictionaries/ja.dict.itop-core-update.php

@@ -23,9 +23,9 @@
 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~~',
-	'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:ConfirmUpdate' => 'Confirm Application Upgrade~~',
+	'itop-core-update:UI:UpdateCoreFiles' => 'Application Upgrading~~',
+	'iTopUpdate:UI:MaintenanceModeActive' => 'The application is currently under maintenance in read-only mode. You have to run a setup 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~~',
@@ -62,10 +62,10 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'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:Loading' => 'Checking files~~',
+	'iTopUpdate:UI:CanCoreUpdate:Error' => 'Checking files failed (%1$s)~~',
+	'iTopUpdate:UI:CanCoreUpdate:ErrorFileNotExist' => 'Checking files failed (File not exist %1$s)~~',
+	'iTopUpdate:UI:CanCoreUpdate:Failed' => 'Checking files 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~~',
@@ -81,7 +81,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'iTopUpdate:UI:SetupMessage:FilesArchive' => 'Archive application 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:Compile' => 'Upgrade application~~',
 	'iTopUpdate:UI:SetupMessage:UpdateDatabase' => 'Upgrade database~~',
 	'iTopUpdate:UI:SetupMessage:ExitMaintenance' => 'Exiting maintenance mode~~',
 	'iTopUpdate:UI:SetupMessage:UpdateDone' => 'Upgrade completed~~',

datamodels/2.x/itop-core-update/dictionaries/sk.dict.itop-core-update.php

@@ -23,9 +23,9 @@
 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~~',
-	'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:ConfirmUpdate' => 'Confirm Application Upgrade~~',
+	'itop-core-update:UI:UpdateCoreFiles' => 'Application Upgrading~~',
+	'iTopUpdate:UI:MaintenanceModeActive' => 'The application is currently under maintenance in read-only mode. You have to run a setup 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~~',
@@ -62,10 +62,10 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'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:Loading' => 'Checking files~~',
+	'iTopUpdate:UI:CanCoreUpdate:Error' => 'Checking files failed (%1$s)~~',
+	'iTopUpdate:UI:CanCoreUpdate:ErrorFileNotExist' => 'Checking files failed (File not exist %1$s)~~',
+	'iTopUpdate:UI:CanCoreUpdate:Failed' => 'Checking files 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~~',
@@ -81,7 +81,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'iTopUpdate:UI:SetupMessage:FilesArchive' => 'Archive application 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:Compile' => 'Upgrade application~~',
 	'iTopUpdate:UI:SetupMessage:UpdateDatabase' => 'Upgrade database~~',
 	'iTopUpdate:UI:SetupMessage:ExitMaintenance' => 'Exiting maintenance mode~~',
 	'iTopUpdate:UI:SetupMessage:UpdateDone' => 'Upgrade completed~~',

datamodels/2.x/itop-core-update/dictionaries/tr.dict.itop-core-update.php

@@ -23,9 +23,9 @@
 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~~',
-	'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:ConfirmUpdate' => 'Confirm Application Upgrade~~',
+	'itop-core-update:UI:UpdateCoreFiles' => 'Application Upgrading~~',
+	'iTopUpdate:UI:MaintenanceModeActive' => 'The application is currently under maintenance in read-only mode. You have to run a setup 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~~',
@@ -62,10 +62,10 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'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:Loading' => 'Checking files~~',
+	'iTopUpdate:UI:CanCoreUpdate:Error' => 'Checking files failed (%1$s)~~',
+	'iTopUpdate:UI:CanCoreUpdate:ErrorFileNotExist' => 'Checking files failed (File not exist %1$s)~~',
+	'iTopUpdate:UI:CanCoreUpdate:Failed' => 'Checking files 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~~',
@@ -81,7 +81,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'iTopUpdate:UI:SetupMessage:FilesArchive' => 'Archive application 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:Compile' => 'Upgrade application~~',
 	'iTopUpdate:UI:SetupMessage:UpdateDatabase' => 'Upgrade database~~',
 	'iTopUpdate:UI:SetupMessage:ExitMaintenance' => 'Exiting maintenance mode~~',
 	'iTopUpdate:UI:SetupMessage:UpdateDone' => 'Upgrade completed~~',

datamodels/2.x/itop-core-update/src/Controller/UpdateController.php

@@ -45,6 +45,7 @@ class UpdateController extends Controller
 		$aParams['sFileUploadMaxSize'] = utils::BytesToFriendlyFormat($aParams['iFileUploadMaxSize']);
 		$aParams['sPostMaxSize'] = ini_get('post_max_size');
 		$aParams['sUploadMaxSize'] = ini_get('upload_max_filesize');
+		$aParams['bDontUpgradeIfIntegrityFailed'] = !utils::IsDevelopmentEnvironment();
 		$oFilter = DBObjectSearch::FromOQL('SELECT ModuleInstallation WHERE parent_id=0 AND name!="datamodel"');
 		$oSet = new DBObjectSet($oFilter, ['installed' => false]); // Most recent first
 		$aParams['oSet'] = $oSet;
@@ -129,7 +130,6 @@ class UpdateController extends Controller
 		$sTransactionId = utils::GetNewTransactionId();
 		$aParams['sTransactionId'] = $sTransactionId;
 
-		$this->AddSaas('css/backoffice/main.scss');
 		$this->m_sOperation = 'ConfirmUpdate';
 		$this->DisplaySetupPage($aParams);
 	}
@@ -158,7 +158,6 @@ class UpdateController extends Controller
 			'sAjaxURL'        => utils::GetAbsoluteUrlAppRoot().'/pages/UI.php',
 		];
 		$this->AddLinkedScript(utils::GetAbsoluteUrlAppRoot().'setup/jquery.progression.js');
-		$this->AddSaas('css/backoffice/main.scss');
 		$this->AddSaas('env-'.utils::GetCurrentEnvironment().'/itop-core-update/css/itop-core-update.scss');
 		$this->m_sOperation = 'UpdateCoreFiles';
 		$this->DisplaySetupPage($aParams);

datamodels/2.x/itop-core-update/templates/SelectUpdateFile.ready.js.twig

@@ -28,10 +28,17 @@ $.ajax({
             $("#file-container").removeClass("ibo-is-hidden");
             $("#check-in-progress").addClass("ibo-is-hidden");
         } else {
-            $("#check-update").prop("disabled", true);
-            $("#file").prop("disabled", true);
-            $('#form-update-outer').slideUp(600);
             oRequirements.addClass("ibo-is-failure");
+            {% if bDontUpgradeIfIntegrityFailed %}
+                $("#check-update").prop("disabled", true);
+                $("#file").prop("disabled", true);
+                $('#form-update-outer').slideUp(600);
+            {% else %}
+                $("#check-update").prop("disabled", false);
+                $("#file").prop("disabled", false);
+                $("#file-container").removeClass("ibo-is-hidden");
+                $("#check-in-progress").addClass("ibo-is-hidden");
+            {% endif %}
         }
     }
 });
@@ -55,7 +62,7 @@ var oGetDBDiskSpace = $.ajax({
     method: "POST",
     url: "{{ sAjaxURL|raw }}",
     data: {
-        route: "core_update_ajax.get_d_b_disk_space",
+        route: "core_update_ajax.get_db_disk_space",
         maintenance: true
     },
     dataType: "json",

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+' => 'A tudástár címe',
+    'Class:FAQ/Attribute:summary' => 'Összefoglaló',
+    'Class:FAQ/Attribute:summary+' => 'Egy rövid leírás a témáról',
+    'Class:FAQ/Attribute:description' => 'Leírás',
+    'Class:FAQ/Attribute:description+' => 'Maga a tudástár cikk',
+    '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+' => 'A keresést segítő kulcsszavak',
+    'Class:FAQ/Attribute:domains' => 'Hibatartomány',
 ));
 
 //
@@ -47,22 +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+' => '',
+    'Class:FAQCategory/Attribute:name' => 'Kategória név',
+    'Class:FAQCategory/Attribute:name+' => '~~',
+    'Class:FAQCategory/Attribute:faq_list' => 'Tudástárak',
+    'Class:FAQCategory/Attribute:faq_list+' => 'Gyakori kérdések ehhez a kategóriához kapcsolódóan',
 ));
 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+' => 'Tudástár kategóriák',
+    'Menu:FAQ' => 'Tudástár',
+    'Menu:FAQ+' => 'Meglévő tudástárak',
+    '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>',
 ));

datamodels/2.x/itop-files-information/dictionaries/cs.dict.itop-files-information.php

@@ -24,7 +24,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	// Errors
 	'FilesInformation:Error:MissingFile' => 'Missing file: %1$s~~',
 	'FilesInformation:Error:CorruptedFile' => 'File %1$s is corrupted~~',
-	'FilesInformation:Error:ListCorruptedFile' => 'File(s) corrupted: %1$s~~',
+	'FilesInformation:Error:ListCorruptedFile' => 'File(s) corrupted: %1$s ~~',
 	'FilesInformation:Error:CantWriteToFile' => 'Can not write to file %1$s~~',
 ));
 

datamodels/2.x/itop-files-information/dictionaries/da.dict.itop-files-information.php

@@ -24,7 +24,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	// Errors
 	'FilesInformation:Error:MissingFile' => 'Missing file: %1$s~~',
 	'FilesInformation:Error:CorruptedFile' => 'File %1$s is corrupted~~',
-	'FilesInformation:Error:ListCorruptedFile' => 'File(s) corrupted: %1$s~~',
+	'FilesInformation:Error:ListCorruptedFile' => 'File(s) corrupted: %1$s ~~',
 	'FilesInformation:Error:CantWriteToFile' => 'Can not write to file %1$s~~',
 ));
 

datamodels/2.x/itop-files-information/dictionaries/es_cr.dict.itop-files-information.php

@@ -25,7 +25,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	// Errors
 	'FilesInformation:Error:MissingFile' => 'Archivo faltante: %1$s',
 	'FilesInformation:Error:CorruptedFile' => 'El archivo %1$s está corrupto',
-	'FilesInformation:Error:ListCorruptedFile' => 'File(s) corrupted: %1$s~~',
+	'FilesInformation:Error:ListCorruptedFile' => 'File(s) corrupted: %1$s ~~',
 	'FilesInformation:Error:CantWriteToFile' => 'No se puede escribir al archivo %1$s',
 ));
 

datamodels/2.x/itop-files-information/dictionaries/it.dict.itop-files-information.php

@@ -24,7 +24,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	// Errors
 	'FilesInformation:Error:MissingFile' => 'Missing file: %1$s~~',
 	'FilesInformation:Error:CorruptedFile' => 'File %1$s is corrupted~~',
-	'FilesInformation:Error:ListCorruptedFile' => 'File(s) corrupted: %1$s~~',
+	'FilesInformation:Error:ListCorruptedFile' => 'File(s) corrupted: %1$s ~~',
 	'FilesInformation:Error:CantWriteToFile' => 'Can not write to file %1$s~~',
 ));
 

datamodels/2.x/itop-files-information/dictionaries/ja.dict.itop-files-information.php

@@ -24,7 +24,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	// Errors
 	'FilesInformation:Error:MissingFile' => 'Missing file: %1$s~~',
 	'FilesInformation:Error:CorruptedFile' => 'File %1$s is corrupted~~',
-	'FilesInformation:Error:ListCorruptedFile' => 'File(s) corrupted: %1$s~~',
+	'FilesInformation:Error:ListCorruptedFile' => 'File(s) corrupted: %1$s ~~',
 	'FilesInformation:Error:CantWriteToFile' => 'Can not write to file %1$s~~',
 ));
 

datamodels/2.x/itop-files-information/dictionaries/nl.dict.itop-files-information.php

@@ -26,7 +26,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	// Errors
 	'FilesInformation:Error:MissingFile' => 'Ontbrekend bestand: %1$s',
 	'FilesInformation:Error:CorruptedFile' => 'Corrupt bestand: %1$s',
-	'FilesInformation:Error:ListCorruptedFile' => 'File(s) corrupted: %1$s~~',
+	'FilesInformation:Error:ListCorruptedFile' => 'File(s) corrupted: %1$s ~~',
 	'FilesInformation:Error:CantWriteToFile' => 'Kan niet schrijven naar bestand %1$s',
 ));
 

datamodels/2.x/itop-files-information/dictionaries/pt_br.dict.itop-files-information.php

@@ -24,7 +24,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	// Errors
 	'FilesInformation:Error:MissingFile' => 'Arquivo ausente: %1$s',
 	'FilesInformation:Error:CorruptedFile' => 'Arquivo %1$s está corrompido',
-	'FilesInformation:Error:ListCorruptedFile' => 'File(s) corrupted: %1$s~~',
+	'FilesInformation:Error:ListCorruptedFile' => 'File(s) corrupted: %1$s ~~',
 	'FilesInformation:Error:CantWriteToFile' => 'Sem permissão de escrita no arquivo %1$s',
 ));
 

datamodels/2.x/itop-files-information/dictionaries/ru.dict.itop-files-information.php

@@ -12,7 +12,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	// Errors
 	'FilesInformation:Error:MissingFile' => 'Файл %1$s отсутствует',
 	'FilesInformation:Error:CorruptedFile' => 'Файл %1$s повреждён',
-	'FilesInformation:Error:ListCorruptedFile' => 'File(s) corrupted: %1$s~~',
+	'FilesInformation:Error:ListCorruptedFile' => 'File(s) corrupted: %1$s ~~',
 	'FilesInformation:Error:CantWriteToFile' => 'Невозможно выполнить запись в файл %1$s',
 ));
 

datamodels/2.x/itop-files-information/dictionaries/sk.dict.itop-files-information.php

@@ -24,7 +24,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	// Errors
 	'FilesInformation:Error:MissingFile' => 'Missing file: %1$s~~',
 	'FilesInformation:Error:CorruptedFile' => 'File %1$s is corrupted~~',
-	'FilesInformation:Error:ListCorruptedFile' => 'File(s) corrupted: %1$s~~',
+	'FilesInformation:Error:ListCorruptedFile' => 'File(s) corrupted: %1$s ~~',
 	'FilesInformation:Error:CantWriteToFile' => 'Can not write to file %1$s~~',
 ));
 

datamodels/2.x/itop-files-information/dictionaries/tr.dict.itop-files-information.php

@@ -24,7 +24,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	// Errors
 	'FilesInformation:Error:MissingFile' => 'Missing file: %1$s~~',
 	'FilesInformation:Error:CorruptedFile' => 'File %1$s is corrupted~~',
-	'FilesInformation:Error:ListCorruptedFile' => 'File(s) corrupted: %1$s~~',
+	'FilesInformation:Error:ListCorruptedFile' => 'File(s) corrupted: %1$s ~~',
 	'FilesInformation:Error:CantWriteToFile' => 'Can not write to file %1$s~~',
 ));
 

datamodels/2.x/itop-files-information/dictionaries/zh_cn.dict.itop-files-information.php

@@ -22,7 +22,7 @@
  */
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	// Errors
-	'FilesInformation:Error:MissingFile' => '文件丢失: %1$s~~',
+	'FilesInformation:Error:MissingFile' => '文件丢失: %1$s',
 	'FilesInformation:Error:CorruptedFile' => '文件 %1$s 已损坏',
 	'FilesInformation:Error:ListCorruptedFile' => '已损坏的文件: %1$s',
 	'FilesInformation:Error:CantWriteToFile' => '文件 %1$s 无法写入',

datamodels/2.x/itop-hub-connector/dictionaries/cs.dict.itop-hub-connector.php

@@ -25,12 +25,12 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Menu:iTopHub' => 'iTop Hub~~',
 	'Menu:iTopHub:Register' => 'Connect to iTop Hub~~',
 	'Menu:iTopHub:Register+' => 'Go to iTop Hub to update your '.ITOP_APPLICATION_SHORT.' instance~~',
-	'Menu:iTopHub:Register:Description' => '<p>Get access to your community platform iTop Hub!</br>Find all the content and information you need, manage your instances through personalized tools & install more extensions.</br><br/>By connecting to the Hub from this page, you will push information about this '.ITOP_APPLICATION_SHORT.' instance into the Hub.</p>~~',
+	'Menu:iTopHub:Register:Description' => '<p>Get access to your community platform iTop Hub!<br>Find all the content and information you need, manage your instances through personalized tools & install more extensions.<br><br>By connecting to the Hub from this page, you will push information about this '.ITOP_APPLICATION_SHORT.' instance into the Hub.</p>~~',
 	'Menu:iTopHub:MyExtensions' => 'Deployed extensions~~',
 	'Menu:iTopHub:MyExtensions+' => 'See the list of extensions deployed on this instance of '.ITOP_APPLICATION_SHORT.'~~',
 	'Menu:iTopHub:BrowseExtensions' => 'Get extensions from iTop Hub~~',
 	'Menu:iTopHub:BrowseExtensions+' => 'Browse for more extensions on iTop Hub~~',
-	'Menu:iTopHub:BrowseExtensions:Description' => '<p>Look into iTop Hub’s store, your one stop place to find wonderful '.ITOP_APPLICATION_SHORT.' extensions !</br>Find the ones that will help you customize and adapt '.ITOP_APPLICATION_SHORT.' to your processes.</br><br/>By connecting to the Hub from this page, you will push information about this '.ITOP_APPLICATION_SHORT.' instance into the Hub.</p>~~',
+	'Menu:iTopHub:BrowseExtensions:Description' => '<p>Look into iTop Hub’s store, your one stop place to find wonderful iTop extensions !<br>Find the ones that will help you customize and adapt '.ITOP_APPLICATION_SHORT.' to your processes.<br><br>By connecting to the Hub from this page, you will push information about this '.ITOP_APPLICATION_SHORT.' instance into the Hub.</p>',
 	'iTopHub:GoBtn' => 'Go To iTop Hub~~',
 	'iTopHub:CloseBtn' => 'Close~~',
 	'iTopHub:GoBtn:Tooltip' => 'Jump to www.itophub.io~~',
@@ -45,7 +45,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'iTopHub:Landing:Status' => 'Deployment status~~',
 	'iTopHub:Landing:Install' => 'Deploying extensions...~~',
 	'iTopHub:CompiledOK' => 'Compilation successful.~~',
-	'iTopHub:ConfigurationSafelyReverted' => 'Error detected during deployment!<br/>'.ITOP_APPLICATION_SHORT.' configuration has NOT been modified.~~',
+	'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~~',

datamodels/2.x/itop-hub-connector/dictionaries/da.dict.itop-hub-connector.php

@@ -25,12 +25,12 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Menu:iTopHub' => 'iTop Hub~~',
 	'Menu:iTopHub:Register' => 'Connect to iTop Hub~~',
 	'Menu:iTopHub:Register+' => 'Go to iTop Hub to update your '.ITOP_APPLICATION_SHORT.' instance~~',
-	'Menu:iTopHub:Register:Description' => '<p>Get access to your community platform iTop Hub!</br>Find all the content and information you need, manage your instances through personalized tools & install more extensions.</br><br/>By connecting to the Hub from this page, you will push information about this '.ITOP_APPLICATION_SHORT.' instance into the Hub.</p>~~',
+	'Menu:iTopHub:Register:Description' => '<p>Get access to your community platform iTop Hub!<br>Find all the content and information you need, manage your instances through personalized tools & install more extensions.<br><br>By connecting to the Hub from this page, you will push information about this '.ITOP_APPLICATION_SHORT.' instance into the Hub.</p>~~',
 	'Menu:iTopHub:MyExtensions' => 'Deployed extensions~~',
 	'Menu:iTopHub:MyExtensions+' => 'See the list of extensions deployed on this instance of '.ITOP_APPLICATION_SHORT.'~~',
 	'Menu:iTopHub:BrowseExtensions' => 'Get extensions from iTop Hub~~',
 	'Menu:iTopHub:BrowseExtensions+' => 'Browse for more extensions on iTop Hub~~',
-	'Menu:iTopHub:BrowseExtensions:Description' => '<p>Look into iTop Hub’s store, your one stop place to find wonderful '.ITOP_APPLICATION_SHORT.' extensions !</br>Find the ones that will help you customize and adapt '.ITOP_APPLICATION_SHORT.' to your processes.</br><br/>By connecting to the Hub from this page, you will push information about this '.ITOP_APPLICATION_SHORT.' instance into the Hub.</p>~~',
+	'Menu:iTopHub:BrowseExtensions:Description' => '<p>Look into iTop Hub’s store, your one stop place to find wonderful iTop extensions !<br>Find the ones that will help you customize and adapt '.ITOP_APPLICATION_SHORT.' to your processes.<br><br>By connecting to the Hub from this page, you will push information about this '.ITOP_APPLICATION_SHORT.' instance into the Hub.</p>',
 	'iTopHub:GoBtn' => 'Go To iTop Hub~~',
 	'iTopHub:CloseBtn' => 'Close~~',
 	'iTopHub:GoBtn:Tooltip' => 'Jump to www.itophub.io~~',
@@ -45,7 +45,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'iTopHub:Landing:Status' => 'Deployment status~~',
 	'iTopHub:Landing:Install' => 'Deploying extensions...~~',
 	'iTopHub:CompiledOK' => 'Compilation successful.~~',
-	'iTopHub:ConfigurationSafelyReverted' => 'Error detected during deployment!<br/>'.ITOP_APPLICATION_SHORT.' configuration has NOT been modified.~~',
+	'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~~',

datamodels/2.x/itop-hub-connector/dictionaries/de.dict.itop-hub-connector.php

@@ -25,12 +25,12 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Menu:iTopHub' => 'iTop Hub',
 	'Menu:iTopHub:Register' => 'Mit dem iTop Hub verbinden',
 	'Menu:iTopHub:Register+' => ITOP_APPLICATION_SHORT.'-Instanzen über den iTop Hub updaten',
-	'Menu:iTopHub:Register:Description' => '<p>Zugriff auf die Community-Plattform iTop Hub!</br>Hier finden sie Informationen zu ihren '.ITOP_APPLICATION_SHORT.' Instanzen, können diese mit personalisierten Tools verwalten und sich Erweiterungen installieren.</br><br/>Durch die Verbindung mit dem iTop Hub, werden Informationen zu Ihrer '.ITOP_APPLICATION_SHORT.' Instanz zum iTop Hub übertragen.</p>',
+	'Menu:iTopHub:Register:Description' => '<p>Zugriff auf die Community-Plattform iTop Hub!<br>Hier finden sie Informationen zu ihren '.ITOP_APPLICATION_SHORT.' Instanzen, können diese mit personalisierten Tools verwalten und sich Erweiterungen installieren.<br><br>Durch die Verbindung mit dem iTop Hub, werden Informationen zu Ihrer '.ITOP_APPLICATION_SHORT.' Instanz zum iTop Hub übertragen.</p>',
 	'Menu:iTopHub:MyExtensions' => 'Installierte Erweiterungen',
 	'Menu:iTopHub:MyExtensions+' => 'Liste der auf ihrer '.ITOP_APPLICATION_SHORT.' Instanz installierten Erweiterungen',
 	'Menu:iTopHub:BrowseExtensions' => 'Erweiterungen vom iTop Hub beziehen',
 	'Menu:iTopHub:BrowseExtensions+' => 'Mehr Erweiterungen auf dem iTop Hub entdecken',
-	'Menu:iTopHub:BrowseExtensions:Description' => '<p>Zugriff auf die Community-Plattform iTop Hub!</br>Hier finden sie Informationen zu ihren '.ITOP_APPLICATION_SHORT.' Instanzen, können diese mit personalisierten Tools verwalten und sich Erweiterungen installieren.</br><br/>Durch die Verbindung mit dem iTop Hub, werden Informationen zu Ihrer '.ITOP_APPLICATION_SHORT.' Instanz zum iTop Hub übertragen.</p>',
+	'Menu:iTopHub:BrowseExtensions:Description' => '<p>Zugriff auf die Community-Plattform iTop Hub!<br>Hier finden sie Informationen zu ihren '.ITOP_APPLICATION_SHORT.' Instanzen, können diese mit personalisierten Tools verwalten und sich Erweiterungen installieren.<br><br>Durch die Verbindung mit dem iTop Hub, werden Informationen zu Ihrer '.ITOP_APPLICATION_SHORT.' Instanz zum iTop Hub übertragen.</p>',
 	'iTopHub:GoBtn' => 'Gehe zum iTop Hub',
 	'iTopHub:CloseBtn' => 'Schließen',
 	'iTopHub:GoBtn:Tooltip' => 'Gehe zu www.itophub.io',
@@ -45,7 +45,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'iTopHub:Landing:Status' => 'Installationsstatus',
 	'iTopHub:Landing:Install' => 'Erweiterungen werden installiert...',
 	'iTopHub:CompiledOK' => 'Installation erfolgreich',
-	'iTopHub:ConfigurationSafelyReverted' => 'Fehler während der Installation!<br/>'.ITOP_APPLICATION_SHORT.' Konfiguration wurde NICHT angepasst.',
+	'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',

datamodels/2.x/itop-hub-connector/dictionaries/en.dict.itop-hub-connector.php

@@ -26,12 +26,12 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Menu:iTopHub' => 'iTop Hub',
 	'Menu:iTopHub:Register' => 'Connect to iTop Hub',
 	'Menu:iTopHub:Register+' => 'Go to iTop Hub to update your '.ITOP_APPLICATION_SHORT.' instance',
-	'Menu:iTopHub:Register:Description' => '<p>Get access to your community platform iTop Hub!</br>Find all the content and information you need, manage your instances through personalized tools & install more extensions.</br><br/>By connecting to the Hub from this page, you will push information about this '.ITOP_APPLICATION_SHORT.' instance into the Hub.</p>',
+	'Menu:iTopHub:Register:Description' => '<p>Get access to your community platform iTop Hub!<br>Find all the content and information you need, manage your instances through personalized tools & install more extensions.<br><br>By connecting to the Hub from this page, you will push information about this '.ITOP_APPLICATION_SHORT.' instance into the Hub.</p>',
 	'Menu:iTopHub:MyExtensions' => 'Deployed extensions',
 	'Menu:iTopHub:MyExtensions+' => 'See the list of extensions deployed on this instance of '.ITOP_APPLICATION_SHORT,
 	'Menu:iTopHub:BrowseExtensions' => 'Get extensions from iTop Hub',
 	'Menu:iTopHub:BrowseExtensions+' => 'Browse for more extensions on iTop Hub',
-	'Menu:iTopHub:BrowseExtensions:Description' => '<p>Look into iTop Hub’s store, your one stop place to find wonderful iTop extensions !</br>Find the ones that will help you customize and adapt '.ITOP_APPLICATION_SHORT.' to your processes.</br><br/>By connecting to the Hub from this page, you will push information about this '.ITOP_APPLICATION_SHORT.' instance into the Hub.</p>',
+	'Menu:iTopHub:BrowseExtensions:Description' => '<p>Look into iTop Hub’s store, your one stop place to find wonderful iTop extensions !<br>Find the ones that will help you customize and adapt '.ITOP_APPLICATION_SHORT.' to your processes.<br><br>By connecting to the Hub from this page, you will push information about this '.ITOP_APPLICATION_SHORT.' instance into the Hub.</p>',
 	'iTopHub:GoBtn' => 'Go To iTop Hub',
 	'iTopHub:CloseBtn' => 'Close',
 	'iTopHub:GoBtn:Tooltip' => 'Jump to www.itophub.io',
@@ -47,7 +47,7 @@ Dict::Add('EN US', 'English', 'English', array(
 	'iTopHub:Landing:Status' => 'Deployment status',
 	'iTopHub:Landing:Install' => 'Deploying extensions...',
 	'iTopHub:CompiledOK' => 'Compilation successful.',
-	'iTopHub:ConfigurationSafelyReverted' => 'Error detected during deployment!<br/>'.ITOP_APPLICATION_SHORT.' configuration has NOT been modified.',
+	'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',
@@ -65,7 +65,7 @@ Dict::Add('EN US', 'English', 'English', array(
 	'iTopHub:Uncompressing' => 'Uncompressing extensions...',
 	'iTopHub:InstallationWelcome' => 'Installation of the extensions downloaded from iTop Hub',
 	'iTopHub:DBBackupLabel' => 'Instance backup',
-	'iTopHub:DBBackupSentence' => 'Do a backup of the database and iTop configuration before updating',
+	'iTopHub:DBBackupSentence' => 'Do a backup of the database and '.ITOP_APPLICATION_SHORT.' configuration before updating',
 	'iTopHub:DeployBtn' => 'Deploy !',
 	'iTopHub:DatabaseBackupProgress' => 'Instance backup...',